权限申请时机优化

CommonLib/Common/src/main/AndroidManifest.xml

@@ -3,18 +3,16 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.yidian.common">
 
-    <!--允许程序打开网络套接字-->
     <uses-permission android:name="android.permission.INTERNET" />
-    <!--允许程序设置内置sd卡的写权限-->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <!--允许程序获取网络状态-->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <!--允许程序访问WiFi网络信息-->
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <!--允许程序读写手机状态和身份-->
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <!--允许程序访问CellID或WiFi热点来获取粗略的位置-->
+
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <!--高德地图 允许程序访问CellID或WiFi热点来获取的位置-->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
 
     <application>
 

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/FlashActivity.kt

 package com.yidian.shenghuoquan.newscontent.ui
 
-import android.Manifest
 import android.content.Intent
 import android.os.Bundle
 import com.orhanobut.hawk.Hawk
-import com.tbruyelle.rxpermissions3.RxPermissions
 import com.yidian.common.HawkConfig
 import com.yidian.common.XRouterPathConstants
 import com.yidian.common.XRouterPathConstants.Companion.FLASH
 import com.yidian.common.base.BaseActivity
-import com.yidian.common.utils.SystemSettingUtils
-import com.yidian.common.widget.DialogBuilder
 import com.yidian.common.services.AppUpgradeService
-import com.yidian.common.utils.DialogUtils
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityFlashBinding
 import com.yidian.shenghuoquan.newscontent.http.ApiService
 import com.yidian.shenghuoquan.newscontent.http.callback.IGetLifeAccountListCallback
@@ -35,7 +30,8 @@ class FlashActivity : BaseActivity<ActivityFlashBinding>(), IGetLifeAccountListC
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-    getPermissions()
+    launcher()
+//    getPermissions()
   }
 
   private fun launcher() {
@@ -105,21 +101,22 @@ class FlashActivity : BaseActivity<ActivityFlashBinding>(), IGetLifeAccountListC
 
   }
 
-  private fun getPermissions() {
-    val rxPermissions = RxPermissions(this)
-    rxPermissions.request(
-      Manifest.permission.ACCESS_COARSE_LOCATION,
-      Manifest.permission.ACCESS_FINE_LOCATION,
-      Manifest.permission.READ_EXTERNAL_STORAGE,
-      Manifest.permission.READ_PHONE_STATE,
-    )
-      .subscribe {
-        if (it) {
-          launcher()
-        } else {
-          DialogUtils.showPermissionDialog(this, "需要电话、存储、位置")
-        }
-      }
-  }
+  // 因为市场审核，不能在用户未同意用户协议之前申请权限
+//  private fun getPermissions() {
+//    val rxPermissions = RxPermissions(this)
+//    rxPermissions.request(
+//      Manifest.permission.ACCESS_COARSE_LOCATION,
+//      Manifest.permission.ACCESS_FINE_LOCATION,
+//      Manifest.permission.READ_EXTERNAL_STORAGE,
+//      Manifest.permission.READ_PHONE_STATE,
+//    )
+//      .subscribe {
+//        if (it) {
+//          launcher()
+//        } else {
+//          DialogUtils.showPermissionDialog(this, "需要电话、存储、位置")
+//        }
+//      }
+//  }
 
 }

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/store/EditStoreActivity.kt

@@ -3,22 +3,17 @@ package com.yidian.shenghuoquan.newscontent.ui.store
 import android.Manifest
 import android.content.Intent
 import android.os.Bundle
-import android.text.Editable
-import android.widget.EditText
-import android.widget.ImageView
 import android.widget.Toast
+import com.tbruyelle.rxpermissions3.Permission
 import com.tbruyelle.rxpermissions3.RxPermissions
 import com.yidian.common.base.BaseActivity
-import com.yidian.common.extensions.hide
-import com.yidian.common.extensions.show
 import com.yidian.common.utils.EditTextUtils
 import com.yidian.common.utils.ToastUtils
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityStoreEditBinding
 import com.yidian.shenghuoquan.newscontent.http.ApiService
 import com.yidian.shenghuoquan.newscontent.utils.StorageUtil
-import com.yidian.shenghuoquan.newscontent.utils.TextWatcherAdapter
 import com.yidian.shenghuoquan.newscontent.widget.CommonTopBarView
-import timber.log.Timber
+import io.reactivex.rxjava3.functions.Consumer
 
 /**
  * 新增/编辑门店

app/src/main/AndroidManifest.xml

@@ -3,27 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.shenghuoquan.business">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_ADDED" />
-    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_CHANGED" />
-    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_INSTALL" />
-    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_REPLACED" />
-    <uses-permission android:name="android.permission.GET_TASKS" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
-    <!--用于访问网络，网络定位需要上网-->
-
     <meta-data
         android:name="design_width_in_dp"
         android:value="375" />

idcard_quality/src/main/AndroidManifest.xml

@@ -2,12 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.megvii.idcard.quality">
 
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"