diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b86273d..bcf4711 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 29f3a07..049b48b 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -13,6 +13,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index b2c751a..29a5cc0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,7 @@
+
-
+
diff --git a/app/src/main/java/com/img/rabbit/BaseApplication.kt b/app/src/main/java/com/img/rabbit/BaseApplication.kt
index a9e1dec..9d00b7e 100644
--- a/app/src/main/java/com/img/rabbit/BaseApplication.kt
+++ b/app/src/main/java/com/img/rabbit/BaseApplication.kt
@@ -27,6 +27,8 @@ import java.lang.Exception
class BaseApplication : Application() {
private val TAG = "BaseApplication"
+ private var uniAppInitialized = false
+ private var uniAppOaid: String? = null
override fun onCreate() {
super.onCreate()
@@ -114,7 +116,11 @@ class BaseApplication : Application() {
//初始化uni-app SDK
private fun initUniAPPSdk() {
- if (isMainProcess(this)) {
+ if (PreferenceUtil.getAgreement() && isMainProcess(this)) {
+ val oaid = PreferenceUtil.getOAID()
+ if (uniAppInitialized && uniAppOaid == oaid) return
+ uniAppInitialized = true
+ uniAppOaid = oaid
val item = MenuActionSheetItem("关于", "gy")
val item1 = MenuActionSheetItem("获取当前页面url", "hqdqym")
val item2 = MenuActionSheetItem("跳转到宿主原生测试页面", "gotoTestPage")
@@ -123,15 +129,19 @@ class BaseApplication : Application() {
sheetItems.add(item1)
sheetItems.add(item2)
val config: DCSDKInitConfig? = DCSDKInitConfig.Builder()
- .setCapsule(true)
+ .setCapsule(false)
.setMenuDefFontSize("16px")
.setMenuDefFontColor("#ff00ff")
.setMenuDefFontWeight("normal")
.setMenuActionSheetItems(sheetItems)
.setCustomOAID(PreferenceUtil.getOAID())
.setEnableBackground(false)
+ .setUniMPFromRecents(true)
.build()
- DCUniMPSDK.getInstance().initialize(this, config)
+ DCUniMPSDK.getInstance().initialize(this, config) { success ->
+ uniAppInitialized = success
+ Log.d("UniMP", "onInitFinished: $success")
+ }
}
}
@@ -151,4 +161,4 @@ class BaseApplication : Application() {
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/img/rabbit/MainActivity.kt b/app/src/main/java/com/img/rabbit/MainActivity.kt
index a93260f..813f7aa 100644
--- a/app/src/main/java/com/img/rabbit/MainActivity.kt
+++ b/app/src/main/java/com/img/rabbit/MainActivity.kt
@@ -1,7 +1,6 @@
package com.img.rabbit
import android.annotation.SuppressLint
-import android.app.Activity
import android.os.Bundle
import android.util.Log
import androidx.activity.ComponentActivity
@@ -63,7 +62,6 @@ import com.img.rabbit.config.Constants.agreementUrl
import com.img.rabbit.config.Constants.privacyUrl
import com.img.rabbit.pages.LoadingCallback
import com.img.rabbit.pages.LoginScreen
-import com.img.rabbit.pages.LoginScreenType
import com.img.rabbit.pages.MainScreen
import com.img.rabbit.pages.dialog.TipsDialog
import com.img.rabbit.pages.dialog.TipsUniMpDialog
@@ -125,9 +123,11 @@ class MainActivity : ComponentActivity(), LoadingCallback {
// 下载小程序资源(在跳转指定页面时,未下载资源需要提示)
var showUniDownloadDialog by remember { mutableStateOf(false) }
var downloadUniEntity by remember { mutableStateOf(null) }
+ var downloadUniPagePath by remember { mutableStateOf(null) }
// 小程序资源更新提示
var showUniUpdateDialog by remember { mutableStateOf(false) }
var updateUniEntity by remember { mutableStateOf(null) }
+ var updateUniPagePath by remember { mutableStateOf(null) }
//以下为流事件收集订阅
LaunchedEffect(Unit) {
GlobalEventBus.events.collect { event ->
@@ -142,11 +142,13 @@ class MainActivity : ComponentActivity(), LoadingCallback {
// 小程序资源下载提示
is GlobalEvent.ShowUniDownloadNotify -> {
downloadUniEntity = event.entity
+ downloadUniPagePath = event.pagePath
showUniDownloadDialog = true
}
// 小程序资源更新提示
is GlobalEvent.ShowUniUpdateNotify -> {
updateUniEntity = event.entity
+ updateUniPagePath = event.pagePath
showUniUpdateDialog = true
}
// 登录提示
@@ -210,6 +212,8 @@ class MainActivity : ComponentActivity(), LoadingCallback {
LaunchedEffect(showUniDownloadDialog) {
if(showUniDownloadDialog) {
downloadUniEntity?.let{
+ val downloadVersion = it
+ val downloadPagePath = downloadUniPagePath
UniAppUtils.downloadReleaseWgt(
coroutineScope,
it,
@@ -251,16 +255,7 @@ class MainActivity : ComponentActivity(), LoadingCallback {
onRelease = { isSuccess->
if(isSuccess){
//资源下载完成后,启动小程序到指定位置
- val uniMpEntity = downloadUniEntity
- if (uniMpEntity != null && UniAppUtils.isRelease(uniMpEntity.unimp_id)) {
- UniAppUtils.startUniMpPage(
- context = context,
- uniMpId = uniMpEntity.unimp_id,
- uniMpType = uniMpEntity.unimp_type,
- pagePath = UniAppUtils.currentUniMpJumpPatch ?: "",
- reportViewModel = reportViewModel
- )
- }
+ UniAppUtils.distributeUniMp(context, downloadVersion, reportViewModel, downloadPagePath) {}
}
},
reportViewModel = reportViewModel
@@ -300,16 +295,6 @@ class MainActivity : ComponentActivity(), LoadingCallback {
// 未登录,显示登录页
//if (token.isNullOrEmpty() && loginViewModel.userConfigResult.value == null) {
if(isLogout){// 退出登录后,显示登录页
- // 同意隐私协议政策,检验是否有一键登录权限
- loginViewModel.oneKeyLoginForGeTuiSdk(context as Activity) { isAllowShowOneKeyScreen ->
- if (isAllowShowOneKeyScreen) {
- loginViewModel.loginScreenType.value = LoginScreenType.LOGIN_ONE_KEY
- } else {
- // 检验是否有一键登录权限失败,显示验证码登录
- loginViewModel.loginScreenType.value = LoginScreenType.LOGIN_CAPTCHA
- }
- }
-
// 显示登录页
LoginScreen(generalViewModel = generalViewModel, loginViewModel = loginViewModel, isVisibilityBreak = false)
} else {
@@ -352,8 +337,8 @@ class MainActivity : ComponentActivity(), LoadingCallback {
}
//UniApp更新提示
- val isDownloadingWGT = mutableStateOf(false)
- val progressWGTState = mutableFloatStateOf(0f)
+ val isDownloadingWGT = remember(showUniUpdateDialog) { mutableStateOf(false) }
+ val progressWGTState = remember(showUniUpdateDialog) { mutableFloatStateOf(0f) }
if(showUniUpdateDialog){
updateUniEntity?.let {
TipsUniMpDialog(
@@ -366,11 +351,17 @@ class MainActivity : ComponentActivity(), LoadingCallback {
data = it,
isStartDown = isDownloadingWGT,
downProgress = progressWGTState,
+ reportViewModel = reportViewModel,
+ pagePath = updateUniPagePath,
onStatusChange = { isUpdateFinish, isCancel, data ->
if(!isUpdateFinish && !isCancel && data != null){
isDownloadingWGT.value = true
}else{
showUniUpdateDialog = false
+ if (isCancel) {
+ UniAppUtils.reportUpdateChoice(it, false, reportViewModel)
+ UniAppUtils.distributeUniMp(context, it, reportViewModel, updateUniPagePath) {}
+ }
}
}
)
@@ -739,4 +730,4 @@ fun MainScreenPreview() {
AppTheme {
MainScreen(generalViewModel = viewModel(), loginViewModel = viewModel())
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/img/rabbit/bean/request/ReportRequest.kt b/app/src/main/java/com/img/rabbit/bean/request/ReportRequest.kt
index 6102bfb..298f939 100644
--- a/app/src/main/java/com/img/rabbit/bean/request/ReportRequest.kt
+++ b/app/src/main/java/com/img/rabbit/bean/request/ReportRequest.kt
@@ -1,14 +1,17 @@
package com.img.rabbit.bean.request
+import kotlinx.serialization.EncodeDefault
+import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.Serializable
@Serializable
+@OptIn(ExperimentalSerializationApi::class)
data class ReportRequest(
- private val source: String = "android",
private val type: String,//事件类型:click error
private val key: String,
private val value: String,
- private val extra: String? = null
+ private val extra: String? = null,
+ @EncodeDefault private val source: String = "android"
)
@@ -18,6 +21,13 @@ object ReportType {
}
object ReportKey {
+ const val EVENT_CLIENT_OPEN_WX_UNIMP = "event_client_open_wx_unimp"
+ const val EVENT_CLIENT_OPEN_ALIPAY_UNIMP = "event_client_open_alipay_unimp"
+ const val EVENT_CLIENT_UNI_FAIL = "client.uni.fail"
+ const val EVENT_CLIENT_DOWNLOAD_UNIMP_ERROR = "client.download.unimp.error"
+ const val EVENT_CLIENT_DOWNLOAD_UNIMP_SUCCESS = "client.download.unimp.success"
+ const val EVENT_CLIENT_CANCEL_DOWNLOAD_UNIMP = "client.cancel.download.unimp"
+ const val EVENT_CLIENT_CONFIRM_DOWNLOAD_UNIMP = "client.confirm.download.unimp"
const val EVENT_CLIENT_UNI_RELEASE_WGT: String = "client.uni.release.wgt" //释放资源
const val EVENT_CLIENT_UNI_SPEC_PAGE_LOAD: String = "client.uni.page.load" //页面加载
}
diff --git a/app/src/main/java/com/img/rabbit/bean/response/ConfigEntity.kt b/app/src/main/java/com/img/rabbit/bean/response/ConfigEntity.kt
index d9aa760..d109e4e 100644
--- a/app/src/main/java/com/img/rabbit/bean/response/ConfigEntity.kt
+++ b/app/src/main/java/com/img/rabbit/bean/response/ConfigEntity.kt
@@ -13,6 +13,8 @@ class ConfigEntity {
var homeIconEntity: List? = emptyList()
@SerializedName("client.wgt.password") //WGT解压密码
var wgtPassword: String? = null
+ @SerializedName("client.uni.pwd") //与 WGT 密码后缀拼接的小程序密码
+ var uniPassword: String? = null
@SerializedName("client.uni.open") //是否开启小程序模拟器
var isUniMpOpen: Boolean? = null
@@ -40,4 +42,4 @@ class ConfigEntity {
@SerializedName("client.login.type") //登录方式
var loginType: List? = emptyList()
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/img/rabbit/bean/response/UniVersionEntity.kt b/app/src/main/java/com/img/rabbit/bean/response/UniVersionEntity.kt
index 691a970..922f2f8 100644
--- a/app/src/main/java/com/img/rabbit/bean/response/UniVersionEntity.kt
+++ b/app/src/main/java/com/img/rabbit/bean/response/UniVersionEntity.kt
@@ -14,4 +14,5 @@ class UniVersionEntity(
var unimp_id: String = "",
var unimp_type: String = "",
var icon: String = "",
-)
\ No newline at end of file
+ var urls: List? = emptyList(),
+)
diff --git a/app/src/main/java/com/img/rabbit/pages/LoginPage.kt b/app/src/main/java/com/img/rabbit/pages/LoginPage.kt
index 326945a..bd03f4f 100644
--- a/app/src/main/java/com/img/rabbit/pages/LoginPage.kt
+++ b/app/src/main/java/com/img/rabbit/pages/LoginPage.kt
@@ -32,6 +32,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.BasicTextField
import androidx.compose.foundation.text.ClickableText
import androidx.compose.material3.Checkbox
+import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@@ -92,6 +93,19 @@ import org.json.JSONObject
fun LoginScreen(navController: NavHostController? = null, generalViewModel: GeneralViewModel, loginViewModel: LoginViewModel, isVisibilityBreak: Boolean) {
val TAG = "Rabbit_LoginScreen"
val context = LocalContext.current
+ var isPreparingOneKeyLogin by remember(loginViewModel) { mutableStateOf(true) }
+
+ LaunchedEffect(loginViewModel) {
+ loginViewModel.setIsPolicyAgreement(false)
+ val activity = context as? Activity
+ val available = activity != null && loginViewModel.prepareOneKeyLogin(activity)
+ loginViewModel.loginScreenType.value = if (available) {
+ LoginScreenType.LOGIN_ONE_KEY
+ } else {
+ LoginScreenType.LOGIN_CAPTCHA
+ }
+ isPreparingOneKeyLogin = false
+ }
//关于登录的事件监听
LaunchedEffect(Unit) {
@@ -150,39 +164,48 @@ fun LoginScreen(navController: NavHostController? = null, generalViewModel: Gene
.fillMaxSize()
) {
Box(modifier = Modifier.fillMaxSize()){
- loginViewModel.setIsPolicyAgreement(false)
- when(loginViewModel.loginScreenType.value){
- LoginScreenType.LOGIN_ONE_KEY -> {
- //一键登录
- OneKeyLoginScreen(context, loginViewModel)
+ if (isPreparingOneKeyLogin) {
+ Column(
+ modifier = Modifier.align(Alignment.Center),
+ horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ CircularProgressIndicator()
+ Text("正在获取本机号码…", modifier = Modifier.padding(top = 16.dp))
}
- LoginScreenType.LOGIN_WX -> {
- //微信登录
- Box(modifier = Modifier.align(Alignment.Center).padding(bottom = 100.dp)){
- WxLoginScreen(context, loginViewModel, generalViewModel)
+ } else {
+ when(loginViewModel.loginScreenType.value){
+ LoginScreenType.LOGIN_ONE_KEY -> {
+ //一键登录
+ OneKeyLoginScreen(context, loginViewModel)
}
+ LoginScreenType.LOGIN_WX -> {
+ //微信登录
+ Box(modifier = Modifier.align(Alignment.Center).padding(bottom = 100.dp)){
+ WxLoginScreen(context, loginViewModel, generalViewModel)
+ }
- }
- LoginScreenType.LOGIN_ALIPAY -> {
- //支付宝登录
- Box(modifier = Modifier.align(Alignment.Center).padding(bottom = 100.dp)){
- AliPayLoginScreen(context, loginViewModel)
+ }
+ LoginScreenType.LOGIN_ALIPAY -> {
+ //支付宝登录
+ Box(modifier = Modifier.align(Alignment.Center).padding(bottom = 100.dp)){
+ AliPayLoginScreen(context, loginViewModel)
+ }
+ }
+ else -> {
+ //默认验证码登录
+ CaptchaLoginScreen(context, loginViewModel)
}
}
- else -> {
- //默认验证码登录
- CaptchaLoginScreen(context, loginViewModel)
- }
- }
- // 其他登录方式Bar
- Column (
- modifier = Modifier
- .fillMaxSize()
- .padding(top = 27.dp),
- verticalArrangement = Arrangement.Bottom
- ){
- OtherLoginBar(viewModel = loginViewModel)
+ // 其他登录方式Bar
+ Column (
+ modifier = Modifier
+ .fillMaxSize()
+ .padding(top = 27.dp),
+ verticalArrangement = Arrangement.Bottom
+ ){
+ OtherLoginBar(viewModel = loginViewModel)
+ }
}
}
}
@@ -316,7 +339,11 @@ private fun CaptchaLoginScreen(context: Context, viewModel: LoginViewModel) {
BasicTextField(
value = viewModel.userName.value,
- onValueChange = { viewModel.setUserName(it) },
+ onValueChange = {
+ if (it.length <= 11) {
+ viewModel.setUserName(it)
+ }
+ },
modifier = Modifier
.fillMaxWidth()
.background(Color.Transparent)
@@ -391,7 +418,7 @@ private fun CaptchaLoginScreen(context: Context, viewModel: LoginViewModel) {
singleLine = true,
maxLines = 1,
keyboardOptions = androidx.compose.foundation.text.KeyboardOptions(
- keyboardType = androidx.compose.ui.text.input.KeyboardType.Text,
+ keyboardType = androidx.compose.ui.text.input.KeyboardType.Number,
imeAction = androidx.compose.ui.text.input.ImeAction.Done
),
decorationBox = { innerTextField ->
@@ -599,24 +626,18 @@ private fun CaptchaLoginScreen(context: Context, viewModel: LoginViewModel) {
@SuppressLint("UseKtx", "InflateParams", "SetTextI18n")
@Composable
private fun OneKeyLoginScreen(context: Context, viewModel: LoginViewModel) {
- val TAG = "Rabbit_LoginScreen_OneKeyLoginScreen"
-
val preLoginResult = GYManager.getInstance().preLoginResult
- val phoneNumber = viewModel.oneKeyPreLogin?.number ?: ""
- val operator = preLoginResult.operator//运营商,CM 移动,CT 电信,CU 联通
+ if (preLoginResult == null || !preLoginResult.isValid) {
+ LaunchedEffect(Unit) {
+ viewModel.loginScreenType.value = LoginScreenType.LOGIN_CAPTCHA
+ }
+ return
+ }
+ val phoneNumber = viewModel.oneKeyPreLogin?.number.orEmpty()
+ val operator = preLoginResult.operator
val privacyName = "《${preLoginResult.privacyName}》"
val privacyUrl = preLoginResult.privacyUrl
- // 详细打印preLoginResult信息
- Log.w(TAG, "=== preLoginResult 详细信息 ===")
- Log.w(TAG, "preLoginResult对象: $preLoginResult")
- Log.w(TAG, "operator: ${preLoginResult.operator}")
- Log.w(TAG, "isValid: ${preLoginResult.isValid}")
- Log.w(TAG, "privacyName: ${preLoginResult.privacyName}")
- Log.w(TAG, "privacyUrl: ${preLoginResult.privacyUrl}")
- Log.w(TAG, "================================")
-
-
val agreementText = "登录即认可${privacyName}、《用户协议》和《隐私政策》并使用本机号码登录"
Column(
modifier = Modifier
@@ -626,15 +647,12 @@ private fun OneKeyLoginScreen(context: Context, viewModel: LoginViewModel) {
// 使用AndroidView嵌入XML布局
@Suppress("COMPOSE_APPLIER_CALL_MISMATCH")
AndroidView(
- factory = { context ->
- LayoutInflater.from(context).inflate(
+ factory = { viewContext ->
+ val view = LayoutInflater.from(viewContext).inflate(
R.layout.layout_one_key_login,
null,
false
) as ConstraintLayout
- },
- modifier = Modifier.fillMaxSize(),
- update = { view ->
// 动态更新XML布局中的内容
val phoneTextView = view.findViewById(R.id.layout_one_key_login_tv_phone)
phoneTextView.text = phoneNumber // 需要回去手机号码
@@ -686,18 +704,17 @@ private fun OneKeyLoginScreen(context: Context, viewModel: LoginViewModel) {
privacyTv = agreementTextView,
viewModel = viewModel
)
-// loginButton.setOnClickListener {
-// // 处理登录点击
-// oneKeyLogin(
-// context = context,
-// numberTv = phoneTextView,
-// sloganTv = serviceTextView,
-// loginBtn = loginButton,
-// checkBox = checkbox,
-// privacyTv = agreementTextView,
-// viewModel = viewModel
-// )
-// }
+ view
+ },
+ modifier = Modifier.fillMaxSize(),
+ update = { view ->
+ // 只更新勾选状态,避免重绘时重复注册 SDK 登录回调。
+ val checkbox = view.findViewById(R.id.layout_one_key_login_agreement_checkbox)
+ checkbox.setOnCheckedChangeListener(null)
+ checkbox.isChecked = viewModel.isPolicyAgreement.value
+ checkbox.setOnCheckedChangeListener { _, isChecked ->
+ viewModel.setIsPolicyAgreement(isChecked)
+ }
}
)
}
@@ -1187,36 +1204,58 @@ private fun oneKeyLogin(
privacyTv: TextView,
viewModel: LoginViewModel,
) {
+ val activity = context as Activity
+ fun fallbackToCaptcha() {
+ activity.runOnUiThread {
+ loginBtn.isEnabled = true
+ if (viewModel.loginScreenType.value == LoginScreenType.LOGIN_ONE_KEY) {
+ viewModel.loginScreenType.value = LoginScreenType.LOGIN_CAPTCHA
+ CenterToast.show("一键登录暂不可用,请使用验证码登录")
+ }
+ }
+ }
val gyCallBack = object : GyCallBack {
override fun onSuccess(response: GYResponse?) {
- loginBtn.isEnabled = true
- Log.i("OneKeyLogin", "OneKeyLoginViewModel------onSuccess:$response")
- try {
- val jsonObject = JSONObject(response?.msg?:"{}")
- val data = jsonObject.getJSONObject("data")
- val token = data.getString("token")
- viewModel.requestOneKeyLogin(response?.gyuid?:"", token)
- } catch (e: Exception) {
- e.printStackTrace()
+ activity.runOnUiThread {
+ loginBtn.isEnabled = true
+ if (viewModel.loginScreenType.value != LoginScreenType.LOGIN_ONE_KEY) return@runOnUiThread
+ try {
+ val data = JSONObject(response?.msg ?: "{}").getJSONObject("data")
+ val token = data.getString("token")
+ val gyuid = response?.gyuid.orEmpty()
+ if (token.isBlank() || gyuid.isBlank()) {
+ fallbackToCaptcha()
+ } else {
+ viewModel.requestOneKeyLogin(gyuid, token)
+ }
+ } catch (e: Exception) {
+ Log.w("OneKeyLogin", "一键登录凭证解析失败", e)
+ fallbackToCaptcha()
+ }
}
}
override fun onFailed(p0: GYResponse?) {
- loginBtn.isEnabled = true
- Log.e("OneKeyLogin", "OneKeyLoginViewModel------onFailed:$p0")
+ fallbackToCaptcha()
}
}
val eloginActivityParam = EloginActivityParam()
- .setActivity(context as Activity)
+ .setActivity(activity)
.setNumberTextview(numberTv)
.setSloganTextview(sloganTv)
.setLoginButton(loginBtn)
.setPrivacyCheckbox(checkBox)
.setPrivacyTextview(privacyTv)
.setUiErrorListener { msg ->
- loginBtn.isEnabled = true
- Log.e("OneKeyLogin", "OneKeyLoginViewModel------UIErrorListener.onError:$msg")
+ activity.runOnUiThread {
+ loginBtn.isEnabled = true
+ if (checkBox.isChecked) {
+ fallbackToCaptcha()
+ } else {
+ CenterToast.show("请先同意用户协议和隐私政策")
+ }
+ }
}
.setLoginOnClickListener {
if (!checkBox.isChecked) {
@@ -1226,7 +1265,12 @@ private fun oneKeyLogin(
}
// 预先注册登录回调
- GYManager.getInstance().eAccountLogin(eloginActivityParam, 5000, gyCallBack)
+ try {
+ GYManager.getInstance().eAccountLogin(eloginActivityParam, 5000, gyCallBack)
+ } catch (e: Exception) {
+ Log.w("OneKeyLogin", "一键登录授权页初始化失败", e)
+ fallbackToCaptcha()
+ }
}
enum class LoginScreenType {
diff --git a/app/src/main/java/com/img/rabbit/pages/MainPage.kt b/app/src/main/java/com/img/rabbit/pages/MainPage.kt
index 96b6100..938edc6 100644
--- a/app/src/main/java/com/img/rabbit/pages/MainPage.kt
+++ b/app/src/main/java/com/img/rabbit/pages/MainPage.kt
@@ -58,9 +58,31 @@ import com.img.rabbit.viewmodel.LoginViewModel
import kotlinx.coroutines.delay
// 定义底部导航的标签页
-sealed class TabItem(val title: String, val router:String, val normalIconRes: Int, val selectedIconRes: Int, val normalColor: Color, val selectedColor: Color) {
- object Home : TabItem("首页", "home", R.mipmap.ic_home_normal, R.mipmap.ic_home_selected, Color(0xFFAAAAAA), Color(0xFF1A1A1A))
- object Mine : TabItem("我的", "mine", R.mipmap.ic_mine_normal, R.mipmap.ic_mine_selected, Color(0xFFAAAAAA), Color(0xFF1A1A1A))
+sealed class TabItem(
+ val title: String,
+ val router: String,
+ val normalIconRes: Int,
+ val selectedIconRes: Int,
+ val normalColor: Color,
+ val selectedColor: Color
+) {
+ object Home : TabItem(
+ "首页",
+ "home",
+ R.mipmap.ic_home_normal,
+ R.mipmap.ic_home_selected,
+ Color(0xFFAAAAAA),
+ Color(0xFF1A1A1A)
+ )
+
+ object Mine : TabItem(
+ "我的",
+ "mine",
+ R.mipmap.ic_mine_normal,
+ R.mipmap.ic_mine_selected,
+ Color(0xFFAAAAAA),
+ Color(0xFF1A1A1A)
+ )
}
/**
@@ -72,7 +94,7 @@ fun MainScreen(generalViewModel: GeneralViewModel, loginViewModel: LoginViewMode
val navController = rememberNavController()
val networkStatus by generalViewModel.networkStatus.observeAsState(initial = true)
val isNavigationBarVisible by generalViewModel.isNavigationBarVisible.observeAsState(initial = true)
- val tabItems = listOf( TabItem.Home, TabItem.Mine )
+ val tabItems = listOf(TabItem.Home, TabItem.Mine)
var selectedTab: TabItem by remember { mutableStateOf(TabItem.Home) }
generalViewModel.navController = navController
@@ -84,7 +106,7 @@ fun MainScreen(generalViewModel: GeneralViewModel, loginViewModel: LoginViewMode
selectedTab = TabItem.Home
// 显示TabBar
generalViewModel.setNavigationBarVisible(true)
- }else if(navBackStackEntry?.destination?.route == "mine"){
+ } else if (navBackStackEntry?.destination?.route == "mine") {
selectedTab = TabItem.Mine
// 显示TabBar
generalViewModel.setNavigationBarVisible(true)
@@ -95,7 +117,7 @@ fun MainScreen(generalViewModel: GeneralViewModel, loginViewModel: LoginViewMode
LaunchedEffect(networkStatus) {
if (!networkStatus) {
// 网络断开时的处理
- Log.w("NetworkStatus","网络断开")
+ Log.w("NetworkStatus", "网络断开")
//延迟500ms,确保页面初始化完成后,再跳转网络错误页面
delay(500)
@@ -104,13 +126,13 @@ fun MainScreen(generalViewModel: GeneralViewModel, loginViewModel: LoginViewMode
navController.navigate("netError")
generalViewModel.setNavigationBarVisible(false)
*/
- }else{
+ } else {
/*
if(navBackStackEntry?.destination?.route == "home"||navBackStackEntry?.destination?.route == "mine"){
generalViewModel.setNavigationBarVisible(true)
}
*/
- Log.w("NetworkStatus","网络已连接")
+ Log.w("NetworkStatus", "网络已连接")
}
}
@@ -122,7 +144,11 @@ fun MainScreen(generalViewModel: GeneralViewModel, loginViewModel: LoginViewMode
) {
Box(modifier = Modifier.height(52.dp)) {
NavigationBar(
- containerColor = Color.White,
+ containerColor = if (selectedTab == TabItem.Mine) {
+ Color(0xFFF9F9F9)
+ } else {
+ Color.White
+ },
contentColor = Color.Transparent
) {
tabItems.forEachIndexed { index, item ->
@@ -140,12 +166,17 @@ fun MainScreen(generalViewModel: GeneralViewModel, loginViewModel: LoginViewMode
modifier = Modifier.clickable(
interactionSource = remember { MutableInteractionSource() },
indication = null
- ){
+ ) {
selectedTab = tabItems[index]
}
)
},
- label = { Text(item.title, color = if (selectedTab == tabItems[index]) item.selectedColor else item.normalColor) },
+ label = {
+ Text(
+ item.title,
+ color = if (selectedTab == tabItems[index]) item.selectedColor else item.normalColor
+ )
+ },
selected = selectedTab == tabItems[index],
onClick = { selectedTab = tabItems[index] },
interactionSource = remember { MutableInteractionSource() },
@@ -255,15 +286,17 @@ fun MainScreen(generalViewModel: GeneralViewModel, loginViewModel: LoginViewMode
}
)
) { backStackEntry ->
- val isVisibilityBreak = when(backStackEntry.arguments?.getInt("type")){
+ val isVisibilityBreak = when (backStackEntry.arguments?.getInt("type")) {
LoginViewModel.JumpLoginType.FROM_ADD.type -> {
// 添加账号
true
}
+
LoginViewModel.JumpLoginType.FROM_LOGOUT.type -> {
// 退出登录
false
}
+
else -> false
}
LoginScreen(
@@ -296,7 +329,8 @@ fun MainScreen(generalViewModel: GeneralViewModel, loginViewModel: LoginViewMode
BindScreen(
navController = navController,
generalViewModel = generalViewModel,
- bindType = backStackEntry.arguments?.getInt("type")?:BindViewModel.BindType.FROM_PHONE.type
+ bindType = backStackEntry.arguments?.getInt("type")
+ ?: BindViewModel.BindType.FROM_PHONE.type
)
}
@@ -305,7 +339,7 @@ fun MainScreen(generalViewModel: GeneralViewModel, loginViewModel: LoginViewMode
NetworkDisconnectedPage(
navController = navController,
generalViewModel = generalViewModel,
- ){
+ ) {
}
}
@@ -317,6 +351,7 @@ fun MainScreen(generalViewModel: GeneralViewModel, loginViewModel: LoginViewMode
TabItem.Home -> navController.navigate(ScreenRoute.Home.route) {
popUpTo(ScreenRoute.Home.route) { inclusive = true }
}
+
TabItem.Mine -> navController.navigate(ScreenRoute.Mine.route) {
popUpTo(ScreenRoute.Mine.route) { inclusive = true }
}
diff --git a/app/src/main/java/com/img/rabbit/pages/dialog/TipsUniMpDialog.kt b/app/src/main/java/com/img/rabbit/pages/dialog/TipsUniMpDialog.kt
index 8437c26..3d9ea5f 100644
--- a/app/src/main/java/com/img/rabbit/pages/dialog/TipsUniMpDialog.kt
+++ b/app/src/main/java/com/img/rabbit/pages/dialog/TipsUniMpDialog.kt
@@ -37,6 +37,7 @@ import com.img.rabbit.R
import com.img.rabbit.bean.response.UniVersionEntity
import com.img.rabbit.utils.UniAppUtils
import com.img.rabbit.utils.UniMpUpdate
+import com.img.rabbit.viewmodel.ReportViewModel
import kotlinx.coroutines.CoroutineScope
@Composable
@@ -50,6 +51,8 @@ fun TipsUniMpDialog(
data: UniVersionEntity,
isStartDown: MutableState,
downProgress: MutableState,
+ reportViewModel: ReportViewModel,
+ pagePath: String?,
onStatusChange: (state: Boolean, isCancel:Boolean, data: Any?) -> Unit
){
val context = LocalContext.current
@@ -61,7 +64,7 @@ fun TipsUniMpDialog(
indication = null,
interactionSource = remember { MutableInteractionSource() }
) {
- onStatusChange(false, true, data)
+ if (!isStartDown.value) onStatusChange(false, true, data)
},
verticalArrangement = Arrangement.Center
){
@@ -213,7 +216,8 @@ fun TipsUniMpDialog(
interactionSource = remember { MutableInteractionSource() }
) {
onStatusChange(false, false, data)
- UniAppUtils.downloadWGT(context, scope, data){ uniState, filePath, progress ->
+ UniAppUtils.reportUpdateChoice(data, true, reportViewModel)
+ UniAppUtils.downloadWGT(context, scope, data, reportViewModel, pagePath){ uniState, _, progress ->
when (uniState) {
UniMpUpdate.DOWNLOAD_START -> {
//资源开始下载
@@ -229,6 +233,7 @@ fun TipsUniMpDialog(
UniMpUpdate.DOWNLOAD_FAIL -> {
//资源下载失败
downProgress.value = -1f
+ onStatusChange(true, false, data)
Log.i("HomeScreen","DOWNLOAD_FAIL")
}
else -> {
@@ -261,4 +266,4 @@ fun TipsUniMpDialog(
}
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/img/rabbit/pages/screen/HomeScreen.kt b/app/src/main/java/com/img/rabbit/pages/screen/HomeScreen.kt
index 3de64c2..fe34cf4 100644
--- a/app/src/main/java/com/img/rabbit/pages/screen/HomeScreen.kt
+++ b/app/src/main/java/com/img/rabbit/pages/screen/HomeScreen.kt
@@ -269,7 +269,7 @@ fun HomeScreen(
)
//下载完成前显示
- if((progressPair[uniMpId]?:0f) > 0f && (progressPair[uniMpId]?:0f) < 1f){
+ if((progressPair[uniMpId]?:-1f) >= 0f && (progressPair[uniMpId]?:-1f) < 1f){
Box(
modifier = Modifier
.fillMaxWidth()
@@ -343,7 +343,7 @@ fun HomeScreen(
)
//下载完成前显示
- if((progressPair[uniMpId]?:0f) > 0f && (progressPair[uniMpId]?:0f) < 1f){
+ if((progressPair[uniMpId]?:-1f) >= 0f && (progressPair[uniMpId]?:-1f) < 1f){
Box(
modifier = Modifier
.fillMaxWidth()
@@ -411,18 +411,11 @@ fun HomeScreen(
CenterToast.show("无可用资源...")
return@clickable
}
- val uniMpId = uniVersion.unimp_id
- UniAppUtils.currentUniMpJumpPatch = item.url
- val wgtExists = UniAppUtils.wgtIsExists(uniMpId)
- if(!wgtExists){
- //是否下载
- scope.launch {
- GlobalEventBus.emit(
- GlobalEvent.ShowUniDownloadNotify(uniVersion))
- }
- }else {
- UniAppUtils.startUniMpPage(context = context, uniMpId = uniMpId, uniMpType = item.type, pagePath = item.url, reportViewModel = reportViewModel)
- }
+ dealUniMpDownloadLaunch(
+ context, scope, uniVersion, progressPair,
+ reportViewModel, loadingCallback,
+ pagePath = item.url, itemName = item.text
+ )
}
) {
Column {
@@ -765,17 +758,32 @@ private fun dealUniMpDownloadLaunch(
uniMp: UniVersionEntity,
progressPair: SnapshotStateMap,
reportViewModel: ReportViewModel,
- loadingCallback: LoadingCallback?){
+ loadingCallback: LoadingCallback?,
+ pagePath: String? = null,
+ itemName: String = "",
+){
val TAG = "Rabbit_HomeScreen_download"
val uniMpId = uniMp.unimp_id
+ UniAppUtils.reportOpen(uniMp, itemName.ifEmpty { if (uniMp.unimp_type == "wx") "微信模拟器" else "小宝模拟器" }, reportViewModel)
+ if (UniAppUtils.isBusy(uniMpId)) {
+ CenterToast.show("请等待模拟器更新完毕!")
+ return
+ }
+ if (UniAppUtils.showRunningUniMp(uniMpId, pagePath)) return
// 处理点击事件,微信模拟器
if (UniAppUtils.isDownloadUniMp(uniMp)) {
+ if (pagePath != null) {
+ scope.launch { GlobalEventBus.emit(GlobalEvent.ShowUniDownloadNotify(uniMp, pagePath)) }
+ return
+ }
//没有下载或者强制更新(更新释放新版本并启动)
UniAppUtils.downloadWGT(
context,
scope,
- uniMp
+ uniMp,
+ reportViewModel,
+ pagePath
) { uniState, _, progress ->
progressPair[uniMpId]
?: mutableMapOf().apply { put(uniMpId, 0f) }
@@ -818,15 +826,14 @@ private fun dealUniMpDownloadLaunch(
}
} else if (UniAppUtils.isUpdate(uniMp)) {
// 提示更新(1、更新释放新版本并启动;2、直接启动现有版本)
- UniAppUtils.currentUpdateUniMp = uniMp
scope.launch {
GlobalEventBus.emit(
- GlobalEvent.ShowUniUpdateNotify(uniMp))
+ GlobalEvent.ShowUniUpdateNotify(uniMp, pagePath))
}
} else {
loadingCallback?.showLoading()
//启动uni小程序(1、直接启动;2、释放并启动)
- UniAppUtils.distributeUniMp(context, uniMp, reportViewModel) {
+ UniAppUtils.distributeUniMp(context, uniMp, reportViewModel, pagePath) {
loadingCallback?.hideLoading()
}
}
diff --git a/app/src/main/java/com/img/rabbit/uni/UniMPAlipaySplashView.java b/app/src/main/java/com/img/rabbit/uni/UniMPAlipaySplashView.java
index c710a35..b24dd5f 100644
--- a/app/src/main/java/com/img/rabbit/uni/UniMPAlipaySplashView.java
+++ b/app/src/main/java/com/img/rabbit/uni/UniMPAlipaySplashView.java
@@ -11,21 +11,30 @@ import com.img.rabbit.R;
import io.dcloud.feature.sdk.Interface.IDCUniMPAppSplashView;
public class UniMPAlipaySplashView implements IDCUniMPAppSplashView {
- FrameLayout splashView;
+ private FrameLayout splashView;
+ private UniMPSplashWindow splashWindow;
@Override
public View getSplashView(Context context, String appid, String s1, String s2) {
+ if (splashWindow != null) splashWindow.close();
splashView = new FrameLayout(context);
ImageView imageView = new ImageView(context);
imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
imageView.setImageResource(R.mipmap.ic_launch_alipay_unimp);
splashView.addView(imageView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+ splashWindow = new UniMPSplashWindow(context, splashView, true);
return splashView;
}
@Override
public void onCloseSplash(ViewGroup rootView) {
- if(rootView != null)
+ if (splashWindow != null) {
+ splashWindow.close();
+ splashWindow = null;
+ }
+ if (rootView != null && splashView != null) {
rootView.removeView(splashView);
+ }
+ splashView = null;
}
}
diff --git a/app/src/main/java/com/img/rabbit/uni/UniMPSplashWindow.kt b/app/src/main/java/com/img/rabbit/uni/UniMPSplashWindow.kt
new file mode 100644
index 0000000..acc0019
--- /dev/null
+++ b/app/src/main/java/com/img/rabbit/uni/UniMPSplashWindow.kt
@@ -0,0 +1,121 @@
+package com.img.rabbit.uni
+
+import android.app.Activity
+import android.content.Context
+import android.content.ContextWrapper
+import android.graphics.Color
+import android.os.Build
+import android.view.View
+import android.view.ViewTreeObserver
+import android.view.WindowManager
+import androidx.core.view.WindowCompat
+
+/** 只在 UniMP 启动图显示期间让图片延伸到系统导航栏下方。 */
+@Suppress("DEPRECATION")
+class UniMPSplashWindow(
+ context: Context,
+ private val splashView: View,
+ private val darkNavigationIcons: Boolean,
+) :
+ View.OnAttachStateChangeListener, ViewTreeObserver.OnGlobalLayoutListener {
+
+ private val window = findActivity(context)?.window
+ private val originalNavigationBarColor = window?.navigationBarColor
+ private val originalSystemUiVisibility = window?.decorView?.systemUiVisibility ?: 0
+ private val originalWindowFlags = window?.attributes?.flags ?: 0
+ private val originalDividerColor = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) window?.navigationBarDividerColor else null
+ private val originalContrastEnforced = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) window?.isNavigationBarContrastEnforced else null
+ private val insetsController = window?.let { WindowCompat.getInsetsController(it, it.decorView) }
+ private val originalLightNavigationBars = insetsController?.isAppearanceLightNavigationBars ?: false
+ private var observer: ViewTreeObserver? = null
+ private var closed = false
+ private val reapply = Runnable { applyTransparentNavigationBar() }
+
+ init {
+ splashView.addOnAttachStateChangeListener(this)
+ applyTransparentNavigationBar()
+ if (splashView.isAttachedToWindow) onViewAttachedToWindow(splashView)
+ }
+
+ override fun onViewAttachedToWindow(view: View) {
+ if (closed) return
+ observer?.takeIf { it.isAlive }?.removeOnGlobalLayoutListener(this)
+ observer = view.viewTreeObserver.also { it.addOnGlobalLayoutListener(this) }
+ applyTransparentNavigationBar()
+ // SDK 初始化窗口时可能覆盖导航栏配置,启动阶段短暂补设。
+ view.removeCallbacks(reapply)
+ for (attempt in 1..10) view.postDelayed(reapply, attempt * 50L)
+ }
+
+ override fun onGlobalLayout() = applyTransparentNavigationBar()
+
+ override fun onViewDetachedFromWindow(view: View) = close()
+
+ private fun applyTransparentNavigationBar() {
+ val window = window ?: return
+ if (closed) return
+ val flags = window.attributes.flags
+ if (flags and WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS == 0) {
+ window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
+ }
+ if (flags and WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION != 0) {
+ window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION)
+ }
+ if (window.navigationBarColor != Color.TRANSPARENT) window.navigationBarColor = Color.TRANSPARENT
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && window.navigationBarDividerColor != Color.TRANSPARENT) {
+ window.navigationBarDividerColor = Color.TRANSPARENT
+ }
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && window.isNavigationBarContrastEnforced) {
+ window.isNavigationBarContrastEnforced = false
+ }
+ val decor = window.decorView
+ val visibility = decor.systemUiVisibility or LAYOUT_FLAGS
+ if (decor.systemUiVisibility != visibility) decor.systemUiVisibility = visibility
+ // 微信启动图为深色、支付宝为白色,分别使用浅色和深色导航按键。
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && insetsController != null &&
+ insetsController.isAppearanceLightNavigationBars != darkNavigationIcons) {
+ insetsController.isAppearanceLightNavigationBars = darkNavigationIcons
+ }
+ }
+
+ fun close() {
+ if (closed) return
+ closed = true
+ // 先取消监听及延时任务,防止关闭后再次改动小程序正文的窗口。
+ splashView.removeCallbacks(reapply)
+ splashView.removeOnAttachStateChangeListener(this)
+ observer?.takeIf { it.isAlive }?.removeOnGlobalLayoutListener(this)
+ observer = null
+
+ val window = window ?: return
+ window.decorView.systemUiVisibility =
+ (window.decorView.systemUiVisibility and LAYOUT_FLAGS.inv()) or
+ (originalSystemUiVisibility and LAYOUT_FLAGS)
+ window.setFlags(originalWindowFlags and WINDOW_FLAGS, WINDOW_FLAGS)
+ originalNavigationBarColor?.let { window.navigationBarColor = it }
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+ originalDividerColor?.let { window.navigationBarDividerColor = it }
+ }
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+ originalContrastEnforced?.let { window.isNavigationBarContrastEnforced = it }
+ }
+ insetsController?.isAppearanceLightNavigationBars = originalLightNavigationBars
+ }
+
+ private companion object {
+ const val LAYOUT_FLAGS = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+ const val WINDOW_FLAGS = WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS or
+ WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION
+
+ fun findActivity(context: Context): Activity? {
+ var current = context
+ while (current is ContextWrapper) {
+ if (current is Activity) return current
+ val base = current.baseContext
+ if (base === current) break
+ current = base
+ }
+ return null
+ }
+ }
+}
diff --git a/app/src/main/java/com/img/rabbit/uni/UniMPWxSplashView.java b/app/src/main/java/com/img/rabbit/uni/UniMPWxSplashView.java
index ddecb5f..6b5c37d 100644
--- a/app/src/main/java/com/img/rabbit/uni/UniMPWxSplashView.java
+++ b/app/src/main/java/com/img/rabbit/uni/UniMPWxSplashView.java
@@ -12,21 +12,30 @@ import com.img.rabbit.R;
import io.dcloud.feature.sdk.Interface.IDCUniMPAppSplashView;
public class UniMPWxSplashView implements IDCUniMPAppSplashView {
- FrameLayout splashView;
+ private FrameLayout splashView;
+ private UniMPSplashWindow splashWindow;
@Override
public View getSplashView(Context context, String appid, String s1, String s2) {
+ if (splashWindow != null) splashWindow.close();
splashView = new FrameLayout(context);
ImageView imageView = new ImageView(context);
imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
imageView.setImageResource(R.mipmap.ic_launch_wx_unimp);
splashView.addView(imageView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+ splashWindow = new UniMPSplashWindow(context, splashView, false);
return splashView;
}
@Override
public void onCloseSplash(ViewGroup rootView) {
- if(rootView != null)
+ if (splashWindow != null) {
+ splashWindow.close();
+ splashWindow = null;
+ }
+ if (rootView != null && splashView != null) {
rootView.removeView(splashView);
+ }
+ splashView = null;
}
}
diff --git a/app/src/main/java/com/img/rabbit/utils/AppEventBus.kt b/app/src/main/java/com/img/rabbit/utils/AppEventBus.kt
index 816de5c..fba194b 100644
--- a/app/src/main/java/com/img/rabbit/utils/AppEventBus.kt
+++ b/app/src/main/java/com/img/rabbit/utils/AppEventBus.kt
@@ -68,8 +68,8 @@ sealed class UniMpWXPayEvent {
sealed class GlobalEvent {
object ShowAppUpdateNotify : GlobalEvent()
object ShowLoginNotify : GlobalEvent()
- data class ShowUniDownloadNotify(val entity: UniVersionEntity) : GlobalEvent()
- data class ShowUniUpdateNotify(val entity: UniVersionEntity) : GlobalEvent()
+ data class ShowUniDownloadNotify(val entity: UniVersionEntity, val pagePath: String? = null) : GlobalEvent()
+ data class ShowUniUpdateNotify(val entity: UniVersionEntity, val pagePath: String? = null) : GlobalEvent()
}
object GlobalEventBus {
diff --git a/app/src/main/java/com/img/rabbit/utils/UniAppUtils.kt b/app/src/main/java/com/img/rabbit/utils/UniAppUtils.kt
index f3fe555..73c1d8f 100644
--- a/app/src/main/java/com/img/rabbit/utils/UniAppUtils.kt
+++ b/app/src/main/java/com/img/rabbit/utils/UniAppUtils.kt
@@ -1,8 +1,9 @@
package com.img.rabbit.utils
import android.content.Context
+import android.os.Handler
+import android.os.Looper
import android.util.Log
-import android.webkit.MimeTypeMap
import com.github.gzuliyujiang.oaid.DeviceIdentifier
import com.img.rabbit.BuildConfig
import com.img.rabbit.bean.request.ReportKey
@@ -23,404 +24,316 @@ import io.dcloud.feature.sdk.DCUniMPSDK
import io.dcloud.feature.sdk.Interface.IUniMP
import io.dcloud.feature.unimp.config.UniMPOpenConfiguration
import io.dcloud.feature.unimp.config.UniMPReleaseConfiguration
+import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.CoroutineStart
import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.NonCancellable
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
-import okhttp3.OkHttpClient
-import okhttp3.Request
+import kotlinx.serialization.json.Json
import java.io.File
-import kotlin.jvm.java
+import java.util.Locale
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.Executors
-/**
- * UniApp工具类
- * 小程序运行路径:/data/user/0/com.img.rabbit/files/apps/(一般/data/data/com.img.rabbit/files/apps/)
- */
+/** UniMP 的下载、解压、启动及事件上报入口。 */
object UniAppUtils {
private const val TAG = "UniAppUtils"
- /**
- * 所有运行的UniMp小程序实体
- */
+ private val mainHandler = Handler(Looper.getMainLooper())
+ private val releaseExecutor = Executors.newSingleThreadExecutor()
+ private val downloader = UniMpDownloader()
+ private val downloading = ConcurrentHashMap.newKeySet()
+ private val releasing = ConcurrentHashMap.newKeySet()
private val _uniMpFlow = MutableStateFlow