diff --git a/README.md b/README.md index 33e1357..a2392bc 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# hyzp_ybqx +# hyzp_ybqx00_yibin HeiYanZhuaPai_YiBin_QuXian Flutter application . diff --git a/Scrshot-03-OK/hyzp_ybqx项目创建信息.txt b/Scrshot-03-OK/hyzp_ybqx项目创建信息.txt deleted file mode 100644 index be9bbc2..0000000 Binary files a/Scrshot-03-OK/hyzp_ybqx项目创建信息.txt and /dev/null differ diff --git a/android/app/build.gradle b/android/app/build.gradle index af31424..9f51d0a 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_ybqx" + applicationId "com.flutter.hyzp_ybqx00_yibin" minSdkVersion 21 targetSdkVersion 29 versionCode flutterVersionCode.toInteger() diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 97e0d6e..6772621 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.flutter.hyzp_ybqx00_yibin"> + package="com.flutter.hyzp_ybqx00_yibin"> diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 174268a..bb176c7 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -11,7 +11,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - hyzp_ybqx + hyzp_ybqx00_yibin CFBundlePackageType APPL CFBundleShortVersionString diff --git a/lib/components/UserAuthority.dart b/lib/components/UserAuthority.dart index 6bbce50..a6640e0 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_ybqx/config/service_url.dart'; -import 'package:hyzp_ybqx/services/EventBus.dart'; +import 'package:hyzp_ybqx00_yibin/config/service_url.dart'; +import 'package:hyzp_ybqx00_yibin/services/EventBus.dart'; import 'commonFun.dart'; diff --git a/lib/components/commonFun.dart b/lib/components/commonFun.dart index 6bb82cc..7d80949 100644 --- a/lib/components/commonFun.dart +++ b/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_ybqx/provider/player_region.dart'; +import 'package:hyzp_ybqx00_yibin/provider/player_region.dart'; import 'UserInfo.dart'; @@ -56,6 +56,16 @@ String copyright_info_PinYin = 'YIBIN BLACK SMOKE CAR CAPTURE SYSTEM'; // String copyright_info = '© 宜宾市翠屏生态环境局 版权所有' + service_tel; // String copyright_info_PinYin = 'YIBIN CUIPING BLACK SMOKE CAR CAPTURE SYSTEM'; +// 5、修改AppID，但存放目錄不變 +// (1)、修改 R:\FlutterProject\FlutterProject51-hyzp_ybqx\hyzp_ybqx\pubspec.yaml 文件中的 +// name: hyzp_ybqx00_yibin +// (2)、右键项目名称 Refactor|rename|hyzp_ybqx00_yibin +// (3)、全局替换： +// A、将 “com.flutter.hyzp_ybqx00_yibin” 全部替换为 “com.flutter.hyzp_ybqx00_yibin00_yibin” +// B、将 “package:hyzp_ybqx/” 全部替换为 “package:hyzp_ybqx00_yibin/” +// C、将 “# hyzp_ybqx” 全部替换为 “# hyzp_ybqx00_yibin” +// D、将 “hyzp_ybqx” 全部替换为 “hyzp_ybqx00_yibin” + // end 统一的全局版权信息 //////////////////////////////////////////// @@ -543,14 +553,14 @@ Future image2Base64(String imagePath) async { //从字符路径 path 获取扩展名，不含点号 getFileExtension(String path) { //return path.substring(path.lastIndexOf('.')); - //imagePath = /data/user/0/com.flutter.hyzp_ybqx/app_flutter/Pictures/flutter_test/1614662209478.jpg, ext = .jpg + //imagePath = /data/user/0/com.flutter.hyzp_ybqx00_yibin/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_ybqx/app_flutter/Pictures/flutter_test/1614662209478.jpg, ext = .jpg + //imagePath = /data/user/0/com.flutter.hyzp_ybqx00_yibin/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 a56286b..88300f6 100644 --- a/lib/components/customDialogHysh.dart +++ b/lib/components/customDialogHysh.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:hyzp_ybqx/components/dioFun.dart'; +import 'package:hyzp_ybqx00_yibin/components/dioFun.dart'; import 'commonFun.dart'; diff --git a/lib/components/dioFun.dart b/lib/components/dioFun.dart index 3d92c4e..9126421 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_ybqx/components/doJSON.dart'; -import 'package:hyzp_ybqx/services/EventBus.dart'; -import 'package:hyzp_ybqx/widget/my_superplayer.dart'; +import 'package:hyzp_ybqx00_yibin/components/doJSON.dart'; +import 'package:hyzp_ybqx00_yibin/services/EventBus.dart'; +import 'package:hyzp_ybqx00_yibin/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_ybqx/widget/player_pro.dart'; -// import 'package:hyzp_ybqx/widget/player_pro_new.dart'; +// import 'package:hyzp_ybqx00_yibin/widget/player_pro.dart'; +// import 'package:hyzp_ybqx00_yibin/widget/player_pro_new.dart'; import 'UserAuthority.dart'; import 'commonFun.dart'; diff --git a/lib/components/doJSON.dart b/lib/components/doJSON.dart index 1f03c4c..b3a27ca 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_ybqx/app_flutter/json/listMessagesInbox02.json - // /data/data/com.flutter.hyzp_ybqx/app_flutter/json/listContacts02.json + // /data/data/com.flutter.hyzp_ybqx00_yibin/app_flutter/json/listMessagesInbox02.json + // /data/data/com.flutter.hyzp_ybqx00_yibin/app_flutter/json/listContacts02.json return File('${(await getApplicationDocumentsDirectory()).path}/json/$fileName'); } diff --git a/lib/main.dart b/lib/main.dart index 3a37aa0..1a489cc 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_ybqx/pages/Login/LoginTabs2.dart'; -import 'package:hyzp_ybqx/pages/MyMsics/05_updated/MyUpdatedNew.dart'; -import 'package:hyzp_ybqx/pages/Works/TJXX/tj_data.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Login/LoginTabs2.dart'; +import 'package:hyzp_ybqx00_yibin/pages/MyMsics/05_updated/MyUpdatedNew.dart'; +import 'package:hyzp_ybqx00_yibin/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_ybqx + // I/flutter (30820): packageName = com.flutter.hyzp_ybqx00_yibin // I/flutter (30820): version = 1.3.1 // I/flutter (30820): buildNumber = 20210508 // I/flutter (30820): buildDate = 2021.05.08 diff --git a/lib/pages/Login/FaceLogin2.dart b/lib/pages/Login/FaceLogin2.dart index 0b69e8a..34182c1 100644 --- a/lib/pages/Login/FaceLogin2.dart +++ b/lib/pages/Login/FaceLogin2.dart @@ -1,11 +1,13 @@ -import 'package:flutter/material.dart'; -import 'package:hyzp_ybqx/pages/Works/TJXX/tj_data.dart'; -import 'package:hyzp_ybqx/widget/JdButton.dart'; -import '../../services/EventBus.dart'; -import 'package:camera/camera.dart'; -import '../../components/commonFun.dart'; import 'dart:io'; + +import 'package:camera/camera.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Works/TJXX/tj_data.dart'; +import 'package:hyzp_ybqx00_yibin/widget/JdButton.dart'; + +import '../../components/commonFun.dart'; +import '../../services/EventBus.dart'; class FaceLogin2 extends StatefulWidget { FaceLogin2({this.arguments, Key key}) : super(key: key); diff --git a/lib/pages/Login/FaceReg.dart b/lib/pages/Login/FaceReg.dart index fd0c06d..41616b5 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_ybqx/components/customDialogFaceReg.dart'; -import 'package:hyzp_ybqx/components/dioFun.dart'; +import 'package:hyzp_ybqx00_yibin/components/customDialogFaceReg.dart'; +import 'package:hyzp_ybqx00_yibin/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 4dc1e4c..9591738 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_ybqx/components/UserAuthority.dart'; -import 'package:hyzp_ybqx/pages/Works/TJXX/tj_data.dart'; +import 'package:hyzp_ybqx00_yibin/components/UserAuthority.dart'; +import 'package:hyzp_ybqx00_yibin/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 a286ba9..727d224 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_ybqx/components/commonFun.dart'; +import 'package:hyzp_ybqx00_yibin/components/commonFun.dart'; import 'LoginTabsWidget.dart'; diff --git a/lib/pages/Login/LoginTabsWidget.dart b/lib/pages/Login/LoginTabsWidget.dart index 2bb5ae4..5b58720 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_ybqx/pages/Works/TJXX/tj_data.dart'; -import 'package:hyzp_ybqx/services/EventBus.dart'; -import 'package:hyzp_ybqx/widget/my_Tabs.dart' as my_Tabs; +import 'package:hyzp_ybqx00_yibin/pages/Works/TJXX/tj_data.dart'; +import 'package:hyzp_ybqx00_yibin/services/EventBus.dart'; +import 'package:hyzp_ybqx00_yibin/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_ybqx/shared_prefs/FlutterSharedPreferences.xml + // /data/data/com.flutter.hyzp_ybqx00_yibin/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 cf4279e..968f064 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_ybqx/components/commonFun.dart'; -import 'package:hyzp_ybqx/components/dioFun.dart'; +import 'package:hyzp_ybqx00_yibin/components/commonFun.dart'; +import 'package:hyzp_ybqx00_yibin/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 a68bdf1..49f6339 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_ybqx/components/commonFun.dart'; +import 'package:hyzp_ybqx00_yibin/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 8fcea56..5d9d5b7 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_ybqx/components/dioFun.dart'; +import 'package:hyzp_ybqx00_yibin/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 96e08e1..b1de66e 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_ybqx/components/dioFun.dart'; +import 'package:hyzp_ybqx00_yibin/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_ybqx/pages/MyMsics/05_updated/MyUpdatedNew.dart:251:10) + E/flutter ( 4745): #1 MyUpdatedNew._updateDownLoadInfo (package:hyzp_ybqx00_yibin/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 af5970d..cb03a1c 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_ybqx/components/commonFun.dart'; -import 'package:hyzp_ybqx/components/hyxx_data_handle.dart'; +import 'package:hyzp_ybqx00_yibin/components/commonFun.dart'; +import 'package:hyzp_ybqx00_yibin/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 7437318..9c96997 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_ybqx/components/dioFun.dart'; +import 'package:hyzp_ybqx00_yibin/components/dioFun.dart'; -//import 'package:hyzp_ybqx/widget/player_pro.dart'; +//import 'package:hyzp_ybqx00_yibin/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 52ddec1..4344fa0 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_ybqx/components/hyxx_data_handle.dart'; +import 'package:hyzp_ybqx00_yibin/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 f024c70..882c05e 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_ybqx/widget/my_delay_toast.dart'; +import 'package:hyzp_ybqx00_yibin/widget/my_delay_toast.dart'; import '../../../components/commonFun.dart'; -//import 'package:hyzp_ybqx/widget/player_pro.dart'; +//import 'package:hyzp_ybqx00_yibin/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 82271c1..e34189f 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_ybqx/widget/my_superplayer.dart'; +import 'package:hyzp_ybqx00_yibin/widget/my_superplayer.dart'; import 'package:keyboard_avoider/keyboard_avoider.dart'; // import '../../../components/commonFun.dart'; -//import 'package:hyzp_ybqx/widget/player_pro_new.dart'; +//import 'package:hyzp_ybqx00_yibin/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 510f2d8..2a3fbcc 100644 --- a/lib/pages/Works/HYSH/hysh_content_new.dart +++ b/lib/pages/Works/HYSH/hysh_content_new.dart @@ -1,34 +1,28 @@ +import 'package:cached_network_image/cached_network_image.dart'; +import 'package:dio/dio.dart'; +//屏幕适配 flutter_screenutil 库与 flustars（获取网络图片尺寸要用到其 WidgetUtil） 库使用的 ScreenUtil() 类名冲突 +// 解决办法是将 flustars 库取个别名 as flustars +import 'package:flustars/flustars.dart' as flustars; import 'package:flutter/material.dart'; 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_ybqx/widget/JdButton.dart'; -//import 'package:hyzp_ybqx/widget/player_pro_new.dart'; +import 'package:hyzp_ybqx00_yibin/widget/JdButton.dart'; +import 'package:hyzp_ybqx00_yibin/widget/my_superplayer.dart'; +import 'package:keyboard_avoider/keyboard_avoider.dart'; +import 'package:photo_view/photo_view.dart'; -import '../../../widget/CarNumberAndCpysItems.dart'; +import '../../../components/commonFun.dart'; import '../../../components/dioFun.dart'; import '../../../components/doJSON.dart'; import '../../../components/hyxx_data_handle.dart'; - -import '../../../services/EventBus.dart'; -import '../../../components/commonFun.dart'; import '../../../config/service_url.dart'; -//import '../../../widget/player_pro.dart'; -import '../../../widget/customRadioWidget.dart'; - -import 'package:dio/dio.dart'; -import 'package:cached_network_image/cached_network_image.dart'; -import 'package:photo_view/photo_view.dart'; - -//屏幕适配 flutter_screenutil 库与 flustars（获取网络图片尺寸要用到其 WidgetUtil） 库使用的 ScreenUtil() 类名冲突 -// 解决办法是将 flustars 库取个别名 as flustars -import 'package:flustars/flustars.dart' as flustars; -import 'package:flutter_screenutil/flutter_screenutil.dart'; - -import 'package:keyboard_avoider/keyboard_avoider.dart'; -import 'package:flutter_drag_scale/flutter_drag_scale.dart'; +import '../../../services/EventBus.dart'; +//import 'package:hyzp_ybqx00_yibin/widget/player_pro_new.dart'; +import '../../../widget/CarNumberAndCpysItems.dart'; import 'hysh_group.dart'; -import 'package:hyzp_ybqx/widget/my_superplayer.dart'; class HyshContentNew extends StatefulWidget { HyshContentNew({ @@ -168,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_ybqx/pages/Works/HYSH/hysh_content.dart:163:7) + // E/flutter (12227): #2 _LoginPageState.getZpjlFields (package:hyzp_ybqx00_yibin/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) @@ -188,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_ybqx/pages/Works/HYSH/hysh_content.dart:415:41) - // E/flutter (12227): #4 _LoginPageState.getZpjlFields (package:hyzp_ybqx/pages/Works/HYSH/hysh_content.dart:162:7) + // E/flutter (12227): #3 _LoginPageState.getTopTabsMap (package:hyzp_ybqx00_yibin/pages/Works/HYSH/hysh_content.dart:415:41) + // E/flutter (12227): #4 _LoginPageState.getZpjlFields (package:hyzp_ybqx00_yibin/pages/Works/HYSH/hysh_content.dart:162:7) //getListFlields({bool b = true}) async { getListFlields() async { @@ -543,10 +537,10 @@ class _HyshPageState extends State with SingleTickerProviderStat Navigator.of(_context).push(MaterialPageRoute( builder: (context) => SuperPlayerPage( - loop: 0, //设置播放循环，默认播放器的循环次数是1， 即不循环播放。如果设置循环次数0，表示无限循环。 + loop: 0, //设置播放循环，默认播放器的循环次数是1， 即不循环播放。如果设置循环次数0，表示无限循环。 url: urlnew, title: - '违章视频： ${listGetZpjl[index]["car_number"]}（抓拍${index + 1}）\n${listGetZpjl[index]['dwms']}'))); + '违章视频： ${listGetZpjl[index]["car_number"]}（抓拍${index + 1}）\n${listGetZpjl[index]['dwms']}'))); // Navigator.of(_context).push(MaterialPageRoute( // builder: (context) => PlayerProNew( diff --git a/lib/pages/Works/HYSH/hysh_getList_fliter.dart b/lib/pages/Works/HYSH/hysh_getList_fliter.dart index 36c6539..6c6ab71 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_ybqx/components/commonFun.dart'; -import 'package:hyzp_ybqx/pages/Works/HYSH/tsjj_content_new.dart'; -import 'package:hyzp_ybqx/services/EventBus.dart'; -import 'package:hyzp_ybqx/widget/DropdownItem.dart'; +import 'package:hyzp_ybqx00_yibin/components/commonFun.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Works/HYSH/tsjj_content_new.dart'; +import 'package:hyzp_ybqx00_yibin/services/EventBus.dart'; +import 'package:hyzp_ybqx00_yibin/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 d005481..60ec0d5 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_ybqx/components/commonFun.dart'; -import 'package:hyzp_ybqx/pages/Works/HYSH/tsjj_content_new.dart'; -import 'package:hyzp_ybqx/services/EventBus.dart'; +import 'package:hyzp_ybqx00_yibin/components/commonFun.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Works/HYSH/tsjj_content_new.dart'; +import 'package:hyzp_ybqx00_yibin/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 bd0d1d0..8aa8cc9 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_ybqx/components/EncryptUtil.dart'; -import 'package:hyzp_ybqx/components/customDialogF.dart'; -import 'package:hyzp_ybqx/components/customDialogHysh.dart'; -import 'package:hyzp_ybqx/components/dioFun.dart'; +import 'package:hyzp_ybqx00_yibin/components/EncryptUtil.dart'; +import 'package:hyzp_ybqx00_yibin/components/customDialogF.dart'; +import 'package:hyzp_ybqx00_yibin/components/customDialogHysh.dart'; +import 'package:hyzp_ybqx00_yibin/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 6601b8f..e56d2e5 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_ybqx/components/customDialogF.dart'; -import 'package:hyzp_ybqx/services/EventBus.dart'; -import 'package:hyzp_ybqx/widget/my_superplayer.dart'; +import 'package:hyzp_ybqx00_yibin/components/customDialogF.dart'; +import 'package:hyzp_ybqx00_yibin/services/EventBus.dart'; +import 'package:hyzp_ybqx00_yibin/widget/my_superplayer.dart'; import 'package:keyboard_avoider/keyboard_avoider.dart'; // import '../../../components/commonFun.dart'; -//import 'package:hyzp_ybqx/widget/player_pro_new.dart'; +//import 'package:hyzp_ybqx00_yibin/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 12784e2..17c3ee3 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_ybqx/services/EventBus.dart'; -import 'package:hyzp_ybqx/widget/JdButton.dart'; +import 'package:hyzp_ybqx00_yibin/services/EventBus.dart'; +import 'package:hyzp_ybqx00_yibin/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 f36f828..3b14548 100644 --- a/lib/pages/Works/SBBJ/sbbj_content.dart +++ b/lib/pages/Works/SBBJ/sbbj_content.dart @@ -1,17 +1,19 @@ +import 'dart:io'; + 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_ybqx/components/commonFun.dart'; -import 'package:hyzp_ybqx/components/customDialogF.dart'; -import 'package:hyzp_ybqx/services/EventBus.dart'; -import 'package:hyzp_ybqx/widget/customRadioWidget.dart'; -import '../../../components/doJSON.dart'; -import '../../../components/dioFun.dart'; -import '../../../components/hyxx_data_handle.dart'; -import 'dart:io'; +import 'package:hyzp_ybqx00_yibin/components/commonFun.dart'; +import 'package:hyzp_ybqx00_yibin/components/customDialogF.dart'; +import 'package:hyzp_ybqx00_yibin/services/EventBus.dart'; +import 'package:hyzp_ybqx00_yibin/widget/customRadioWidget.dart'; + import '../../../components/customDialogH.dart'; import '../../../components/customDialogJ.dart'; +import '../../../components/dioFun.dart'; +import '../../../components/doJSON.dart'; +import '../../../components/hyxx_data_handle.dart'; class SbbjContent extends StatefulWidget { //SbbjContent({Key key, this.title, this.mapData}) : super(key: key); diff --git a/lib/pages/Works/SBGL/dwxx_content.dart b/lib/pages/Works/SBGL/dwxx_content.dart index c9ba130..e50a8b6 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_ybqx/components/commonFun.dart'; +import 'package:hyzp_ybqx00_yibin/components/commonFun.dart'; import '../../../components/customDialogH.dart'; import '../../../components/customDialogJ.dart'; import '../../../components/dioFun.dart'; -//import 'package:hyzp_ybqx/widget/player_pro.dart'; +//import 'package:hyzp_ybqx00_yibin/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 f5650b0..77625d5 100644 --- a/lib/pages/Works/TJXX/tj_data.dart +++ b/lib/pages/Works/TJXX/tj_data.dart @@ -1,7 +1,7 @@ -import 'package:hyzp_ybqx/components/commonFun.dart'; -import 'package:hyzp_ybqx/components/dioFun.dart'; -import 'package:hyzp_ybqx/components/hyxx_data_handle.dart'; -import 'package:hyzp_ybqx/services/EventBus.dart'; +import 'package:hyzp_ybqx00_yibin/components/commonFun.dart'; +import 'package:hyzp_ybqx00_yibin/components/dioFun.dart'; +import 'package:hyzp_ybqx00_yibin/components/hyxx_data_handle.dart'; +import 'package:hyzp_ybqx00_yibin/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 4a74fd6..6fc5a6f 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_ybqx/components/commonFun.dart'; -import 'package:hyzp_ybqx/pages/Works/HYSH/tsjj_content_new.dart'; -import 'package:hyzp_ybqx/pages/Works/TJXX/tj_data.dart'; -import 'package:hyzp_ybqx/pages/Works/TJXX/today_list_zpjl_content.dart'; -import 'package:hyzp_ybqx/services/EventBus.dart'; +import 'package:hyzp_ybqx00_yibin/components/commonFun.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Works/HYSH/tsjj_content_new.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Works/TJXX/tj_data.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Works/TJXX/today_list_zpjl_content.dart'; +import 'package:hyzp_ybqx00_yibin/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 eaab13b..c450e15 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_ybqx/widget/my_superplayer.dart'; +import 'package:hyzp_ybqx00_yibin/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 43ac37e..7b856c3 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_ybqx/components/commonFun.dart'; -import 'package:hyzp_ybqx/components/dioFun.dart'; -import 'package:hyzp_ybqx/components/hyxx_data_handle.dart'; -import 'package:hyzp_ybqx/pages/Works/TJXX/tj_data.dart'; +import 'package:hyzp_ybqx00_yibin/components/commonFun.dart'; +import 'package:hyzp_ybqx00_yibin/components/dioFun.dart'; +import 'package:hyzp_ybqx00_yibin/components/hyxx_data_handle.dart'; +import 'package:hyzp_ybqx00_yibin/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 97e8490..fe5b498 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_ybqx/components/commonFun.dart'; -import 'package:hyzp_ybqx/components/dioFun.dart'; -import 'package:hyzp_ybqx/components/hyxx_data_handle.dart'; -import 'package:hyzp_ybqx/pages/Works/TJXX/tj_data.dart'; +import 'package:hyzp_ybqx00_yibin/components/commonFun.dart'; +import 'package:hyzp_ybqx00_yibin/components/dioFun.dart'; +import 'package:hyzp_ybqx00_yibin/components/hyxx_data_handle.dart'; +import 'package:hyzp_ybqx00_yibin/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 c7a3639..1767bc6 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_ybqx/components/save_data_to_file.dart'; -import 'package:hyzp_ybqx/pages/Works/TJXX/zptj_bar_chart.dart'; -import 'package:hyzp_ybqx/pages/Works/TJXX/zptj_bar_chart_one.dart'; +import 'package:hyzp_ybqx00_yibin/components/save_data_to_file.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Works/TJXX/zptj_bar_chart.dart'; +import 'package:hyzp_ybqx00_yibin/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 c2b6b00..a6496cc 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_ybqx/pages/tabs/page4_myMsics_new.dart'; +import 'package:hyzp_ybqx00_yibin/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 03677ae..ad39129 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_ybqx/components/commonFun.dart'; -// import 'package:hyzp_ybqx/pages/Works/DWSP/dw_list_sound.dart'; -// import 'package:hyzp_ybqx/pages/Works/DWSP/dw_sound.dart'; -import 'package:hyzp_ybqx/pages/Works/DWSP/dwsp_getList.dart'; -import 'package:hyzp_ybqx/pages/Works/HYSH/hysh_getList_fliter.dart'; -import 'package:hyzp_ybqx/pages/Works/HYSH/hysh_getList_new.dart'; -import 'package:hyzp_ybqx/pages/Works/SBBJ/sbbj_getList.dart'; -import 'package:hyzp_ybqx/pages/Works/SBGL/dwxx_getList.dart'; -import 'package:hyzp_ybqx/pages/Works/TJXX/tj_data.dart'; -import 'package:hyzp_ybqx/pages/Works/TJXX/today_list.dart'; -import 'package:hyzp_ybqx/pages/Works/TJXX/zptj_bar_chart.dart'; -import 'package:hyzp_ybqx/pages/Works/TJXX/zptj_bar_chart_one.dart'; -import 'package:hyzp_ybqx/pages/Works/TJXX/zptj_page.dart'; -import 'package:hyzp_ybqx/services/EventBus.dart'; +import 'package:hyzp_ybqx00_yibin/components/commonFun.dart'; +// import 'package:hyzp_ybqx00_yibin/pages/Works/DWSP/dw_list_sound.dart'; +// import 'package:hyzp_ybqx00_yibin/pages/Works/DWSP/dw_sound.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Works/DWSP/dwsp_getList.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Works/HYSH/hysh_getList_fliter.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Works/HYSH/hysh_getList_new.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Works/SBBJ/sbbj_getList.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Works/SBGL/dwxx_getList.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Works/TJXX/tj_data.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Works/TJXX/today_list.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Works/TJXX/zptj_bar_chart.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Works/TJXX/zptj_bar_chart_one.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Works/TJXX/zptj_page.dart'; +import 'package:hyzp_ybqx00_yibin/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 078575e..2b6a451 100644 --- a/lib/pages/tabs/page4_myMsics_new.dart +++ b/lib/pages/tabs/page4_myMsics_new.dart @@ -5,19 +5,19 @@ 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_ybqx/components/commonFun.dart'; -import 'package:hyzp_ybqx/pages/Login/FaceLogin.dart'; -import 'package:hyzp_ybqx/pages/Login/FaceReg.dart'; -import 'package:hyzp_ybqx/pages/MyMsics/05_updated/MyUpdatedNew.dart'; -import 'package:hyzp_ybqx/pages/tabs/page5_userManager.dart'; -import 'package:hyzp_ybqx/widget/JdButton.dart'; +import 'package:hyzp_ybqx00_yibin/components/commonFun.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Login/FaceLogin.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Login/FaceReg.dart'; +import 'package:hyzp_ybqx00_yibin/pages/MyMsics/05_updated/MyUpdatedNew.dart'; +import 'package:hyzp_ybqx00_yibin/pages/tabs/page5_userManager.dart'; +import 'package:hyzp_ybqx00_yibin/widget/JdButton.dart'; import 'package:package_info/package_info.dart'; import 'package:path_provider/path_provider.dart'; import '../../components/commonFun.dart'; import '../../components/customDialogF.dart'; import '../../services/Storage.dart'; -//import 'package:hyzp_ybqx/widget/player_pro.dart'; +//import 'package:hyzp_ybqx00_yibin/widget/player_pro.dart'; import '../Login/ModifyPassword.dart'; import '../MyMsics/03_personal/PersonalData.dart'; import '../MyMsics/04_MyFeedback/MyFeedback.dart'; @@ -415,7 +415,7 @@ class _Page4_MyMsicsNewState extends State print('buildNumber = $buildNumber'); print('buildDate = $buildDate'); // I/flutter (30820): appName = 宜宾市翠屏黑烟抓拍 - // I/flutter (30820): packageName = com.flutter.hyzp_ybqx + // I/flutter (30820): packageName = com.flutter.hyzp_ybqx00_yibin // 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 8dd39cc..0b13abd 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_ybqx/pages/Login/FaceReg.dart'; -import 'package:hyzp_ybqx/pages/Login/ModifyPassword.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Login/FaceReg.dart'; +import 'package:hyzp_ybqx00_yibin/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 3b8e4d1..f0f9f6f 100644 --- a/lib/routers/router.dart +++ b/lib/routers/router.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:hyzp_ybqx/pages/Login/FaceLogin.dart'; -import 'package:hyzp_ybqx/pages/Login/FaceReg.dart'; -import 'package:hyzp_ybqx/pages/Login/LoginTabs2.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Login/FaceLogin.dart'; +import 'package:hyzp_ybqx00_yibin/pages/Login/FaceReg.dart'; +import 'package:hyzp_ybqx00_yibin/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 7f91210..ca3037e 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_ybqx/components/customDialogHysh.dart'; -import 'package:hyzp_ybqx/components/dioFun.dart'; +import 'package:hyzp_ybqx00_yibin/components/customDialogHysh.dart'; +import 'package:hyzp_ybqx00_yibin/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 9002b1e..f10f3c1 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_ybqx/components/commonFun.dart'; -import 'package:hyzp_ybqx/components/dioFun.dart'; -import 'package:hyzp_ybqx/provider/player_ratio.dart'; -import 'package:hyzp_ybqx/provider/player_region.dart'; +import 'package:hyzp_ybqx00_yibin/components/commonFun.dart'; +import 'package:hyzp_ybqx00_yibin/components/dioFun.dart'; +import 'package:hyzp_ybqx00_yibin/provider/player_ratio.dart'; +import 'package:hyzp_ybqx00_yibin/provider/player_region.dart'; import 'package:provider/provider.dart'; import '../components/commonFun.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index 17f5ce3..6677972 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,4 +1,4 @@ -name: hyzp_ybqx +name: hyzp_ybqx00_yibin description: HeiYanZhuaPai_YiBin_QuXian Flutter application . # The following line prevents the package from being accidentally published to @@ -53,7 +53,7 @@ dependencies: # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.0 - # hyzp_ybqx Project Adds + # hyzp_ybqx00_yibin Project Adds # fijkplayer: ^0.8.7 path_provider: ^1.6.14 #permission_handler: ^3.3.0 diff --git a/test/widget_test.dart b/test/widget_test.dart index dc61885..8e538ae 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_ybqx/main.dart'; +import 'package:hyzp_ybqx00_yibin/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async {