Merge branch 'master' into feature/压缩apk

baselibrary/src/main/java/com/yc/baselibrary/view/webview/WebViewActivity.kt

@@ -19,8 +19,10 @@ import androidx.core.content.FileProvider
 import androidx.lifecycle.Observer
 import com.tencent.smtt.sdk.ValueCallback
 import com.tencent.smtt.sdk.WebChromeClient
+import com.xueyu.kotlinextlibrary.string
 import com.yc.baselibrary.R
 import com.yc.baselibrary.event.LiveBusEvent
+import com.yc.baselibrary.ext.showTopPopup
 import com.yc.baselibrary.utils.ContentUtil
 import com.yc.baselibrary.utils.ImageUtil
 import com.yc.baselibrary.utils.PermissionUtil
@@ -229,6 +231,10 @@ class WebViewActivity : BaseActivity<WebViewVm>(), OpenFileChooserCallBack {
                             REQUEST_PERMISSIONS_ALBUM,
                             Manifest.permission.READ_EXTERNAL_STORAGE
                         )
+                        showTopPopup(
+                            string(R.string.camera_permission_usage_instructions_str),
+                            string(R.string.camera_permission_usage_instructions_des)
+                        )
                     }
                 } else {
                     try {
@@ -291,6 +297,10 @@ class WebViewActivity : BaseActivity<WebViewVm>(), OpenFileChooserCallBack {
                         Manifest.permission.WRITE_EXTERNAL_STORAGE,
                         Manifest.permission.CAMERA
                     )
+                    showTopPopup(
+                        string(R.string.camera_permission_usage_instructions_str),
+                        string(R.string.camera_permission_usage_instructions_des)
+                    )
                 }
             }
         }.show()
@@ -475,6 +485,10 @@ class WebViewActivity : BaseActivity<WebViewVm>(), OpenFileChooserCallBack {
                     REQUEST_PERMISSIONS_FILE,
                     Manifest.permission.READ_EXTERNAL_STORAGE
                 )
+                showTopPopup(
+                    string(R.string.camera_permission_usage_instructions_str),
+                    string(R.string.camera_permission_usage_instructions_des)
+                )
             }
         }
         return true

baselibrary/src/main/java/com/yc/baselibrary/view/webview/WebViewJsActivity.kt

@@ -21,10 +21,12 @@ import androidx.lifecycle.Observer
 import com.effective.android.webview.jsbridge.DefaultHandler
 import com.smallbuer.jsbridge.core.BridgeHandler
 import com.smallbuer.jsbridge.core.CallBackFunction
+import com.xueyu.kotlinextlibrary.string
 import com.yc.baselibrary.R
 import com.yc.baselibrary.event.GOTO_ROOM
 import com.yc.baselibrary.event.LiveBus
 import com.yc.baselibrary.event.LiveBusEvent
+import com.yc.baselibrary.ext.showTopPopup
 import com.yc.baselibrary.utils.ContentUtil
 import com.yc.baselibrary.utils.ImageUtil
 import com.yc.baselibrary.utils.PermissionUtil
@@ -255,6 +257,10 @@ class WebViewJsActivity : BaseActivity<WebViewVm>(), JsReWebChromeClient.OpenFil
                             REQUEST_PERMISSIONS_ALBUM,
                             Manifest.permission.READ_EXTERNAL_STORAGE
                         )
+                        showTopPopup(
+                            string(R.string.camera_permission_usage_instructions_str),
+                            string(R.string.camera_permission_usage_instructions_des)
+                        )
                     }
                 } else {
                     try {
@@ -317,6 +323,10 @@ class WebViewJsActivity : BaseActivity<WebViewVm>(), JsReWebChromeClient.OpenFil
                         Manifest.permission.WRITE_EXTERNAL_STORAGE,
                         Manifest.permission.CAMERA
                     )
+                    showTopPopup(
+                        string(R.string.camera_permission_usage_instructions_str),
+                        string(R.string.camera_permission_usage_instructions_des)
+                    )
                 }
             }
         }.show()
@@ -507,6 +517,10 @@ class WebViewJsActivity : BaseActivity<WebViewVm>(), JsReWebChromeClient.OpenFil
                     REQUEST_PERMISSIONS_FILE,
                     Manifest.permission.READ_EXTERNAL_STORAGE
                 )
+                showTopPopup(
+                    string(R.string.camera_permission_usage_instructions_str),
+                    string(R.string.camera_permission_usage_instructions_des)
+                )
             }
         }
         return true

baselibrary/src/main/res/values/strings.xml

@@ -6,4 +6,6 @@
 	<string name="appbar_fixed_behavior_base">com.yc.baselibrary.behavior.AppBarLayoutFixedBehavior</string>
 	<string name="appbar_scrolling_view_behavior_base" translatable="false">com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior</string>
 
+	<string name="camera_permission_usage_instructions_str">相机权限和内存写入权限使用说明</string>
+	<string name="camera_permission_usage_instructions_des">相机权限用户拍照，实名认证，视频直播等场景，存储权限用于保存照片，存储文件等场景</string>
 </resources>

module_home/src/main/java/com/mita/module_home/view/HomeFragment.kt

@@ -16,6 +16,7 @@ import com.mita.module_home.view.cell.HomeTopShowLiveListVH
 import com.mita.module_home.view.live.HomeLiveAnchorListFragment
 import com.mita.module_home.view.new.HomeNewAnchorListFragment
 import com.xueyu.kotlinextlibrary.color
+import com.xueyu.kotlinextlibrary.string
 import com.xueyu.kotlinextlibrary.toGone
 import com.xueyu.kotlinextlibrary.toVisible
 import com.yc.baselibrary.adapter.viewHolder.MutableAdapter
@@ -23,6 +24,7 @@ import com.yc.baselibrary.adapter.viewHolder.setFullSpan
 import com.yc.baselibrary.event.LiveBusEvent
 import com.yc.baselibrary.ext.bind
 import com.yc.baselibrary.ext.proxy
+import com.yc.baselibrary.ext.showTopPopup
 import com.yc.baselibrary.ext.toast
 import com.yc.baselibrary.view.base.BaseFragment
 import com.yc.module_base.arouter.HomeRouter
@@ -231,6 +233,10 @@ class HomeFragment : BaseFragment<HomeViewModel>() {
                 PERMISSIONS,
                 PERMISSION_REQ
             )
+            requireContext().showTopPopup(
+                string(R.string.camera_permission_usage_instructions_str),
+                string(R.string.camera_permission_usage_instructions_des)
+            )
         } else {
             gotoLive()
         }

module_live/src/main/java/com/yc/module_live/view/voice/VoiceFragment.kt

@@ -15,6 +15,7 @@ import com.xueyu.kotlinextlibrary.toGone
 import com.xueyu.kotlinextlibrary.toVisible
 import com.yc.baselibrary.event.LiveBusEvent
 import com.yc.baselibrary.ext.loadImage
+import com.yc.baselibrary.ext.showTopPopup
 import com.yc.baselibrary.ext.toast
 import com.yc.baselibrary.view.base.BaseFragment
 import com.yc.module_base.LiveSession
@@ -325,6 +326,10 @@ class VoiceFragment : BaseFragment<VoiceVm>() {
                 ActivityCompat.requestPermissions(
                     it, PERMISSIONS_CAMERA, PERMISSION_CAMERA_REQ
                 )
+                requireContext().showTopPopup(
+                    string(R.string.camera_permission_usage_instructions_str),
+                    string(R.string.camera_permission_usage_instructions_des)
+                )
             }
         } else {
             startPreview()
@@ -337,6 +342,10 @@ class VoiceFragment : BaseFragment<VoiceVm>() {
                 ActivityCompat.requestPermissions(
                     it, PERMISSIONS_AUDIO, PERMISSION_AUDIO_REQ
                 )
+                requireContext().showTopPopup(
+                    string(com.yc.baselibrary.R.string.camera_permission_usage_instructions_str),
+                    string(com.yc.baselibrary.R.string.camera_permission_usage_instructions_des)
+                )
             }
         } else {
             openAudio()

module_main/src/main/java/com/mita/module_main/view/main/MainActivity.kt

@@ -30,11 +30,13 @@ import com.umeng.umlink.MobclickLink
 import com.umeng.umlink.UMLinkListener
 import com.xueyu.kotlinextlibrary.launchActivity
 import com.xueyu.kotlinextlibrary.manifest
+import com.xueyu.kotlinextlibrary.string
 import com.yc.baselibrary.cache.Cache
 import com.yc.baselibrary.event.IS_OPEN_TEENAGERS
 import com.yc.baselibrary.event.LiveBus
 import com.yc.baselibrary.event.LiveBusEvent
 import com.yc.baselibrary.event.USER_LOGIN_STATE_CHANGED
+import com.yc.baselibrary.ext.showTopPopup
 import com.yc.baselibrary.ext.toast
 import com.yc.baselibrary.manager.ActivityManager
 import com.yc.baselibrary.utils.TimeUtils
@@ -350,6 +352,10 @@ class MainActivity : BaseActivity<MainViewModel>() {
                 PERMISSIONS,
                 PERMISSION_REQ
             )
+            showTopPopup(
+                string(R.string.camera_permission_usage_instructions_str),
+                string(R.string.camera_permission_usage_instructions_des)
+            )
         } else {
             gotoLive()
         }