patton99/hyzp_ybqx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hyzp_ybqx-Commit022：按照 yzp_ybqx-Commit022-区县切换新方法-OK 完美切换到 hyzp_ybqx03_junlian 版本

Browse Source
This commit is contained in:
WinUser01
2021-12-15 16:27:32 +08:00
parent 08e36d2f7c
commit 002be326be
63 changed files with 167 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -1,4 +1,4 @@
# hyzp_ybqx02_xingwen
# hyzp_ybqx03_junlian
HeiYanZhuaPai_YiBin_QuXian Flutter application .
android/app/build.gradle
+1 -1
View File
@@ -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()
android/app/src/main/AndroidManifest.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.flutter.hyzp_ybqx02_xingwen">
package="com.flutter.hyzp_ybqx03_junlian">
<!-- * What went wrong:
Execution failed for task ':app:generateDebugBuildConfig'.
> org.xml.sax.SAXParseException; systemId: file:/R:/FlutterProject/FlutterProject33/hyzp_ybqx/android/app/src/main/AndroidManifest.xml; lineNumber: 69; columnNumber: 48; ��Ԫ
@@ -37,7 +37,7 @@
<!-- android:label="宜宾黑烟抓拍"-->
<!-- android:label="宜宾市翠屏黑烟抓拍"-->
<application
android:name="com.flutter.hyzp_ybqx02_xingwen.MyApplication"
android:name="com.flutter.hyzp_ybqx03_junlian.MyApplication"
android:icon="@mipmap/ic_launcher"
android:label="宜宾市兴文黑烟抓拍"
android:networkSecurityConfig="@xml/network_security_config"
android/app/src/main/java/com/example/hyzp_yibin/MainActivity.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.flutter.hyzp_ybqx02_xingwen;
package com.flutter.hyzp_ybqx03_junlian;
import io.flutter.embedding.android.FlutterActivity;
android/app/src/main/java/com/example/hyzp_yibin/MyApplication.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.flutter.hyzp_ybqx02_xingwen;
package com.flutter.hyzp_ybqx03_junlian;
import com.baidu.flutter_bmfbase.BmfMapApplication;
android/app/src/main/res/drawable/launch_background.xml
+1 -1
View File
@@ -16,7 +16,7 @@
<item android:top="37.5dp">
<bitmap
android:gravity="fill"
android:src="@mipmap/hyzp_ybqx02_xingwen_launche" />
android:src="@mipmap/hyzp_ybqx03_junlian_launche" />
</item>
</layer-list>
android/app/src/main/res/mipmap-hdpi/hyzp_ybqx02_xingwen_launche.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 550 KiB

android/app/src/main/res/mipmap-hdpi/hyzp_ybqx03_junlian_launche.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 549 KiB

android/app/src/main/res/mipmap-mdpi/hyzp_ybqx02_xingwen_launche.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 256 KiB

android/app/src/main/res/mipmap-mdpi/hyzp_ybqx03_junlian_launche.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 256 KiB

android/app/src/main/res/mipmap-xhdpi/hyzp_ybqx02_xingwen_launche.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 857 KiB

android/app/src/main/res/mipmap-xhdpi/hyzp_ybqx03_junlian_launche.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 856 KiB

android/app/src/main/res/mipmap-xxhdpi/hyzp_ybqx02_xingwen_launche.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 MiB

android/app/src/main/res/mipmap-xxhdpi/hyzp_ybqx03_junlian_launche.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 MiB

android/app/src/main/res/mipmap-xxxhdpi/hyzp_ybqx02_xingwen_launche.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 MiB

android/app/src/main/res/mipmap-xxxhdpi/hyzp_ybqx03_junlian_launche.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 MiB

android/app/src/profile/AndroidManifest.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.flutter.hyzp_ybqx02_xingwen">
package="com.flutter.hyzp_ybqx03_junlian">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
assets/images/hyzp_ybqx02_xingwen_launche.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 857 KiB

assets/images/hyzp_ybqx03_junlian_launche.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 856 KiB

ios/Runner/Info.plist
+1 -1
View File
@@ -11,7 +11,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>hyzp_ybqx02_xingwen</string>
<string>hyzp_ybqx03_junlian</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
lib/components/UserAuthority.dart
+2 -2
View File
@@ -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';
lib/components/commonFun.dart
+31 -36
View File
@@ -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';
// 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';
// 5、修改AppID，但存放目錄不變
// (1)、修改 R:\FlutterProject\FlutterProject51-hyzp_ybqx\hyzp_ybqx\pubspec.yaml 文件中的
// (4)、筠连县
String service_tel = '\n服务热线：187-8467-8300';
String yibin_QuXian = '宜宾市筠连';
String copyright_info = '© 宜宾市筠连生态环境局 四川省踏石科技 版权所有' + service_tel;
String copyright_info_PinYin = 'YIBIN JUNLIAN BLACK SMOKE CAR CAPTURE SYSTEM';
// 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、将 “<string>hyzp_ybqx00_yibin</string>” 全部替换为 “<string>hyzp_ybqx02_xingwen</string>”
// 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、将 “<string>hyzp_ybqx00_yibin</string>” 全部替换为 “<string>hyzp_ybqx03_junlian</string>”
// 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); //不含点号
}
lib/components/customDialogHysh.dart
+1 -1
View File
@@ -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';
lib/components/dioFun.dart
+5 -5
View File
@@ -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';
lib/components/doJSON.dart
+2 -2
View File
@@ -155,8 +155,8 @@ Future<File> 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');
}
lib/main.dart
+5 -5
View File
@@ -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<MyApp> {
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<SplashScreen> {
// child: Image.asset('assets/images/hyzp_ybqx00_yibin_launche.png', fit: BoxFit.cover),
// child: Image.asset('assets/images/hyzp_ybqx01_cuiping_launche.png', fit: BoxFit.cover),
child:
Image.asset('assets/images/hyzp_ybqx02_xingwen_launche.png', fit: BoxFit.cover)),
Image.asset('assets/images/hyzp_ybqx03_junlian_launche.png', fit: BoxFit.cover)),
],
),
);
lib/pages/Login/FaceLogin2.dart
+2 -2
View File
@@ -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';
lib/pages/Login/FaceReg.dart
+2 -2
View File
@@ -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';
lib/pages/Login/LoginByName2.dart
+2 -2
View File
@@ -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';
lib/pages/Login/LoginTabs2.dart
+1 -1
View File
@@ -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';
lib/pages/Login/LoginTabsWidget.dart
+4 -4
View File
@@ -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<LoginTabsWidget> 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)
lib/pages/MyMsics/03_personal/PersonalData.dart
+2 -2
View File
@@ -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';
lib/pages/MyMsics/04_myFeedback/MyFeedback.dart
+1 -1
View File
@@ -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';
lib/pages/MyMsics/05_updated/MyUpdated.dart
+1 -1
View File
@@ -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';
lib/pages/MyMsics/05_updated/MyUpdatedNew.dart
+2 -2
View File
@@ -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)
lib/pages/Works/DWDT/basic_map.dart
+2 -2
View File
@@ -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';
lib/pages/Works/DWDT/dwInfoDialog.dart
+2 -2
View File
@@ -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';
//确认对话框
lib/pages/Works/DWDT/dwInfo_data.dart
+1 -1
View File
@@ -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;
lib/pages/Works/DWSP/dwsp_getList.dart
+2 -2
View File
@@ -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';
lib/pages/Works/HYSH/fhycx_content_new.dart
+2 -2
View File
@@ -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';
lib/pages/Works/HYSH/hysh_content_new.dart
+6 -6
View File
@@ -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<HyshContentNew> with SingleTickerProviderStat
// n removed from the tree. To avoid memory leaks, consider breaking the reference to this object during dispose().
// E/flutter (12227): #0 State.setState.<anonymous closure> (package:flutter/src/widgets/framework.dart:1208:9)
// E/flutter (12227): #1 State.setState (package:flutter/src/widgets/framework.dart:1243:6)
// E/flutter (12227): #2 _LoginPageState.getZpjlFields (package:hyzp_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<HyshContentNew> with SingleTickerProviderStat
// E/flutter (12227): #0 _AssertionError._doThrowNew (dart:core-patch/errors_patch.dart:46:39)
// E/flutter (12227): #1 _AssertionError._throwNew (dart:core-patch/errors_patch.dart:36:5)
// E/flutter (12227): #2 MediaQuery.of (package:flutter/src/widgets/media_query.dart:812:12)
// E/flutter (12227): #3 _LoginPageState.getTopTabsMap (package:hyzp_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 {
lib/pages/Works/HYSH/hysh_getList_fliter.dart
+4 -4
View File
@@ -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';
lib/pages/Works/HYSH/hysh_getList_new.dart
+3 -3
View File
@@ -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';
lib/pages/Works/HYSH/hysh_group.dart
+4 -4
View File
@@ -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';
lib/pages/Works/HYSH/tsjj_content_new.dart
+4 -4
View File
@@ -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';
lib/pages/Works/LED_XSXX/led_xsxx_content.dart
+2 -2
View File
@@ -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';
lib/pages/Works/SBBJ/sbbj_content.dart
+4 -4
View File
@@ -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';
lib/pages/Works/SBGL/dwxx_content.dart
+2 -2
View File
@@ -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';
lib/pages/Works/TJXX/tj_data.dart
+4 -4
View File
@@ -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; //正在获取车流量日统计数据，禁止重入
lib/pages/Works/TJXX/today_list.dart
+5 -5
View File
@@ -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';
lib/pages/Works/TJXX/today_list_zpjl_content.dart
+1 -1
View File
@@ -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';
//
lib/pages/Works/TJXX/zptj_bar_chart.dart
+4 -4
View File
@@ -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);
lib/pages/Works/TJXX/zptj_bar_chart_one.dart
+4 -4
View File
@@ -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);
lib/pages/Works/TJXX/zptj_page.dart
+3 -3
View File
@@ -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';
lib/pages/tabs/Tabs.dart
+1 -1
View File
@@ -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';
lib/pages/tabs/page1_work.dart
+14 -14
View File
@@ -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';
lib/pages/tabs/page4_myMsics_new.dart
+8 -8
View File
@@ -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<Page4_MyMsicsNew>
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
lib/pages/tabs/page5_userManager.dart
+2 -2
View File
@@ -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';
lib/routers/router.dart
+3 -3
View File
@@ -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';
lib/widget/customRadioWidget.dart
+2 -2
View File
@@ -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';
lib/widget/my_superplayer.dart
+4 -4
View File
@@ -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';
pubspec.yaml
+1 -1
View File
@@ -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
test/widget_test.dart
+1 -1
View File
@@ -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 {