diff --git a/README.md b/README.md index cbada3f..ade0a9d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# hyzp_ybqx02_xingwen +# hyzp_ybqx03_junlian HeiYanZhuaPai_YiBin_QuXian Flutter application . diff --git a/android/app/build.gradle b/android/app/build.gradle index b50034b..520906a 100644 --- a/android/app/build.gradle +++ b/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_ybqx02_xingwen" + applicationId "com.flutter.hyzp_ybqx03_junlian" minSdkVersion 21 targetSdkVersion 29 versionCode flutterVersionCode.toInteger() diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 4a9a6e6..c04873f 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.flutter.hyzp_ybqx03_junlian"> + android:src="@mipmap/hyzp_ybqx03_junlian_launche" /> diff --git a/android/app/src/main/res/mipmap-hdpi/hyzp_ybqx02_xingwen_launche.png b/android/app/src/main/res/mipmap-hdpi/hyzp_ybqx02_xingwen_launche.png deleted file mode 100644 index 95e1bf1..0000000 Binary files a/android/app/src/main/res/mipmap-hdpi/hyzp_ybqx02_xingwen_launche.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-hdpi/hyzp_ybqx03_junlian_launche.png b/android/app/src/main/res/mipmap-hdpi/hyzp_ybqx03_junlian_launche.png new file mode 100644 index 0000000..228c2c1 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/hyzp_ybqx03_junlian_launche.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/hyzp_ybqx02_xingwen_launche.png b/android/app/src/main/res/mipmap-mdpi/hyzp_ybqx02_xingwen_launche.png deleted file mode 100644 index fe84d4d..0000000 Binary files a/android/app/src/main/res/mipmap-mdpi/hyzp_ybqx02_xingwen_launche.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/hyzp_ybqx03_junlian_launche.png b/android/app/src/main/res/mipmap-mdpi/hyzp_ybqx03_junlian_launche.png new file mode 100644 index 0000000..5b008f5 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/hyzp_ybqx03_junlian_launche.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/hyzp_ybqx02_xingwen_launche.png b/android/app/src/main/res/mipmap-xhdpi/hyzp_ybqx02_xingwen_launche.png deleted file mode 100644 index 98f8c27..0000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/hyzp_ybqx02_xingwen_launche.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/hyzp_ybqx03_junlian_launche.png b/android/app/src/main/res/mipmap-xhdpi/hyzp_ybqx03_junlian_launche.png new file mode 100644 index 0000000..cd8a206 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/hyzp_ybqx03_junlian_launche.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/hyzp_ybqx02_xingwen_launche.png b/android/app/src/main/res/mipmap-xxhdpi/hyzp_ybqx02_xingwen_launche.png deleted file mode 100644 index 4f7c67a..0000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/hyzp_ybqx02_xingwen_launche.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/hyzp_ybqx03_junlian_launche.png b/android/app/src/main/res/mipmap-xxhdpi/hyzp_ybqx03_junlian_launche.png new file mode 100644 index 0000000..f550b29 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/hyzp_ybqx03_junlian_launche.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/hyzp_ybqx02_xingwen_launche.png b/android/app/src/main/res/mipmap-xxxhdpi/hyzp_ybqx02_xingwen_launche.png deleted file mode 100644 index c5cf4a1..0000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/hyzp_ybqx02_xingwen_launche.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/hyzp_ybqx03_junlian_launche.png b/android/app/src/main/res/mipmap-xxxhdpi/hyzp_ybqx03_junlian_launche.png new file mode 100644 index 0000000..5f79c3f Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/hyzp_ybqx03_junlian_launche.png differ diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml index a871da8..536c8fa 100644 --- a/android/app/src/profile/AndroidManifest.xml +++ b/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.flutter.hyzp_ybqx03_junlian"> diff --git a/assets/images/hyzp_ybqx02_xingwen_launche.png b/assets/images/hyzp_ybqx02_xingwen_launche.png deleted file mode 100644 index 98f8c27..0000000 Binary files a/assets/images/hyzp_ybqx02_xingwen_launche.png and /dev/null differ diff --git a/assets/images/hyzp_ybqx03_junlian_launche.png b/assets/images/hyzp_ybqx03_junlian_launche.png new file mode 100644 index 0000000..cd8a206 Binary files /dev/null and b/assets/images/hyzp_ybqx03_junlian_launche.png differ diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 557c1cc..41ffddf 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -11,7 +11,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - hyzp_ybqx02_xingwen + hyzp_ybqx03_junlian CFBundlePackageType APPL CFBundleShortVersionString diff --git a/lib/components/UserAuthority.dart b/lib/components/UserAuthority.dart index 59cb2ee..5be2f6a 100644 --- a/lib/components/UserAuthority.dart +++ b/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_ybqx02_xingwen/config/service_url.dart'; -import 'package:hyzp_ybqx02_xingwen/services/EventBus.dart'; +import 'package:hyzp_ybqx03_junlian/config/service_url.dart'; +import 'package:hyzp_ybqx03_junlian/services/EventBus.dart'; import 'commonFun.dart'; diff --git a/lib/components/commonFun.dart b/lib/components/commonFun.dart index d9d350d..1fbfc26 100644 --- a/lib/components/commonFun.dart +++ b/lib/components/commonFun.dart @@ -12,12 +12,12 @@ 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_ybqx02_xingwen/provider/player_region.dart'; +import 'package:hyzp_ybqx03_junlian/provider/player_region.dart'; import 'UserInfo.dart'; //////////////////////////////////////////// -// begin App统一全局区县切換方法-OK +// begin hyzp_ybqx-Commit022-区县切换新方法-OK // 1、修改手机桌面的App图标文本 // R:\FlutterProject\FlutterProject51-hyzp_ybqx\hyzp_ybqx\android\app\src\main\AndroidManifest.xml @@ -25,29 +25,19 @@ import 'UserInfo.dart'; // android:label="宜宾市翠屏黑烟抓拍" // android:label="宜宾市兴文黑烟抓拍" -// 2、修改App的android启动图片 -// (1)、分别制作并运行 hyzp_ybqx00_yibin.images_copy.cmd 拷贝不同分辨率的图片文件hyzp_ybqx01_cuiping_launche.png到下面目录 +// 2、修改App的android和Flutter启动图片 +// 制作并运行 hyzp_ybqx03_junlian.images_copy.cmd，自动完成两项拷贝任务 +// (1)、拷贝不同分辨率的图片文件hyzp_ybqx03_junlian_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\ // r:\FlutterProject\FlutterProject51-hyzp_ybqx\hyzp_ybqx\android\app\src\main\res\mipmap-xxhdpi\ // r:\FlutterProject\FlutterProject51-hyzp_ybqx\hyzp_ybqx\android\app\src\main\res\mipmap-xxxhdpi\ -// (2)、然后修改文件 -// R:\FlutterProject\FlutterProject51-hyzp_ybqx\hyzp_ybqx\android\app\src\main\res\drawable\launch_background.xml -// android:src="@mipmap/hyzp_ybqx00_yibin_launche" /> -// android:src="@mipmap/hyzp_ybqx01_cuiping_launche" /> -// android:src="@mipmap/hyzp_ybqx02_xingwen_launche" /> - -// 3、App的Flutter启动图片 -// (1)、运行 hyzp_ybqx00_yibin.images_copy.cmd 拷贝 750 * 1334 的图片文件到： +// (2)、拷贝 750 * 1334 的图片文件到下面目录，作为App的Flutter启动图片 // r:\FlutterProject\FlutterProject51-hyzp_ybqx\hyzp_ybqx\assets\images\hyzp_ybqx01_cuiping_launche.png -// (2)、然后修改文件 -// R:\FlutterProject\FlutterProject51-hyzp_ybqx\hyzp_ybqx\lib\main.dart -// 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_ybqx02_xingwen_launche.png', fit: BoxFit.cover), -// 4、文本信息 +// 3、修改文本变量 +// 位于文件 R:\FlutterProject\FlutterProject51-hyzp_ybqx\hyzp_ybqx\lib\components\commonFun.dart 中 // (1)、宜宾市 // String service_tel = '\n服务热线：187-8467-8300'; // String yibin_QuXian = '宜宾'; @@ -61,28 +51,33 @@ import 'UserInfo.dart'; // String copyright_info_PinYin = 'YIBIN CUIPING BLACK SMOKE CAR CAPTURE SYSTEM'; // (3)、兴文县 +// String service_tel = '\n服务热线：187-8467-8300'; +// String yibin_QuXian = '宜宾市兴文'; +// String copyright_info = '© 宜宾市兴文生态环境局 四川省踏石科技 版权所有' + service_tel; +// String copyright_info_PinYin = 'YIBIN XINGWEN BLACK SMOKE CAR CAPTURE SYSTEM'; + +// (4)、筠连县 String service_tel = '\n服务热线：187-8467-8300'; -String yibin_QuXian = '宜宾市兴文'; -String copyright_info = '© 宜宾市兴文生态环境局 四川省踏石科技 版权所有' + service_tel; -String copyright_info_PinYin = 'YIBIN XINGWEN BLACK SMOKE CAR CAPTURE SYSTEM'; +String yibin_QuXian = '宜宾市筠连'; +String copyright_info = '© 宜宾市筠连生态环境局 四川省踏石科技 版权所有' + service_tel; +String copyright_info_PinYin = 'YIBIN JUNLIAN BLACK SMOKE CAR CAPTURE SYSTEM'; -// 5、修改AppID，但存放目錄不變 -// (1)、修改 R:\FlutterProject\FlutterProject51-hyzp_ybqx\hyzp_ybqx\pubspec.yaml 文件中的 +// 4、全局替换，将 ”hyzp_ybqx03_junlian“全部替换为 ”hyzp_ybqx03_junlian“，自动完成以下修改 +// (1)、修改 R:\FlutterProject\FlutterProject51-hyzp_ybqx\hyzp_ybqx\pubspec.yaml 文件中的AppID，但存放目錄不變 // name: hyzp_ybqx00_yibin // name: hyzp_ybqx01_cuiping -// name: hyzp_ybqx02_xingwen -// (2)、可以跳过：右键项目名称 Refactor|rename|hyzp_ybqx00_yibin，不属于git库信息，无关痛痒，但便于识别 -// (3)、全局替换： -// A、将 “com.flutter.hyzp_ybqx00_yibin” 全部替换为 “com.flutter.hyzp_ybqx02_xingwen” -// B、将 “package:hyzp_ybqx00_yibin/” 全部替换为 “package:hyzp_ybqx02_xingwen/” -// C、将 “# hyzp_ybqx00_yibin” 全部替换为 “# hyzp_ybqx02_xingwen” -// D、将 “hyzp_ybqx00_yibin” 全部替换为 “hyzp_ybqx02_xingwen” +// name: hyzp_ybqx03_junlian +// (2)、全局替换： +// A、将 “com.flutter.hyzp_ybqx00_yibin” 全部替换为 “com.flutter.hyzp_ybqx03_junlian” +// B、将 “package:hyzp_ybqx00_yibin/” 全部替换为 “package:hyzp_ybqx03_junlian/” +// C、将 “# hyzp_ybqx00_yibin” 全部替换为 “# hyzp_ybqx03_junlian” +// D、将 “hyzp_ybqx00_yibin” 全部替换为 “hyzp_ybqx03_junlian” -// 6、完成以上修改后，打开 Android Studio 的终端窗口，切换到项目的 lib 目录下，运行 flutter clean +// 5、完成以上修改后，打开 Android Studio 的终端窗口，切换到项目的 lib 目录下，运行 flutter clean -// 7、重新编译运行App +// 6、重新编译运行App -// end App统一全局区县切換方法-OK +// end hyzp_ybqx-Commit022-区县切换新方法-OK //////////////////////////////////////////// //LED字幕信息 @@ -569,14 +564,14 @@ Future image2Base64(String imagePath) async { //从字符路径 path 获取扩展名，不含点号 getFileExtension(String path) { //return path.substring(path.lastIndexOf('.')); - //imagePath = /data/user/0/com.flutter.hyzp_ybqx02_xingwen/app_flutter/Pictures/flutter_test/1614662209478.jpg, ext = .jpg + //imagePath = /data/user/0/com.flutter.hyzp_ybqx03_junlian/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_ybqx02_xingwen/app_flutter/Pictures/flutter_test/1614662209478.jpg, ext = .jpg + //imagePath = /data/user/0/com.flutter.hyzp_ybqx03_junlian/app_flutter/Pictures/flutter_test/1614662209478.jpg, ext = .jpg return path.substring(path.lastIndexOf('/') + 1); //不含点号 } diff --git a/lib/components/customDialogHysh.dart b/lib/components/customDialogHysh.dart index ec5eefe..028a581 100644 --- a/lib/components/customDialogHysh.dart +++ b/lib/components/customDialogHysh.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:hyzp_ybqx02_xingwen/components/dioFun.dart'; +import 'package:hyzp_ybqx03_junlian/components/dioFun.dart'; import 'commonFun.dart'; diff --git a/lib/components/dioFun.dart b/lib/components/dioFun.dart index 58c12c4..bddf73f 100644 --- a/lib/components/dioFun.dart +++ b/lib/components/dioFun.dart @@ -6,17 +6,17 @@ 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_ybqx02_xingwen/components/doJSON.dart'; -import 'package:hyzp_ybqx02_xingwen/services/EventBus.dart'; -import 'package:hyzp_ybqx02_xingwen/widget/my_superplayer.dart'; +import 'package:hyzp_ybqx03_junlian/components/doJSON.dart'; +import 'package:hyzp_ybqx03_junlian/services/EventBus.dart'; +import 'package:hyzp_ybqx03_junlian/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 '../widget/my_delay_toast.dart'; -// import 'package:hyzp_ybqx02_xingwen/widget/player_pro.dart'; -// import 'package:hyzp_ybqx02_xingwen/widget/player_pro_new.dart'; +// import 'package:hyzp_ybqx03_junlian/widget/player_pro.dart'; +// import 'package:hyzp_ybqx03_junlian/widget/player_pro_new.dart'; import 'UserAuthority.dart'; import 'commonFun.dart'; diff --git a/lib/components/doJSON.dart b/lib/components/doJSON.dart index e439fe6..8e39347 100644 --- a/lib/components/doJSON.dart +++ b/lib/components/doJSON.dart @@ -155,8 +155,8 @@ Future getTheFile(String fileName) async { print(e); } - // /data/data/com.flutter.hyzp_ybqx02_xingwen/app_flutter/json/listMessagesInbox02.json - // /data/data/com.flutter.hyzp_ybqx02_xingwen/app_flutter/json/listContacts02.json + // /data/data/com.flutter.hyzp_ybqx03_junlian/app_flutter/json/listMessagesInbox02.json + // /data/data/com.flutter.hyzp_ybqx03_junlian/app_flutter/json/listContacts02.json return File('${(await getApplicationDocumentsDirectory()).path}/json/$fileName'); } diff --git a/lib/main.dart b/lib/main.dart index 2052ae9..06e4380 100644 --- a/lib/main.dart +++ b/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_ybqx02_xingwen/pages/Login/LoginTabs2.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/MyMsics/05_updated/MyUpdatedNew.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/TJXX/tj_data.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Login/LoginTabs2.dart'; +import 'package:hyzp_ybqx03_junlian/pages/MyMsics/05_updated/MyUpdatedNew.dart'; +import 'package:hyzp_ybqx03_junlian/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 { print('buildNumber = $buildNumber'); print('buildDate = $buildDate'); // I/flutter (30820): appName = 宜宾市翠屏黑烟抓拍 - // I/flutter (30820): packageName = com.flutter.hyzp_ybqx02_xingwen + // I/flutter (30820): packageName = com.flutter.hyzp_ybqx03_junlian // I/flutter (30820): version = 1.3.1 // I/flutter (30820): buildNumber = 20210508 // I/flutter (30820): buildDate = 2021.05.08 @@ -244,7 +244,7 @@ class _SplashScreenState extends State { // 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_ybqx02_xingwen_launche.png', fit: BoxFit.cover)), + Image.asset('assets/images/hyzp_ybqx03_junlian_launche.png', fit: BoxFit.cover)), ], ), ); diff --git a/lib/pages/Login/FaceLogin2.dart b/lib/pages/Login/FaceLogin2.dart index 41b0ec6..ddf3f5d 100644 --- a/lib/pages/Login/FaceLogin2.dart +++ b/lib/pages/Login/FaceLogin2.dart @@ -3,8 +3,8 @@ import 'dart:io'; import 'package:camera/camera.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/TJXX/tj_data.dart'; -import 'package:hyzp_ybqx02_xingwen/widget/JdButton.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Works/TJXX/tj_data.dart'; +import 'package:hyzp_ybqx03_junlian/widget/JdButton.dart'; import '../../components/commonFun.dart'; import '../../services/EventBus.dart'; diff --git a/lib/pages/Login/FaceReg.dart b/lib/pages/Login/FaceReg.dart index 25e75ea..7ceffc1 100644 --- a/lib/pages/Login/FaceReg.dart +++ b/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_ybqx02_xingwen/components/customDialogFaceReg.dart'; -import 'package:hyzp_ybqx02_xingwen/components/dioFun.dart'; +import 'package:hyzp_ybqx03_junlian/components/customDialogFaceReg.dart'; +import 'package:hyzp_ybqx03_junlian/components/dioFun.dart'; import 'package:image_picker/image_picker.dart'; import '../../components/commonFun.dart'; diff --git a/lib/pages/Login/LoginByName2.dart b/lib/pages/Login/LoginByName2.dart index 5ebc272..d5c8cc4 100644 --- a/lib/pages/Login/LoginByName2.dart +++ b/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_ybqx02_xingwen/components/UserAuthority.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/TJXX/tj_data.dart'; +import 'package:hyzp_ybqx03_junlian/components/UserAuthority.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Works/TJXX/tj_data.dart'; import '../../components/EncryptUtil.dart'; import '../../components/commonFun.dart'; diff --git a/lib/pages/Login/LoginTabs2.dart b/lib/pages/Login/LoginTabs2.dart index 13e7802..c3d05a7 100644 --- a/lib/pages/Login/LoginTabs2.dart +++ b/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_ybqx02_xingwen/components/commonFun.dart'; +import 'package:hyzp_ybqx03_junlian/components/commonFun.dart'; import 'LoginTabsWidget.dart'; diff --git a/lib/pages/Login/LoginTabsWidget.dart b/lib/pages/Login/LoginTabsWidget.dart index 223b3f3..c3b4f35 100644 --- a/lib/pages/Login/LoginTabsWidget.dart +++ b/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_ybqx02_xingwen/pages/Works/TJXX/tj_data.dart'; -import 'package:hyzp_ybqx02_xingwen/services/EventBus.dart'; -import 'package:hyzp_ybqx02_xingwen/widget/my_Tabs.dart' as my_Tabs; +import 'package:hyzp_ybqx03_junlian/pages/Works/TJXX/tj_data.dart'; +import 'package:hyzp_ybqx03_junlian/services/EventBus.dart'; +import 'package:hyzp_ybqx03_junlian/widget/my_Tabs.dart' as my_Tabs; import '../../components/commonFun.dart'; import '../../services/Storage.dart'; @@ -59,7 +59,7 @@ class _MyHomePageState extends State with SingleTickerProviderS super.initState(); //若下面文件不存在， - // /data/data/com.flutter.hyzp_ybqx02_xingwen/shared_prefs/FlutterSharedPreferences.xml + // /data/data/com.flutter.hyzp_ybqx03_junlian/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) diff --git a/lib/pages/MyMsics/03_personal/PersonalData.dart b/lib/pages/MyMsics/03_personal/PersonalData.dart index 4e926f4..d7db0c7 100644 --- a/lib/pages/MyMsics/03_personal/PersonalData.dart +++ b/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_ybqx02_xingwen/components/commonFun.dart'; -import 'package:hyzp_ybqx02_xingwen/components/dioFun.dart'; +import 'package:hyzp_ybqx03_junlian/components/commonFun.dart'; +import 'package:hyzp_ybqx03_junlian/components/dioFun.dart'; import '../../../components/customDialogH.dart'; import '../../../components/hyxx_data_handle.dart'; diff --git a/lib/pages/MyMsics/04_myFeedback/MyFeedback.dart b/lib/pages/MyMsics/04_myFeedback/MyFeedback.dart index 517ddd4..aeb4407 100644 --- a/lib/pages/MyMsics/04_myFeedback/MyFeedback.dart +++ b/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_ybqx02_xingwen/components/commonFun.dart'; +import 'package:hyzp_ybqx03_junlian/components/commonFun.dart'; import '../../../widget/JdButton.dart'; diff --git a/lib/pages/MyMsics/05_updated/MyUpdated.dart b/lib/pages/MyMsics/05_updated/MyUpdated.dart index f93f9c3..2cc7abf 100644 --- a/lib/pages/MyMsics/05_updated/MyUpdated.dart +++ b/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_ybqx02_xingwen/components/dioFun.dart'; +import 'package:hyzp_ybqx03_junlian/components/dioFun.dart'; import 'package:open_file/open_file.dart'; import 'package:package_info/package_info.dart'; import 'package:path_provider/path_provider.dart'; diff --git a/lib/pages/MyMsics/05_updated/MyUpdatedNew.dart b/lib/pages/MyMsics/05_updated/MyUpdatedNew.dart index 3a5e13b..23f5423 100644 --- a/lib/pages/MyMsics/05_updated/MyUpdatedNew.dart +++ b/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_ybqx02_xingwen/components/dioFun.dart'; +import 'package:hyzp_ybqx03_junlian/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_ybqx02_xingwen/pages/MyMsics/05_updated/MyUpdatedNew.dart:251:10) + E/flutter ( 4745): #1 MyUpdatedNew._updateDownLoadInfo (package:hyzp_ybqx03_junlian/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) diff --git a/lib/pages/Works/DWDT/basic_map.dart b/lib/pages/Works/DWDT/basic_map.dart index f728b59..886fda4 100644 --- a/lib/pages/Works/DWDT/basic_map.dart +++ b/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_ybqx02_xingwen/components/commonFun.dart'; -import 'package:hyzp_ybqx02_xingwen/components/hyxx_data_handle.dart'; +import 'package:hyzp_ybqx03_junlian/components/commonFun.dart'; +import 'package:hyzp_ybqx03_junlian/components/hyxx_data_handle.dart'; import '../../../components/dioFun.dart'; import 'dwInfoDialog.dart'; diff --git a/lib/pages/Works/DWDT/dwInfoDialog.dart b/lib/pages/Works/DWDT/dwInfoDialog.dart index 07ba277..6131a07 100644 --- a/lib/pages/Works/DWDT/dwInfoDialog.dart +++ b/lib/pages/Works/DWDT/dwInfoDialog.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:hyzp_ybqx02_xingwen/components/dioFun.dart'; +import 'package:hyzp_ybqx03_junlian/components/dioFun.dart'; -//import 'package:hyzp_ybqx02_xingwen/widget/player_pro.dart'; +//import 'package:hyzp_ybqx03_junlian/widget/player_pro.dart'; import '../../../components/commonFun.dart'; //确认对话框 diff --git a/lib/pages/Works/DWDT/dwInfo_data.dart b/lib/pages/Works/DWDT/dwInfo_data.dart index 1f477e1..2d3076c 100644 --- a/lib/pages/Works/DWDT/dwInfo_data.dart +++ b/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_ybqx02_xingwen/components/hyxx_data_handle.dart'; +import 'package:hyzp_ybqx03_junlian/components/hyxx_data_handle.dart'; ///批量添加定位标记 bool enable = true; diff --git a/lib/pages/Works/DWSP/dwsp_getList.dart b/lib/pages/Works/DWSP/dwsp_getList.dart index e019841..83979e9 100644 --- a/lib/pages/Works/DWSP/dwsp_getList.dart +++ b/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_ybqx02_xingwen/widget/my_delay_toast.dart'; +import 'package:hyzp_ybqx03_junlian/widget/my_delay_toast.dart'; import '../../../components/commonFun.dart'; -//import 'package:hyzp_ybqx02_xingwen/widget/player_pro.dart'; +//import 'package:hyzp_ybqx03_junlian/widget/player_pro.dart'; import '../../../components/dioFun.dart'; import '../../../components/hyxx_data_handle.dart'; diff --git a/lib/pages/Works/HYSH/fhycx_content_new.dart b/lib/pages/Works/HYSH/fhycx_content_new.dart index dd1d03b..9f18a1b 100644 --- a/lib/pages/Works/HYSH/fhycx_content_new.dart +++ b/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_ybqx02_xingwen/widget/my_superplayer.dart'; +import 'package:hyzp_ybqx03_junlian/widget/my_superplayer.dart'; import 'package:keyboard_avoider/keyboard_avoider.dart'; // import '../../../components/commonFun.dart'; -//import 'package:hyzp_ybqx02_xingwen/widget/player_pro_new.dart'; +//import 'package:hyzp_ybqx03_junlian/widget/player_pro_new.dart'; import '../../../components/dioFun.dart'; import '../../../components/doJSON.dart'; import '../../../components/hyxx_data_handle.dart'; diff --git a/lib/pages/Works/HYSH/hysh_content_new.dart b/lib/pages/Works/HYSH/hysh_content_new.dart index a96598f..bb9c11f 100644 --- a/lib/pages/Works/HYSH/hysh_content_new.dart +++ b/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_ybqx02_xingwen/widget/JdButton.dart'; -import 'package:hyzp_ybqx02_xingwen/widget/my_superplayer.dart'; +import 'package:hyzp_ybqx03_junlian/widget/JdButton.dart'; +import 'package:hyzp_ybqx03_junlian/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_ybqx02_xingwen/widget/player_pro_new.dart'; +//import 'package:hyzp_ybqx03_junlian/widget/player_pro_new.dart'; import '../../../widget/CarNumberAndCpysItems.dart'; import 'hysh_group.dart'; @@ -162,7 +162,7 @@ class _HyshPageState extends State 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. (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_ybqx02_xingwen/pages/Works/HYSH/hysh_content.dart:163:7) + // E/flutter (12227): #2 _LoginPageState.getZpjlFields (package:hyzp_ybqx03_junlian/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 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_ybqx02_xingwen/pages/Works/HYSH/hysh_content.dart:415:41) - // E/flutter (12227): #4 _LoginPageState.getZpjlFields (package:hyzp_ybqx02_xingwen/pages/Works/HYSH/hysh_content.dart:162:7) + // E/flutter (12227): #3 _LoginPageState.getTopTabsMap (package:hyzp_ybqx03_junlian/pages/Works/HYSH/hysh_content.dart:415:41) + // E/flutter (12227): #4 _LoginPageState.getZpjlFields (package:hyzp_ybqx03_junlian/pages/Works/HYSH/hysh_content.dart:162:7) //getListFlields({bool b = true}) async { getListFlields() async { diff --git a/lib/pages/Works/HYSH/hysh_getList_fliter.dart b/lib/pages/Works/HYSH/hysh_getList_fliter.dart index c5e24b6..394960f 100644 --- a/lib/pages/Works/HYSH/hysh_getList_fliter.dart +++ b/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_ybqx02_xingwen/components/commonFun.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/HYSH/tsjj_content_new.dart'; -import 'package:hyzp_ybqx02_xingwen/services/EventBus.dart'; -import 'package:hyzp_ybqx02_xingwen/widget/DropdownItem.dart'; +import 'package:hyzp_ybqx03_junlian/components/commonFun.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Works/HYSH/tsjj_content_new.dart'; +import 'package:hyzp_ybqx03_junlian/services/EventBus.dart'; +import 'package:hyzp_ybqx03_junlian/widget/DropdownItem.dart'; import '../../../components/commonFun.dart'; import '../../../components/dioFun.dart'; diff --git a/lib/pages/Works/HYSH/hysh_getList_new.dart b/lib/pages/Works/HYSH/hysh_getList_new.dart index 5aa006f..6a3b4b6 100644 --- a/lib/pages/Works/HYSH/hysh_getList_new.dart +++ b/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_ybqx02_xingwen/components/commonFun.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/HYSH/tsjj_content_new.dart'; -import 'package:hyzp_ybqx02_xingwen/services/EventBus.dart'; +import 'package:hyzp_ybqx03_junlian/components/commonFun.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Works/HYSH/tsjj_content_new.dart'; +import 'package:hyzp_ybqx03_junlian/services/EventBus.dart'; import '../../../components/commonFun.dart'; import '../../../components/dioFun.dart'; diff --git a/lib/pages/Works/HYSH/hysh_group.dart b/lib/pages/Works/HYSH/hysh_group.dart index 271f9bd..9c06675 100644 --- a/lib/pages/Works/HYSH/hysh_group.dart +++ b/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_ybqx02_xingwen/components/EncryptUtil.dart'; -import 'package:hyzp_ybqx02_xingwen/components/customDialogF.dart'; -import 'package:hyzp_ybqx02_xingwen/components/customDialogHysh.dart'; -import 'package:hyzp_ybqx02_xingwen/components/dioFun.dart'; +import 'package:hyzp_ybqx03_junlian/components/EncryptUtil.dart'; +import 'package:hyzp_ybqx03_junlian/components/customDialogF.dart'; +import 'package:hyzp_ybqx03_junlian/components/customDialogHysh.dart'; +import 'package:hyzp_ybqx03_junlian/components/dioFun.dart'; import '../../../components/doJSON.dart'; import '../../../components/hyxx_data_handle.dart'; diff --git a/lib/pages/Works/HYSH/tsjj_content_new.dart b/lib/pages/Works/HYSH/tsjj_content_new.dart index 1c40033..36c7a1d 100644 --- a/lib/pages/Works/HYSH/tsjj_content_new.dart +++ b/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_ybqx02_xingwen/components/customDialogF.dart'; -import 'package:hyzp_ybqx02_xingwen/services/EventBus.dart'; -import 'package:hyzp_ybqx02_xingwen/widget/my_superplayer.dart'; +import 'package:hyzp_ybqx03_junlian/components/customDialogF.dart'; +import 'package:hyzp_ybqx03_junlian/services/EventBus.dart'; +import 'package:hyzp_ybqx03_junlian/widget/my_superplayer.dart'; import 'package:keyboard_avoider/keyboard_avoider.dart'; // import '../../../components/commonFun.dart'; -//import 'package:hyzp_ybqx02_xingwen/widget/player_pro_new.dart'; +//import 'package:hyzp_ybqx03_junlian/widget/player_pro_new.dart'; import '../../../components/dioFun.dart'; import '../../../components/doJSON.dart'; import '../../../components/hyxx_data_handle.dart'; diff --git a/lib/pages/Works/LED_XSXX/led_xsxx_content.dart b/lib/pages/Works/LED_XSXX/led_xsxx_content.dart index 1c978e5..ea62c53 100644 --- a/lib/pages/Works/LED_XSXX/led_xsxx_content.dart +++ b/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_ybqx02_xingwen/services/EventBus.dart'; -import 'package:hyzp_ybqx02_xingwen/widget/JdButton.dart'; +import 'package:hyzp_ybqx03_junlian/services/EventBus.dart'; +import 'package:hyzp_ybqx03_junlian/widget/JdButton.dart'; import 'package:keyboard_avoider/keyboard_avoider.dart'; import '../../../components/commonFun.dart'; diff --git a/lib/pages/Works/SBBJ/sbbj_content.dart b/lib/pages/Works/SBBJ/sbbj_content.dart index 04ad290..3d3bcd4 100644 --- a/lib/pages/Works/SBBJ/sbbj_content.dart +++ b/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_ybqx02_xingwen/components/commonFun.dart'; -import 'package:hyzp_ybqx02_xingwen/components/customDialogF.dart'; -import 'package:hyzp_ybqx02_xingwen/services/EventBus.dart'; -import 'package:hyzp_ybqx02_xingwen/widget/customRadioWidget.dart'; +import 'package:hyzp_ybqx03_junlian/components/commonFun.dart'; +import 'package:hyzp_ybqx03_junlian/components/customDialogF.dart'; +import 'package:hyzp_ybqx03_junlian/services/EventBus.dart'; +import 'package:hyzp_ybqx03_junlian/widget/customRadioWidget.dart'; import '../../../components/customDialogH.dart'; import '../../../components/customDialogJ.dart'; diff --git a/lib/pages/Works/SBGL/dwxx_content.dart b/lib/pages/Works/SBGL/dwxx_content.dart index d07f82d..20a24c5 100644 --- a/lib/pages/Works/SBGL/dwxx_content.dart +++ b/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_ybqx02_xingwen/components/commonFun.dart'; +import 'package:hyzp_ybqx03_junlian/components/commonFun.dart'; import '../../../components/customDialogH.dart'; import '../../../components/customDialogJ.dart'; import '../../../components/dioFun.dart'; -//import 'package:hyzp_ybqx02_xingwen/widget/player_pro.dart'; +//import 'package:hyzp_ybqx03_junlian/widget/player_pro.dart'; import '../../../components/doJSON.dart'; import '../../../components/hyxx_data_handle.dart'; diff --git a/lib/pages/Works/TJXX/tj_data.dart b/lib/pages/Works/TJXX/tj_data.dart index fbc42f4..1be4248 100644 --- a/lib/pages/Works/TJXX/tj_data.dart +++ b/lib/pages/Works/TJXX/tj_data.dart @@ -1,7 +1,7 @@ -import 'package:hyzp_ybqx02_xingwen/components/commonFun.dart'; -import 'package:hyzp_ybqx02_xingwen/components/dioFun.dart'; -import 'package:hyzp_ybqx02_xingwen/components/hyxx_data_handle.dart'; -import 'package:hyzp_ybqx02_xingwen/services/EventBus.dart'; +import 'package:hyzp_ybqx03_junlian/components/commonFun.dart'; +import 'package:hyzp_ybqx03_junlian/components/dioFun.dart'; +import 'package:hyzp_ybqx03_junlian/components/hyxx_data_handle.dart'; +import 'package:hyzp_ybqx03_junlian/services/EventBus.dart'; ///获取车流量日统计数据 bool cllRStatisDataGeting = false; //正在获取车流量日统计数据，禁止重入 diff --git a/lib/pages/Works/TJXX/today_list.dart b/lib/pages/Works/TJXX/today_list.dart index 61a6440..28537ae 100644 --- a/lib/pages/Works/TJXX/today_list.dart +++ b/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_ybqx02_xingwen/components/commonFun.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/HYSH/tsjj_content_new.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/TJXX/tj_data.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/TJXX/today_list_zpjl_content.dart'; -import 'package:hyzp_ybqx02_xingwen/services/EventBus.dart'; +import 'package:hyzp_ybqx03_junlian/components/commonFun.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Works/HYSH/tsjj_content_new.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Works/TJXX/tj_data.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Works/TJXX/today_list_zpjl_content.dart'; +import 'package:hyzp_ybqx03_junlian/services/EventBus.dart'; import '../../../components/commonFun.dart'; import '../../../components/doJSON.dart'; diff --git a/lib/pages/Works/TJXX/today_list_zpjl_content.dart b/lib/pages/Works/TJXX/today_list_zpjl_content.dart index 7d20eea..d1fe44b 100644 --- a/lib/pages/Works/TJXX/today_list_zpjl_content.dart +++ b/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_ybqx02_xingwen/widget/my_superplayer.dart'; +import 'package:hyzp_ybqx03_junlian/widget/my_superplayer.dart'; import 'package:keyboard_avoider/keyboard_avoider.dart'; // diff --git a/lib/pages/Works/TJXX/zptj_bar_chart.dart b/lib/pages/Works/TJXX/zptj_bar_chart.dart index c33e574..9256691 100644 --- a/lib/pages/Works/TJXX/zptj_bar_chart.dart +++ b/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_ybqx02_xingwen/components/commonFun.dart'; -import 'package:hyzp_ybqx02_xingwen/components/dioFun.dart'; -import 'package:hyzp_ybqx02_xingwen/components/hyxx_data_handle.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/TJXX/tj_data.dart'; +import 'package:hyzp_ybqx03_junlian/components/commonFun.dart'; +import 'package:hyzp_ybqx03_junlian/components/dioFun.dart'; +import 'package:hyzp_ybqx03_junlian/components/hyxx_data_handle.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Works/TJXX/tj_data.dart'; class ZptjBarChart extends StatefulWidget { ZptjBarChart({this.statisType, this.data_ok = false, Key key}) : super(key: key); diff --git a/lib/pages/Works/TJXX/zptj_bar_chart_one.dart b/lib/pages/Works/TJXX/zptj_bar_chart_one.dart index afd6cc2..f5ecfee 100644 --- a/lib/pages/Works/TJXX/zptj_bar_chart_one.dart +++ b/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_ybqx02_xingwen/components/commonFun.dart'; -import 'package:hyzp_ybqx02_xingwen/components/dioFun.dart'; -import 'package:hyzp_ybqx02_xingwen/components/hyxx_data_handle.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/TJXX/tj_data.dart'; +import 'package:hyzp_ybqx03_junlian/components/commonFun.dart'; +import 'package:hyzp_ybqx03_junlian/components/dioFun.dart'; +import 'package:hyzp_ybqx03_junlian/components/hyxx_data_handle.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Works/TJXX/tj_data.dart'; class ZptjBarChartOne extends StatefulWidget { ZptjBarChartOne({this.statisType, this.data_ok = false, Key key}) : super(key: key); diff --git a/lib/pages/Works/TJXX/zptj_page.dart b/lib/pages/Works/TJXX/zptj_page.dart index f592065..62d708c 100644 --- a/lib/pages/Works/TJXX/zptj_page.dart +++ b/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_ybqx02_xingwen/components/save_data_to_file.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/TJXX/zptj_bar_chart.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/TJXX/zptj_bar_chart_one.dart'; +import 'package:hyzp_ybqx03_junlian/components/save_data_to_file.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Works/TJXX/zptj_bar_chart.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Works/TJXX/zptj_bar_chart_one.dart'; import '../../../components/commonFun.dart'; import '../../../components/hyxx_data_handle.dart'; diff --git a/lib/pages/tabs/Tabs.dart b/lib/pages/tabs/Tabs.dart index 04752f4..9a0c9ae 100644 --- a/lib/pages/tabs/Tabs.dart +++ b/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_ybqx02_xingwen/pages/tabs/page4_myMsics_new.dart'; +import 'package:hyzp_ybqx03_junlian/pages/tabs/page4_myMsics_new.dart'; //import '../../widget/player_pro.dart'; import '../../components/commonFun.dart'; diff --git a/lib/pages/tabs/page1_work.dart b/lib/pages/tabs/page1_work.dart index c359acf..b583586 100644 --- a/lib/pages/tabs/page1_work.dart +++ b/lib/pages/tabs/page1_work.dart @@ -3,20 +3,20 @@ 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_ybqx02_xingwen/components/commonFun.dart'; -// import 'package:hyzp_ybqx02_xingwen/pages/Works/DWSP/dw_list_sound.dart'; -// import 'package:hyzp_ybqx02_xingwen/pages/Works/DWSP/dw_sound.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/DWSP/dwsp_getList.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/HYSH/hysh_getList_fliter.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/HYSH/hysh_getList_new.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/SBBJ/sbbj_getList.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/SBGL/dwxx_getList.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/TJXX/tj_data.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/TJXX/today_list.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/TJXX/zptj_bar_chart.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/TJXX/zptj_bar_chart_one.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Works/TJXX/zptj_page.dart'; -import 'package:hyzp_ybqx02_xingwen/services/EventBus.dart'; +import 'package:hyzp_ybqx03_junlian/components/commonFun.dart'; +// import 'package:hyzp_ybqx03_junlian/pages/Works/DWSP/dw_list_sound.dart'; +// import 'package:hyzp_ybqx03_junlian/pages/Works/DWSP/dw_sound.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Works/DWSP/dwsp_getList.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Works/HYSH/hysh_getList_fliter.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Works/HYSH/hysh_getList_new.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Works/SBBJ/sbbj_getList.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Works/SBGL/dwxx_getList.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Works/TJXX/tj_data.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Works/TJXX/today_list.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Works/TJXX/zptj_bar_chart.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Works/TJXX/zptj_bar_chart_one.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Works/TJXX/zptj_page.dart'; +import 'package:hyzp_ybqx03_junlian/services/EventBus.dart'; import 'package:url_launcher/url_launcher.dart'; import '../../components/hyxx_data_handle.dart'; diff --git a/lib/pages/tabs/page4_myMsics_new.dart b/lib/pages/tabs/page4_myMsics_new.dart index bcc8ee9..a7a10a1 100644 --- a/lib/pages/tabs/page4_myMsics_new.dart +++ b/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_ybqx02_xingwen/components/commonFun.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Login/FaceLogin.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Login/FaceReg.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/MyMsics/05_updated/MyUpdatedNew.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/tabs/page5_userManager.dart'; -import 'package:hyzp_ybqx02_xingwen/widget/JdButton.dart'; +import 'package:hyzp_ybqx03_junlian/components/commonFun.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Login/FaceLogin.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Login/FaceReg.dart'; +import 'package:hyzp_ybqx03_junlian/pages/MyMsics/05_updated/MyUpdatedNew.dart'; +import 'package:hyzp_ybqx03_junlian/pages/tabs/page5_userManager.dart'; +import 'package:hyzp_ybqx03_junlian/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_ybqx02_xingwen/widget/player_pro.dart'; +//import 'package:hyzp_ybqx03_junlian/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 print('buildNumber = $buildNumber'); print('buildDate = $buildDate'); // I/flutter (30820): appName = 宜宾市翠屏黑烟抓拍 - // I/flutter (30820): packageName = com.flutter.hyzp_ybqx02_xingwen + // I/flutter (30820): packageName = com.flutter.hyzp_ybqx03_junlian // I/flutter (30820): version = 1.3.1 // I/flutter (30820): buildNumber = 20210508 // I/flutter (30820): buildDate = 2021.05.08 diff --git a/lib/pages/tabs/page5_userManager.dart b/lib/pages/tabs/page5_userManager.dart index d4231da..e9c649c 100644 --- a/lib/pages/tabs/page5_userManager.dart +++ b/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_ybqx02_xingwen/pages/Login/FaceReg.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Login/ModifyPassword.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Login/FaceReg.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Login/ModifyPassword.dart'; import '../../components/commonFun.dart'; import '../../widget/JdButton.dart'; diff --git a/lib/routers/router.dart b/lib/routers/router.dart index df6019d..f623dd6 100644 --- a/lib/routers/router.dart +++ b/lib/routers/router.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Login/FaceLogin.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Login/FaceReg.dart'; -import 'package:hyzp_ybqx02_xingwen/pages/Login/LoginTabs2.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Login/FaceLogin.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Login/FaceReg.dart'; +import 'package:hyzp_ybqx03_junlian/pages/Login/LoginTabs2.dart'; //import '../pages/CheckOut.dart'; import '../pages/Address/AddressAdd.dart'; diff --git a/lib/widget/customRadioWidget.dart b/lib/widget/customRadioWidget.dart index 0a40c2a..ffc8293 100644 --- a/lib/widget/customRadioWidget.dart +++ b/lib/widget/customRadioWidget.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:fluttertoast/fluttertoast.dart'; -import 'package:hyzp_ybqx02_xingwen/components/customDialogHysh.dart'; -import 'package:hyzp_ybqx02_xingwen/components/dioFun.dart'; +import 'package:hyzp_ybqx03_junlian/components/customDialogHysh.dart'; +import 'package:hyzp_ybqx03_junlian/components/dioFun.dart'; import '../components/hyxx_data_handle.dart'; import '../services/EventBus.dart'; diff --git a/lib/widget/my_superplayer.dart b/lib/widget/my_superplayer.dart index 87f45da..a6895c1 100644 --- a/lib/widget/my_superplayer.dart +++ b/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_ybqx02_xingwen/components/commonFun.dart'; -import 'package:hyzp_ybqx02_xingwen/components/dioFun.dart'; -import 'package:hyzp_ybqx02_xingwen/provider/player_ratio.dart'; -import 'package:hyzp_ybqx02_xingwen/provider/player_region.dart'; +import 'package:hyzp_ybqx03_junlian/components/commonFun.dart'; +import 'package:hyzp_ybqx03_junlian/components/dioFun.dart'; +import 'package:hyzp_ybqx03_junlian/provider/player_ratio.dart'; +import 'package:hyzp_ybqx03_junlian/provider/player_region.dart'; import 'package:provider/provider.dart'; import '../components/commonFun.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index 5498e89..5d5d651 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,4 +1,4 @@ -name: hyzp_ybqx02_xingwen +name: hyzp_ybqx03_junlian description: HeiYanZhuaPai_YiBin_QuXian Flutter application . # The following line prevents the package from being accidentally published to diff --git a/test/widget_test.dart b/test/widget_test.dart index 4903093..8b19f14 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -7,7 +7,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:hyzp_ybqx02_xingwen/main.dart'; +import 'package:hyzp_ybqx03_junlian/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async {