1.修改拦截器数据，防止拦截器崩溃。

2.添加区域码保存。
3.修改百度定位逻辑。

app/src/main/java/com/xhly/manageapp/ManageApplication.kt

@@ -521,7 +521,7 @@ class ManageApplication : MultiDexApplication() {
          */
         fun disableStatusBarPanel(enableFlag: Boolean) {
             if (ModelNameUtils.IS_LianxX505f()||ModelNameUtils.IS_LianxX6e6f()) {
-                csdkManager?.disableStatusBarPanel(enableFlag)
+                csdkManager?.disableStatusBarPanel(false)
             }
         }
 

app/src/main/java/com/xhly/manageapp/ui/login/activity/LoginActivity.kt

@@ -88,6 +88,10 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
         viewModel.regionCodeData.observe(this){
            if (!it){
                regioncode=""
+           }else{
+               if (regioncode.isNotBlank()){
+                   currentSpUtils.setParam(Const.REGIONCODEKEY,regioncode)
+               }
            }
         }
       /*  val exitControlFlag = currentSpUtils.getParam(Const.EXIT_CONTROL, false) as Boolean
@@ -277,6 +281,8 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
                     val cancelTv = v.findViewById<TextView>(R.id.dialog_cancel_tv)
                     val editText = v.findViewById<EditText>(R.id.dialog_et)
                     val titleTv=v.findViewById<TextView>(R.id.dialog_title_tv)
+                    regioncode = currentSpUtils.getParam(Const.REGIONCODEKEY, regioncode) as String
+                    editText.setText(regioncode)
                     enterTv.setOnClickListener {
                         dialog.dismiss()
                         val text = editText.text

app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt

@@ -921,52 +921,66 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
 
     private fun baiduLocation(){
         LocationClient.setAgreePrivacy(true)
-        locationClient = LocationClient(application)
-        val option = LocationClientOption()
-        option.locationMode=LocationClientOption.LocationMode.Hight_Accuracy
-        option.setCoorType("bd09ll")
-        option.setFirstLocType(LocationClientOption.FirstLocType.ACCURACY_IN_FIRST_LOC)
-        option.setScanSpan(1000*60*5)
-        option.setOpenGnss(true)
-        option.setLocationNotify(true)
-        option.setEnableSimulateGnss(false)
-        option.setNeedNewVersionRgc(true)
-        option.setIsNeedAddress(true)
-        locationClient?.locOption=option
-        locationClient?.registerLocationListener(object :BDAbstractLocationListener(){
-            override fun onReceiveLocation(bdLocation: BDLocation) {
-                //此处的BDLocation为定位结果信息类，通过它的各种get方法可获取定位相关的全部结果
-                val latitude: Double = bdLocation.getLatitude() //获取纬度信息
-
-                val longitude: Double = bdLocation.getLongitude() //获取经度信息
-                val addrStr = bdLocation.addrStr
-                val location = PadLocationConst.currentLocation
-                location.lat=latitude
-                location.lon=longitude
-                location.address=addrStr
-                try {
-                    val lastLocation = PadLocationConst.lastLocation
-                    if (location.lat!=null&&location.lon!=null&&(lastLocation.lon!=location.lon&&lastLocation.lat!=location.lat)){
-                        lastLocation.lat=location.lat
-                        lastLocation.lon=location.lon
-                        ManageApplication.getDeviceInfo()?.let {
-                            location.sn=it
-                        }
-                        userBean?.let {
-                            location.userid=it.userid
+        if (locationClient!=null){
+            LogShow("开始定位")
+            locationClient?.start()
+        }else{
+            LogShow("重新定位")
+            locationClient = LocationClient(application)
+            val option = LocationClientOption()
+            option.locationMode=LocationClientOption.LocationMode.Hight_Accuracy
+            //可选，设置返回经纬度坐标类型，默认gcj02
+            //gcj02：国测局坐标；
+            //bd09ll：百度经纬度坐标；
+            option.setCoorType("bd09ll")
+            option.setFirstLocType(LocationClientOption.FirstLocType.ACCURACY_IN_FIRST_LOC)
+            //可选，设置发起定位请求的间隔，int类型，单位ms,改为由定时任务动态调用
+            /*  option.setScanSpan(1000*60*5)*/
+            //设置是否使用卫星定位
+            option.setOpenGnss(true)
+            //设置是否当卫星定位有效时按照1S/1次频率输出卫星定位结果
+            option.setLocationNotify(true)
+            //设置是否需要过滤卫星定位仿真结果，默认需要，即参数为false
+            option.setEnableSimulateGnss(false)
+            //可选，设置是否需要最新版本的地址信息。默认需要，即参数为true
+            option.setNeedNewVersionRgc(true)
+            option.setIsNeedAddress(true)
+            locationClient?.locOption=option
+            locationClient?.registerLocationListener(object :BDAbstractLocationListener(){
+                override fun onReceiveLocation(bdLocation: BDLocation) {
+                    //此处的BDLocation为定位结果信息类，通过它的各种get方法可获取定位相关的全部结果
+                    val latitude: Double = bdLocation.getLatitude() //获取纬度信息
+
+                    val longitude: Double = bdLocation.getLongitude() //获取经度信息
+                    val addrStr = bdLocation.addrStr
+                    val location = PadLocationConst.currentLocation
+                    location.lat=latitude
+                    location.lon=longitude
+                    location.address=addrStr
+                    try {
+                        val lastLocation = PadLocationConst.lastLocation
+                        if (location.lat!=null&&location.lon!=null&&!location.address.isNullOrBlank()&&(lastLocation.lon!=location.lon&&lastLocation.lat!=location.lat)){
+                            lastLocation.lat=location.lat
+                            lastLocation.lon=location.lon
+                            ManageApplication.getDeviceInfo()?.let {
+                                location.sn=it
+                            }
+                            userBean?.let {
+                                location.userid=it.userid
+                            }
+                            viewModel.postPadLocation((location))
+                            LogShow("真没有位置")
+                        }else{
+                            LogShow("没有位置")
                         }
-                        viewModel.postPadLocation((location))
-                        LogShow("真没有位置")
-                    }else{
-                        LogShow("没有位置")
+                    }catch (e:Exception){
+                        LogShow("没有位置问题"+e.toString())
                     }
-                }catch (e:Exception){
-                    LogShow("没有位置问题"+e.toString())
                 }
-            }
 
-        })
-        locationClient?.start()
+            })
+            locationClient?.start()
+        }
     }
 
     private fun useTimeStrategy() {
@@ -1274,6 +1288,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
             Const.ACCOUNTLOGINOUTSUCESS->{
                 loginOutSucess()
             }
+            Const.STARTLOCATION->{
+                getLocation()
+            }
         }
     }
 

app/src/main/java/com/xhly/manageapp/workmanager/TimingWorker.kt

@@ -81,7 +81,7 @@ class TimingWorker(context: Context, workerParams: WorkerParameters) :
             }catch (e:Exception){
                 LogShow("没有位置问题"+e.toString())
             }
-*/
+*/          UIEvent(Const.STARTLOCATION).post()
             userBean?.let {
                 val map=HashMap<String,Any>()
                 map["sn"]=ManageApplication.getDeviceInfo()?:""

corelib/src/main/java/com/xhly/corelib/Const.kt

@@ -65,6 +65,8 @@ object Const {
     //标记上次打开的包名，当连续打开同一包名时，不认为打开多次
     var LASTPKGNAME = ""
 
+    //存储区域码，存在则在弹窗出现时显示
+    const val REGIONCODEKEY="REGIONCODEKEY"
     //接口地址
     const val URL1: String = "https://mcapitest.xhkjedu.com/"
 
@@ -101,6 +103,10 @@ object Const {
      */
     const val ACCOUNTLOGINOUTSUCESS = "ACCOUNTLOGINOUTSUCESS"
 
+    /**
+     * 调用定位
+     */
+    const val STARTLOCATION = "STARTLOCATION"
 
     /**
      * 调用安装app方法

corelib/src/main/java/com/xhly/corelib/network/ResponseInterceptor.kt

@@ -59,12 +59,12 @@ class ResponseInterceptor : Interceptor {
     }
     fun createDefaultResponse(): Response {
         // 创建默认的响应体内容
-        val responseBody = "Default Response Body" // 替换为您想要返回的默认响应体内容
+        val responseBody = "{\"code\":0,\"msg\":\"\",\"obj\":false}" // 替换为您想要返回的默认响应体内容
 
         // 创建默认的响应对象
         val response = Response.Builder()
             .code(200) // 替换为您想要的响应码
-            .message("Default Response Message") // 替换为您想要的响应消息
+            .message("{\"code\":0,\"msg\":\"\",\"obj\":false}") // 替换为您想要的响应消息
             .protocol(okhttp3.Protocol.HTTP_1_1) // 替换为您想要的协议
             .request(okhttp3.Request.Builder().url("http://example.com").build()) // 替换为请求对象
             .body(responseBody.toResponseBody()) // 设置响应体