Merge remote-tracking branch 'patton99/master' into iOS

# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/widget/my_superplayer.dart
#	pubspec.yaml

lib/components/UserInfo.dart

@@ -66,6 +66,7 @@ class UserInfo {
     qx_name_long = '宜宾市' + trim_county(qx_name);
     service_tel = '\n服务热线：187-8467-8300';
     copyright_info = '© ' + qx_name_long + '生态环境局 四川省踏石科技 版权所有' + service_tel;
+    official_seal = qx_name_long + '生态环境局' + '.png'; // 区县单位公章
     // 中心地址：宜宾市白塔山
     center_latitude = 28.77914; // 区县中心纬度
     center_longitude = 104.644079; // 区县中心经度
@@ -109,6 +110,11 @@ class UserInfo {
         qx_name_long = '宜宾' + qx_name;
         copyright_info = '© ' + qx_name_long + '城乡融合发展局 四川省踏石科技\n版权所有，' + service_tel.substring(1);
         copyright_info_PinYin = 'YIBIN SANJIANG NEW AREA BLACK SMOKE CAR CAPTURE SYSTEM';
+
+        // 经测试发现，当images目录下面的图片文件名长度达到14个汉字便会报错，将该文件名称改为“宜宾三江新区城乡融合发展局.png”，编译通过
+        // “r:\FlutterProject\FlutterProject61-hyzp_ybqx_with_ios\hyzp_ybqx\assets\images\宜宾三江新区城乡融合发展局.png”
+        official_seal = qx_name_long + '城乡融合发展局' + '.png'; // 区县单位公章
+
         // 中心地址：
         // 点击底图空白处响应：coordinate = {latitude: 28.822633806922394, longitude: 104.75964294854222}
         center_latitude = 28.822633806922394; // 区县中心纬度
@@ -161,6 +167,7 @@ class UserInfo {
       default:
         break;
     }
+    print('official_seal = $official_seal'); // official_seal = 宜宾市长宁生态环境局.png
   }
 
   // 去除末尾的区县

lib/components/commonFun.dart

@@ -7,7 +7,6 @@ import 'dart:math';
 import 'package:ai_save_account/ai_save_account.dart';
 import 'package:audioplayers/audio_cache.dart';
 import 'package:audioplayers/audioplayers.dart';
-
 import 'package:camera/camera.dart';
 import 'package:convert/convert.dart';
 import 'package:crypto/crypto.dart' as crypto;
@@ -15,17 +14,13 @@ import 'package:device_info/device_info.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:hyzp_ybqx/provider/player_region.dart';
 
 import 'UserInfo.dart';
-import 'dioFun.dart';
 
 ////////////////////////////////////////////
-double g_radioImage = 10 / 16;  // 违章图片默认宽高比率
-
-
+double g_radioImage = 10 / 16; // 违章图片默认宽高比率
 
 AudioPlayer playerClick;
 AudioPlayer playerClacks;
@@ -124,6 +119,52 @@ List listReviewed = [];
 bool g_bVoiceRemind = false; // 用户设置是否开启语音提醒
 int g_remindGap = 60; // 提醒间隔默认为60S，0表示取消定时提醒
 
+bool g_bSaveDefaultMap = false; // 是否保存默认地图
+String g_defaultMapName = ''; // 用户选择的默认地图名称
+// 获取地图的中文名称
+String getMapChsName(String mapName) {
+  if (mapName.length == 0) {
+    return '';
+  }
+  mapName = mapName.toLowerCase();
+  String mapKey = '';
+  String _mapChsName = '';
+
+  // 查找包含 mapName 的最短 key
+  for (var key in mapChsName.keys) {
+    // print('$key ${mapChsName[key]}');
+    if (mapName.indexOf(key) > -1) {
+      if (mapKey.length == 0 || key.length < mapKey.length) {
+        mapKey = key;
+      }
+    }
+  }
+
+  _mapChsName = mapChsName[mapKey];
+
+  if (_mapChsName == null) {
+    _mapChsName = mapName + (mapName.length > 0 ? '地图' : '');
+  }
+  return _mapChsName;
+}
+
+// key 全部小写
+Map<String, String> mapChsName = {
+  'apple': '苹果地图',
+  'google': '谷歌地图',
+  'googlego': '谷歌地图轻量版',
+  'amap': '高德地图',
+  'baidu': '百度地图',
+  'waze': '位智地图',
+  'yandexmaps': 'Yandex地图',
+  'yandexnavi': 'Yandex导航地图',
+  'citymapper': '城市地图',
+  'mapswithme': '离线地图',
+  'osmand': 'OsmAnd地图',
+  'doubleGis': 'doubleGis地图',
+  'tencent': '腾讯地图',
+};
+
 // Timer g_remindTimer; //定时提醒变量
 //
 // // 设置定时提醒
@@ -187,6 +228,7 @@ String copyright_info_PinYin = '';
 // 区县中心地址
 double center_latitude = -1; // 区县中心纬度
 double center_longitude = -1; // 区县中心经度
+String official_seal = ''; // 区县单位公章
 
 clear_user_info() {
   qx_code = -1;
@@ -887,7 +929,7 @@ Widget getImageWidget() {
                   color: Color.fromRGBO(49, 216, 123, 1),
                   fontWeight: FontWeight.bold)),
         ),
-        SizedBox(height: ScreenUtil().setHeight(copyright_info.contains('\n') ? 25 : 90)),
+        SizedBox(height: ScreenUtil().setHeight(copyright_info.contains('\n') ? 25 : 70)),
         Container(
           alignment: Alignment.center,
           child: Text(copyright_info,

lib/components/dioFun.dart

@@ -2078,6 +2078,7 @@ Future playUrl({@required int index, String url, BuildContext context}) {
             id: index + 1,
             dwip: listDwinfoGetList2[index]['dwip'],
             url: urlnew,
+            urlType: 'rtmp',
             title: '点位视频\n${(index + 1)}、${listDwinfoGetList2[index]['dwmc']}',
           )));