简单的消息公告，增加应用更新异常跳转到反馈， 修复应用下载的bug

bihe0832 · bihe0832 · commit 7443fc33e15a · 2023-02-28T17:24:25.000+08:00
diff --git a/Application/src/main/java/com/bihe0832/android/app/AppFactoryInit.kt b/Application/src/main/java/com/bihe0832/android/app/AppFactoryInit.kt
@@ -5,6 +5,7 @@ import android.app.ActivityManager
 import android.content.Context
 import android.os.Bundle
 import com.bihe0832.android.app.leakcanary.LeakCanaryManager
+import com.bihe0832.android.app.message.AAFMessageManager
 import com.bihe0832.android.app.router.RouterHelper
 import com.bihe0832.android.common.network.NetworkChangeManager
 import com.bihe0832.android.framework.ZixieContext
@@ -46,25 +47,17 @@ object AppFactoryInit {
 
             RouterHelper.initRouter()
             initPermission()
+            AAFMessageManager.initModule(application)
             ThreadManager.getInstance().start {
                 DownloadUtils.init(ctx, 10, ZixieContext.isDebug())
             }
 
             ThreadManager.getInstance().start({
                 ZLog.e("Application process initCore web start")
                 WebViewHelper.init(ctx, null, Bundle().apply {
-                    putString(
-                            TbsPrivacyAccess.ConfigurablePrivacy.MODEL.name,
-                            ManufacturerUtil.MODEL
-                    )
-                    putString(
-                            TbsPrivacyAccess.ConfigurablePrivacy.ANDROID_ID.name,
-                            ZixieContext.deviceId
-                    )
-                    putString(
-                            TbsPrivacyAccess.ConfigurablePrivacy.SERIAL.name,
-                            ZixieContext.deviceId
-                    )
+                    putString(TbsPrivacyAccess.ConfigurablePrivacy.MODEL.name, ManufacturerUtil.MODEL)
+                    putString(TbsPrivacyAccess.ConfigurablePrivacy.ANDROID_ID.name, ZixieContext.deviceId)
+                    putString(TbsPrivacyAccess.ConfigurablePrivacy.SERIAL.name, ZixieContext.deviceId)
                 }, true)
             }, 5)
             ZLog.d("Application process $processName initCore ManufacturerUtil:" + ManufacturerUtil.MODEL)
@@ -85,8 +78,7 @@ object AppFactoryInit {
             val am = application.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
             val runningApps = am.runningAppProcesses
             for (it in runningApps) {
-                if (it.pid == android.os.Process.myPid() && it.processName != null &&
-                        it.processName.contains(application.getPackageName())) {
+                if (it.pid == android.os.Process.myPid() && it.processName != null && it.processName.contains(application.getPackageName())) {
                     ZLog.e("Application initCore process: name:" + it.processName + " and id:" + it.pid)
                     val processName = it.processName
                     initCore(application, processName)
@@ -102,19 +94,15 @@ object AppFactoryInit {
     }
 
     private fun initPermission() {
-        PermissionManager.addPermissionGroupDesc(
-                HashMap<String, String>().apply {
-                    put(Manifest.permission.WRITE_EXTERNAL_STORAGE, "访问存储卡")
-                    put(Manifest.permission.READ_PHONE_STATE, "读取手机状态")
-                }
-        )
+        PermissionManager.addPermissionGroupDesc(HashMap<String, String>().apply {
+            put(Manifest.permission.WRITE_EXTERNAL_STORAGE, "访问存储卡")
+            put(Manifest.permission.READ_PHONE_STATE, "读取手机状态")
+        })
 
-        PermissionManager.addPermissionGroupScene(
-                HashMap<String, String>().apply {
-                    put(Manifest.permission.WRITE_EXTERNAL_STORAGE, "获取应用信息")
-                    put(Manifest.permission.READ_PHONE_STATE, "获取应用安装时间等")
-                }
-        )
+        PermissionManager.addPermissionGroupScene(HashMap<String, String>().apply {
+            put(Manifest.permission.WRITE_EXTERNAL_STORAGE, "获取应用信息")
+            put(Manifest.permission.READ_PHONE_STATE, "获取应用安装时间等")
+        })
     }
 
 }
diff --git a/Application/src/main/java/com/bihe0832/android/app/message/AAFMessageManager.kt b/Application/src/main/java/com/bihe0832/android/app/message/AAFMessageManager.kt
@@ -0,0 +1,50 @@
+package com.bihe0832.android.app.message
+
+import android.app.Activity
+import com.bihe0832.android.app.R
+import com.bihe0832.android.app.api.AAFNetWorkApi
+import com.bihe0832.android.common.message.base.MessageManager
+import com.bihe0832.android.common.message.data.MessageInfoItem
+import com.bihe0832.android.framework.ZixieContext
+import com.bihe0832.android.lib.thread.ThreadManager
+import com.bihe0832.android.lib.ui.dialog.OnDialogListener
+import com.bihe0832.android.lib.ui.dialog.blockdialog.DependenceBlockDialogManager
+
+/**
+ *
+ * @author zixie code@bihe0832.com
+ * Created on 2019-10-21.
+ * Description: Description
+ *
+ */
+object AAFMessageManager : MessageManager() {
+
+    private val mDependenceBlockDialogManager by lazy {
+        DependenceBlockDialogManager(true)
+    }
+
+    override fun fetchNewMsg() {
+        fetchMessageByFile(AAFNetWorkApi.getCommonURL(ZixieContext.applicationContext?.getString(R.string.message_url)
+                ?: "", ""))
+    }
+
+    fun showNotice(activity: Activity, messageInfoItem: MessageInfoItem, showFace: Boolean) {
+        mDependenceBlockDialogManager.getDependentTaskManager().addTask(messageInfoItem.messageID, {
+            ThreadManager.getInstance().runOnUIThread {
+                showNotice(activity, messageInfoItem, showFace, object : OnDialogListener {
+                    override fun onPositiveClick() {
+                        mDependenceBlockDialogManager.getDependentTaskManager().finishTask(messageInfoItem.messageID)
+                    }
+
+                    override fun onNegativeClick() {
+                        onPositiveClick()
+                    }
+
+                    override fun onCancel() {
+                        onPositiveClick()
+                    }
+                })
+            }
+        }, mutableListOf())
+    }
+}
diff --git a/BaseAdbInput/src/main/java/com/bihe0832/android/base/adb/input/settings/InputSettingsActivity.kt b/BaseAdbInput/src/main/java/com/bihe0832/android/base/adb/input/settings/InputSettingsActivity.kt
@@ -3,15 +3,16 @@ package com.bihe0832.android.base.adb.input.settings
 import android.content.Intent
 import android.os.Bundle
 import android.view.inputmethod.InputMethodManager
+import com.bihe0832.android.app.message.AAFMessageManager
 import com.bihe0832.android.app.router.RouterConstants
 import com.bihe0832.android.app.router.RouterHelper
 import com.bihe0832.android.app.update.UpdateManager
 import com.bihe0832.android.base.adb.input.R
+import com.bihe0832.android.base.adb.input.ZixieIME
+import com.bihe0832.android.base.adb.input.switcher.InputSwitchTools
 import com.bihe0832.android.framework.ui.BaseActivity
 import com.bihe0832.android.lib.log.ZLog
 import com.bihe0832.android.lib.router.annotation.Module
-import com.bihe0832.android.base.adb.input.ZixieIME
-import com.bihe0832.android.base.adb.input.switcher.InputSwitchTools
 import kotlinx.android.synthetic.main.activity_input_settings.*
 
 
@@ -30,6 +31,11 @@ class InputSettingsActivity : BaseActivity() {
             RouterHelper.openPageByRouter(RouterConstants.MODULE_NAME_BASE_ABOUT)
         }
         UpdateManager.checkUpdateAndShowDialog(this, false)
+        AAFMessageManager.getMessageLiveData().observe(this) { t ->
+            t?.filter { it.canShow(true) }?.forEach {
+                AAFMessageManager.showNotice(this@InputSettingsActivity, it, true)
+            }
+        }
     }
 
     override fun onNewIntent(intent: Intent?) {
diff --git a/PubGetAPKInfo/src/main/java/com/bihe0832/android/app/apk/MainActivity.kt b/PubGetAPKInfo/src/main/java/com/bihe0832/android/app/apk/MainActivity.kt
@@ -5,8 +5,10 @@ import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.os.Bundle
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.RecyclerView
 import com.bihe0832.android.app.getapk.R
+import com.bihe0832.android.app.message.AAFMessageManager
 import com.bihe0832.android.app.router.RouterConstants
 import com.bihe0832.android.app.router.RouterHelper
 import com.bihe0832.android.app.update.UpdateManager
@@ -15,6 +17,7 @@ import com.bihe0832.android.base.card.tips.TipsData
 import com.bihe0832.android.common.list.CardItemForCommonList
 import com.bihe0832.android.common.list.CommonListLiveData
 import com.bihe0832.android.common.list.swiperefresh.CommonListActivity
+import com.bihe0832.android.common.message.data.MessageInfoItem
 import com.bihe0832.android.framework.ZixieContext
 import com.bihe0832.android.lib.adapter.CardBaseModule
 import com.bihe0832.android.lib.debug.DebugTools
@@ -72,6 +75,11 @@ class MainActivity : CommonListActivity() {
         initAdapter()
         showTips()
         UpdateManager.checkUpdateAndShowDialog(this, false)
+        AAFMessageManager.getMessageLiveData().observe(this) { t ->
+            t?.filter { it.canShow(true) }?.forEach {
+                AAFMessageManager.showNotice(this@MainActivity, it, true)
+            }
+        }
     }
 
     override fun getStatusBarColor(): Int {
diff --git a/PubM3U8/src/main/java/com/bihe0832/android/app/m3u8/MainActivity.kt b/PubM3U8/src/main/java/com/bihe0832/android/app/m3u8/MainActivity.kt
@@ -1,7 +1,7 @@
 package com.bihe0832.android.app.m3u8
 
 import android.os.Bundle
-import com.bihe0832.android.app.getapk.R
+import com.bihe0832.android.app.message.AAFMessageManager
 import com.bihe0832.android.app.router.RouterConstants
 import com.bihe0832.android.app.router.RouterHelper
 import com.bihe0832.android.app.update.UpdateManager
@@ -26,7 +26,11 @@ class MainActivity : M3U8ListActivity() {
         }
         M3U8DBManager.init(this)
 
-
+        AAFMessageManager.getMessageLiveData().observe(this) { t ->
+            t?.filter { it.canShow(true) }?.forEach {
+                AAFMessageManager.showNotice(this@MainActivity, it, true)
+            }
+        }
     }
 
 }
diff --git a/PubPuzzleGame/src/main/java/com/bihe0832/android/app/puzzle/MainActivity.kt b/PubPuzzleGame/src/main/java/com/bihe0832/android/app/puzzle/MainActivity.kt
@@ -3,6 +3,7 @@ package com.bihe0832.android.app.puzzle
 import android.os.Bundle
 import android.text.Html
 import androidx.core.content.ContextCompat
+import com.bihe0832.android.app.message.AAFMessageManager
 import com.bihe0832.android.app.router.RouterConstants
 import com.bihe0832.android.app.router.RouterHelper
 import com.bihe0832.android.app.update.UpdateManager
@@ -31,6 +32,11 @@ class MainActivity : BaseActivity() {
                         " 1. <b><font color='#38ADFF'>点击</font>下方图标</b>，选择拼图的素材<BR>" +
                         " 2. 选择图片后，进入<b><font color='#38ADFF'>拼图游戏</font>页面，可自由切换模式和难度</b>"
         )
+        AAFMessageManager.getMessageLiveData().observe(this) { t ->
+            t?.filter { it.canShow(true) }?.forEach {
+                AAFMessageManager.showNotice(this@MainActivity, it, true)
+            }
+        }
     }
 
     override fun getStatusBarColor(): Int {
diff --git a/config.gradle b/config.gradle
@@ -12,7 +12,7 @@ ext {
     //版本号，正式版本会由自动构建替换
     versionCode = 1
     //版本名，正式版本会由自动构建替换
-    versionName = "1.2.0"
+    versionName = "1.0.0"
     //Android 构建包时是否混淆代码
     minifyEnabled = true
 
@@ -42,6 +42,6 @@ ext {
     //使用kotlin版本
     kotlin_version = '1.7.10'
 
-    aaf_test_version = '5.10.54'
-    aaf_version = '5.10.54'
+    aaf_test_version = '5.10.55'
+    aaf_version = '5.10.55'
 }
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -34,7 +34,7 @@ ext.moduleVersionName = "3.6.5"
 ext.moduleInfo = [
 
     "APPTest"         : [
-        "apidependenciesList": ["",
+        "apidependenciesList" : [ "",
                                 "Application", "BaseDebug"
         ]
     ],

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package com.bihe0832.android.app.m3u8`
`2`	`2`
`3`	`3`	`import android.os.Bundle`
`4`		`-import com.bihe0832.android.app.getapk.R`
	`4`	`+import com.bihe0832.android.app.message.AAFMessageManager`
`5`	`5`	`import com.bihe0832.android.app.router.RouterConstants`
`6`	`6`	`import com.bihe0832.android.app.router.RouterHelper`
`7`	`7`	`import com.bihe0832.android.app.update.UpdateManager`
`@@ -26,7 +26,11 @@ class MainActivity : M3U8ListActivity() {`
`26`	`26`	`}`
`27`	`27`	`M3U8DBManager.init(this)`
`28`	`28`
`29`		`-`
	`29`	`+ AAFMessageManager.getMessageLiveData().observe(this) { t ->`
	`30`	`+ t?.filter { it.canShow(true) }?.forEach {`
	`31`	`+ AAFMessageManager.showNotice(this@MainActivity, it, true)`
	`32`	`+ }`
	`33`	`+ }`
`30`	`34`	`}`
`31`	`35`
`32`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ ext.moduleVersionName = "3.6.5"`
`34`	`34`	`ext.moduleInfo = [`
`35`	`35`
`36`	`36`	`"APPTest" : [`
`37`		`- "apidependenciesList": ["",`
	`37`	`+ "apidependenciesList" : [ "",`
`38`	`38`	`"Application", "BaseDebug"`
`39`	`39`	`]`
`40`	`40`	`],`