Browse Source

处理安卓13屏蔽局部依赖

zhangshenjie 2 months ago
parent
commit
db680d5582

+ 1 - 1
BusinessMain/src/main/res/layout/food_grid_view.xml

@@ -5,7 +5,7 @@
     android:scrollbars="vertical"
     android:background="@color/bg_color"
     android:paddingStart="@dimen/convert_14px"
-    android:paddingEnd="@dimen/permission_sp_14"
+    android:paddingEnd="@dimen/convert_14px"
     android:layout_width="match_parent"
     android:nestedScrollingEnabled="true"
     android:layout_height="wrap_content">

+ 11 - 9
BusinessSetting/src/main/java/com/develop/setting/ui/WifiListActivity.kt

@@ -39,8 +39,8 @@ import com.develop.setting.databinding.ActivityWifiListBinding
 import com.drake.brv.utils.bindingAdapter
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
-import com.yanzhenjie.permission.AndPermission
-import com.yanzhenjie.permission.runtime.Permission
+//import com.yanzhenjie.permission.AndPermission
+//import com.yanzhenjie.permission.runtime.Permission
 import org.greenrobot.eventbus.EventBus
 
 
@@ -105,13 +105,13 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
     private fun initView() {
         isFromMainSetting = intent.extras?.getBoolean(WIFI_FROM_MAIN_SETTING) ?: false
         //
-        AndPermission.with(this).runtime().permission(
-            Permission.ACCESS_FINE_LOCATION,
-            Permission.ACCESS_BACKGROUND_LOCATION,
-            Permission.ACCESS_COARSE_LOCATION
-        ).onGranted {
-            wifiHelp.scan()
-        }.start()
+//        AndPermission.with(this).runtime().permission(
+//            Permission.ACCESS_FINE_LOCATION,
+//            Permission.ACCESS_BACKGROUND_LOCATION,
+//            Permission.ACCESS_COARSE_LOCATION
+//        ).onGranted {
+//
+//        }.start()
 
 
         if (isBrand036I()) {
@@ -372,6 +372,8 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
         }.build()
 
 
+        wifiHelp.scan()
+
     }
 
 

+ 1 - 1
app/build.gradle

@@ -20,7 +20,7 @@ ext {
     versionCode = Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
 //    brandCode="000B"
-    brandCode = "011A"
+    brandCode = "000A"
 //    model = "5037"
     model = "1039"
 

+ 1 - 1
libBase/src/main/java/com/develop/base/ext/GlobaExt.kt

@@ -291,7 +291,7 @@ fun getSN(): String {
 //        return  "077A10390020123010190023"
     } else {
 
-//        return  "000A10390020123021685555"
+        return  "000A10390020123021685555"
 
 
         //通过反射获取sn号

+ 1 - 1
libThirdPart/build.gradle

@@ -69,7 +69,7 @@ dependencies {
    // api "io.coil-kt:coil:2.2.1" //图片加载
     api "com.youth.banner:banner:2.1.0"
     api 'com.google.android.flexbox:flexbox:3.0.0'
-    api 'com.yanzhenjie:permission:2.0.3'
+//    api 'com.yanzhenjie:permission:2.0.3'
     api 'io.github.azhon:appupdate:4.2.9'
     api 'cn.aigestudio.wheelpicker:WheelPicker:1.1.3'