[3.4.0-map-sdk] update ,wait to test

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -294,6 +294,7 @@ internal class DebugSettingView @JvmOverloads constructor(
         }
     }
 
+    @SuppressLint("SetTextI18n")
     private fun initView() {
         post {
             val maxHeight = ScreenUtils.getScreenHeight() - BarUtils.getStatusBarHeight()
@@ -1033,7 +1034,7 @@ internal class DebugSettingView @JvmOverloads constructor(
         //设置连接司机屏IP
         btnConnectServerIp.setOnClickListener {
             val ip = etConnectServerIp.text.toString()
-            if (!ip.isNullOrEmpty()) {
+            if (!ip.isEmpty()) {
                 CallerAutoPilotControlManager.connectSpecifiedServer(ip)
             }
         }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt

@@ -1,15 +1,12 @@
 package com.mogo.eagle.core.function.main
 
-import android.Manifest
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
 import android.view.*
 import android.widget.FrameLayout
-import androidx.core.app.ActivityCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.kwai.koom.base.MonitorManager.addMonitorConfig
 import com.kwai.koom.nativeoom.leakmonitor.LeakListener
@@ -84,14 +81,12 @@ open class MainActivity : MvpActivity<MainView?, MainPresenter?>(), MainView,
         initConnectInfoRV()
         CallerHmiManager.init(this)
 
-        //申请悬浮窗权限
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            // 检查是否有悬浮窗权限
-            if (Settings.canDrawOverlays(this)) {
-                return
-            }
-            PermissionsDialogUtils.openAppDetails(this, "显示悬浮窗", REQUEST_CODE_DIALOG)
+        // 检查是否有悬浮窗权限
+        if (Settings.canDrawOverlays(this)) {
+            return
         }
+        //申请悬浮窗权限
+        PermissionsDialogUtils.openAppDetails(this, "显示悬浮窗", REQUEST_CODE_DIALOG)
     }
 
     private fun injectStatusBar() {
@@ -116,7 +111,6 @@ open class MainActivity : MvpActivity<MainView?, MainPresenter?>(), MainView,
         decorView.addView(statusBarView, statusBarLP)
     }
 
-
     // todo 优化 车聊聊
     private fun injectFloatView() {
         val decorView = this.window.decorView as? FrameLayout ?: return