1.添加6e6f的机型判断和相册包名

app/src/main/java/com/xhly/manageapp/utils/StrategyUtils.kt

@@ -238,7 +238,7 @@ object StrategyUtils {
     public fun setSchoolSetDevice(schoolDeviceSetBean: SchoolDeviceSetBean, appList: List<AppInfo>):ArrayList<AppInfo> {
         val dataList = arrayListOf<AppInfo>()
         appList.forEach { appinfo ->
-            if (ModelNameUtils.IS_LianxX505f()){
+            if (ModelNameUtils.IS_LianxX505f()||ModelNameUtils.IS_LianxX6e6f()){
                 //启用电话短信:1是0否
                 if (schoolDeviceSetBean.simcard == 0 && (appinfo.packageName.equals(Const.ANDROIDPHONE) || appinfo.packageName.equals(Const.ANDROIDMMS))) {
                     return@forEach
@@ -255,10 +255,14 @@ object StrategyUtils {
                 if (schoolDeviceSetBean.camera == 1 && appinfo.packageName.equals(Const.ANDROIDCAMERA)) {
                     return@forEach
                 }
-                //是否隐藏相册:1是0否
+                //是否隐藏相册:1是0否(505f)
                 if (schoolDeviceSetBean.gallery == 1 && appinfo.packageName.equals(Const.ANDROIDGALLERY)) {
                     return@forEach
                 }
+                //是否隐藏相册:1是0否(6e6f)
+                if (schoolDeviceSetBean.gallery == 1 && appinfo.packageName.equals(Const.ANDROIDGALLERY6)) {
+                    return@forEach
+                }
             }
             //是否隐藏一键加速:1是0否
             if (schoolDeviceSetBean.accelerate==1&&appinfo.packageName.equals(Const.CUSTOMSPEEDAPP)){

corelib/src/main/java/com/xhly/corelib/Const.kt

@@ -235,9 +235,13 @@ object Const {
     const val ANDROIDCAMERA = "org.codeaurora.snapcam"
 
     /**
-     * 联想相册
+     * 联想相册505f
      */
     const val ANDROIDGALLERY = "org.codeaurora.gallery"
+    /**
+     * 联想相册6e6f
+     */
+    const val ANDROIDGALLERY6 = "com.android.gallery3d"
 
     /**
      * 这几个应用由学校设置接口处理
@@ -248,7 +252,8 @@ object Const {
         ANDROIDCALENDAR,
         ANDROIDDESKCLOCK,
         ANDROIDCAMERA,
-        ANDROIDGALLERY
+        ANDROIDGALLERY,
+        ANDROIDGALLERY6
     )
 
     /**

corelib/src/main/java/com/xhly/corelib/utils/ModelNameUtils.kt

@@ -6,5 +6,10 @@ class ModelNameUtils {
             val systemModel: String = SystemUtil.getSystemModel()
             return "Lenovo TB-X505F" == systemModel
         }
+
+        fun IS_LianxX6e6f(): Boolean{
+            val systemModel: String = SystemUtil.getSystemModel()
+            return "Lenovo TB-X6E6F" == systemModel
+        }
     }
 }