【设备】4G 主界面右上角4G 图标 和二级菜单4G图标不一致

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/view/CommonTopBar.kt

@@ -60,7 +60,10 @@ class CommonTopBar : LinearLayout {
 
     private val batteryCallback = object : BatteryHelper.OnBatteryLevelCallback {
         override fun onLevel(level: Int, charging: Boolean) {
-            Log.i(this@CommonTopBar.javaClass.name, "batteryCallback onLevel = $level  charging = $charging")
+            Log.i(
+                this@CommonTopBar.javaClass.name,
+                "batteryCallback onLevel = $level  charging = $charging"
+            )
             mBinding?.root?.post {
                 mBinding?.battery?.setImageLevel(if (charging) 200 else level)
                 mBinding?.batteryTxt?.text = "${level}%"
@@ -107,17 +110,20 @@ class CommonTopBar : LinearLayout {
         override fun onLevel(level: Int) {
             LogUtils.w("simCallback onLevel = $level")
             mBinding?.root?.post {
-                var showLevel =
+                var showLevel = (level + 1) * 20
-                    if (AppData.hasCameraData()) (level / 15 + 1) * 20 else (level + 1) * 20
+//                var showLevel =
+//                    if (AppData.hasCameraData()) (level / 15 + 1) * 20 else (level + 1) * 20
+
                 if (showLevel > 100) {
                     showLevel = 100
                 }
                 mBinding?.fourG?.setImageLevel(showLevel)
+                Log.d("chenweijie", "$showLevel")
             }
         }
     }
 
-    private fun watchNetWork(){
+    private fun watchNetWork() {
         NetworkHelper.watch(wifiCallback, simCallback)
     }