hyzp_ybqx-Commit065：为实现套APP适应多个区县做以下修改，还无法读取统计数据：

一套APP适应多个区县
(1)修改版本号：version: 1.4.8+20220102
R:\FlutterProject\FlutterProject51-hyzp_ybqx\hyzp_ybqx\pubspec.yaml
(2)全局替换（158处），并 flutter pub upgrade
hyzp_ybqx511528_xingwen
为
hyzp_ybqx
(3)将下面文件中的“宜宾市兴文黑烟抓拍”替换为“黑烟车抓拍系統”
R:\FlutterProject\FlutterProject51-hyzp_ybqx\hyzp_ybqx\android\app\src\main\AndroidManifest.xml
(4)修改区县接口信息：
R:\FlutterProject\FlutterProject51-hyzp_ybqx\hyzp_ybqx\lib\components\commonFun.dart
(5)运行 hyzp_ybqx.images_copy.cmd，自动拷贝App的Android、Flutter启动图片
r:\FlutterProject\FlutterProject51-hyzp_ybqx\hyzp_ybqx.images.switch\hyzp_ybqx.images_copy.cmd
(6)关闭Android Studio再重新启动，在Android Studio终端窗口，切换到项目的 lib 目录下，运行 flutter clean
(7)运行调试App，确定区县中心坐标数据：center_latitude、center_longitude
R:\FlutterProject\FlutterProject51-hyzp_ybqx\hyzp_ybqx\lib\components\commonFun.dart

README.md

@@ -1,6 +1,6 @@
-# hyzp_ybqx511528_xingwen
+# hyzp_ybqx
 
-HeiYanZhuaPai_YiBin_QuXian Flutter application .
+HeiYanZhuaPai_qx_name Flutter application .
 
 ## Getting Started
 

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_ybqx511528_xingwen"
+        applicationId "com.flutter.hyzp_ybqx"
         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_ybqx511528_xingwen">
+    package="com.flutter.hyzp_ybqx">
     <!--    * 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_ybqx511528_xingwen.MyApplication"
+        android:name="com.flutter.hyzp_ybqx.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_ybqx511528_xingwen;
+package com.flutter.hyzp_ybqx;
 
 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_ybqx511528_xingwen;
+package com.flutter.hyzp_ybqx;
 
 import com.baidu.flutter_bmfbase.BmfMapApplication;
 

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

@@ -30,7 +30,7 @@
     <item android:top="37.5dp">
         <bitmap
             android:gravity="top"
-            android:src="@mipmap/hyzp_ybqx511528_xingwen_launche" />
+            android:src="@mipmap/hyzp_ybqx_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_ybqx511528_xingwen">
+    package="com.flutter.hyzp_ybqx">
     <!-- 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_ybqx511528_xingwen</string>
+	<string>hyzp_ybqx</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_ybqx511528_xingwen/config/service_url.dart';
+import 'package:hyzp_ybqx/config/service_url.dart';
-import 'package:hyzp_ybqx511528_xingwen/services/EventBus.dart';
+import 'package:hyzp_ybqx/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_ybqx511528_xingwen/provider/player_region.dart';
+import 'package:hyzp_ybqx/provider/player_region.dart';
 
 import 'UserInfo.dart';
 
@@ -28,8 +28,8 @@ import 'UserInfo.dart';
 //         android:label="宜宾市筠连黑烟抓拍"
 //         android:label="宜宾市兴文黑烟抓拍"
 
-// 2、修改App的android和Flutter启动图片，制作并运行 hyzp_ybqx511528_xingwen.images_copy.cmd，自动完成两项拷贝任务
+// 2、修改App的android和Flutter启动图片，制作并运行 hyzp_ybqx.images_copy.cmd，自动完成两项拷贝任务
-// (1)、拷贝不同分辨率的图片文件hyzp_ybqx511528_xingwen_launche.png到下面目录，作为App的android启动图片
+// (1)、拷贝不同分辨率的图片文件hyzp_ybqx_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\
@@ -43,62 +43,58 @@ import 'UserInfo.dart';
 // 511501、宜宾市
 // String APPkey = 'ijddvzgEGaxbzsbmCtpdohxHyrAArwJB'; // 宜宾市APPkey
 // String service_tel = '\n服务热线：187-8467-8300';
-// String yibin_QuXian = '宜宾';
+// String qx_name = '宜宾';
-// String copyright_info = '© ' + yibin_QuXian + '市生态环境局 四川省踏石科技有限公司 版权所有' + service_tel;
+// String copyright_info = '© ' + qx_name + '市生态环境局 四川省踏石科技有限公司 版权所有' + service_tel;
 // String copyright_info_PinYin = 'YIBIN BLACK SMOKE CAR CAPTURE SYSTEM';
 
 // const serviceUrl_ybqx = 'http://125.64.218.67:9904'; // 宜宾市
 // const serviceUrl_ybqx_media = 'http://125.64.218.67:9908/'; // 宜宾市
 
+// 区县APPkey
+String APPkey = 'pdohxHyr79ddvzgE8ArwGaxb01bmCtJB';
 // 区县后台地址
 const serviceUrl_ybqx = 'http://125.64.218.67:9909';
-// 区县的违章图片和视频地址前缀：http://125.64.218.67:9912/
+// 区县违章图片和视频地址前缀
 const serviceUrl_ybqx_media = 'http://125.64.218.67:9912/';
-//5、球机方向控制接口说明：
+// 区县球机方向控制地址
-// 接口地址：http://125.64.218.67:9906/api/ptz/{通道ID}/{球机ID}
+const String setSphericalCameraUrl = 'http://125.64.218.67:9914/';
-// static const String setSphericalCameraUrl = 'http://125.64.218.67:9906/api/ptz/'; //球机方向控制接口
-// 区县球机方向控制：
-// http://125.64.218.67:9914/?type=publish&dwip=172.16.3.21&topic=camera&dataType=PTZ&cmdCode=23&to=456&speed=40
-const String setSphericalCameraUrl = 'http://125.64.218.67:9914/'; //球机方向控制接口
 
-// 511502、翠屏区
+// {
-// int qxdm = 511502;
+//     "ret": 200,
-// String service_tel = '';
+//     "data": {
-// String yibin_QuXian = '宜宾市翠屏';
+//         "is_login": true,
-// String copyright_info = '© ' + yibin_QuXian + '生态环境局 版权所有' + service_tel;
+//         "user_id": 152,
-// String copyright_info_PinYin = 'YIBIN CUIPING BLACK SMOKE CAR CAPTURE SYSTEM';
+//         "token": "959091E2A5E362E22F22F8DBE05737A95545A43AF28B19AB3DAD5F8557EE2E29",
+//         "qx_code": "511528",
+//         "qx_name": "兴文县"
+//     },
+//     "msg": ""
+// }
 
-// 511505、三江新区
+// 一套APP适应多个区县，等用户登录后，会返回 qx_code、qx_name
-// String service_tel = '服务热线：187-8467-8300';
+int qx_code = -1;
-// String yibin_QuXian = '宜宾三江新区';
+String qx_name = '';
-// String copyright_info = '© ' + yibin_QuXian + '城乡融合发展局 四川省踏石科技\n版权所有， ' + service_tel;
+String service_tel = '';
-// String copyright_info_PinYin = 'YIBIN SANJIANG NEW AREA BLACK SMOKE CAR CAPTURE SYSTEM';
+String copyright_info = '';
-
+String copyright_info_PinYin = '';
-// 511524、长宁县
+// 兴文县中心地址：天泉商城
-// String service_tel = '';
+double center_latitude = -1; // 区县中心纬度
-// String yibin_QuXian = '宜宾市长宁';
+double center_longitude = -1; // 区县中心经度
-// String copyright_info = '© ' + yibin_QuXian + '生态环境局 版权所有' + service_tel;
-// String copyright_info_PinYin = 'YIBIN CHANGNING BLACK SMOKE CAR CAPTURE SYSTEM';
-
-// 511527、筠连县
-// String service_tel = '\n服务热线：187-8467-8300';
-// String yibin_QuXian = '宜宾市筠连';
-// String copyright_info = '© ' + yibin_QuXian + '生态环境局 四川省踏石科技 版权所有' + service_tel;
-// String copyright_info_PinYin = 'YIBIN JUNLIAN BLACK SMOKE CAR CAPTURE SYSTEM';
 
 // 511528、兴文县
-int qxdm = 511528;
+// int qx_code = 511528;
-String APPkey = 'pdohxHyr79ddvzgE8ArwGaxb01bmCtJB'; // 宜宾区县APPkey
+// String qx_name = '宜宾市兴文';
-String service_tel = '\n服务热线：187-8467-8300';
+// String service_tel = '\n服务热线：187-8467-8300';
-String yibin_QuXian = '宜宾市兴文';
+// String copyright_info = '© ' + qx_name + '生态环境局 四川省踏石科技 版权所有' + service_tel;
-String copyright_info = '© ' + yibin_QuXian + '生态环境局 四川省踏石科技 版权所有' + service_tel;
+// String copyright_info_PinYin = 'YIBIN XINGWEN BLACK SMOKE CAR CAPTURE SYSTEM';
-String copyright_info_PinYin = 'YIBIN XINGWEN BLACK SMOKE CAR CAPTURE SYSTEM';
+// // 兴文县中心地址：天泉商城
+// double center_latitude = 28.29678023715008; // 区县中心纬度
+// double center_longitude = 105.24189826141459; // 区县中心经度
 
 // 注意：百度官方发布的城市中心点坐标是经度在前、纬度在后，必须对调才行，否则无法正确显示指定城市的地图
 // BMFCoordinate BMFCoordinate(double latitude (纬度), double longitude (经度)) //中国领域一般经度大些
 // center: BMFCoordinate(28.77914, 104.644079), //宜宾市翠屏白塔山
-double center_latitude = 28.29678023715008; // 区县中心纬度
+
-double center_longitude = 105.24189826141459; // 区县中心经度
 // 在点位地图中点击某个标注，在控制台会显示该标注的纬度和经度
 // 兴文县中心位置：I/flutter (12538): mapPoi = {text: 半岛和居, pt: {latitude: 28.29678023715008, longitude: 105.24189826141459}, uid: b9e39ee2e8304f872fe67bcf}
 // 兴文县5个点位坐标
@@ -109,14 +105,14 @@ double center_longitude = 105.24189826141459; // 区县中心经度
 // 4	石海收费站附近	双向4车道	105.251038 28.287758	抓拍自古宜高速入城黑烟车辆
 // 5	温水溪加油站附近	双向2车道	105.246259 28.286645	抓拍自云南威信县方向入城黑烟车辆
 
-// 4、全局替换，将 ”hyzp_ybqx511528_xingwen“全部替换为 ”hyzp_ybqx511528_xingwen“，自动完成以下修改
+// 4、全局替换，将 ”hyzp_ybqx“全部替换为 ”hyzp_ybqx“，自动完成以下修改
 // (1)、修改 R:\FlutterProject\FlutterProject51-hyzp_ybqx\hyzp_ybqx\pubspec.yaml 文件中的AppID，但存放目錄不變
-// name: hyzp_ybqx511528_xingwen
+// name: hyzp_ybqx
 // (2)、全局替换：
-//  A、将 “com.flutter.hyzp_ybqx00_yibin” 全部替换为 “com.flutter.hyzp_ybqx511528_xingwen”
+//  A、将 “com.flutter.hyzp_ybqx00_yibin” 全部替换为 “com.flutter.hyzp_ybqx”
-//  B、将 “package:hyzp_ybqx00_yibin/” 全部替换为 “package:hyzp_ybqx511528_xingwen/”
+//  B、将 “package:hyzp_ybqx00_yibin/” 全部替换为 “package:hyzp_ybqx/”
-//  C、将 “# hyzp_ybqx00_yibin” 全部替换为 “# hyzp_ybqx511528_xingwen”
+//  C、将 “# hyzp_ybqx00_yibin” 全部替换为 “# hyzp_ybqx”
-//  D、将 “<string>hyzp_ybqx00_yibin</string>” 全部替换为 “<string>hyzp_ybqx511528_xingwen</string>”
+//  D、将 “<string>hyzp_ybqx00_yibin</string>” 全部替换为 “<string>hyzp_ybqx</string>”
 
 // 5、完成以上修改后，打开 Android Studio 的终端窗口，切换到项目的 lib 目录下，运行 flutter clean
 
@@ -133,7 +129,7 @@ bool bFlutterDownloader_initialize = false;
 bool bNewVer = false; //是否发现新版本
 
 //处理延时登录，判断从网络获取三种统计数据是否完成
-bool bMayLogin = false;
+bool bMayLogin = true;
 //处理延时登录，判断是否已经点击登录按钮
 bool bPreLoading = false;
 //处理延时登录，判断用户名登录是否验证通过
@@ -216,8 +212,10 @@ UserInfo g_userInfo = UserInfo(mapUserInfoRet: {
   "ret": 200,
   "data": {
     "is_login": true,
-    "user_id": 1,
+    "user_id": 152,
-    "token": "B93EC91FA2FE293B7077162D4527FC4BB228CD6C0A4F24A882B9A8BBE6C3FB47"
+    "token": "959091E2A5E362E22F22F8DBE05737A95545A43AF28B19AB3DAD5F8557EE2E29",
+    "qx_code": "511528",
+    "qx_name": "兴文县"
   },
   "msg": ""
 });
@@ -613,14 +611,14 @@ Future image2Base64(String imagePath) async {
 //从字符路径 path 获取扩展名，不含点号
 getFileExtension(String path) {
   //return path.substring(path.lastIndexOf('.'));
-  //imagePath = /data/user/0/com.flutter.hyzp_ybqx511528_xingwen/app_flutter/Pictures/flutter_test/1614662209478.jpg, ext = .jpg
+  //imagePath = /data/user/0/com.flutter.hyzp_ybqx/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_ybqx511528_xingwen/app_flutter/Pictures/flutter_test/1614662209478.jpg, ext = .jpg
+  //imagePath = /data/user/0/com.flutter.hyzp_ybqx/app_flutter/Pictures/flutter_test/1614662209478.jpg, ext = .jpg
   return path.substring(path.lastIndexOf('/') + 1); //不含点号
 }
 

lib/components/customDialogHysh.dart

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

lib/components/dioFun.dart

@@ -2,16 +2,16 @@ import 'package:dio/dio.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/doJSON.dart';
+import 'package:hyzp_ybqx/components/doJSON.dart';
-import 'package:hyzp_ybqx511528_xingwen/services/EventBus.dart';
+import 'package:hyzp_ybqx/services/EventBus.dart';
-import 'package:hyzp_ybqx511528_xingwen/widget/my_superplayer.dart';
+import 'package:hyzp_ybqx/widget/my_superplayer.dart';
 import 'package:sprintf/sprintf.dart';
 
 import '../components/hyxx_data_handle.dart';
 import '../config/service_url.dart';
 import '../res/listContacts.dart';
-// import 'package:hyzp_ybqx511528_xingwen/widget/player_pro.dart';
+// import 'package:hyzp_ybqx/widget/player_pro.dart';
-// import 'package:hyzp_ybqx511528_xingwen/widget/player_pro_new.dart';
+// import 'package:hyzp_ybqx/widget/player_pro_new.dart';
 import 'UserAuthority.dart';
 import 'commonFun.dart';
 
@@ -475,7 +475,7 @@ Future getAllStatisData({String ip = '', String date = ''}) async {
     }
 
     //访问区县后台接口，需要统一添加区县代码参数
-    map['qxdm'] = qxdm;
+    map['qx_code'] = qx_code;
 
     Dio dio = Dio();
     String api = ServicePath.getStaAllUrl;
@@ -735,7 +735,7 @@ Future getStatisData({@required String statisType, String ip = '', String date =
     }
 
     //访问区县后台接口，需要统一添加区县代码参数
-    map['qxdm'] = qxdm;
+    map['qx_code'] = qx_code;
 
     Dio dio = Dio();
     String api = mapStatisType[statisType]['api'];
@@ -1963,7 +1963,7 @@ Future getThePageList(
     }
 
     //访问区县后台接口，需要统一添加区县代码参数
-    map['qxdm'] = qxdm;
+    map['qx_code'] = qx_code;
 
     print('mapHyshlx[theHyshlx][api] = ${mapHyshlx[theHyshlx]['api']}');
     // mapHyshlx[theHyshlx][api] = http://125.64.218.67:9904/?s=App.Car_Hyc.GetList
@@ -1972,7 +1972,7 @@ Future getThePageList(
     print('response = ${response.toString()}');
     // I/flutter (16869): mapHyshlx[theHyshlx][api] = http://125.64.218.67:9909?s=App.Car_Hyc.GetList
     // I/flutter (16869): map = {page: 1, perpage: 100, sign: ff2b4ea7283c2a2dd86ab665c5fe0f0f, random: 763117, workflow: 1}
-    // I/flutter (16869): response = {"ret":400,"data":{},"msg":"非法请求：缺少必要参数qxdm"}
+    // I/flutter (16869): response = {"ret":400,"data":{},"msg":"非法请求：缺少必要参数qx_code"}
 
     //I/flutter ( 5232): {"ret":200,"data":{"items":[],"total":0,"page":1,"perpage":10},"msg":""}
     if (response.statusCode == 200) {

lib/components/doJSON.dart

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

lib/config/service_url.dart

@@ -12,7 +12,7 @@
 //http://125.64.218.67:9904/docs.php
 // const serviceUrl_ybqx = 'http://125.64.218.67:9904/';
 //图片视频需要添加前缀：http://125.64.218.67:9908
-import 'package:hyzp_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx/components/commonFun.dart';
 
 //const serviceUrl_ybqx_media = 'http://125.64.218.67:9908/';
 

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_ybqx511528_xingwen/pages/Login/LoginTabs2.dart';
+import 'package:hyzp_ybqx/pages/Login/LoginTabs2.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/MyMsics/05_updated/MyUpdatedNew.dart';
+import 'package:hyzp_ybqx/pages/MyMsics/05_updated/MyUpdatedNew.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/tj_data.dart';
+import 'package:hyzp_ybqx/pages/Works/TJXX/tj_data.dart';
 import 'package:package_info/package_info.dart';
 // 引入provider
 import 'package:provider/provider.dart';
@@ -81,7 +81,7 @@ class _MyAppState extends State<MyApp> {
       print('buildNumber = $buildNumber');
       print('buildDate = $buildDate');
       // I/flutter (30820): appName = 宜宾市翠屏黑烟抓拍
-      // I/flutter (30820): packageName = com.flutter.hyzp_ybqx511528_xingwen
+      // I/flutter (30820): packageName = com.flutter.hyzp_ybqx
       // I/flutter (30820): version = 1.3.1
       // I/flutter (30820): buildNumber = 20210508
       // I/flutter (30820): buildDate = 2021.05.08
@@ -250,7 +250,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_ybqx511528_xingwen_launche.png',
+              child: Image.asset('assets/images/hyzp_ybqx_launche.png',
                   fit: BoxFit.cover)),
         ],
       ),

lib/pages/Login/FaceLogin2.dart

@@ -3,7 +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_ybqx511528_xingwen/pages/Works/TJXX/tj_data.dart';
+import 'package:hyzp_ybqx/pages/Works/TJXX/tj_data.dart';
 
 import '../../components/commonFun.dart';
 import '../../services/EventBus.dart';

lib/pages/Login/FaceReg.dart

@@ -5,8 +5,8 @@ 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_ybqx/components/customDialogFaceReg.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/dioFun.dart';
+import 'package:hyzp_ybqx/components/dioFun.dart';
 import 'package:image_picker/image_picker.dart';
 
 import '../../components/commonFun.dart';

lib/pages/Login/LoginByName2.dart

@@ -4,7 +4,7 @@ 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_ybqx511528_xingwen/pages/Works/TJXX/tj_data.dart';
+import 'package:hyzp_ybqx/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_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx/components/commonFun.dart';
 
 import 'LoginTabsWidget.dart';
 
@@ -84,7 +84,7 @@ class LoginTabs2State extends State<LoginTabs2> {
                       text: TextSpan(children: [
                         TextSpan(
                             // text: '宜宾市翠屏黑烟车',
-                            text: yibin_QuXian + '黑烟车',
+                            text: qx_name + '黑烟车',
                             style: TextStyle(
                                 fontSize: 26.0, color: Colors.white, fontWeight: FontWeight.bold)),
                         TextSpan(

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_ybqx511528_xingwen/pages/Works/TJXX/tj_data.dart';
+import 'package:hyzp_ybqx/pages/Works/TJXX/tj_data.dart';
-import 'package:hyzp_ybqx511528_xingwen/services/EventBus.dart';
+import 'package:hyzp_ybqx/services/EventBus.dart';
-import 'package:hyzp_ybqx511528_xingwen/widget/my_Tabs.dart' as my_Tabs;
+import 'package:hyzp_ybqx/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_ybqx511528_xingwen/shared_prefs/FlutterSharedPreferences.xml
+    // /data/data/com.flutter.hyzp_ybqx/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_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx/components/commonFun.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/dioFun.dart';
+import 'package:hyzp_ybqx/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_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx/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_ybqx511528_xingwen/components/dioFun.dart';
+import 'package:hyzp_ybqx/components/dioFun.dart';
 import 'package:open_file/open_file.dart';
 import 'package:package_info/package_info.dart';
 import 'package:path_provider/path_provider.dart';
@@ -228,7 +228,7 @@ class _MyUpdatedState extends State<MyUpdated> {
                 children: <Widget>[
                   SizedBox(height: 60),
                   // Text('宜宾市翠屏黑烟车电子抓拍系统', style: TextStyle(fontSize: 20)),
-                  Text(yibin_QuXian + '黑烟车电子抓拍系统', style: TextStyle(fontSize: 20)),
+                  Text(qx_name + '黑烟车电子抓拍系统', style: TextStyle(fontSize: 20)),
                   Text('v${widget.ver}（${widget.date}）', style: TextStyle(fontSize: 20)),
                   SizedBox(height: 60),
                   //Text('© 宜宾市翠屏生态环境局  版权所有',

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_ybqx511528_xingwen/components/dioFun.dart';
+import 'package:hyzp_ybqx/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_ybqx511528_xingwen/pages/MyMsics/05_updated/MyUpdatedNew.dart:251:10)
+    E/flutter ( 4745): #1      MyUpdatedNew._updateDownLoadInfo (package:hyzp_ybqx/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/MyMsics/07_myAbout/MyAbout.dart

@@ -113,7 +113,7 @@ class _LoginPageState extends State<MyAbout> {
                 children: <Widget>[
                   SizedBox(height: 60),
                   // Text('宜宾市翠屏黑烟车电子抓拍系统', style: TextStyle(fontSize: 20)),
-                  Text(yibin_QuXian + '黑烟车电子抓拍系统', style: TextStyle(fontSize: 20)),
+                  Text(qx_name + '黑烟车电子抓拍系统', style: TextStyle(fontSize: 20)),
                   Text('v${widget.ver}（${widget.date}）', style: TextStyle(fontSize: 20)),
                   SizedBox(height: 60),
                   // Text('© 宜宾市翠屏生态环境局  版权所有',

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_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx/components/commonFun.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/hyxx_data_handle.dart';
+import 'package:hyzp_ybqx/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_ybqx511528_xingwen/components/dioFun.dart';
+import 'package:hyzp_ybqx/components/dioFun.dart';
 
-//import 'package:hyzp_ybqx511528_xingwen/widget/player_pro.dart';
+//import 'package:hyzp_ybqx/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_ybqx511528_xingwen/components/hyxx_data_handle.dart';
+import 'package:hyzp_ybqx/components/hyxx_data_handle.dart';
 
 ///批量添加定位标记
 bool enable = true;

lib/pages/Works/DWSP/dwsp_getList.dart

@@ -5,7 +5,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 
 import '../../../components/commonFun.dart';
-//import 'package:hyzp_ybqx511528_xingwen/widget/player_pro.dart';
+//import 'package:hyzp_ybqx/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_ybqx511528_xingwen/widget/my_superplayer.dart';
+import 'package:hyzp_ybqx/widget/my_superplayer.dart';
 import 'package:keyboard_avoider/keyboard_avoider.dart';
 
 //
 import '../../../components/commonFun.dart';
-//import 'package:hyzp_ybqx511528_xingwen/widget/player_pro_new.dart';
+//import 'package:hyzp_ybqx/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,7 +8,7 @@ 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_ybqx511528_xingwen/widget/my_superplayer.dart';
+import 'package:hyzp_ybqx/widget/my_superplayer.dart';
 import 'package:keyboard_avoider/keyboard_avoider.dart';
 import 'package:photo_view/photo_view.dart';
 
@@ -18,7 +18,7 @@ import '../../../components/doJSON.dart';
 import '../../../components/hyxx_data_handle.dart';
 import '../../../config/service_url.dart';
 import '../../../services/EventBus.dart';
-//import 'package:hyzp_ybqx511528_xingwen/widget/player_pro_new.dart';
+//import 'package:hyzp_ybqx/widget/player_pro_new.dart';
 
 import '../../../widget/CarNumberAndCpysItems.dart';
 import 'hysh_group.dart';
@@ -161,7 +161,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_ybqx511528_xingwen/pages/Works/HYSH/hysh_content.dart:163:7)
+  // E/flutter (12227): #2      _LoginPageState.getZpjlFields (package:hyzp_ybqx/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)
@@ -181,8 +181,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_ybqx511528_xingwen/pages/Works/HYSH/hysh_content.dart:415:41)
+  // E/flutter (12227): #3      _LoginPageState.getTopTabsMap (package:hyzp_ybqx/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)
+  // E/flutter (12227): #4      _LoginPageState.getZpjlFields (package:hyzp_ybqx/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_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx/components/commonFun.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/HYSH/tsjj_content_new.dart';
+import 'package:hyzp_ybqx/pages/Works/HYSH/tsjj_content_new.dart';
-import 'package:hyzp_ybqx511528_xingwen/services/EventBus.dart';
+import 'package:hyzp_ybqx/services/EventBus.dart';
-import 'package:hyzp_ybqx511528_xingwen/widget/DropdownItem.dart';
+import 'package:hyzp_ybqx/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_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx/components/commonFun.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/HYSH/tsjj_content_new.dart';
+import 'package:hyzp_ybqx/pages/Works/HYSH/tsjj_content_new.dart';
-import 'package:hyzp_ybqx511528_xingwen/services/EventBus.dart';
+import 'package:hyzp_ybqx/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_ybqx511528_xingwen/components/EncryptUtil.dart';
+import 'package:hyzp_ybqx/components/EncryptUtil.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/customDialogF.dart';
+import 'package:hyzp_ybqx/components/customDialogF.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/customDialogHysh.dart';
+import 'package:hyzp_ybqx/components/customDialogHysh.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/dioFun.dart';
+import 'package:hyzp_ybqx/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_ybqx511528_xingwen/components/customDialogF.dart';
+import 'package:hyzp_ybqx/components/customDialogF.dart';
-import 'package:hyzp_ybqx511528_xingwen/services/EventBus.dart';
+import 'package:hyzp_ybqx/services/EventBus.dart';
-import 'package:hyzp_ybqx511528_xingwen/widget/my_superplayer.dart';
+import 'package:hyzp_ybqx/widget/my_superplayer.dart';
 import 'package:keyboard_avoider/keyboard_avoider.dart';
 
 //
 import '../../../components/commonFun.dart';
-//import 'package:hyzp_ybqx511528_xingwen/widget/player_pro_new.dart';
+//import 'package:hyzp_ybqx/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_ybqx511528_xingwen/services/EventBus.dart';
+import 'package:hyzp_ybqx/services/EventBus.dart';
-import 'package:hyzp_ybqx511528_xingwen/widget/JdButton.dart';
+import 'package:hyzp_ybqx/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_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx/components/commonFun.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/customDialogF.dart';
+import 'package:hyzp_ybqx/components/customDialogF.dart';
-import 'package:hyzp_ybqx511528_xingwen/services/EventBus.dart';
+import 'package:hyzp_ybqx/services/EventBus.dart';
-import 'package:hyzp_ybqx511528_xingwen/widget/customRadioWidget.dart';
+import 'package:hyzp_ybqx/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_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx/components/commonFun.dart';
 
 import '../../../components/customDialogH.dart';
 import '../../../components/customDialogJ.dart';
 import '../../../components/dioFun.dart';
-//import 'package:hyzp_ybqx511528_xingwen/widget/player_pro.dart';
+//import 'package:hyzp_ybqx/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_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx/components/commonFun.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/dioFun.dart';
+import 'package:hyzp_ybqx/components/dioFun.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/hyxx_data_handle.dart';
+import 'package:hyzp_ybqx/components/hyxx_data_handle.dart';
-import 'package:hyzp_ybqx511528_xingwen/services/EventBus.dart';
+import 'package:hyzp_ybqx/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_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx/components/commonFun.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/HYSH/tsjj_content_new.dart';
+import 'package:hyzp_ybqx/pages/Works/HYSH/tsjj_content_new.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/tj_data.dart';
+import 'package:hyzp_ybqx/pages/Works/TJXX/tj_data.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/today_list_zpjl_content.dart';
+import 'package:hyzp_ybqx/pages/Works/TJXX/today_list_zpjl_content.dart';
-import 'package:hyzp_ybqx511528_xingwen/services/EventBus.dart';
+import 'package:hyzp_ybqx/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_ybqx511528_xingwen/widget/my_superplayer.dart';
+import 'package:hyzp_ybqx/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_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx/components/commonFun.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/dioFun.dart';
+import 'package:hyzp_ybqx/components/dioFun.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/hyxx_data_handle.dart';
+import 'package:hyzp_ybqx/components/hyxx_data_handle.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/tj_data.dart';
+import 'package:hyzp_ybqx/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_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx/components/commonFun.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/dioFun.dart';
+import 'package:hyzp_ybqx/components/dioFun.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/hyxx_data_handle.dart';
+import 'package:hyzp_ybqx/components/hyxx_data_handle.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/tj_data.dart';
+import 'package:hyzp_ybqx/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_bar_echarts_trinity_new.dart

@@ -1,11 +1,11 @@
 //import 'package:flustars/flustars.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx/components/commonFun.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/hyxx_data_handle.dart';
+import 'package:hyzp_ybqx/components/hyxx_data_handle.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/tj_data.dart';
+import 'package:hyzp_ybqx/pages/Works/TJXX/tj_data.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/zptj_bar_echarts_trinity_new_getdata.dart';
+import 'package:hyzp_ybqx/pages/Works/TJXX/zptj_bar_echarts_trinity_new_getdata.dart';
-import 'package:hyzp_ybqx511528_xingwen/widget/table_scrollable/table_scrollable.dart';
+import 'package:hyzp_ybqx/widget/table_scrollable/table_scrollable.dart';
 
 import '../../../services/EventBus.dart';
 

lib/pages/Works/TJXX/zptj_bar_echarts_trinity_new_getdata.dart

@@ -3,12 +3,12 @@ import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_echarts/flutter_echarts.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx/components/commonFun.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/dioFun.dart';
+import 'package:hyzp_ybqx/components/dioFun.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/doJSON.dart';
+import 'package:hyzp_ybqx/components/doJSON.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/hyxx_data_handle.dart';
+import 'package:hyzp_ybqx/components/hyxx_data_handle.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/tj_data.dart';
+import 'package:hyzp_ybqx/pages/Works/TJXX/tj_data.dart';
-import 'package:hyzp_ybqx511528_xingwen/widget/DropdownItem.dart';
+import 'package:hyzp_ybqx/widget/DropdownItem.dart';
 
 import '../../../services/EventBus.dart';
 

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_ybqx511528_xingwen/components/save_data_to_file.dart';
+import 'package:hyzp_ybqx/components/save_data_to_file.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/zptj_bar_chart.dart';
+import 'package:hyzp_ybqx/pages/Works/TJXX/zptj_bar_chart.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/zptj_bar_chart_one.dart';
+import 'package:hyzp_ybqx/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_ybqx511528_xingwen/pages/tabs/page4_myMsics_new.dart';
+import 'package:hyzp_ybqx/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_ybqx/components/commonFun.dart';
-// import 'package:hyzp_ybqx511528_xingwen/pages/Works/DWSP/dw_list_sound.dart';
+// import 'package:hyzp_ybqx/pages/Works/DWSP/dw_list_sound.dart';
-// import 'package:hyzp_ybqx511528_xingwen/pages/Works/DWSP/dw_sound.dart';
+// import 'package:hyzp_ybqx/pages/Works/DWSP/dw_sound.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/DWSP/dwsp_getList.dart';
+import 'package:hyzp_ybqx/pages/Works/DWSP/dwsp_getList.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/HYSH/hysh_getList_fliter.dart';
+import 'package:hyzp_ybqx/pages/Works/HYSH/hysh_getList_fliter.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/HYSH/hysh_getList_new.dart';
+import 'package:hyzp_ybqx/pages/Works/HYSH/hysh_getList_new.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/LED_XSXX/led_xsxx_content.dart';
+import 'package:hyzp_ybqx/pages/Works/LED_XSXX/led_xsxx_content.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/SBBJ/sbbj_getList.dart';
+import 'package:hyzp_ybqx/pages/Works/SBBJ/sbbj_getList.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/SBGL/dwxx_getList.dart';
+import 'package:hyzp_ybqx/pages/Works/SBGL/dwxx_getList.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/tj_data.dart';
+import 'package:hyzp_ybqx/pages/Works/TJXX/tj_data.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/today_list.dart';
+import 'package:hyzp_ybqx/pages/Works/TJXX/today_list.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/zptj_bar_chart.dart';
+import 'package:hyzp_ybqx/pages/Works/TJXX/zptj_bar_chart.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/zptj_bar_chart_one.dart';
+import 'package:hyzp_ybqx/pages/Works/TJXX/zptj_bar_chart_one.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Works/TJXX/zptj_page.dart';
+import 'package:hyzp_ybqx/pages/Works/TJXX/zptj_page.dart';
-import 'package:hyzp_ybqx511528_xingwen/services/EventBus.dart';
+import 'package:hyzp_ybqx/services/EventBus.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import '../../components/hyxx_data_handle.dart';
@@ -918,7 +918,7 @@ class _Page1_WorksState extends State<Page1_Works>
     //   }),
     // );
     int defauld_led_id = 1;
-    switch (qxdm) {
+    switch (qx_code) {
       case 511528: // 兴文县
         break;
       default:

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_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx/components/commonFun.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Login/FaceLogin.dart';
+import 'package:hyzp_ybqx/pages/Login/FaceLogin.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Login/FaceReg.dart';
+import 'package:hyzp_ybqx/pages/Login/FaceReg.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/MyMsics/05_updated/MyUpdatedNew.dart';
+import 'package:hyzp_ybqx/pages/MyMsics/05_updated/MyUpdatedNew.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/tabs/page5_userManager.dart';
+import 'package:hyzp_ybqx/pages/tabs/page5_userManager.dart';
-import 'package:hyzp_ybqx511528_xingwen/widget/JdButton.dart';
+import 'package:hyzp_ybqx/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_ybqx511528_xingwen/widget/player_pro.dart';
+//import 'package:hyzp_ybqx/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_ybqx511528_xingwen
+      // I/flutter (30820): packageName = com.flutter.hyzp_ybqx
       // 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_ybqx511528_xingwen/pages/Login/FaceReg.dart';
+import 'package:hyzp_ybqx/pages/Login/FaceReg.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Login/ModifyPassword.dart';
+import 'package:hyzp_ybqx/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_ybqx511528_xingwen/pages/Login/FaceLogin.dart';
+import 'package:hyzp_ybqx/pages/Login/FaceLogin.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Login/FaceReg.dart';
+import 'package:hyzp_ybqx/pages/Login/FaceReg.dart';
-import 'package:hyzp_ybqx511528_xingwen/pages/Login/LoginTabs2.dart';
+import 'package:hyzp_ybqx/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_ybqx511528_xingwen/components/customDialogHysh.dart';
+import 'package:hyzp_ybqx/components/customDialogHysh.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/dioFun.dart';
+import 'package:hyzp_ybqx/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_ybqx511528_xingwen/components/commonFun.dart';
+import 'package:hyzp_ybqx/components/commonFun.dart';
-import 'package:hyzp_ybqx511528_xingwen/components/dioFun.dart';
+import 'package:hyzp_ybqx/components/dioFun.dart';
-import 'package:hyzp_ybqx511528_xingwen/provider/player_ratio.dart';
+import 'package:hyzp_ybqx/provider/player_ratio.dart';
-import 'package:hyzp_ybqx511528_xingwen/provider/player_region.dart';
+import 'package:hyzp_ybqx/provider/player_region.dart';
 import 'package:provider/provider.dart';
 
 import '../components/commonFun.dart';

pubspec.yaml

@@ -1,5 +1,5 @@
-name: hyzp_ybqx511528_xingwen
+name: hyzp_ybqx
-description: HeiYanZhuaPai_YiBin_QuXian Flutter application .
+description: HeiYanZhuaPai_qx_name Flutter application .
 
 # The following line prevents the package from being accidentally published to
 # pub.dev using `pub publish`. This is preferred for private packages.
@@ -44,7 +44,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # version: 1.4.2+20211227
 # version: 1.4.4+20211230
 # version: 1.4.6+20211231
-version: 1.4.7+20220101
+# version: 1.4.7+20220101
+version: 1.4.8+20220102
 
 environment:
   sdk: ">=2.7.0 <3.0.0"

test/widget_test.dart

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