提交人：jtm

提交内容:bug fix

BusinessCommon/src/main/java/com/develop/common/data_repo/db/DataFactory.kt

@@ -14,21 +14,21 @@ object DataFactory {
         val languageList = mutableListOf<LanguageModel>()
         val strList = mutableListOf<String>(
             resource.getString(R.string.english),
-            resource.getString(R.string.chinese),
-            resource.getString(R.string.france),
-            resource.getString(R.string.japan)
+//            resource.getString(R.string.chinese),
+//            resource.getString(R.string.france),
+//            resource.getString(R.string.japan)
         )
         val iconList = mutableListOf<Int>(
             R.drawable.ic_english,
-            R.drawable.ic_chinese,
-            R.drawable.ic_france,
-            R.drawable.ic_japan
+//            R.drawable.ic_chinese,
+//            R.drawable.ic_france,
+//            R.drawable.ic_japan
         )
         val typeList = mutableListOf<LanguageType>(
             LanguageType.English,
-            LanguageType.Chinese,
-            LanguageType.France,
-            LanguageType.Japan
+//            LanguageType.Chinese,
+//            LanguageType.France,
+//            LanguageType.Japan
         )
         for (i in strList.indices) {
             languageList.add(LanguageModel(iconList[i], strList[i], typeList[i]))
@@ -132,7 +132,7 @@ object DataFactory {
             R.drawable.ic_setting_voice,
             R.drawable.ic_setting_brightness,
             R.drawable.ic_setting_user,
-            R.drawable.ic_setting_folder,
+//            R.drawable.ic_setting_folder,
             R.drawable.ic_setting_reset,
             R.drawable.ic_setting_about,
 
@@ -143,7 +143,7 @@ object DataFactory {
             resource.getString(R.string.sound),
             resource.getString(R.string.brightness),
             resource.getString(R.string.user_account),
-            resource.getString(R.string.storage),
+//            resource.getString(R.string.storage),
             resource.getString(R.string.reset),
             resource.getString(R.string.about)
 

BusinessCommon/src/main/java/com/develop/common/widget/HomeFunctionTopBar.kt

@@ -37,7 +37,7 @@ class HomeFunctionTopBar : RelativeLayout, View.OnClickListener {
         binding.modeLayout.setOnClickListener(this)
         binding.ivTab.setOnClickListener(this)
         binding.ivWifi.setOnClickListener(this)
-        binding.ivWifi.setImageResource(R.drawable.icon_wifi_signal_level)
+        binding.ivWifi.setImageResource(R.drawable.icon_wifi_act_signal_level)
         binding.ivWifi.setImageLevel(0)
         binding.ivFunction.load(R.drawable.ic_home)
 

BusinessCommon/src/main/res/drawable/icon_wifi_act_signal_level.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:drawable="@drawable/ic_wifi_act_0"
+        android:maxLevel="0" />
+
+    <item
+        android:drawable="@drawable/ic_wifi_act_1"
+        android:maxLevel="1" />
+
+    <item
+        android:drawable="@drawable/ic_wifi_act_2"
+        android:maxLevel="2" />
+
+    <item
+        android:drawable="@drawable/ic_wifi_act_3"
+        android:maxLevel="3" />
+
+    <item
+        android:drawable="@drawable/ic_wifi_act_4"
+        android:maxLevel="4" />
+</level-list>

BusinessCommon/src/main/res/layout/news_view.xml

@@ -31,7 +31,7 @@
         android:gravity="center"
         android:text="@string/empty_notice"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/convert_300px"/>
+        android:layout_height="match_parent"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:layout_marginTop="@dimen/convert_34px"

BusinessSetting/src/main/java/com/develop/setting/ui/WifiListActivity.kt

@@ -88,7 +88,7 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>() {
                     R.id.wifi_content.onClick {
                         val clickModel = getModel<WifiData>()
                         if (clickModel.isConnected) {
-                            GlobalToast.showToast("已连接")
+                            GlobalToast.showToast("connected successfully")
                         } else if (clickModel.password.isNotEmpty()) {
                             showPlainDialog()
                             wifiHelp.connect(clickModel, clickModel.password)
@@ -99,6 +99,9 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>() {
                             updateSelectionPos(absoluteAdapterPosition)
                         }
                     }
+                    R.id.wifi_content.onLongClick {
+                        wifiHelp.removeSaveWifi(wifiDataList[absoluteAdapterPosition])
+                    }
                 }
             }
         }.models = wifiDataList
@@ -126,7 +129,7 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>() {
         }
 
         wifiHelp = WifiHelp.Build(this).setErrorAuthenticating {
-            GlobalToast.showToast("连接失败")
+            GlobalToast.showToast("failed to connect")
         }.setScanCallback {
             it?.apply {
                 wifiDataList.clear()

libBase/src/main/java/com/develop/base/manager/WifiHelp.kt

@@ -169,7 +169,7 @@ open class WifiHelp {
                 mWifiManager.disconnect()
                 mWifiManager.removeNetwork(item.networkId)
                 mWifiManager.saveConfiguration()
-                mWifiManager.reconnect()
+//                mWifiManager.reconnect()
             }
         }
     }