Bläddra i källkod

[fix]键盘插件,跳转的方法名

hezihao 7 månader sedan
förälder
incheckning
56442a1608

+ 2 - 1
plugins/keyboard_android/android/src/main/kotlin/com/atmob/keyboard_android/component/child/impl/AiKeyboardCommonPanelComponent.kt

@@ -20,6 +20,7 @@ import com.atmob.keyboard_android.component.item.AddCharacterViewBinder
 import com.atmob.keyboard_android.component.item.AiKeyboardKeyViewBinder
 import com.atmob.keyboard_android.constant.Constants
 import com.atmob.keyboard_android.enums.HelpMode
+import com.atmob.keyboard_android.enums.host.HostMainTab
 import com.atmob.keyboard_android.ext.click
 import com.atmob.keyboard_android.ext.setGone
 import com.atmob.keyboard_android.ext.setVisible
@@ -143,7 +144,7 @@ class AiKeyboardCommonPanelComponent @JvmOverloads constructor(
                 })
                 // 添加人设按键
                 register(AddCharacterModel::class.java, AddCharacterViewBinder {
-                    FlutterBridgeManager.jump2CharacterMarketPage()
+                    FlutterBridgeManager.jump2MainPage(HostMainTab.CHARACTER)
                 })
             }
             if (Constants.AI_KEYBOARD_KEY_LIST_PAGE_ENABLE) {

+ 2 - 1
plugins/keyboard_android/android/src/main/kotlin/com/atmob/keyboard_android/component/child/impl/SettingComponent.kt

@@ -9,6 +9,7 @@ import com.atmob.keyboard_android.component.base.animator.ComponentAnimator
 import com.atmob.keyboard_android.component.base.animator.impl.TransitionAnimator
 import com.atmob.keyboard_android.component.child.ISettingComponent
 import com.atmob.keyboard_android.constant.Constants
+import com.atmob.keyboard_android.enums.host.HostMainTab
 import com.atmob.keyboard_android.ext.click
 import com.atmob.keyboard_android.util.KeyboardHolder
 import com.atmob.keyboard_android.util.bridge.FlutterBridgeManager
@@ -46,7 +47,7 @@ class SettingComponent @JvmOverloads constructor(
         }
         // 人设市场
         vSettingMarketLayout.click {
-            FlutterBridgeManager.jump2CharacterMarketPage()
+            FlutterBridgeManager.jump2MainPage(HostMainTab.CHARACTER)
         }
         // 解锁会员
         vSettingUnlockVipLayout.click {

+ 2 - 2
plugins/keyboard_android/android/src/main/kotlin/com/atmob/keyboard_android/constant/FlutterHostConstants.kt

@@ -46,9 +46,9 @@ interface FlutterHostConstants {
         const val PAGE_CHARACTER_CUSTOM = "/characterCustom"
 
         /**
-         * 人设市场
+         * 首页,可以选择切换到哪个Tab
          */
-        const val PAGE_CHARACTER_MARKET = "/mainTab"
+        const val PAGE_MAIN = "/mainTab"
 
         /**
          * VIP商店

+ 5 - 2
plugins/keyboard_android/android/src/main/kotlin/com/atmob/keyboard_android/mvvm/viewmodel/KeyboardViewModel.kt

@@ -8,6 +8,7 @@ import com.atmob.keyboard_android.enums.KeyboardGlobalType
 import com.atmob.keyboard_android.enums.KeyboardType
 import com.atmob.keyboard_android.model.KeyboardSelectModel
 import com.atmob.keyboard_android.mvvm.repository.KeyboardRepository
+import com.atmob.keyboard_android.util.LogUtil
 import com.atmob.keyboard_android.util.bridge.model.base.EmptyResp
 import com.atmob.keyboard_android.util.bridge.model.req.SuperReplyReq
 import com.atmob.keyboard_android.util.bridge.model.req.SuperSpeakReq
@@ -307,8 +308,10 @@ class KeyboardViewModel : ViewModel() {
             ErrorHandler.handleError(errorCode, errorMsg)
         }
         // 先获取当前键盘信息,得到键盘Id
-        getCurrentKeyboardInfoWithDefault(onSuccess = {
-            val keyboardId = it.id
+        getCurrentKeyboardInfoWithDefault(onSuccess = { keyboardInfo ->
+            val keyboardId = keyboardInfo.id
+            val keyboardName = keyboardInfo.name
+            LogUtil.d("加载人设列表, id: ${keyboardId}, name: $keyboardName")
             // 查询该键盘下的人设列表
             mKeyboardRepository.getCharacterList(keyboardId, onSuccess = {
                 _characterList.value = it.characterInfos ?: listOf()

+ 7 - 7
plugins/keyboard_android/android/src/main/kotlin/com/atmob/keyboard_android/util/bridge/FlutterBridgeManager.kt

@@ -87,20 +87,20 @@ object FlutterBridgeManager : IBridgeApi {
         FlutterPageLaunchUtil.jumpFlutterPage(FlutterHostConstants.PAGE_LOGIN)
     }
 
-    override fun jump2CustomCharacterPage() {
-        FlutterPageLaunchUtil.jumpFlutterPage(FlutterHostConstants.PAGE_CHARACTER_CUSTOM)
-    }
-
-    override fun jump2CharacterMarketPage() {
+    override fun jump2MainPage(mainTab: HostMainTab) {
         FlutterPageLaunchUtil.jumpFlutterPage(
-            FlutterHostConstants.PAGE_CHARACTER_MARKET, mapOf(
-                FlutterHostConstants.KEY_TAB_NAME to HostMainTab.CHARACTER.tabName
+            FlutterHostConstants.PAGE_MAIN, mapOf(
+                FlutterHostConstants.KEY_TAB_NAME to mainTab.tabName
             ),
             // 因为是跳转到首页,所以清空上层页面
             offAll = true
         )
     }
 
+    override fun jump2CustomCharacterPage() {
+        FlutterPageLaunchUtil.jumpFlutterPage(FlutterHostConstants.PAGE_CHARACTER_CUSTOM)
+    }
+
     override fun jump2VipStore() {
         FlutterPageLaunchUtil.jumpFlutterPage(FlutterHostConstants.PAGE_STORE)
     }

+ 8 - 4
plugins/keyboard_android/android/src/main/kotlin/com/atmob/keyboard_android/util/bridge/api/RouteJumpApi.kt

@@ -1,5 +1,7 @@
 package com.atmob.keyboard_android.util.bridge.api
 
+import com.atmob.keyboard_android.enums.host.HostMainTab
+
 /**
  * 路由跳转API
  */
@@ -15,14 +17,16 @@ interface RouteJumpApi {
     fun jump2LoginPage()
 
     /**
-     * 跳转到定制人设页
+     * 跳转到首页
+     *
+     * @param mainTab 切换到首页的哪个Tab
      */
-    fun jump2CustomCharacterPage()
+    fun jump2MainPage(mainTab: HostMainTab)
 
     /**
-     * 跳转到人设市场
+     * 跳转到定制人设页
      */
-    fun jump2CharacterMarketPage()
+    fun jump2CustomCharacterPage()
 
     /**
      * 跳转到VIP商店