浏览代码

1.网络不可用时允许点击网络设置。

2.网络不可用时显示更新策略。
20241218TB223FC(测试jar包)
wangwanlei 11 个月前
父节点
当前提交
63552d35c5

+ 11
- 6
app/src/main/java/com/xhly/manageapp/AppAdapter.kt 查看文件

15
 import com.xhly.corelib.eventbus.UIEvent
15
 import com.xhly.corelib.eventbus.UIEvent
16
 import com.xhly.corelib.utils.AppUtils
16
 import com.xhly.corelib.utils.AppUtils
17
 import com.xhly.corelib.utils.LogShow
17
 import com.xhly.corelib.utils.LogShow
18
+import com.xhly.corelib.utils.NetworkUtils
18
 import com.xhly.corelib.utils.SystemUtil
19
 import com.xhly.corelib.utils.SystemUtil
19
 import com.xhly.manageapp.utils.InstallUtils
20
 import com.xhly.manageapp.utils.InstallUtils
20
 import com.xhly.manageapp.utils.StrategyUtils
21
 import com.xhly.manageapp.utils.StrategyUtils
61
                     it.changeCode()
62
                     it.changeCode()
62
                 }
63
                 }
63
             }else if (appInfo.packageName.equals(Const.UPDATESTRATEGYPKGNAME)){
64
             }else if (appInfo.packageName.equals(Const.UPDATESTRATEGYPKGNAME)){
64
-                if (lastTimeLong+20*1000<System.currentTimeMillis()){
65
-                    lastTimeLong=System.currentTimeMillis()
66
-                    UIEvent(Const.CODE2004.toString()).post()
67
-                }else{
68
-                    Toaster.show(context.getString(R.string.strategyupdatetips))
69
-                }
65
+               if (NetworkUtils.isAvailable(context)){
66
+                   if (lastTimeLong+20*1000<System.currentTimeMillis()){
67
+                       lastTimeLong=System.currentTimeMillis()
68
+                       UIEvent(Const.CODE2004.toString()).post()
69
+                   }else{
70
+                       Toaster.show(context.getString(R.string.strategyupdatetips))
71
+                   }
72
+               }else{
73
+                   Toaster.show(context.getString(R.string.checknettips))
74
+               }
70
             }else if (appInfo.packageName.equals(Const.WIFISEETTINGPKG)){
75
             }else if (appInfo.packageName.equals(Const.WIFISEETTINGPKG)){
71
                 context.startActivity(Intent(Settings.ACTION_WIFI_SETTINGS))
76
                 context.startActivity(Intent(Settings.ACTION_WIFI_SETTINGS))
72
             }else if (appInfo.packageName.equals(Const.STOREAPPPKG)){
77
             }else if (appInfo.packageName.equals(Const.STOREAPPPKG)){

+ 23
- 1
app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt 查看文件

28
 import android.widget.TextView
28
 import android.widget.TextView
29
 import android.widget.Toast
29
 import android.widget.Toast
30
 import androidx.activity.addCallback
30
 import androidx.activity.addCallback
31
+import androidx.appcompat.content.res.AppCompatResources
31
 import androidx.lifecycle.lifecycleScope
32
 import androidx.lifecycle.lifecycleScope
32
 import androidx.lifecycle.viewModelScope
33
 import androidx.lifecycle.viewModelScope
33
 import androidx.recyclerview.widget.GridLayoutManager
34
 import androidx.recyclerview.widget.GridLayoutManager
710
 
711
 
711
     override fun onResume() {
712
     override fun onResume() {
712
         super.onResume()
713
         super.onResume()
713
-
714
+        updateNetErrorAppRv()
714
         lifecycleScope.launch(Dispatchers.IO){
715
         lifecycleScope.launch(Dispatchers.IO){
715
             try {
716
             try {
716
                 val json = spUtils.getFromJson(Const.USERINFO, UserBean().javaClass)
717
                 val json = spUtils.getFromJson(Const.USERINFO, UserBean().javaClass)
1388
 
1389
 
1389
         }
1390
         }
1390
     }
1391
     }
1392
+     //在网络无连接时显示数据
1393
+    private fun updateNetErrorAppRv(){
1394
+        if (!NetworkUtils.isAvailable(this)&&mBinding.rv.visibility==View.INVISIBLE){
1395
+            //未联网时,默认只显示更新策略图标
1396
+            dataList.clear()
1397
+            dataList.add(CustomAppUtils().getCusomAppBean(
1398
+                getString(R.string.updatestrategy),
1399
+                Const.UPDATESTRATEGYPKGNAME,
1400
+                AppCompatResources.getDrawable(this,R.drawable.icon_updatestrategy)!!
1401
+            ))
1402
+            mBinding.rv.visibility=View.VISIBLE
1403
+            if (adapter == null) {
1404
+                adapter = AppAdapter(this, dataList)
1405
+                adapter?.changePwdListener = getChangeCodeListener()
1406
+                mBinding.rv.adapter = adapter
1407
+            }
1408
+            adapter?.let {
1409
+                it.notifyDataSetChanged()
1410
+            }
1411
+        }
1412
+    }
1391
 
1413
 
1392
     fun checkAccessibility(context: Context): Boolean {
1414
     fun checkAccessibility(context: Context): Boolean {
1393
         // 判断辅助功能是否开启
1415
         // 判断辅助功能是否开启

+ 1
- 1
app/src/main/java/com/xhly/manageapp/utils/CustomAppUtils.kt 查看文件

49
         return appList
49
         return appList
50
     }
50
     }
51
 
51
 
52
-    private fun getCusomAppBean(name: String, pkg: String, icon: Drawable):AppInfo{
52
+    public fun getCusomAppBean(name: String, pkg: String, icon: Drawable):AppInfo{
53
         val appInfo = AppInfo()
53
         val appInfo = AppInfo()
54
         appInfo.name = name
54
         appInfo.name = name
55
         appInfo.packageName = pkg
55
         appInfo.packageName = pkg

+ 2
- 0
app/src/main/res/layout/activity_main.xml 查看文件

162
             android:layout_gravity="bottom|right"
162
             android:layout_gravity="bottom|right"
163
             android:layout_marginRight="10dp"
163
             android:layout_marginRight="10dp"
164
             android:layout_marginBottom="10dp"
164
             android:layout_marginBottom="10dp"
165
+            android:paddingLeft="10dp"
166
+            android:paddingTop="10dp"
165
             android:gravity="center"
167
             android:gravity="center"
166
             android:orientation="horizontal">
168
             android:orientation="horizontal">
167
 
169
 

+ 1
- 0
app/src/main/res/values/strings.xml 查看文件

47
     <string name="checkcode">密码校验</string>
47
     <string name="checkcode">密码校验</string>
48
     <string name="startapptips">应用正在安装,请稍后</string>
48
     <string name="startapptips">应用正在安装,请稍后</string>
49
     <string name="strategyupdatetips">请求过于频繁,请稍等</string>
49
     <string name="strategyupdatetips">请求过于频繁,请稍等</string>
50
+    <string name="checknettips">请检查网络连接是否正常</string>
50
 </resources>
51
 </resources>

正在加载...
取消
保存