diff --git a/Scrshot-03-OK/hyzp_ybqx项目创建信息.txt b/Scrshot-03-OK/hyzp_ybqx项目创建信息.txt index 7fdd52e..be9bbc2 100644 Binary files a/Scrshot-03-OK/hyzp_ybqx项目创建信息.txt and b/Scrshot-03-OK/hyzp_ybqx项目创建信息.txt differ diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index b290df0..9cde085 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -37,7 +37,7 @@ diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml index 20eb120..1d2af9b 100644 --- a/android/app/src/main/res/drawable/launch_background.xml +++ b/android/app/src/main/res/drawable/launch_background.xml @@ -12,7 +12,8 @@ + android:src="@mipmap/hyzp_ybqx_cuipingqu_launche" /> + diff --git a/android/app/src/main/res/mipmap-hdpi/hyzp_ybqx_cuipingqu_launche.png b/android/app/src/main/res/mipmap-hdpi/hyzp_ybqx_cuipingqu_launche.png new file mode 100644 index 0000000..1676a3f Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/hyzp_ybqx_cuipingqu_launche.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/hyzp_ybqx_cuipingqu_launche.png b/android/app/src/main/res/mipmap-mdpi/hyzp_ybqx_cuipingqu_launche.png new file mode 100644 index 0000000..12e1d63 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/hyzp_ybqx_cuipingqu_launche.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/hyzp_ybqx_cuipingqu_launche.png b/android/app/src/main/res/mipmap-xhdpi/hyzp_ybqx_cuipingqu_launche.png new file mode 100644 index 0000000..5cfd1ef Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/hyzp_ybqx_cuipingqu_launche.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/hyzp_ybqx_cuipingqu_launche.png b/android/app/src/main/res/mipmap-xxhdpi/hyzp_ybqx_cuipingqu_launche.png new file mode 100644 index 0000000..74d7421 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/hyzp_ybqx_cuipingqu_launche.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/hyzp_ybqx_cuipingqu_launche.png b/android/app/src/main/res/mipmap-xxxhdpi/hyzp_ybqx_cuipingqu_launche.png new file mode 100644 index 0000000..53d3450 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/hyzp_ybqx_cuipingqu_launche.png differ diff --git a/assets/images/hyzp_yibin_launche.png b/assets/images/hyzp_yibin_launche.png deleted file mode 100644 index d5b6e74..0000000 Binary files a/assets/images/hyzp_yibin_launche.png and /dev/null differ diff --git a/lib/components/commonFun.dart b/lib/components/commonFun.dart index 9826a8b..4848923 100644 --- a/lib/components/commonFun.dart +++ b/lib/components/commonFun.dart @@ -17,7 +17,7 @@ import 'package:hyzp_ybqx/provider/player_region.dart'; import 'UserInfo.dart'; //LED字幕信息 -//String g_ledMessage = '绿水青山就是金山银山 宜宾市生态环境局宣。'; +//String g_ledMessage = '绿水青山就是金山银山 宜宾市翠屏生态环境局宣。'; // 是否已经调用 FlutterDownloader.initialize(debug: true) bool bFlutterDownloader_initialize = false; diff --git a/lib/components/dioFun.dart b/lib/components/dioFun.dart index 8830074..3d92c4e 100644 --- a/lib/components/dioFun.dart +++ b/lib/components/dioFun.dart @@ -197,7 +197,7 @@ Future set_sfyc_tsjj(int _zpsj) async { // Map _mapGetLedXsxxGetData = { // "id": 2, // "dwip": "172.16.3.2", -// "xsnr": "绿水青山就是金山银山 宜宾市生态环境局宣。", +// "xsnr": "绿水青山就是金山银山 宜宾市翠屏生态环境局宣。", // "xsts": 0, //显示抓拍到的多少条违章记录 // "stime": "07:00", // "etime": "23:00", @@ -1772,7 +1772,7 @@ Future getWzxxItemData(int id) async { // "id":1211,"plate_id":"川Q023Y2","plate_color":"蓝色","zpsj":1612840361,"yjxx_id":"1387","workflow":999, // "video_url":"video/3_6063_20210209_111241_川Q023Y2.mp4", // "pic_url":"/wwwroot/admin/Api/wwwroot/public/uploads/c43286bf381af0a393b44272829d1f07.jpg","clfl":"集装箱卡车", - // "dwip":"172.16.3.3","dwms":"宜宾南收费站出城方向","lgmzs":3,"jczxd":"876","sfhy":"黑烟车" + // "dwip":"172.16.3.3","dwms":"宜宾市翠屏南收费站出城方向","lgmzs":3,"jczxd":"876","sfhy":"黑烟车" //},"msg":""} if (response.statusCode == 200) { @@ -1784,7 +1784,7 @@ Future getWzxxItemData(int id) async { // id: 1217, plate_id: 川QFX088, plate_color: 蓝色, zpsj: 1612847361, yjxx_id: 1393, workflow: 999, // video_url: video/3_6063_20210209_130921_川QFX088.mp4, // pic_url: /wwwroot/admin/Api/wwwroot/public/uploads/c227c65bcaadcdf53094c5448c2460ce.jpg, - // clfl: 面包车, dwip: 172.16.3.3, dwms: 宜宾南收费站出城方向, lgmzs: 3, jczxd: 992, sfhy: 黑烟车 + // clfl: 面包车, dwip: 172.16.3.3, dwms: 宜宾市翠屏南收费站出城方向, lgmzs: 3, jczxd: 992, sfhy: 黑烟车 //} } else { throw Exception('后端接口出现异常，请检测代码和服务器情况.........'); diff --git a/lib/components/hyxx_data_handle.dart b/lib/components/hyxx_data_handle.dart index e852da3..5d69f37 100644 --- a/lib/components/hyxx_data_handle.dart +++ b/lib/components/hyxx_data_handle.dart @@ -1193,7 +1193,7 @@ Map mapGetWzxxGetDataModifiable = { //App.Car_Led.GetList接口获取的记录数据结构 Map mapGetLedXsxxGetData = { "id": 2, - "xsnr": "绿水青山就是金山银山 宜宾市生态环境局宣。", + "xsnr": "绿水青山就是金山银山 宜宾市翠屏生态环境局宣。", "addtime": "2021-01-20 10:16:07", "updatetime": "2021-02-13 11:48:51" }; @@ -1221,73 +1221,73 @@ Map mapGetLedXsxxListRet = { List listLedXsxxGetList2 = [ { "id": 2, - "xsnr": "绿水青山就是金山银山 宜宾市生态环境局宣。", + "xsnr": "绿水青山就是金山银山 宜宾市翠屏生态环境局宣。", "addtime": "2021-01-20 10:16:07", "updatetime": "2021-02-13 11:48:51" }, { "id": 1, - "xsnr": "绿水青山就是金山银山 宜宾市生态环境局宣。", + "xsnr": "绿水青山就是金山银山 宜宾市翠屏生态环境局宣。", "addtime": "2021-01-06 00:59:43", "updatetime": "2021-02-03 19:57:55" }, { "id": 3, - "xsnr": "绿水青山就是金山银山 宜宾市生态环境局宣。", + "xsnr": "绿水青山就是金山银山 宜宾市翠屏生态环境局宣。", "addtime": "2021-01-20 10:18:50", "updatetime": "2021-02-03 19:57:43" }, { "id": 8, - "xsnr": "绿水青山就是金山银山 宜宾市生态环境局宣。", + "xsnr": "绿水青山就是金山银山 宜宾市翠屏生态环境局宣。", "addtime": "2021-01-20 10:19:22", "updatetime": "2021-02-03 19:57:34" }, { "id": 6, - "xsnr": "绿水青山就是金山银山 宜宾市生态环境局宣。", + "xsnr": "绿水青山就是金山银山 宜宾市翠屏生态环境局宣。", "addtime": "2021-01-20 10:19:09", "updatetime": "2021-01-22 22:01:06" }, { "id": 5, - "xsnr": "绿水青山就是金山银山 宜宾市生态环境局宣。", + "xsnr": "绿水青山就是金山银山 宜宾市翠屏生态环境局宣。", "addtime": "2021-01-20 10:19:02", "updatetime": "2021-01-22 22:01:02" }, { "id": 7, - "xsnr": "绿水青山就是金山银山 宜宾市生态环境局宣。", + "xsnr": "绿水青山就是金山银山 宜宾市翠屏生态环境局宣。", "addtime": "2021-01-20 10:19:16", "updatetime": "2021-01-22 22:00:49" }, { "id": 4, - "xsnr": "绿水青山就是金山银山 宜宾市生态环境局宣。", + "xsnr": "绿水青山就是金山银山 宜宾市翠屏生态环境局宣。", "addtime": "2021-01-20 10:18:56", "updatetime": "2021-01-22 22:00:41" }, { "id": 9, - "xsnr": "绿水青山就是金山银山 宜宾市生态环境局宣。", + "xsnr": "绿水青山就是金山银山 宜宾市翠屏生态环境局宣。", "addtime": "2021-01-20 10:19:29", "updatetime": "2021-01-22 22:00:21" }, { "id": 10, - "xsnr": "绿水青山就是金山银山 宜宾市生态环境局宣。", + "xsnr": "绿水青山就是金山银山 宜宾市翠屏生态环境局宣。", "addtime": "2021-01-20 10:19:36", "updatetime": "2021-01-22 22:00:16" }, { "id": 11, - "xsnr": "绿水青山就是金山银山 宜宾市生态环境局宣。", + "xsnr": "绿水青山就是金山银山 宜宾市翠屏生态环境局宣。", "addtime": "2021-01-20 10:19:50", "updatetime": "2021-01-22 22:00:08" }, { "id": 12, - "xsnr": "绿水青山就是金山银山 宜宾市生态环境局宣。", + "xsnr": "绿水青山就是金山银山 宜宾市翠屏生态环境局宣。", "addtime": "2021-01-20 10:19:58", "updatetime": "2021-01-22 21:58:48" } @@ -1324,19 +1324,19 @@ List listDwinfoGetList0 = [ "dwip": "172.16.3.2", "dwmc": "宜飞路", "dwbh": 2, - "dwinfo": "宜宾南收费站宜飞路入城方向", + "dwinfo": "宜宾市翠屏南收费站宜飞路入城方向", "dwzb": "104.589904|28.787078", - "dwms": "宜宾南收费站宜飞路入城方向，识别屏山、菜坝入城排放黑烟车辆", + "dwms": "宜宾市翠屏南收费站宜飞路入城方向，识别屏山、菜坝入城排放黑烟车辆", "dwzt": "正常" }, { "id": 3, "dwip": "172.16.3.3", - "dwmc": "宜宾南收费站", + "dwmc": "宜宾市翠屏南收费站", "dwbh": 3, - "dwinfo": "宜宾南收费站出城方向", + "dwinfo": "宜宾市翠屏南收费站出城方向", "dwzb": "104.603919|28.765568", - "dwms": "宜宾南收费站出城方向，识别宜宾南收费站出城排放黑烟车辆", + "dwms": "宜宾市翠屏南收费站出城方向，识别宜宾市翠屏南收费站出城排放黑烟车辆", "dwzt": "正常" }, { @@ -1372,11 +1372,11 @@ List listDwinfoGetList0 = [ { "id": 7, "dwip": "172.16.3.7", - "dwmc": "宜宾财政局", + "dwmc": "宜宾市翠屏财政局", "dwbh": 7, - "dwinfo": "高县至宜宾财政局入城方向", + "dwinfo": "高县至宜宾市翠屏财政局入城方向", "dwzb": "104.616581|28.731942", - "dwms": "高县至宜宾财政局入城方向，识别高县入城排放黑烟车辆", + "dwms": "高县至宜宾市翠屏财政局入城方向，识别高县入城排放黑烟车辆", "dwzt": "正常" }, { diff --git a/lib/main.dart b/lib/main.dart index 97b96e3..aec7b93 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'dart:io' show Platform; import 'dart:ui'; -import 'package:badges/badges.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_bmfbase/BaiduMap/bmfmap_base.dart' show BMFMapSDK, BMF_COORD_TYPE; @@ -16,9 +15,6 @@ import 'package:provider/provider.dart'; import 'components/commonFun.dart'; import 'file_manager/file_manager_init.dart'; -// import 'provider/Cart.dart'; -// import 'provider/CheckOut.dart'; -import 'pages/Login/LoginTabs.dart'; import 'provider/player_ratio.dart'; import 'provider/player_region.dart'; import 'routers/router.dart'; @@ -79,7 +75,7 @@ class _MyAppState extends State { print('version = $version'); print('buildNumber = $buildNumber'); print('buildDate = $buildDate'); - // I/flutter (30820): appName = 宜宾黑烟抓拍 + // I/flutter (30820): appName = 宜宾市翠屏黑烟抓拍 // I/flutter (30820): packageName = com.flutter.hyzp_ybqx // I/flutter (30820): version = 1.3.1 // I/flutter (30820): buildNumber = 20210508 @@ -226,7 +222,8 @@ class _SplashScreenState extends State { Widget build(BuildContext context) { return new Scaffold( body: new Center( - child: new Image.asset('assets/images/hyzp_yibin_launche.png'), + // child: new Image.asset('assets/images/hyzp_yibin_launche.png'), + child: new Image.asset('assets/images/hyzp_ybqx_cuipingqu_launche.png'), ), ); } diff --git a/lib/my_flutter_superplayer/example/lib/data_file.dart b/lib/my_flutter_superplayer/example/lib/data_file.dart index 13fec30..2cac58a 100644 --- a/lib/my_flutter_superplayer/example/lib/data_file.dart +++ b/lib/my_flutter_superplayer/example/lib/data_file.dart @@ -1,4 +1,3 @@ - ///App.Car_Dwinfo.GetList 获取分页列表数据 Map mapDwinfo = { "ret": 200, @@ -43,7 +42,7 @@ Map mapDwinfo = { "dwbh": 3, "dwinfo": "岷江南路森林小区附近", "dwzb": "104.603919|28.765568", - "dwms": "岷江南路森林小区附近，识别宜宾南收费站出城排放黑烟车辆", + "dwms": "岷江南路森林小区附近，识别宜宾市翠屏南收费站出城排放黑烟车辆", "dwzt": "正常", "video12": "/rtp/gb_play_34020000001320003012_34020000001320003012", "video13": "/rtp/gb_play_34020000001320003013_34020000001320003013", @@ -73,9 +72,9 @@ Map mapDwinfo = { "dwip": "172.16.3.5", "dwmc": "育才学校", "dwbh": 5, - "dwinfo": "陵园路宜宾育才学校附近", + "dwinfo": "陵园路宜宾市翠屏育才学校附近", "dwzb": "104.533476|28.699059", - "dwms": "陵园路宜宾育才学校附近，识别叙州区老城区出城车辆排放黑烟", + "dwms": "陵园路宜宾市翠屏育才学校附近，识别叙州区老城区出城车辆排放黑烟", "dwzt": "正常", "video12": "/rtp/gb_play_34020000001320005012_34020000001320005012", "video13": "/rtp/gb_play_34020000001320005013_34020000001320005013", @@ -105,9 +104,9 @@ Map mapDwinfo = { "dwip": "172.16.3.7", "dwmc": "市财政局", "dwbh": 7, - "dwinfo": "南六路宜宾市财政局附近", + "dwinfo": "南六路宜宾市翠屏财政局附近", "dwzb": "104.616581|28.731942", - "dwms": "南六路宜宾市财政局附近，识别高县入城排放黑烟车辆", + "dwms": "南六路宜宾市翠屏财政局附近，识别高县入城排放黑烟车辆", "dwzt": "正常", "video12": "/rtp/gb_play_34020000001320007012_34020000001320007012", "video13": "/rtp/gb_play_34020000001320007013_34020000001320007013", diff --git a/lib/pages/Login/LoginTabs.dart b/lib/pages/Login/LoginTabs.dart index 62d4ef0..cfa13a6 100644 --- a/lib/pages/Login/LoginTabs.dart +++ b/lib/pages/Login/LoginTabs.dart @@ -74,7 +74,7 @@ class _MyHomePageState extends State { //backgroundColor: Colors.transparent, appBar: AppBar( //backgroundColor: Colors.transparent, - title: Text("宜宾市黑烟车电子抓拍系统"), + title: Text("宜宾市翠屏黑烟车电子抓拍系统"), leading: IconButton( icon: Icon(Icons.close), onPressed: () { diff --git a/lib/pages/Login/LoginTabs2.dart b/lib/pages/Login/LoginTabs2.dart index 4511194..f32ba81 100644 --- a/lib/pages/Login/LoginTabs2.dart +++ b/lib/pages/Login/LoginTabs2.dart @@ -1,7 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import '../../components/commonFun.dart'; -import 'LoginByName2.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'LoginTabsWidget.dart'; @@ -84,7 +82,7 @@ class LoginTabs2State extends State { textAlign: TextAlign.center, text: TextSpan(children: [ TextSpan( - text: '宜宾黑烟车', + text: '宜宾市翠屏黑烟车', style: TextStyle( fontSize: 26.0, color: Colors.white, fontWeight: FontWeight.bold)), TextSpan( @@ -110,9 +108,10 @@ class LoginTabs2State extends State { color: Colors.transparent, height: ScreenUtil().setHeight(130), //不能超过133，否则有些手机会越界 child: Text( - //'© 宜宾市生态环境局\n© 四川省踏石科技有限公司 版权所有 \n服务热线：187-8467-8300', - //'© 宜宾市生态环境局\n© 四川省踏石科技有限公司', - '© 宜宾市生态环境局 四川省踏石科技 版权所有\n服务热线：187-8467-8300', + //'© 宜宾市翠屏生态环境局\n© 四川省踏石科技有限公司 版权所有 \n服务热线：187-8467-8300', + //'© 宜宾市翠屏生态环境局\n© 四川省踏石科技有限公司', + // '© 宜宾市翠屏生态环境局 四川省踏石科技 版权所有\n服务热线：187-8467-8300', + '© 宜宾市翠屏生态环境局 四川省踏石科技 版权所有', maxLines: 2, textAlign: TextAlign.center, style: TextStyle( diff --git a/lib/pages/MyMsics/05_updated/MyUpdated.dart b/lib/pages/MyMsics/05_updated/MyUpdated.dart index ff04f47..2d1d771 100644 --- a/lib/pages/MyMsics/05_updated/MyUpdated.dart +++ b/lib/pages/MyMsics/05_updated/MyUpdated.dart @@ -10,7 +10,6 @@ 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_ybqx/components/doJSON.dart'; import 'package:open_file/open_file.dart'; import 'package:package_info/package_info.dart'; import 'package:path_provider/path_provider.dart'; @@ -228,11 +227,12 @@ class _MyUpdatedState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ SizedBox(height: 60), - Text('宜宾市黑烟车电子抓拍系统', style: TextStyle(fontSize: 20)), + Text('宜宾市翠屏黑烟车电子抓拍系统', style: TextStyle(fontSize: 20)), Text('v${widget.ver}（${widget.date}）', style: TextStyle(fontSize: 20)), SizedBox(height: 60), - Text('© 宜宾市生态环境局 四川省踏石科技 版权所有\n服务热线：187-8467-8300', + Text('© 宜宾市翠屏生态环境局 四川省踏石科技 版权所有', maxLines: 2, style: TextStyle(fontSize: 16), textAlign: TextAlign.center), + // Text('© 宜宾市翠屏生态环境局 四川省踏石科技 版权所有\n服务热线：187-8467-8300', ], ), ), diff --git a/lib/pages/MyMsics/07_myAbout/MyAbout.dart b/lib/pages/MyMsics/07_myAbout/MyAbout.dart index 44aafdd..afcf5ec 100644 --- a/lib/pages/MyMsics/07_myAbout/MyAbout.dart +++ b/lib/pages/MyMsics/07_myAbout/MyAbout.dart @@ -1,9 +1,8 @@ import 'package:flutter/material.dart'; -import '../../../components/commonFun.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; -import '../../../widget/JdButton.dart'; import '../../../components/commonFun.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; +import '../../../widget/JdButton.dart'; class MyAbout extends StatefulWidget { MyAbout({Key key, this.ver, this.date}) : super(key: key); @@ -113,12 +112,13 @@ class _LoginPageState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ SizedBox(height: 60), - Text('宜宾市黑烟车电子抓拍系统', style: TextStyle(fontSize: 20)), + Text('宜宾市翠屏黑烟车电子抓拍系统', style: TextStyle(fontSize: 20)), Text('v${widget.ver}（${widget.date}）', style: TextStyle(fontSize: 20)), SizedBox(height: 60), - Text('© 宜宾市生态环境局 四川省踏石科技 版权所有\n服务热线：187-8467-8300', + Text('© 宜宾市翠屏生态环境局 四川省踏石科技 版权所有', maxLines: 2, style: TextStyle(fontSize: 16), textAlign: TextAlign.center), ], + // Text('© 宜宾市翠屏生态环境局 四川省踏石科技 版权所有\n服务热线：187-8467-8300', ), ), SizedBox(height: 100), diff --git a/lib/pages/Works/DWDT/basic_map.dart b/lib/pages/Works/DWDT/basic_map.dart index 1e72aff..af5970d 100644 --- a/lib/pages/Works/DWDT/basic_map.dart +++ b/lib/pages/Works/DWDT/basic_map.dart @@ -40,20 +40,20 @@ class _BasicMapState extends State { //30 116.395645038,39.9299857781 北京-北京市 //center: BMFCoordinate(34.263161, 108.948024), //西安市 /// 设置地图显示中心点坐标，必须是百度官方发布的百度地图-城市中心点坐标 - /// 为宜宾市白塔山： BMFCoordinate(104.644079, 28.77914) - //center: BMFCoordinate(104.644079, 28.77914), //宜宾市白塔山，无效，经纬度搞反了 - //52 104.633019062,28.7696747963 四川省-宜宾市 + /// 为宜宾市翠屏白塔山： BMFCoordinate(104.644079, 28.77914) + //center: BMFCoordinate(104.644079, 28.77914), //宜宾市翠屏白塔山，无效，经纬度搞反了 + //52 104.633019062,28.7696747963 四川省-宜宾市翠屏 ///Flutter百度地图采坑注意： // BMFCoordinate(this.latitude, this.longitude); // BMFCoordinate 构造方法参数是纬度在前、经度在后，latitude 纬度，longitude 经度 // 百度官方发布的城市中心点坐标是经度在前、纬度在后，必须对调才行，否则无法正确显示指定城市的地图 - // 比如：//52 104.633019062,28.7696747963 四川省-宜宾市 - // 必须将经纬度对调才行：center: BMFCoordinate(28.7696747963, 104.633019062), //四川省-宜宾市 - //center: BMFCoordinate(28.7696747963, 104.633019062), //四川省-宜宾市 + // 比如：//52 104.633019062,28.7696747963 四川省-宜宾市翠屏 + // 必须将经纬度对调才行：center: BMFCoordinate(28.7696747963, 104.633019062), //四川省-宜宾市翠屏 + //center: BMFCoordinate(28.7696747963, 104.633019062), //四川省-宜宾市翠屏 center: BMFCoordinate(28.77914, 104.644079), - //宜宾市白塔山 - //宜宾市白塔山 + //宜宾市翠屏白塔山 + //宜宾市翠屏白塔山 showMapPoi: _showMapPoi, //设定地图是否显示底图poi标注(不包含室内图标注)，默认true zoomLevel: g_zoomLevel, diff --git a/lib/pages/Works/HYSH/hysh_getList_fliter.dart b/lib/pages/Works/HYSH/hysh_getList_fliter.dart index cd9e3ba..cbd483f 100644 --- a/lib/pages/Works/HYSH/hysh_getList_fliter.dart +++ b/lib/pages/Works/HYSH/hysh_getList_fliter.dart @@ -1012,11 +1012,11 @@ class _HyshPageState extends State { // '全部', // '1、江北振兴大道', // '2、宜飞路', - // '3、宜宾南收费站', + // '3、宜宾市翠屏南收费站', // '4、一曼路', // '5、柏溪收费站', // '6、七星路万达广场', - // '7、宜宾财政局', + // '7、宜宾市翠屏财政局', // '8、宜威路南广镇', // '9、宜长路', // '10、宜南快速通道', diff --git a/lib/pages/Works/LED_XSXX/led_xsxx_content.dart b/lib/pages/Works/LED_XSXX/led_xsxx_content.dart index bb71fa1..12784e2 100644 --- a/lib/pages/Works/LED_XSXX/led_xsxx_content.dart +++ b/lib/pages/Works/LED_XSXX/led_xsxx_content.dart @@ -90,9 +90,9 @@ class _LedXsxxPageState extends State { // "dwip": "172.16.3.2", // "dwmc": "宜飞路", // "dwbh": 2, - // "dwinfo": "宜宾南收费站宜飞路入城方向", + // "dwinfo": "宜宾市翠屏南收费站宜飞路入城方向", // "dwzb": "104.589904|28.787078", - // "dwms": "宜宾南收费站宜飞路入城方向，识别屏山、菜坝入城排放黑烟车辆" + // "dwms": "宜宾市翠屏南收费站宜飞路入城方向，识别屏山、菜坝入城排放黑烟车辆" //},]; _widthLeft = _screenWidth / 2.6; @@ -144,7 +144,7 @@ class _LedXsxxPageState extends State { Map _mapGetLedXsxxGetData = { "id": 2, "dwip": "172.16.3.2", - "xsnr": "绿水青山就是金山银山 宜宾市生态环境局宣。", + "xsnr": "绿水青山就是金山银山 宜宾市翠屏生态环境局宣。", "xsts": 0, //显示抓拍到的多少条违章记录 "stime": "07:00", "etime": "23:00", @@ -156,11 +156,11 @@ class _LedXsxxPageState extends State { // 全部 // 1 '江北振兴大道', // 2 '宜飞路', - // 3 '宜宾南收费站', + // 3 '宜宾市翠屏南收费站', // 4 '一曼路', // 5 '柏溪收费站', // 6 '七星路万达广场', - // 7 '宜宾财政局', + // 7 '宜宾市翠屏财政局', // 8 '宜威路南广镇', // 9 '宜长路', // 10 '宜南快速通道', @@ -173,11 +173,11 @@ class _LedXsxxPageState extends State { // '全部', // '1、江北振兴大道', // '2、宜飞路', - // '3、宜宾南收费站', + // '3、宜宾市翠屏南收费站', // '4、一曼路', // '5、柏溪收费站', // '6、七星路万达广场', - // '7、宜宾财政局', + // '7、宜宾市翠屏财政局', // '8、宜威路南广镇', // '9、宜长路', // '10、宜南快速通道', @@ -190,13 +190,13 @@ class _LedXsxxPageState extends State { int _xsts = 0; String _startTime = '07:00'; String _endTime = '23:00'; - String _ledMessage = '绿水青山就是金山银山 宜宾市生态环境局宣。'; + String _ledMessage = '绿水青山就是金山银山 宜宾市翠屏生态环境局宣。'; //App.Car_Led.Get接口获取的记录数据结构（比App.Car_Led.GetList接口获取的丰富） // Map _mapGetLedXsxxGetData = { // "id": 2, // "dwip": "172.16.3.2", - // "xsnr": "绿水青山就是金山银山 宜宾市生态环境局宣。", + // "xsnr": "绿水青山就是金山银山 宜宾市翠屏生态环境局宣。", // "xsts": 0, //显示抓拍到的多少条违章记录 // "stime": "07:00", // "etime": "23:00", @@ -219,7 +219,7 @@ class _LedXsxxPageState extends State { //_mapGetLedXsxxGetData = { // "id": 1, // "dwip": "172.16.3.1", - // "xsnr": "绿水青山就是金山银山 宜宾市生态环境局宣。", + // "xsnr": "绿水青山就是金山银山 宜宾市翠屏生态环境局宣。", // "xsts": 0, // "stime": "07:00", // "etime": "23:00", diff --git a/lib/pages/Works/LED_XSXX/led_xsxx_getList.dart b/lib/pages/Works/LED_XSXX/led_xsxx_getList.dart index 493288a..3a5ef08 100644 --- a/lib/pages/Works/LED_XSXX/led_xsxx_getList.dart +++ b/lib/pages/Works/LED_XSXX/led_xsxx_getList.dart @@ -1,17 +1,16 @@ import 'dart:async'; 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 'led_xsxx_content.dart'; +import '../../../components/commonFun.dart'; import '../../../components/dioFun.dart'; +import '../../../components/doJSON.dart'; import '../../../components/hyxx_data_handle.dart'; -import '../../../components/commonFun.dart'; import '../../../services/EventBus.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import '../../../components/doJSON.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; - +import 'led_xsxx_content.dart'; //LedXsxx是本项目中“LED显示信息”的统一缩写 class LedXsxxGetList extends StatefulWidget { @@ -89,7 +88,7 @@ class _LedXsxxPageState extends State { //Led数据变量 // Map mapGetLedXsxxGetData = { // "id": 2, - // "xsnr": "绿水青山就是金山银山 宜宾市生态环境局宣。", + // "xsnr": "绿水青山就是金山银山 宜宾市翠屏生态环境局宣。", // "addtime": "2021-01-20 10:16:07", // "updatetime": "2021-02-13 11:48:51" // }; diff --git a/lib/pages/tabs/page1_work.dart b/lib/pages/tabs/page1_work.dart index c1ee19c..75e2dae 100644 --- a/lib/pages/tabs/page1_work.dart +++ b/lib/pages/tabs/page1_work.dart @@ -250,12 +250,13 @@ class _Page1_WorksState extends State children: [ Padding( padding: EdgeInsets.only(top: ScreenUtil().setHeight(10)), - child: Image.asset( - 'assets/images/形状 2.png', - height: ScreenUtil().setHeight(45), - ), + child: Text(""), + // child: Image.asset( + // 'assets/images/形状 2.png', + // height: ScreenUtil().setHeight(45), + // ), ), - Text(" 客服热线", + Text(" ", // " 客服热线", style: TextStyle(fontSize: 16, color: Colors.white)), ], ), diff --git a/lib/pages/tabs/page4_myMsics_new.dart b/lib/pages/tabs/page4_myMsics_new.dart index ac684b9..21026f4 100644 --- a/lib/pages/tabs/page4_myMsics_new.dart +++ b/lib/pages/tabs/page4_myMsics_new.dart @@ -1,30 +1,19 @@ -import 'dart:convert'; import 'dart:io'; import 'package:badges/badges.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:fluttertoast/fluttertoast.dart'; -import 'package:fluttertoast/fluttertoast.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/Works/TJXX/tj_data.dart'; -import 'package:hyzp_ybqx/services/EventBus.dart'; -import 'package:hyzp_ybqx/services/EventBus.dart'; import 'package:hyzp_ybqx/widget/JdButton.dart'; import 'package:package_info/package_info.dart'; -import 'package:package_info/package_info.dart'; import 'package:path_provider/path_provider.dart'; -//import 'package:hyzp_ybqx/widget/player_pro.dart'; -import 'package:scroll_to_index/util.dart'; -import 'package:url_launcher/url_launcher.dart'; -import '../../components/commonFun.dart'; import '../../components/commonFun.dart'; import '../../components/customDialogF.dart'; import '../../services/Storage.dart'; @@ -32,7 +21,6 @@ import '../../services/Storage.dart'; import '../Login/ModifyPassword.dart'; import '../MyMsics/03_personal/PersonalData.dart'; import '../MyMsics/04_MyFeedback/MyFeedback.dart'; -import '../MyMsics/05_updated/MyUpdated.dart'; import '../MyMsics/07_myAbout/MyAbout.dart'; ///flutter中如何获取子类Widget并调用它的方法 萤火虫离别的礼物 2019.08.07 15:46:08 https://www.jianshu.com/p/b16f70dd692c @@ -296,23 +284,25 @@ class _Page4_MyMsicsNewState extends State //crossAxisAlignment: CrossAxisAlignment.start, //用的比较少 children: [ FlatButton( - child: Container( - child: Row( - children: [ - Padding( - padding: EdgeInsets.only(top: ScreenUtil().setHeight(10)), - child: Image.asset( - 'assets/images/形状 2.png', - height: ScreenUtil().setHeight(45), + child: Container( + child: Row( + children: [ + Padding( + padding: EdgeInsets.only(top: ScreenUtil().setHeight(10)), + child: Text(""), + // child: Image.asset( + // 'assets/images/形状 2.png', + // height: ScreenUtil().setHeight(45), + // ), ), - ), - Text(" 客服热线", - style: TextStyle(fontSize: 16, color: Colors.white)), - ], + Text(" ", //" 客服热线", + style: TextStyle(fontSize: 16, color: Colors.white)), + ], + ), + ), + onPressed: () {} + // onPressed: () => launch("tel://18784678300"), ), - ), - onPressed: () => launch("tel://18784678300"), - ), SizedBox( width: ScreenUtil().setWidth(45), ), @@ -451,7 +441,7 @@ class _Page4_MyMsicsNewState extends State print('version = $version'); print('buildNumber = $buildNumber'); print('buildDate = $buildDate'); - // I/flutter (30820): appName = 宜宾黑烟抓拍 + // I/flutter (30820): appName = 宜宾市翠屏黑烟抓拍 // I/flutter (30820): packageName = com.flutter.hyzp_ybqx // I/flutter (30820): version = 1.3.1 // I/flutter (30820): buildNumber = 20210508