chore：版本更新至 5.13.6

feat:【光环助手】存储权限授权弹窗埋点补充 https://jira.shanqu.cc/browse/GHZS-163

See merge request halo/android/assistant-android!426

dependencies.gradle

@@ -7,8 +7,8 @@ ext {
     targetSdkVersion = 28
 
     // application info (每个大版本之间的 versionCode 增加 20)
-    versionCode = 615
-    versionName = "5.13.5"
+    versionCode = 616
+    versionName = "5.13.6"
     applicationId = "com.gh.gamecenter"
 
     // AndroidX

module_common/src/main/java/com/gh/gamecenter/common/utils/NewFlagLogUtils.kt

@@ -0,0 +1,49 @@
+package com.gh.gamecenter.common.utils
+
+import com.gh.gamecenter.common.json.JsonObjectBuilder
+import com.gh.gamecenter.common.json.json
+import com.gh.gamecenter.common.loghub.LoghubUtils
+import com.lightgame.utils.Utils
+import org.json.JSONObject
+
+object NewFlagLogUtils {
+
+    private fun log(jsonObject: JSONObject, logStore: String, uploadImmediately: Boolean) {
+        Utils.log("NewFlatLogUtils", jsonObject.toString(4))
+        LoghubUtils.log(jsonObject, logStore, uploadImmediately, true)
+    }
+
+    private fun parseAndPutMeta(): JsonObjectBuilder.() -> Unit = {
+        val meta = LogUtils.getMetaObject()
+        val metaKeys = meta.keys()
+        while (metaKeys.hasNext()) {
+            val key: String = metaKeys.next().toString()
+            val value = meta.getString(key)
+            key to value
+        }
+    }
+
+    /**
+     * 记录外部存储权限提示弹窗出现
+     */
+    fun logExternalStoragePermissionDialogAppearance() {
+        val json = json {
+            "event" to "storage_permission_pop_show"
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    /**
+     * 记录外部存储权限弹窗行为
+     */
+    fun logExternalStoragePermissionDialogAction(action: String) {
+        val json = json {
+            "event" to "storage_permission_pop_click"
+            "button" to action
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+}

module_common/src/main/java/com/gh/gamecenter/common/utils/PermissionHelper.kt

@@ -244,24 +244,41 @@ object PermissionHelper {
     }
 
     private fun showDialogBeforeRequestingStorageDialog(context: FragmentActivity, emptyCallback: EmptyCallback) {
+        // 是否点击外部区域触发弹窗消失
+        var isCanceledByClickingOutside = true
+
+        NewFlagLogUtils.logExternalStoragePermissionDialogAppearance()
         DialogHelper.showDialog(
             context,
             title = "权限申请",
             content = "光环助手将向您申请开启设备的存储权限，以保证能正常使用相关功能。拒绝授权将无法正常使用部分功能。",
             cancelText = "放弃",
             confirmText = "去授权",
-            cancelClickCallback = null,
-            confirmClickCallback = { checkStoragePermissionBeforeAction(context, emptyCallback) },
+            cancelClickCallback = {
+                isCanceledByClickingOutside = false
+                NewFlagLogUtils.logExternalStoragePermissionDialogAction("放弃")
+            },
+            confirmClickCallback = {
+                isCanceledByClickingOutside = false
+                checkStoragePermissionBeforeAction(context, emptyCallback)
+                NewFlagLogUtils.logExternalStoragePermissionDialogAction("去授权")
+            },
             extraConfig = DialogHelper.Config(hint = "查看权限应用场景"),
             uiModificationCallback = {
                 it.hintTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font))
                 it.hintTv.setOnClickListener {
-                    val provider = ARouter.getInstance().build(RouteConsts.provider.directUtils).navigation() as? IDirectProvider
+                    val provider =
+                        ARouter.getInstance().build(RouteConsts.provider.directUtils).navigation() as? IDirectProvider
                     provider?.directToWebView(context, Constants.PERMISSION_SCENARIO_ADDRESS, "(权限弹窗)")
+                    NewFlagLogUtils.logExternalStoragePermissionDialogAction("查看权限应用场景")
                 }
                 it.contentTv.setTextColor(ContextCompat.getColor(context, R.color.text_title))
             }
-        )
+        )?.setOnDismissListener {
+            if (isCanceledByClickingOutside) {
+                NewFlagLogUtils.logExternalStoragePermissionDialogAction("点击弹窗以外空白区域")
+            }
+        }
     }
 
     private fun showDialogBeforeRequestingGetInstalledListDialog(context: FragmentActivity, emptyCallback: EmptyCallback) {