hyzp_ybqx-Commit027：开始实现兴文县App。按照 yzp_ybqx-Commit026-区县切换新方法-OK 切换到 hyzp_ybqx511528_xingwen 版本，编译运行成功，但登录失败

README.md

@@ -1,4 +1,4 @@
-# hyzp_ybqx511505_sanjiang_new_area_launche
+# hyzp_ybqx511528_xingwen
 
 HeiYanZhuaPai_YiBin_QuXian Flutter application .
 

android/app/build.gradle

@@ -36,7 +36,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.flutter.hyzp_ybqx511505_sanjiang_new_area_launche"
+        applicationId "com.flutter.hyzp_ybqx511528_xingwen"
         minSdkVersion 21
         targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.flutter.hyzp_ybqx511505_sanjiang_new_area_launche">
+    package="com.flutter.hyzp_ybqx511528_xingwen">
     <!--    * What went wrong:
     Execution failed for task ':app:generateDebugBuildConfig'.
     > org.xml.sax.SAXParseException; systemId: file:/R:/FlutterProject/FlutterProject33/hyzp_ybqx/android/app/src/main/AndroidManifest.xml; lineNumber: 69; columnNumber: 48; ��Ԫ
@@ -35,9 +35,9 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name="com.flutter.hyzp_ybqx511505_sanjiang_new_area_launche.MyApplication"
+        android:name="com.flutter.hyzp_ybqx511528_xingwen.MyApplication"
         android:icon="@mipmap/ic_launcher"
-        android:label="宜宾三江新区黑烟抓拍"
+        android:label="宜宾市兴文黑烟抓拍"
         android:networkSecurityConfig="@xml/network_security_config"
         android:usesCleartextTraffic="true"
         tools:replace="android:label">

android/app/src/main/java/com/example/hyzp_yibin/MainActivity.java

@@ -1,4 +1,4 @@
-package com.flutter.hyzp_ybqx511505_sanjiang_new_area_launche;
+package com.flutter.hyzp_ybqx511528_xingwen;
 
 import io.flutter.embedding.android.FlutterActivity;
 

android/app/src/main/java/com/example/hyzp_yibin/MyApplication.java

@@ -1,4 +1,4 @@
-package com.flutter.hyzp_ybqx511505_sanjiang_new_area_launche;
+package com.flutter.hyzp_ybqx511528_xingwen;
 
 import com.baidu.flutter_bmfbase.BmfMapApplication;
 

android/app/src/main/res/drawable/launch_background.xml

@@ -16,7 +16,7 @@
     <item android:top="37.5dp">
         <bitmap
             android:gravity="fill"
-            android:src="@mipmap/hyzp_ybqx511505_sanjiang_new_area_launche" />
+            android:src="@mipmap/hyzp_ybqx511528_xingwen_launche" />
     </item>
 
 </layer-list>

android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.flutter.hyzp_ybqx511505_sanjiang_new_area_launche">
+    package="com.flutter.hyzp_ybqx511528_xingwen">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

ios/Runner/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>hyzp_ybqx511505_sanjiang_new_area_launche</string>
+	<string>hyzp_ybqx511528_xingwen</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>

lib/components/UserAuthority.dart

@@ -1,8 +1,8 @@
 import 'package:dio/dio.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/config/service_url.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/services/EventBus.dart';
+import 'package:hyzp_ybqx511528_xingwen/config/service_url.dart';
+import 'package:hyzp_ybqx511528_xingwen/services/EventBus.dart';
 
 import 'commonFun.dart';
 

lib/components/commonFun.dart

@@ -12,7 +12,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 //import '../my_wechat_assets_picker_fix/my_asset_picker_1.dart';
 import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/provider/player_region.dart';
+import 'package:hyzp_ybqx511528_xingwen/provider/player_region.dart';
 
 import 'UserInfo.dart';
 
@@ -28,8 +28,8 @@ import 'UserInfo.dart';
 //         android:label="宜宾市筠连黑烟抓拍"
 //         android:label="宜宾市兴文黑烟抓拍"
 
-// 2、修改App的android和Flutter启动图片，制作并运行 hyzp_ybqx511505_sanjiang_new_area_launche.images_copy.cmd，自动完成两项拷贝任务
-// (1)、拷贝不同分辨率的图片文件hyzp_ybqx511505_sanjiang_new_area_launche_launche.png到下面目录，作为App的android启动图片
+// 2、修改App的android和Flutter启动图片，制作并运行 hyzp_ybqx511528_xingwen.images_copy.cmd，自动完成两项拷贝任务
+// (1)、拷贝不同分辨率的图片文件hyzp_ybqx511528_xingwen_launche.png到下面目录，作为App的android启动图片
 // r:\FlutterProject\FlutterProject51-hyzp_ybqx\hyzp_ybqx\android\app\src\main\res\mipmap-hdpi\
 // r:\FlutterProject\FlutterProject51-hyzp_ybqx\hyzp_ybqx\android\app\src\main\res\mipmap-mdpi\
 // r:\FlutterProject\FlutterProject51-hyzp_ybqx\hyzp_ybqx\android\app\src\main\res\mipmap-xhdpi\
@@ -45,18 +45,21 @@ import 'UserInfo.dart';
 // String yibin_QuXian = '宜宾';
 // String copyright_info = '© ' + yibin_QuXian + '市生态环境局 四川省踏石科技有限公司 版权所有' + service_tel;
 // String copyright_info_PinYin = 'YIBIN BLACK SMOKE CAR CAPTURE SYSTEM';
+// const serviceUrl_ybqx = 'http://125.64.218.67:9904';
 
+const serviceUrl_ybqx = 'http://125.64.218.67:9909';
 // 511502、翠屏区
+// int qxdm = 511502;
 // String service_tel = '';
 // String yibin_QuXian = '宜宾市翠屏';
 // String copyright_info = '© ' + yibin_QuXian + '生态环境局 版权所有' + service_tel;
 // String copyright_info_PinYin = 'YIBIN CUIPING BLACK SMOKE CAR CAPTURE SYSTEM';
 
 // 511505、三江新区
-String service_tel = '服务热线：187-8467-8300';
-String yibin_QuXian = '宜宾三江新区';
-String copyright_info = '© ' + yibin_QuXian + '城乡融合发展局 四川省踏石科技\n版权所有， ' + service_tel;
-String copyright_info_PinYin = 'YIBIN SANJIANG NEW AREA BLACK SMOKE CAR CAPTURE SYSTEM';
+// String service_tel = '服务热线：187-8467-8300';
+// String yibin_QuXian = '宜宾三江新区';
+// String copyright_info = '© ' + yibin_QuXian + '城乡融合发展局 四川省踏石科技\n版权所有， ' + service_tel;
+// String copyright_info_PinYin = 'YIBIN SANJIANG NEW AREA BLACK SMOKE CAR CAPTURE SYSTEM';
 
 // 511524、长宁县
 // String service_tel = '';
@@ -71,19 +74,20 @@ String copyright_info_PinYin = 'YIBIN SANJIANG NEW AREA BLACK SMOKE CAR CAPTURE
 // String copyright_info_PinYin = 'YIBIN JUNLIAN BLACK SMOKE CAR CAPTURE SYSTEM';
 
 // 511528、兴文县
-// String service_tel = '\n服务热线：187-8467-8300';
-// String yibin_QuXian = '宜宾市兴文';
-// String copyright_info = '© ' + yibin_QuXian + '生态环境局 四川省踏石科技 版权所有' + service_tel;
-// String copyright_info_PinYin = 'YIBIN XINGWEN BLACK SMOKE CAR CAPTURE SYSTEM';
+int qxdm = 511528;
+String service_tel = '\n服务热线：187-8467-8300';
+String yibin_QuXian = '宜宾市兴文';
+String copyright_info = '© ' + yibin_QuXian + '生态环境局 四川省踏石科技 版权所有' + service_tel;
+String copyright_info_PinYin = 'YIBIN XINGWEN BLACK SMOKE CAR CAPTURE SYSTEM';
 
-// 4、全局替换，将 ”hyzp_ybqx511505_sanjiang_new_area_launche“全部替换为 ”hyzp_ybqx511505_sanjiang_new_area_launche“，自动完成以下修改
+// 4、全局替换，将 ”hyzp_ybqx511528_xingwen“全部替换为 ”hyzp_ybqx511528_xingwen“，自动完成以下修改
 // (1)、修改 R:\FlutterProject\FlutterProject51-hyzp_ybqx\hyzp_ybqx\pubspec.yaml 文件中的AppID，但存放目錄不變
-// name: hyzp_ybqx511505_sanjiang_new_area_launche
+// name: hyzp_ybqx511528_xingwen
 // (2)、全局替换：
-//  A、将 “com.flutter.hyzp_ybqx00_yibin” 全部替换为 “com.flutter.hyzp_ybqx511505_sanjiang_new_area_launche”
-//  B、将 “package:hyzp_ybqx00_yibin/” 全部替换为 “package:hyzp_ybqx511505_sanjiang_new_area_launche/”
-//  C、将 “# hyzp_ybqx00_yibin” 全部替换为 “# hyzp_ybqx511505_sanjiang_new_area_launche”
-//  D、将 “<string>hyzp_ybqx00_yibin</string>” 全部替换为 “<string>hyzp_ybqx511505_sanjiang_new_area_launche</string>”
+//  A、将 “com.flutter.hyzp_ybqx00_yibin” 全部替换为 “com.flutter.hyzp_ybqx511528_xingwen”
+//  B、将 “package:hyzp_ybqx00_yibin/” 全部替换为 “package:hyzp_ybqx511528_xingwen/”
+//  C、将 “# hyzp_ybqx00_yibin” 全部替换为 “# hyzp_ybqx511528_xingwen”
+//  D、将 “<string>hyzp_ybqx00_yibin</string>” 全部替换为 “<string>hyzp_ybqx511528_xingwen</string>”
 
 // 5、完成以上修改后，打开 Android Studio 的终端窗口，切换到项目的 lib 目录下，运行 flutter clean
 
@@ -576,14 +580,14 @@ Future image2Base64(String imagePath) async {
 //从字符路径 path 获取扩展名，不含点号
 getFileExtension(String path) {
   //return path.substring(path.lastIndexOf('.'));
-  //imagePath = /data/user/0/com.flutter.hyzp_ybqx511505_sanjiang_new_area_launche/app_flutter/Pictures/flutter_test/1614662209478.jpg, ext = .jpg
+  //imagePath = /data/user/0/com.flutter.hyzp_ybqx511528_xingwen/app_flutter/Pictures/flutter_test/1614662209478.jpg, ext = .jpg
   return path.substring(path.lastIndexOf('.') + 1); //不含点号
 }
 
 //从字符路径 path 获取文件名(含扩展名)
 getFileName(String path) {
   //return path.substring(path.lastIndexOf('.'));
-  //imagePath = /data/user/0/com.flutter.hyzp_ybqx511505_sanjiang_new_area_launche/app_flutter/Pictures/flutter_test/1614662209478.jpg, ext = .jpg
+  //imagePath = /data/user/0/com.flutter.hyzp_ybqx511528_xingwen/app_flutter/Pictures/flutter_test/1614662209478.jpg, ext = .jpg
   return path.substring(path.lastIndexOf('/') + 1); //不含点号
 }
 

lib/components/customDialogH.dart

@@ -1,8 +1,8 @@
-import 'package:flutter/material.dart';
 import 'dart:io';
-import 'package:image_picker/image_picker.dart';
+
 import 'package:dio/dio.dart';
-import '../config/service_url.dart';
+import 'package:flutter/material.dart';
+import 'package:image_picker/image_picker.dart';
 
 //拍照、选择相册图片对话框
 class customDialogH extends Dialog {
@@ -154,7 +154,7 @@ class customDialogH extends Dialog {
       "file": await MultipartFile.fromFile(fileDir, filename: "xxx.jpg")
     });
     //var response = await Dio().post(ServicePath.uploadImageUrl, data: fileDir);
-    var response = await Dio().post(ServiceUrlJd, data: fileDir);
-    print(response);
+    // var response = await Dio().post(ServiceUrlJd, data: fileDir);
+    // print(response);
   }
 }

lib/components/customDialogHysh.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/dioFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/dioFun.dart';
 
 import 'commonFun.dart';
 

lib/components/dioFun.dart

@@ -1,22 +1,17 @@
-import 'dart:convert';
-
 import 'package:dio/dio.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/screen_util.dart';
 import 'package:fluttertoast/fluttertoast.dart';
-import 'package:http/http.dart' as my_http;
+import 'package:hyzp_ybqx511528_xingwen/components/doJSON.dart';
+import 'package:hyzp_ybqx511528_xingwen/services/EventBus.dart';
+import 'package:hyzp_ybqx511528_xingwen/widget/my_superplayer.dart';
 import 'package:sprintf/sprintf.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/doJSON.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/services/EventBus.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/my_superplayer.dart';
 
 import '../components/hyxx_data_handle.dart';
 import '../config/service_url.dart';
 import '../res/listContacts.dart';
-import '../widget/my_delay_toast.dart';
-// import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/player_pro.dart';
-// import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/player_pro_new.dart';
+// import 'package:hyzp_ybqx511528_xingwen/widget/player_pro.dart';
+// import 'package:hyzp_ybqx511528_xingwen/widget/player_pro_new.dart';
 import 'UserAuthority.dart';
 import 'commonFun.dart';
 
@@ -2007,168 +2002,168 @@ Future getDwspUrlNew(
 }
 
 ///得到点位视频（Dwsp）播放地址，用插件 http: ^0.12.2
-Future getDwspUrl({@required int index, String theSbgllx = 'dwsp', BuildContext context}) async {
-  print('\n --- getingDwVideo = $getingDwVideo --- \n');
-  //正在获取点位视频标志，禁止重入
-  if (getingDwVideo) {
-    Fluttertoast.showToast(
-      msg: '正在后台获取 $getingDwmc 点位视频地址，请稍后重试',
-      toastLength: Toast.LENGTH_SHORT,
-      gravity: ToastGravity.CENTER,
-    );
-    return '';
-  }
-
-  //标注正在获取点位视频的记录
-  getingIndex = index;
-  print('_getingIndex = $getingIndex');
-  eventBus.fire(DwspUpdateEvent('点位视频信息数据更新广播'));
-
-  getingDwVideo = true;
-  getingDwmc = '${(index + 1)}、${listDwinfoGetList2[index]['dwmc']}'; //正在获取视频的点位名称
-  print('\n --- 正在后台获取 $getingDwmc 点位视频地址 --- \n');
-  print('\n --- getingDwVideo = $getingDwVideo --- \n');
-
-  String _dwspUrl;
-  getCount = 1;
-
-  //MediaQueryData.fromWindow(window).padding.top //这个就是状态栏的高度
-  //ScreenUtil().statusBarHeight  //状态栏高度 刘海屏会更高  单位dp
-  print('ScreenUtil().statusBarHeight = ${ScreenUtil().statusBarHeight}');
-  getSumTime = getCurrentTiem();
-  MyDelayToast(
-      context: context,
-      showTime: 30,
-      top: ScreenUtil().statusBarHeight + 2.5,
-      left: ScreenUtil().screenWidth - 80 - 2.5);
-
-  print('开始第$getCount次获取视频地址');
-  getDwspUrl2(index: index, theSbgllx: theSbgllx).then((url) {
-    _dwspUrl = url;
-    if (!isVideoUrl(_dwspUrl)) {
-      print('第$getCount次获取视频地址失败，等待1秒后重试');
-      getCount++;
-      Future.delayed(Duration(seconds: 1), () async {
-        print('开始第$getCount次获取视频地址');
-        getDwspUrl2(index: index, theSbgllx: theSbgllx).then((url) {
-          _dwspUrl = url;
-          if (!isVideoUrl(_dwspUrl)) {
-            print('第$getCount次获取视频地址失败，等待1秒后重试');
-            getCount++;
-            Future.delayed(Duration(seconds: 1), () async {
-              print('开始第$getCount次获取视频地址');
-              getDwspUrl2(index: index, theSbgllx: theSbgllx).then((url) {
-                _dwspUrl = url;
-                if (!isVideoUrl(_dwspUrl)) {
-                  print('第$getCount次获取视频地址失败，等待1秒后重试');
-                  getCount++;
-                  Future.delayed(Duration(seconds: 1), () async {
-                    print('开始第$getCount次获取视频地址');
-                    getDwspUrl2(index: index, theSbgllx: theSbgllx).then((url) {
-                      _dwspUrl = url;
-                      if (!isVideoUrl(_dwspUrl)) {
-                        print('第$getCount次获取视频地址失败，等待1秒后重试');
-                        getCount++;
-                        Future.delayed(Duration(seconds: 1), () async {
-                          print('开始第$getCount次获取视频地址');
-                          getDwspUrl2(index: index, theSbgllx: theSbgllx).then((url) {
-                            _dwspUrl = url;
-                            if (!isVideoUrl(_dwspUrl)) {
-                              getSumTime = getCurrentTiem() - getSumTime;
-                              print('第$getCount次获取 $getingDwmc 点位视频地址失败，直接返回。共用时 $getSumTime 秒');
-                              Fluttertoast.showToast(
-                                msg: '第$getCount次获取 $getingDwmc 点位视频地址失败，请稍后重试。共用时 $getSumTime 秒',
-                                toastLength: Toast.LENGTH_SHORT,
-                                gravity: ToastGravity.CENTER,
-                              );
-                              //正在获取点位视频标志，禁止重入
-                              getingDwVideo = false;
-
-                              //标注正在获取点位视频的记录
-                              getingIndex = -1;
-                              print('_getingIndex = $getingIndex');
-                              eventBus.fire(DwspUpdateEvent('点位视频信息数据更新广播'));
-                            } else {
-                              print('开始播放：第$getCount次成功获取的视频地址');
-                              playUrl(index: index, url: _dwspUrl, context: context);
-                            }
-                          });
-                        });
-                      } else {
-                        print('开始播放：第$getCount次成功获取的视频地址');
-                        playUrl(index: index, url: _dwspUrl, context: context);
-                      }
-                    });
-                  });
-                } else {
-                  print('开始播放：第$getCount次成功获取的视频地址');
-                  playUrl(index: index, url: _dwspUrl, context: context);
-                }
-              });
-            });
-          } else {
-            print('开始播放：第$getCount次成功获取的视频地址');
-            playUrl(index: index, url: _dwspUrl, context: context);
-          }
-        });
-      });
-    } else {
-      print('开始播放：第$getCount次成功获取的视频地址');
-      playUrl(index: index, url: _dwspUrl, context: context);
-    }
-  });
-
-  //不能放到此处，此处不会等待，将导致禁止重入失败
-  //正在获取点位视频标志，禁止重入
-  //getingDwVideo = false;
-
-  //print('失败：$getCount次获取的视频地址都失败！');
-  return _dwspUrl;
-}
+// Future getDwspUrl({@required int index, String theSbgllx = 'dwsp', BuildContext context}) async {
+//   print('\n --- getingDwVideo = $getingDwVideo --- \n');
+//   //正在获取点位视频标志，禁止重入
+//   if (getingDwVideo) {
+//     Fluttertoast.showToast(
+//       msg: '正在后台获取 $getingDwmc 点位视频地址，请稍后重试',
+//       toastLength: Toast.LENGTH_SHORT,
+//       gravity: ToastGravity.CENTER,
+//     );
+//     return '';
+//   }
+//
+//   //标注正在获取点位视频的记录
+//   getingIndex = index;
+//   print('_getingIndex = $getingIndex');
+//   eventBus.fire(DwspUpdateEvent('点位视频信息数据更新广播'));
+//
+//   getingDwVideo = true;
+//   getingDwmc = '${(index + 1)}、${listDwinfoGetList2[index]['dwmc']}'; //正在获取视频的点位名称
+//   print('\n --- 正在后台获取 $getingDwmc 点位视频地址 --- \n');
+//   print('\n --- getingDwVideo = $getingDwVideo --- \n');
+//
+//   String _dwspUrl;
+//   getCount = 1;
+//
+//   //MediaQueryData.fromWindow(window).padding.top //这个就是状态栏的高度
+//   //ScreenUtil().statusBarHeight  //状态栏高度 刘海屏会更高  单位dp
+//   print('ScreenUtil().statusBarHeight = ${ScreenUtil().statusBarHeight}');
+//   getSumTime = getCurrentTiem();
+//   MyDelayToast(
+//       context: context,
+//       showTime: 30,
+//       top: ScreenUtil().statusBarHeight + 2.5,
+//       left: ScreenUtil().screenWidth - 80 - 2.5);
+//
+//   print('开始第$getCount次获取视频地址');
+//   getDwspUrl2(index: index, theSbgllx: theSbgllx).then((url) {
+//     _dwspUrl = url;
+//     if (!isVideoUrl(_dwspUrl)) {
+//       print('第$getCount次获取视频地址失败，等待1秒后重试');
+//       getCount++;
+//       Future.delayed(Duration(seconds: 1), () async {
+//         print('开始第$getCount次获取视频地址');
+//         getDwspUrl2(index: index, theSbgllx: theSbgllx).then((url) {
+//           _dwspUrl = url;
+//           if (!isVideoUrl(_dwspUrl)) {
+//             print('第$getCount次获取视频地址失败，等待1秒后重试');
+//             getCount++;
+//             Future.delayed(Duration(seconds: 1), () async {
+//               print('开始第$getCount次获取视频地址');
+//               getDwspUrl2(index: index, theSbgllx: theSbgllx).then((url) {
+//                 _dwspUrl = url;
+//                 if (!isVideoUrl(_dwspUrl)) {
+//                   print('第$getCount次获取视频地址失败，等待1秒后重试');
+//                   getCount++;
+//                   Future.delayed(Duration(seconds: 1), () async {
+//                     print('开始第$getCount次获取视频地址');
+//                     getDwspUrl2(index: index, theSbgllx: theSbgllx).then((url) {
+//                       _dwspUrl = url;
+//                       if (!isVideoUrl(_dwspUrl)) {
+//                         print('第$getCount次获取视频地址失败，等待1秒后重试');
+//                         getCount++;
+//                         Future.delayed(Duration(seconds: 1), () async {
+//                           print('开始第$getCount次获取视频地址');
+//                           getDwspUrl2(index: index, theSbgllx: theSbgllx).then((url) {
+//                             _dwspUrl = url;
+//                             if (!isVideoUrl(_dwspUrl)) {
+//                               getSumTime = getCurrentTiem() - getSumTime;
+//                               print('第$getCount次获取 $getingDwmc 点位视频地址失败，直接返回。共用时 $getSumTime 秒');
+//                               Fluttertoast.showToast(
+//                                 msg: '第$getCount次获取 $getingDwmc 点位视频地址失败，请稍后重试。共用时 $getSumTime 秒',
+//                                 toastLength: Toast.LENGTH_SHORT,
+//                                 gravity: ToastGravity.CENTER,
+//                               );
+//                               //正在获取点位视频标志，禁止重入
+//                               getingDwVideo = false;
+//
+//                               //标注正在获取点位视频的记录
+//                               getingIndex = -1;
+//                               print('_getingIndex = $getingIndex');
+//                               eventBus.fire(DwspUpdateEvent('点位视频信息数据更新广播'));
+//                             } else {
+//                               print('开始播放：第$getCount次成功获取的视频地址');
+//                               playUrl(index: index, url: _dwspUrl, context: context);
+//                             }
+//                           });
+//                         });
+//                       } else {
+//                         print('开始播放：第$getCount次成功获取的视频地址');
+//                         playUrl(index: index, url: _dwspUrl, context: context);
+//                       }
+//                     });
+//                   });
+//                 } else {
+//                   print('开始播放：第$getCount次成功获取的视频地址');
+//                   playUrl(index: index, url: _dwspUrl, context: context);
+//                 }
+//               });
+//             });
+//           } else {
+//             print('开始播放：第$getCount次成功获取的视频地址');
+//             playUrl(index: index, url: _dwspUrl, context: context);
+//           }
+//         });
+//       });
+//     } else {
+//       print('开始播放：第$getCount次成功获取的视频地址');
+//       playUrl(index: index, url: _dwspUrl, context: context);
+//     }
+//   });
+//
+//   //不能放到此处，此处不会等待，将导致禁止重入失败
+//   //正在获取点位视频标志，禁止重入
+//   //getingDwVideo = false;
+//
+//   //print('失败：$getCount次获取的视频地址都失败！');
+//   return _dwspUrl;
+// }
 
 ///得到点位视频（Dwsp）播放地址，用插件 http: ^0.12.2
-Future getDwspUrl2({@required int index, String theSbgllx = 'dwsp'}) async {
-  String _dwspUrl = '';
-
-  print('开始处理 ${mapHyshlx[theSbgllx]['text']} 网络请求...');
-  String api = ServicePath.getDwspUrl + '${index.toString()}.php';
-  print('api = ${api}');
-  //api = http://125.64.218.67:9908/rtmp/1.php
-
-  try {
-    my_http.Response response = await my_http.get(api);
-    print('response.statusCode = ${response.statusCode}');
-    //I/flutter (18114): Response status: 200
-
-    //var ret = json.decode(response.body); //报错
-    //print('Utf8Codec().decode(response.bodyBytes) = ${Utf8Codec().decode(response.bodyBytes)}');
-    // I/flutter (18114): rtmp://125.64.218.67:9903/rtp/26CCDAA7
-
-    print('response = ${response.toString()}');
-    //response = Instance of 'Response'
-
-    if (response.statusCode == 200) {
-      //final Map<String, dynamic> responseData = json.decode(response.body);
-      //报错：e：Error on line 1, column 18: Invalid media type: expected application/json;
-      _dwspUrl = Utf8Codec().decode(response.bodyBytes).replaceAll('\n', ''); //删除所有换行符
-      print('_dwspUrl = $_dwspUrl');
-      //_dwspUrl = rtmp://125.64.218.67:9903/rtp/30C91573
-    } else {
-      throw Exception('${mapHyshlx[theSbgllx]['text']} 后端接口出现异常，请检测代码和服务器情况...');
-      getingDwVideo = false; //出现异常必须提前释放禁止重入标志
-    }
-  } catch (e) {
-    print('${mapHyshlx[theSbgllx]['text']} 网络请求过程异常 e：${e}');
-    Fluttertoast.showToast(
-      msg: 'ERROR:======>${e}',
-      toastLength: Toast.LENGTH_SHORT,
-      gravity: ToastGravity.CENTER,
-    );
-    getingDwVideo = false; //出现异常必须提前释放禁止重入标志
-  }
-
-  return _dwspUrl;
-}
+// Future getDwspUrl2({@required int index, String theSbgllx = 'dwsp'}) async {
+//   String _dwspUrl = '';
+//
+//   print('开始处理 ${mapHyshlx[theSbgllx]['text']} 网络请求...');
+//   String api = ServicePath.getDwspUrl + '${index.toString()}.php';
+//   print('api = ${api}');
+//   //api = http://125.64.218.67:9908/rtmp/1.php
+//
+//   try {
+//     my_http.Response response = await my_http.get(api);
+//     print('response.statusCode = ${response.statusCode}');
+//     //I/flutter (18114): Response status: 200
+//
+//     //var ret = json.decode(response.body); //报错
+//     //print('Utf8Codec().decode(response.bodyBytes) = ${Utf8Codec().decode(response.bodyBytes)}');
+//     // I/flutter (18114): rtmp://125.64.218.67:9903/rtp/26CCDAA7
+//
+//     print('response = ${response.toString()}');
+//     //response = Instance of 'Response'
+//
+//     if (response.statusCode == 200) {
+//       //final Map<String, dynamic> responseData = json.decode(response.body);
+//       //报错：e：Error on line 1, column 18: Invalid media type: expected application/json;
+//       _dwspUrl = Utf8Codec().decode(response.bodyBytes).replaceAll('\n', ''); //删除所有换行符
+//       print('_dwspUrl = $_dwspUrl');
+//       //_dwspUrl = rtmp://125.64.218.67:9903/rtp/30C91573
+//     } else {
+//       throw Exception('${mapHyshlx[theSbgllx]['text']} 后端接口出现异常，请检测代码和服务器情况...');
+//       getingDwVideo = false; //出现异常必须提前释放禁止重入标志
+//     }
+//   } catch (e) {
+//     print('${mapHyshlx[theSbgllx]['text']} 网络请求过程异常 e：${e}');
+//     Fluttertoast.showToast(
+//       msg: 'ERROR:======>${e}',
+//       toastLength: Toast.LENGTH_SHORT,
+//       gravity: ToastGravity.CENTER,
+//     );
+//     getingDwVideo = false; //出现异常必须提前释放禁止重入标志
+//   }
+//
+//   return _dwspUrl;
+// }
 
 /// 获取最新版本号
 Future getNewverUrl() async {

lib/components/doJSON.dart

@@ -155,8 +155,8 @@ Future<File> getTheFile(String fileName) async {
     print(e);
   }
 
-  // /data/data/com.flutter.hyzp_ybqx511505_sanjiang_new_area_launche/app_flutter/json/listMessagesInbox02.json
-  // /data/data/com.flutter.hyzp_ybqx511505_sanjiang_new_area_launche/app_flutter/json/listContacts02.json
+  // /data/data/com.flutter.hyzp_ybqx511528_xingwen/app_flutter/json/listMessagesInbox02.json
+  // /data/data/com.flutter.hyzp_ybqx511528_xingwen/app_flutter/json/listContacts02.json
   return File('${(await getApplicationDocumentsDirectory()).path}/json/$fileName');
 }
 

lib/config/service_url.dart

@@ -10,111 +10,120 @@
 
 //20210123更换为该地址
 //http://125.64.218.67:9904/docs.php
-const ServiceUrl = 'http://125.64.218.67:9904/';
+// const serviceUrl_ybqx = 'http://125.64.218.67:9904/';
 //图片视频需要添加前缀：http://125.64.218.67:9908
+import 'package:hyzp_ybqx511528_xingwen/components/commonFun.dart';
+
 const ServiceMediaUrl = 'http://125.64.218.67:9908/';
 
 //20201222更换为该地址
 //http://125.64.218.67:9901/docs.php
 //const ServiceUrl = 'http://125.64.218.67:9901/';
-const ServiceUrlJd = 'http://jd.itying.com/imgupload/';
+// const ServiceUrlJd = 'http://jd.itying.com/imgupload/';
 
 ///点位视频（Dwsp）接口Url
-const ServiceDwspUrl = 'http://125.64.218.67:9901';
+// const ServiceDwspUrl = 'http://125.64.218.67:9901';
 
 class ServicePath {
   ///用户登录相关接口
-  static const String loginUrl = ServiceUrl + '?s=App.User_User.Login'; //用户名登录
-  static const String modifyPwUrl = ServiceUrl + '?s=App.User_User.Cpass'; //根据账号和原密码进行修改密码操作
-  static const String loginStateUrl = ServiceUrl + '?s=App.User_User.CheckSession';
-  static const String getUserInfoUrl = ServiceUrl + '?s=App.User_User.Profile'; //获取我的个人信息
-  static const String uploadImageUrl = ServiceUrl + '?s=App.Car_Upload.Pic'; //上传黑烟图片
+  static const String loginUrl = serviceUrl_ybqx + '?s=App.User_User.Login'; //用户名登录
+  static const String modifyPwUrl = serviceUrl_ybqx + '?s=App.User_User.Cpass'; //根据账号和原密码进行修改密码操作
+  static const String loginStateUrl = serviceUrl_ybqx + '?s=App.User_User.CheckSession';
+  static const String getUserInfoUrl = serviceUrl_ybqx + '?s=App.User_User.Profile'; //获取我的个人信息
+  static const String uploadImageUrl = serviceUrl_ybqx + '?s=App.Car_Upload.Pic'; //上传黑烟图片
 
   ///人脸注册和登录相关接口
-  static const String uploadFaceregUrl = ServiceUrl + '?s=App.User_User.Facereg'; //人脸注册接口
-  static const String uploadFaceloginUrl = ServiceUrl + '?s=App.User_User.Facelogin'; //人脸识别登录接口
-  static const String getUserListUrl = ServiceUrl + '?s=App.User_User.GetUserList'; //获取用户分页列表数据
+  static const String uploadFaceregUrl = serviceUrl_ybqx + '?s=App.User_User.Facereg'; //人脸注册接口
+  static const String uploadFaceloginUrl =
+      serviceUrl_ybqx + '?s=App.User_User.Facelogin'; //人脸识别登录接口
+  static const String getUserListUrl =
+      serviceUrl_ybqx + '?s=App.User_User.GetUserList'; //获取用户分页列表数据
 
   ///用户权限管理
   static const String getUserAccessUrl =
-      ServiceUrl + '?s=App.User_User.GetAccess'; //1、根据用户ID获取用户所属角色
-  static const String getUserGroupUrl = ServiceUrl + '?s=App.User_User.GetGroup'; //2、获取后台用户角色分组数据
+      serviceUrl_ybqx + '?s=App.User_User.GetAccess'; //1、根据用户ID获取用户所属角色
+  static const String getUserGroupUrl =
+      serviceUrl_ybqx + '?s=App.User_User.GetGroup'; //2、获取后台用户角色分组数据
   static const String getUserGroupListUrl =
-      ServiceUrl + '?s=App.User_User.GetGroupList'; //3、获取后台用户角色分组分页列表数据
-  static const String getUserAuthUrl = ServiceUrl + '?s=App.User_User.GetAuth'; //4、获取后台功能分类数据
+      serviceUrl_ybqx + '?s=App.User_User.GetGroupList'; //3、获取后台用户角色分组分页列表数据
+  static const String getUserAuthUrl = serviceUrl_ybqx + '?s=App.User_User.GetAuth'; //4、获取后台功能分类数据
   static const String getUserAuthListUrl =
-      ServiceUrl + '?s=App.User_User.GetAuthList'; //5、获取后台功能分类分页列表数据
+      serviceUrl_ybqx + '?s=App.User_User.GetAuthList'; //5、获取后台功能分类分页列表数据
 
   ///违章信息数据相关接口
   // static const String getWzxxGetDataUrl = ServiceUrl + '?s=App.Car_Yjxx.Get';       //获取违章信息单条数据
   // static const String getWzxxGetAllUrl = ServiceUrl + '?s=App.Car_Yjxx.GetAll';     //获取违章信息全部分页列表数据
   // static const String getWzxxGetListUrl = ServiceUrl + '?s=App.Car_Yjxx.GetList';   //获取违章信息分页列表数据
   // static const String auditWzxxUrl = ServiceUrl + '?s=App.Car_Yjxx.Workflow';       //违章信息审核
-  static const String getWzxxGetDataUrl = ServiceUrl + '?s=App.Car_Hyc.Get'; //获取违章信息单条数据
-  static const String getWzxxGetAllUrl = ServiceUrl + '?s=App.Car_Hyc.GetAll'; //获取违章信息全部分页列表数据
-  static const String getWzxxGetListUrl = ServiceUrl + '?s=App.Car_Hyc.GetList'; //获取违章信息分页列表数据
-  static const String updateWzxxUrl = ServiceUrl + '?s=App.Car_Yjxx.Update'; //违章信息更新
+  static const String getWzxxGetDataUrl = serviceUrl_ybqx + '?s=App.Car_Hyc.Get'; //获取违章信息单条数据
+  static const String getWzxxGetAllUrl = serviceUrl_ybqx + '?s=App.Car_Hyc.GetAll'; //获取违章信息全部分页列表数据
+  static const String getWzxxGetListUrl = serviceUrl_ybqx + '?s=App.Car_Hyc.GetList'; //获取违章信息分页列表数据
+  static const String updateWzxxUrl = serviceUrl_ybqx + '?s=App.Car_Yjxx.Update'; //违章信息更新
 
   ////违章信息审核相关接口
-  static const String auditWzxxUrl = ServiceUrl + '?s=App.Car_Hyc.Workflow'; //违章信息审核
-  static const String getShenheUrl = ServiceUrl + '?s=App.Car_Hyc.GetShenhe'; //获取审核信息
-  static const String getNtimeUrl = ServiceUrl + '?s=App.Car_Hyc.GetNtime'; //获取违章间隔时间数据
+  static const String auditWzxxUrl = serviceUrl_ybqx + '?s=App.Car_Hyc.Workflow'; //违章信息审核
+  static const String getShenheUrl = serviceUrl_ybqx + '?s=App.Car_Hyc.GetShenhe'; //获取审核信息
+  static const String getNtimeUrl = serviceUrl_ybqx + '?s=App.Car_Hyc.GetNtime'; //获取违章间隔时间数据
 
-  static const String tsjjGetTsStatus = ServiceUrl + '?s=App.Car_Hyc.GetTs'; //获取推送交警状态信息
-  static const String tsjjFtpUpftpUrl = ServiceUrl + '?s=App.Car_Ftp.Upftp'; //向交警服务器推送数据
-  static const String tsjjFtpUptsztUrl = ServiceUrl + '?s=App.Car_Ftp.Uptszt'; //回写推送交警状态
+  static const String tsjjGetTsStatus = serviceUrl_ybqx + '?s=App.Car_Hyc.GetTs'; //获取推送交警状态信息
+  static const String tsjjFtpUpftpUrl = serviceUrl_ybqx + '?s=App.Car_Ftp.Upftp'; //向交警服务器推送数据
+  static const String tsjjFtpUptsztUrl = serviceUrl_ybqx + '?s=App.Car_Ftp.Uptszt'; //回写推送交警状态
 
   ///Zpjl为抓拍记录缩写
-  static const String getZpjlGetUrl = ServiceUrl + '?s=App.Car_Yjxx.Get'; //根据ID获取对应抓拍记录列表数据
-  static const String getZpjlGetAllUrl = ServiceUrl + '?s=App.Car_Yjxx.GetAll'; //获取全部抓拍记录分页列表数据
+  static const String getZpjlGetUrl = serviceUrl_ybqx + '?s=App.Car_Yjxx.Get'; //根据ID获取对应抓拍记录列表数据
+  static const String getZpjlGetAllUrl =
+      serviceUrl_ybqx + '?s=App.Car_Yjxx.GetAll'; //获取全部抓拍记录分页列表数据
   static const String getZpjlGetListUrl =
-      ServiceUrl + '?s=App.Car_Yjxx.GetList'; //根据审核状态获取抓拍记录分页列表数据
+      serviceUrl_ybqx + '?s=App.Car_Yjxx.GetList'; //根据审核状态获取抓拍记录分页列表数据
 
   ///获取设备信息接口
-  static const String getSbbjGetListUrl = ServiceUrl + '?s=App.Car_Bjxx.GetList'; //获取设备报警信息分页列表数据
-  static const String getSbbjGetUrl = ServiceUrl + '?s=App.Car_Bjxx.Get'; //获取设备报警信息单条数据
-  static const String auditSbbjUrl = ServiceUrl + '?s=App.Car_Bjxx.Workflow'; //核查处理设备报警信息
+  static const String getSbbjGetListUrl =
+      serviceUrl_ybqx + '?s=App.Car_Bjxx.GetList'; //获取设备报警信息分页列表数据
+  static const String getSbbjGetUrl = serviceUrl_ybqx + '?s=App.Car_Bjxx.Get'; //获取设备报警信息单条数据
+  static const String auditSbbjUrl = serviceUrl_ybqx + '?s=App.Car_Bjxx.Workflow'; //核查处理设备报警信息
 
   static const String getMachineGetListUrl =
-      ServiceUrl + '?s=App.Car_Machine.GetList'; //获取设备管理信息分页列表数据
+      serviceUrl_ybqx + '?s=App.Car_Machine.GetList'; //获取设备管理信息分页列表数据
   //http://125.64.218.67:9901/?s=App.Car_Sbbj.GetList
-  static const String getMachineGetDataUrl = ServiceUrl + '?s=App.Car_Machine.Get'; //获取设备管理信息单条数据
+  static const String getMachineGetDataUrl =
+      serviceUrl_ybqx + '?s=App.Car_Machine.Get'; //获取设备管理信息单条数据
 
   ///LED字幕信息
   static const String getLedXsxxGetListUrl =
-      ServiceUrl + '?s=App.Car_Led.GetList'; //获取LED显示信息分页列表数据
-  static const String getLedXsxxGetUrl = ServiceUrl + '?s=App.Car_Led.Get'; //获取LED信息单条数据
+      serviceUrl_ybqx + '?s=App.Car_Led.GetList'; //获取LED显示信息分页列表数据
+  static const String getLedXsxxGetUrl = serviceUrl_ybqx + '?s=App.Car_Led.Get'; //获取LED信息单条数据
   //static const String insertLedXsxxUrl = ServiceUrl + '?s=App.Car_Led.Insert'; //添加LED字幕，已取消该接口
-  static const String updateLedXsxxGetUrl = ServiceUrl + '?s=App.Car_Led.Update'; //更新LED数据
+  static const String updateLedXsxxGetUrl = serviceUrl_ybqx + '?s=App.Car_Led.Update'; //更新LED数据
 
   ///点位信息
-  static const String getDwinfoGetListUrl = ServiceUrl + '?s=App.Car_Dwinfo.GetList'; //获取点位信息分页列表数据
+  static const String getDwinfoGetListUrl =
+      serviceUrl_ybqx + '?s=App.Car_Dwinfo.GetList'; //获取点位信息分页列表数据
 
   ///统计信息
-  static const String getStaYjxxUrl = ServiceUrl + '?s=App.Car_Statis.GetStaYjxx'; //获取抓拍统计数据
-  static const String getStaHycUrl = ServiceUrl + '?s=App.Car_Statis.GetStaHyc'; //获取审核黑烟车统计数据
-  static const String getStaCllUrl = ServiceUrl + '?s=App.Car_Statis.GetStaCll'; //获取车流量统计数据
-  static const String getStaAllUrl = ServiceUrl + '?s=App.Car_Statis.GetStaAll'; //获取今日所有统计数据
+  static const String getStaYjxxUrl = serviceUrl_ybqx + '?s=App.Car_Statis.GetStaYjxx'; //获取抓拍统计数据
+  static const String getStaHycUrl = serviceUrl_ybqx + '?s=App.Car_Statis.GetStaHyc'; //获取审核黑烟车统计数据
+  static const String getStaCllUrl = serviceUrl_ybqx + '?s=App.Car_Statis.GetStaCll'; //获取车流量统计数据
+  static const String getStaAllUrl = serviceUrl_ybqx + '?s=App.Car_Statis.GetStaAll'; //获取今日所有统计数据
 
   static const String getRStaCllUrl =
-      ServiceUrl + '?s=App.Car_Statis.GetStaView'; //获取车流量日统计数据(含早晚高峰)
+      serviceUrl_ybqx + '?s=App.Car_Statis.GetStaView'; //获取车流量日统计数据(含早晚高峰)
 
-  ///点位视频（Dwsp）播放
-  //1、系统登录
-  static const String getDwspLoginUrl = ServiceDwspUrl + '/api/v1/system/login';
-
-  //2、获取设备列表
-  static const String getDwspDeviceListUrl = ServiceDwspUrl + '/api/v1/device/list';
-
-  //'http://125.64.218.67:9908/api/v1/device/list'
-  //3、根据设备ID获取实时直播接口 - 开始实时直播
-  static const String getDwspStartRtmpUrl = ServiceDwspUrl + '/api/v1/stream/start';
-
-  //4、开始实时直播
-  static const String getDwspStopRtmpUrl = ServiceDwspUrl + '/api/v1/stream/stop'; //5、关闭实时直播
-  ///测试用，获取点位视频播放地址，类似 'http://125.64.218.67:9908/rtmp/1.php'
-  ///const ServiceMediaUrl = 'http://125.64.218.67:9908/';
-  static const String getDwspUrl = ServiceMediaUrl + 'rtmp/';
+  // ///点位视频（Dwsp）播放
+  // //1、系统登录
+  // static const String getDwspLoginUrl = ServiceDwspUrl + '/api/v1/system/login';
+  //
+  // //2、获取设备列表
+  // static const String getDwspDeviceListUrl = ServiceDwspUrl + '/api/v1/device/list';
+  //
+  // //'http://125.64.218.67:9908/api/v1/device/list'
+  // //3、根据设备ID获取实时直播接口 - 开始实时直播
+  // static const String getDwspStartRtmpUrl = ServiceDwspUrl + '/api/v1/stream/start';
+  //
+  // //4、开始实时直播
+  // static const String getDwspStopRtmpUrl = ServiceDwspUrl + '/api/v1/stream/stop'; //5、关闭实时直播
+  // ///测试用，获取点位视频播放地址，类似 'http://125.64.218.67:9908/rtmp/1.php'
+  // ///const ServiceMediaUrl = 'http://125.64.218.67:9908/';
+  // // static const String getDwspUrl = ServiceMediaUrl + 'rtmp/';
 
   //5、球机方向控制接口说明：
   // 接口地址：http://125.64.218.67:9906/api/ptz/{通道ID}/{球机ID}
@@ -124,6 +133,6 @@ class ServicePath {
   // api = http://sctastech.com/download/index.html
   // http://www.sctastech.com/download/hyzp_20210425.apk
   // 接口地址：http://sctastech.com/download/index.html
-  static const String getVerUrl = ServiceUrl + '?s=App.Car_Ver.Getver'; //获取最新版本号
+  static const String getVerUrl = serviceUrl_ybqx + '?s=App.Car_Ver.Getver'; //获取最新版本号
 
 }

lib/main.dart

@@ -6,9 +6,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bmfbase/BaiduMap/bmfmap_base.dart' show BMFMapSDK, BMF_COORD_TYPE;
 import 'package:flutter_screenutil/screenutil_init.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Login/LoginTabs2.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/MyMsics/05_updated/MyUpdatedNew.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/TJXX/tj_data.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Login/LoginTabs2.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/MyMsics/05_updated/MyUpdatedNew.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/tj_data.dart';
 import 'package:package_info/package_info.dart';
 // 引入provider
 import 'package:provider/provider.dart';
@@ -76,7 +76,7 @@ class _MyAppState extends State<MyApp> {
       print('buildNumber = $buildNumber');
       print('buildDate = $buildDate');
       // I/flutter (30820): appName = 宜宾市翠屏黑烟抓拍
-      // I/flutter (30820): packageName = com.flutter.hyzp_ybqx511505_sanjiang_new_area_launche
+      // I/flutter (30820): packageName = com.flutter.hyzp_ybqx511528_xingwen
       // I/flutter (30820): version = 1.3.1
       // I/flutter (30820): buildNumber = 20210508
       // I/flutter (30820): buildDate = 2021.05.08
@@ -243,7 +243,7 @@ class _SplashScreenState extends State<SplashScreen> {
               // 屏幕高度
               // child: Image.asset('assets/images/hyzp_ybqx00_yibin_launche.png', fit: BoxFit.cover),
               // child: Image.asset('assets/images/hyzp_ybqx01_cuiping_launche.png', fit: BoxFit.cover),
-              child: Image.asset('assets/images/hyzp_ybqx511505_sanjiang_new_area_launche.png',
+              child: Image.asset('assets/images/hyzp_ybqx511528_xingwen_launche.png',
                   fit: BoxFit.cover)),
         ],
       ),

lib/pages/Login/FaceLogin2.dart

@@ -3,8 +3,7 @@ import 'dart:io';
 import 'package:camera/camera.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/TJXX/tj_data.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/JdButton.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/tj_data.dart';
 
 import '../../components/commonFun.dart';
 import '../../services/EventBus.dart';

lib/pages/Login/FaceReg.dart

@@ -5,9 +5,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_drag_scale/core/drag_scale_widget.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/customDialogFaceReg.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/dioFun.dart';
 import 'package:image_picker/image_picker.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/customDialogFaceReg.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/dioFun.dart';
 
 import '../../components/commonFun.dart';
 import '../../services/EventBus.dart';

lib/pages/Login/LoginByName2.dart

@@ -5,8 +5,8 @@ import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/UserAuthority.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/TJXX/tj_data.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/UserAuthority.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/tj_data.dart';
 
 import '../../components/EncryptUtil.dart';
 import '../../components/commonFun.dart';

lib/pages/Login/LoginTabs2.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/commonFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/commonFun.dart';
 
 import 'LoginTabsWidget.dart';
 

lib/pages/Login/LoginTabsWidget.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart'; //import 'package:flustars/flustars.dart' as flustars; //该组件中有ScreenUtil，// 获取网络图片尺寸flustars.WidgetUtil
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/TJXX/tj_data.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/services/EventBus.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/my_Tabs.dart' as my_Tabs;
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/tj_data.dart';
+import 'package:hyzp_ybqx511528_xingwen/services/EventBus.dart';
+import 'package:hyzp_ybqx511528_xingwen/widget/my_Tabs.dart' as my_Tabs;
 
 import '../../components/commonFun.dart';
 import '../../services/Storage.dart';
@@ -59,7 +59,7 @@ class _MyHomePageState extends State<LoginTabsWidget> with SingleTickerProviderS
     super.initState();
 
     //若下面文件不存在，
-    // /data/data/com.flutter.hyzp_ybqx511505_sanjiang_new_area_launche/shared_prefs/FlutterSharedPreferences.xml
+    // /data/data/com.flutter.hyzp_ybqx511528_xingwen/shared_prefs/FlutterSharedPreferences.xml
     // value为null， 会抛出异常：
     // [ERROR:flutter/lib/ui/ui_dart_state.cc(177)] Unhandled Exception: Invalid argument(s): The source must not be null
     // int.parse (dart:core-patch/integers_patch.dart:51:25)

lib/pages/MyMsics/03_personal/PersonalData.dart

@@ -2,8 +2,8 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/commonFun.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/dioFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/dioFun.dart';
 
 import '../../../components/customDialogH.dart';
 import '../../../components/hyxx_data_handle.dart';

lib/pages/MyMsics/04_myFeedback/MyFeedback.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/commonFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/commonFun.dart';
 
 import '../../../widget/JdButton.dart';
 

lib/pages/MyMsics/05_updated/MyUpdated.dart

@@ -9,7 +9,7 @@ import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:flutter_downloader/flutter_downloader.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/dioFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/dioFun.dart';
 import 'package:open_file/open_file.dart';
 import 'package:package_info/package_info.dart';
 import 'package:path_provider/path_provider.dart';

lib/pages/MyMsics/05_updated/MyUpdatedNew.dart

@@ -9,7 +9,7 @@ import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:flutter_downloader/flutter_downloader.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/dioFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/dioFun.dart';
 import 'package:open_file/open_file.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:progress_dialog/progress_dialog.dart';
@@ -64,7 +64,7 @@ class MyUpdatedNew {
     E/flutter ( 4745): Receiver: null
     E/flutter ( 4745): Tried calling: update(message: "下载中，请稍后…", progress: 0.0)
     E/flutter ( 4745): #0      Object.noSuchMethod (dart:core-patch/object_patch.dart:51:5)
-    E/flutter ( 4745): #1      MyUpdatedNew._updateDownLoadInfo (package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/MyMsics/05_updated/MyUpdatedNew.dart:251:10)
+    E/flutter ( 4745): #1      MyUpdatedNew._updateDownLoadInfo (package:hyzp_ybqx511528_xingwen/pages/MyMsics/05_updated/MyUpdatedNew.dart:251:10)
     E/flutter ( 4745): #2      _rootRunUnary (dart:async/zone.dart:1206:13)
     E/flutter ( 4745): #3      _CustomZone.runUnary (dart:async/zone.dart:1100:19)
     E/flutter ( 4745): #4      _CustomZone.runUnaryGuarded (dart:async/zone.dart:1005:7)

lib/pages/Works/DWDT/basic_map.dart

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bmfbase/BaiduMap/bmfmap_base.dart';
 import 'package:flutter_bmfmap/BaiduMap/bmfmap_map.dart';
 import 'package:flutter_screenutil/screen_util.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/commonFun.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/hyxx_data_handle.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/hyxx_data_handle.dart';
 
 import '../../../components/dioFun.dart';
 import 'dwInfoDialog.dart';

lib/pages/Works/DWDT/dwInfoDialog.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/dioFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/dioFun.dart';
 
-//import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/player_pro.dart';
+//import 'package:hyzp_ybqx511528_xingwen/widget/player_pro.dart';
 import '../../../components/commonFun.dart';
 
 //确认对话框

lib/pages/Works/DWDT/dwInfo_data.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bmfbase/BaiduMap/bmfmap_base.dart';
 import 'package:flutter_bmfmap/BaiduMap/bmfmap_map.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/hyxx_data_handle.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/hyxx_data_handle.dart';
 
 ///批量添加定位标记
 bool enable = true;

lib/pages/Works/DWSP/dwsp_getList.dart

@@ -3,10 +3,10 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/my_delay_toast.dart';
+import 'package:hyzp_ybqx511528_xingwen/widget/my_delay_toast.dart';
 
 import '../../../components/commonFun.dart';
-//import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/player_pro.dart';
+//import 'package:hyzp_ybqx511528_xingwen/widget/player_pro.dart';
 
 import '../../../components/dioFun.dart';
 import '../../../components/hyxx_data_handle.dart';

lib/pages/Works/HYSH/fhycx_content_new.dart

@@ -6,12 +6,12 @@ import 'package:flustars/flustars.dart'
 import 'package:flutter/material.dart';
 import 'package:flutter_drag_scale/flutter_drag_scale.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/my_superplayer.dart';
+import 'package:hyzp_ybqx511528_xingwen/widget/my_superplayer.dart';
 import 'package:keyboard_avoider/keyboard_avoider.dart';
 
 //
 import '../../../components/commonFun.dart';
-//import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/player_pro_new.dart';
+//import 'package:hyzp_ybqx511528_xingwen/widget/player_pro_new.dart';
 import '../../../components/dioFun.dart';
 import '../../../components/doJSON.dart';
 import '../../../components/hyxx_data_handle.dart';

lib/pages/Works/HYSH/hysh_content_new.dart

@@ -8,8 +8,8 @@ import 'package:flutter/services.dart';
 import 'package:flutter_drag_scale/flutter_drag_scale.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/JdButton.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/my_superplayer.dart';
+import 'package:hyzp_ybqx511528_xingwen/widget/JdButton.dart';
+import 'package:hyzp_ybqx511528_xingwen/widget/my_superplayer.dart';
 import 'package:keyboard_avoider/keyboard_avoider.dart';
 import 'package:photo_view/photo_view.dart';
 
@@ -19,7 +19,7 @@ import '../../../components/doJSON.dart';
 import '../../../components/hyxx_data_handle.dart';
 import '../../../config/service_url.dart';
 import '../../../services/EventBus.dart';
-//import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/player_pro_new.dart';
+//import 'package:hyzp_ybqx511528_xingwen/widget/player_pro_new.dart';
 
 import '../../../widget/CarNumberAndCpysItems.dart';
 import 'hysh_group.dart';
@@ -162,7 +162,7 @@ class _HyshPageState extends State<HyshContentNew> with SingleTickerProviderStat
   // n removed from the tree. To avoid memory leaks, consider breaking the reference to this object during dispose().
   // E/flutter (12227): #0      State.setState.<anonymous closure> (package:flutter/src/widgets/framework.dart:1208:9)
   // E/flutter (12227): #1      State.setState (package:flutter/src/widgets/framework.dart:1243:6)
-  // E/flutter (12227): #2      _LoginPageState.getZpjlFields (package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/HYSH/hysh_content.dart:163:7)
+  // E/flutter (12227): #2      _LoginPageState.getZpjlFields (package:hyzp_ybqx511528_xingwen/pages/Works/HYSH/hysh_content.dart:163:7)
   // E/flutter (12227): #3      _rootRunUnary (dart:async/zone.dart:1198:47)
   // E/flutter (12227): #4      _CustomZone.runUnary (dart:async/zone.dart:1100:19)
   // E/flutter (12227): #5      _FutureListener.handleValue (dart:async/future_impl.dart:143:18)
@@ -182,8 +182,8 @@ class _HyshPageState extends State<HyshContentNew> with SingleTickerProviderStat
   // E/flutter (12227): #0      _AssertionError._doThrowNew (dart:core-patch/errors_patch.dart:46:39)
   // E/flutter (12227): #1      _AssertionError._throwNew (dart:core-patch/errors_patch.dart:36:5)
   // E/flutter (12227): #2      MediaQuery.of (package:flutter/src/widgets/media_query.dart:812:12)
-  // E/flutter (12227): #3      _LoginPageState.getTopTabsMap (package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/HYSH/hysh_content.dart:415:41)
-  // E/flutter (12227): #4      _LoginPageState.getZpjlFields (package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/HYSH/hysh_content.dart:162:7)
+  // E/flutter (12227): #3      _LoginPageState.getTopTabsMap (package:hyzp_ybqx511528_xingwen/pages/Works/HYSH/hysh_content.dart:415:41)
+  // E/flutter (12227): #4      _LoginPageState.getZpjlFields (package:hyzp_ybqx511528_xingwen/pages/Works/HYSH/hysh_content.dart:162:7)
 
   //getListFlields({bool b = true}) async {
   getListFlields() async {

lib/pages/Works/HYSH/hysh_getList_fliter.dart

@@ -6,10 +6,10 @@ import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/commonFun.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/HYSH/tsjj_content_new.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/services/EventBus.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/DropdownItem.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/HYSH/tsjj_content_new.dart';
+import 'package:hyzp_ybqx511528_xingwen/services/EventBus.dart';
+import 'package:hyzp_ybqx511528_xingwen/widget/DropdownItem.dart';
 
 import '../../../components/commonFun.dart';
 import '../../../components/dioFun.dart';

lib/pages/Works/HYSH/hysh_getList_new.dart

@@ -5,9 +5,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/commonFun.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/HYSH/tsjj_content_new.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/services/EventBus.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/HYSH/tsjj_content_new.dart';
+import 'package:hyzp_ybqx511528_xingwen/services/EventBus.dart';
 
 import '../../../components/commonFun.dart';
 import '../../../components/dioFun.dart';

lib/pages/Works/HYSH/hysh_group.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/screen_util.dart';
 import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/EncryptUtil.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/customDialogF.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/customDialogHysh.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/dioFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/EncryptUtil.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/customDialogF.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/customDialogHysh.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/dioFun.dart';
 
 import '../../../components/doJSON.dart';
 import '../../../components/hyxx_data_handle.dart';

lib/pages/Works/HYSH/tsjj_content_new.dart

@@ -6,14 +6,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter_drag_scale/flutter_drag_scale.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/customDialogF.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/services/EventBus.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/my_superplayer.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/customDialogF.dart';
+import 'package:hyzp_ybqx511528_xingwen/services/EventBus.dart';
+import 'package:hyzp_ybqx511528_xingwen/widget/my_superplayer.dart';
 import 'package:keyboard_avoider/keyboard_avoider.dart';
 
 //
 import '../../../components/commonFun.dart';
-//import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/player_pro_new.dart';
+//import 'package:hyzp_ybqx511528_xingwen/widget/player_pro_new.dart';
 import '../../../components/dioFun.dart';
 import '../../../components/doJSON.dart';
 import '../../../components/hyxx_data_handle.dart';

lib/pages/Works/LED_XSXX/led_xsxx_content.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/services/EventBus.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/JdButton.dart';
+import 'package:hyzp_ybqx511528_xingwen/services/EventBus.dart';
+import 'package:hyzp_ybqx511528_xingwen/widget/JdButton.dart';
 import 'package:keyboard_avoider/keyboard_avoider.dart';
 
 import '../../../components/commonFun.dart';

lib/pages/Works/SBBJ/sbbj_content.dart

@@ -4,10 +4,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/screen_util.dart';
 import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/commonFun.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/customDialogF.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/services/EventBus.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/customRadioWidget.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/customDialogF.dart';
+import 'package:hyzp_ybqx511528_xingwen/services/EventBus.dart';
+import 'package:hyzp_ybqx511528_xingwen/widget/customRadioWidget.dart';
 
 import '../../../components/customDialogH.dart';
 import '../../../components/customDialogJ.dart';

lib/pages/Works/SBGL/dwxx_content.dart

@@ -3,12 +3,12 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/screen_util.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/commonFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/commonFun.dart';
 
 import '../../../components/customDialogH.dart';
 import '../../../components/customDialogJ.dart';
 import '../../../components/dioFun.dart';
-//import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/player_pro.dart';
+//import 'package:hyzp_ybqx511528_xingwen/widget/player_pro.dart';
 import '../../../components/doJSON.dart';
 import '../../../components/hyxx_data_handle.dart';
 

lib/pages/Works/TJXX/tj_data.dart

@@ -1,7 +1,7 @@
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/commonFun.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/dioFun.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/hyxx_data_handle.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/services/EventBus.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/dioFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/hyxx_data_handle.dart';
+import 'package:hyzp_ybqx511528_xingwen/services/EventBus.dart';
 
 ///获取车流量日统计数据
 bool cllRStatisDataGeting = false; //正在获取车流量日统计数据，禁止重入

lib/pages/Works/TJXX/today_list.dart

@@ -4,11 +4,11 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/commonFun.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/HYSH/tsjj_content_new.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/TJXX/tj_data.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/TJXX/today_list_zpjl_content.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/services/EventBus.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/HYSH/tsjj_content_new.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/tj_data.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/today_list_zpjl_content.dart';
+import 'package:hyzp_ybqx511528_xingwen/services/EventBus.dart';
 
 import '../../../components/commonFun.dart';
 import '../../../components/doJSON.dart';

lib/pages/Works/TJXX/today_list_zpjl_content.dart

@@ -4,7 +4,7 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_drag_scale/flutter_drag_scale.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/my_superplayer.dart';
+import 'package:hyzp_ybqx511528_xingwen/widget/my_superplayer.dart';
 import 'package:keyboard_avoider/keyboard_avoider.dart';
 
 //

lib/pages/Works/TJXX/zptj_bar_chart.dart

@@ -2,10 +2,10 @@ import 'package:fl_chart/fl_chart.dart';
 //import 'package:flustars/flustars.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/commonFun.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/dioFun.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/hyxx_data_handle.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/TJXX/tj_data.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/dioFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/hyxx_data_handle.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/tj_data.dart';
 
 class ZptjBarChart extends StatefulWidget {
   ZptjBarChart({this.statisType, this.data_ok = false, Key key}) : super(key: key);

lib/pages/Works/TJXX/zptj_bar_chart_one.dart

@@ -2,10 +2,10 @@ import 'package:fl_chart/fl_chart.dart';
 //import 'package:flustars/flustars.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/commonFun.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/dioFun.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/hyxx_data_handle.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/TJXX/tj_data.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/dioFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/hyxx_data_handle.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/tj_data.dart';
 
 class ZptjBarChartOne extends StatefulWidget {
   ZptjBarChartOne({this.statisType, this.data_ok = false, Key key}) : super(key: key);

lib/pages/Works/TJXX/zptj_page.dart

@@ -3,9 +3,9 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/save_data_to_file.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/TJXX/zptj_bar_chart.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/TJXX/zptj_bar_chart_one.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/save_data_to_file.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/zptj_bar_chart.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/zptj_bar_chart_one.dart';
 
 import '../../../components/commonFun.dart';
 import '../../../components/hyxx_data_handle.dart';

lib/pages/tabs/Tabs.dart

@@ -1,7 +1,7 @@
 import 'package:badges/badges.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/tabs/page4_myMsics_new.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/tabs/page4_myMsics_new.dart';
 
 //import '../../widget/player_pro.dart';
 import '../../components/commonFun.dart';

lib/pages/tabs/page1_work.dart

@@ -3,21 +3,21 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/commonFun.dart';
+// import 'package:hyzp_ybqx511528_xingwen/pages/Works/DWSP/dw_list_sound.dart';
+// import 'package:hyzp_ybqx511528_xingwen/pages/Works/DWSP/dw_sound.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/DWSP/dwsp_getList.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/HYSH/hysh_getList_fliter.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/HYSH/hysh_getList_new.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/SBBJ/sbbj_getList.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/SBGL/dwxx_getList.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/tj_data.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/today_list.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/zptj_bar_chart.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/zptj_bar_chart_one.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/zptj_page.dart';
+import 'package:hyzp_ybqx511528_xingwen/services/EventBus.dart';
 import 'package:url_launcher/url_launcher.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/commonFun.dart';
-// import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/DWSP/dw_list_sound.dart';
-// import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/DWSP/dw_sound.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/DWSP/dwsp_getList.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/HYSH/hysh_getList_fliter.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/HYSH/hysh_getList_new.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/SBBJ/sbbj_getList.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/SBGL/dwxx_getList.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/TJXX/tj_data.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/TJXX/today_list.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/TJXX/zptj_bar_chart.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/TJXX/zptj_bar_chart_one.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Works/TJXX/zptj_page.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/services/EventBus.dart';
 
 import '../../components/hyxx_data_handle.dart';
 import '../Works/DWDT/basic_map.dart';

lib/pages/tabs/page4_myMsics_new.dart

@@ -5,12 +5,12 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/commonFun.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Login/FaceLogin.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Login/FaceReg.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/MyMsics/05_updated/MyUpdatedNew.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/tabs/page5_userManager.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/JdButton.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Login/FaceLogin.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Login/FaceReg.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/MyMsics/05_updated/MyUpdatedNew.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/tabs/page5_userManager.dart';
+import 'package:hyzp_ybqx511528_xingwen/widget/JdButton.dart';
 import 'package:package_info/package_info.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -18,7 +18,7 @@ import 'package:url_launcher/url_launcher.dart';
 import '../../components/commonFun.dart';
 import '../../components/customDialogF.dart';
 import '../../services/Storage.dart';
-//import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/widget/player_pro.dart';
+//import 'package:hyzp_ybqx511528_xingwen/widget/player_pro.dart';
 import '../Login/ModifyPassword.dart';
 import '../MyMsics/03_personal/PersonalData.dart';
 import '../MyMsics/04_MyFeedback/MyFeedback.dart';
@@ -416,7 +416,7 @@ class _Page4_MyMsicsNewState extends State<Page4_MyMsicsNew>
       print('buildNumber = $buildNumber');
       print('buildDate = $buildDate');
       // I/flutter (30820): appName = 宜宾市翠屏黑烟抓拍
-      // I/flutter (30820): packageName = com.flutter.hyzp_ybqx511505_sanjiang_new_area_launche
+      // I/flutter (30820): packageName = com.flutter.hyzp_ybqx511528_xingwen
       // I/flutter (30820): version = 1.3.1
       // I/flutter (30820): buildNumber = 20210508
       // I/flutter (30820): buildDate = 2021.05.08

lib/pages/tabs/page5_userManager.dart

@@ -1,8 +1,8 @@
 import 'package:badges/badges.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Login/FaceReg.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Login/ModifyPassword.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Login/FaceReg.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Login/ModifyPassword.dart';
 
 import '../../components/commonFun.dart';
 import '../../widget/JdButton.dart';

lib/routers/router.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Login/FaceLogin.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Login/FaceReg.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/pages/Login/LoginTabs2.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Login/FaceLogin.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Login/FaceReg.dart';
+import 'package:hyzp_ybqx511528_xingwen/pages/Login/LoginTabs2.dart';
 
 //import '../pages/CheckOut.dart';
 import '../pages/Address/AddressAdd.dart';

lib/widget/customRadioWidget.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/customDialogHysh.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/dioFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/customDialogHysh.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/dioFun.dart';
 
 import '../components/hyxx_data_handle.dart';
 import '../services/EventBus.dart';

lib/widget/my_superplayer.dart

@@ -7,10 +7,10 @@ import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/screen_util.dart';
 import 'package:flutter_superplayer/flutter_superplayer.dart';
 import 'package:flutterptcontrol/flutterptcontrol.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/commonFun.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/components/dioFun.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/provider/player_ratio.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/provider/player_region.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/components/dioFun.dart';
+import 'package:hyzp_ybqx511528_xingwen/provider/player_ratio.dart';
+import 'package:hyzp_ybqx511528_xingwen/provider/player_region.dart';
 import 'package:provider/provider.dart';
 
 import '../components/commonFun.dart';

pubspec.yaml

@@ -1,4 +1,4 @@
-name: hyzp_ybqx511505_sanjiang_new_area_launche
+name: hyzp_ybqx511528_xingwen
 description: HeiYanZhuaPai_YiBin_QuXian Flutter application .
 
 # The following line prevents the package from being accidentally published to

test/widget_test.dart

@@ -7,7 +7,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:hyzp_ybqx511505_sanjiang_new_area_launche/main.dart';
+import 'package:hyzp_ybqx511528_xingwen/main.dart';
 
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {