1.隐私协议/条款/订阅说明的html适配多语言

2.g30增加蓝牙一键定位功能

baselibrary/src/main/java/com/abbidot/baselibrary/constant/EventName.kt

@@ -39,7 +39,6 @@ import androidx.annotation.StringDef
     EventName.BluetoothSwitch,
     EventName.BleReport,
     EventName.BleFirmwareVersion,
-    EventName.BleGetLocation,
     EventName.BleReportData,
     EventName.LogReport,
     EventName.BlePassThrough,
@@ -108,11 +107,9 @@ annotation class EventName {
         //日志上报数据
         const val LogReport = "logReport"
 
-        //设备获取手机位置
-        const val BleGetLocation = "bleGetLocation"
-
         //设备固件版本
         const val BleFirmwareVersion = "firmwareVersion"
+
         //蓝牙透传
         const val BlePassThrough = "blePassThrough"
     }

baselibrary/src/main/java/com/abbidot/baselibrary/constant/MMKVKey.kt

@@ -41,6 +41,9 @@ import androidx.annotation.StringDef
     MMKVKey.ShowAllPet,
     MMKVKey.isCrash,
     MMKVKey.AvailableOrder,
+    MMKVKey.UserGpsLat,
+    MMKVKey.UserGpsLon,
+    MMKVKey.UserGpsSpeed,
     MMKVKey.isFirstCheckBleOpen,
     MMKVKey.Shared
 )
@@ -90,6 +93,11 @@ annotation class MMKVKey {
         const val MapShowDefaultLat = "mapDefaultLat"
         const val MapShowDefaultLon = "mapDefaultLon"
 
+        //手机Gps定位信息
+        const val UserGpsLat = "userGpsLat"
+        const val UserGpsLon = "userGpsLon"
+        const val UserGpsSpeed = "userGpsSpeed"
+
         //地图模式类型
         const val MapType = "mapType"
 

baselibrary/src/main/java/com/abbidot/baselibrary/util/AppUtils.kt

@@ -18,7 +18,7 @@ class AppUtils {
 
     companion object {
 
-//        private var isDebug: Boolean? = true
+        //        private var isDebug: Boolean? = true
         private var isDebug: Boolean? = null
 
         /**
@@ -103,7 +103,7 @@ class AppUtils {
                 return MMKVUtil.getBoolean(MMKVKey.DebugIp, true)
             }
             val locale = Locale.getDefault()
-            val lang = locale.language.uppercase() + "-" + locale.country.uppercase()
+            val lang = locale.country.uppercase() + "-" + locale.language.uppercase()
             return lang.contains("CN") || lang.contains("ZH")
         }