Ver código fonte

1.修改增加应用安装白名单的调用方法,先移除再添加。

20241218TB223FC(测试jar包)
wangwanlei 10 meses atrás
pai
commit
76ac5e722d

+ 5
- 9
app/src/main/java/com/xhly/manageapp/ManageApplication.kt Ver arquivo

@@ -35,6 +35,8 @@ class ManageApplication : MultiDexApplication() {
35 35
          */
36 36
         fun addInstallPackageWhiteList(pkgList: ArrayList<String>) {
37 37
             if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()) {
38
+                //先移除,再添加。
39
+                removeInstallPackageWhiteList(getInstallPackageWhiteList())
38 40
                 pkgList.add(Const.CURRENTAPPPKG)
39 41
                 csdkManager?.addInstallPackageWhiteList(pkgList)
40 42
             }
@@ -62,10 +64,7 @@ class ManageApplication : MultiDexApplication() {
62 64
             } catch (e: Exception) {
63 65
 
64 66
             }
65
-            return arrayListOf(
66
-                Const.CURRENTAPPPKG,
67
-                "com.xhkjedu.xh_control_appstore"
68
-            )
67
+            return arrayListOf()
69 68
         }
70 69
 
71 70
         /**
@@ -74,9 +73,6 @@ class ManageApplication : MultiDexApplication() {
74 73
 
75 74
         fun installPackage(string: String) {
76 75
             enableAllUnkownsourcesV3(true)
77
-            val installPackageWhiteList = getInstallPackageWhiteList()
78
-            installPackageWhiteList.add(string)
79
-            addInstallPackageWhiteList(installPackageWhiteList)
80 76
             if (ModelNameUtils.IS_LianxX505f() || ModelNameUtils.IS_LianxX6e6f()) {
81 77
                 LogShow("开始安装$string" + File(string).exists())
82 78
                 csdkManager?.installPackage(string)
@@ -188,9 +184,9 @@ class ManageApplication : MultiDexApplication() {
188 184
          */
189 185
         fun enableWifi(enableFlag: Boolean) {
190 186
             if (ModelNameUtils.IS_LianxX505f()) {
191
-                //csdkManager?.enableWifi_v3(enableFlag)
187
+               csdkManager?.enableWifi_v3(enableFlag)
192 188
             } else if (ModelNameUtils.IS_LianxX6e6f()) {
193
-                //csdkManager?.enableWifiV3(enableFlag)
189
+               csdkManager?.enableWifiV3(enableFlag)
194 190
             }
195 191
         }
196 192
 

+ 3
- 0
app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt Ver arquivo

@@ -249,7 +249,10 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
249 249
                             whiteList.add(it.appPackage)
250 250
                         }
251 251
                     }
252
+                    //添加到应用网络白名单
252 253
                     ManageApplication.addAppWhiteRule(whiteList)
254
+                    //添加到安装应用白名单
255
+                    ManageApplication.addInstallPackageWhiteList(appNameList)
253 256
                     spUtils.saveJson(Const.APPSTOREDATAKEY,modelList)
254 257
                     //获得应用集合,必装应用和推荐应用,再加上预装应用(预装应用直接隐藏),其余应用需要静默卸载,必装应用需要进行静默下载和安装。安装应用从forceapp接口获取
255 258
                     val appList = AppUtils.GetAppList(this@MainActivity)

+ 2
- 1
app/src/main/java/com/xhly/manageapp/utils/StrategyUtils.kt Ver arquivo

@@ -101,7 +101,8 @@ object StrategyUtils {
101 101
                 }
102 102
 
103 103
                 Const.DEVICETYPE4 -> {
104
-                    ManageApplication.enableWifi(it.enabled == 1)
104
+                    //TODO 屏蔽对wifi的控制
105
+                    //ManageApplication.enableWifi(it.enabled == 1)
105 106
                 }
106 107
 
107 108
                 Const.DEVICETYPE5 -> {

Carregando…
Cancelar
Salvar