소스 검색

[feat]键盘插件,增加页面跳转,去掉测试代码

hezihao 8 달 전
부모
커밋
a2e1c31d5d

+ 6 - 12
plugins/keyboard_android/android/src/main/kotlin/com/atmob/keyboard_android/component/child/impl/ToolBarComponent.kt

@@ -11,10 +11,11 @@ import com.atmob.keyboard_android.component.child.IToolBarComponent
 import com.atmob.keyboard_android.component.root.IKeyboardRootComponent
 import com.atmob.keyboard_android.enums.KeyboardGlobalType
 import com.atmob.keyboard_android.ext.click
-import com.atmob.keyboard_android.ext.longClick
 import com.atmob.keyboard_android.ext.setGone
 import com.atmob.keyboard_android.keyboard.InputMethodPickerActivity
 import com.atmob.keyboard_android.util.KeyboardHolder
+import com.atmob.keyboard_android.util.UserInfoHelper
+import com.atmob.keyboard_android.util.bridge.FlutterBridgeManager
 
 /**
  * 工具类组件
@@ -62,22 +63,15 @@ class ToolBarComponent @JvmOverloads constructor(
                 updateKeyboardGlobalType(newGlobalType)
             }
         }
-        // TODO: hezhiao,测试显示vip页,记得要去掉
-        vIcon.longClick {
-            val rootComponent =
-                ComponentMediator.findComponent<IKeyboardRootComponent>(IKeyboardRootComponent::class.java)
-            rootComponent?.switchVipPage()
-            true
-        }
         vKeyboardSwitchBtn.click {
             // 打开系统输入法选择器
             InputMethodPickerActivity.start(context)
         }
         vIntimacyLayout.click {
-            // 点击亲密度布局,跳转去登录
-            val rootComponent =
-                ComponentMediator.findComponent<IKeyboardRootComponent>(IKeyboardRootComponent::class.java)
-            rootComponent?.switchLoginPage()
+            // 点击亲密度布局,跳转去亲密度页
+            UserInfoHelper.checkLogin {
+                FlutterBridgeManager.jump2IntimacyPage()
+            }
         }
 
         setupViewModel()

+ 2 - 2
plugins/keyboard_android/android/src/main/kotlin/com/atmob/keyboard_android/component/page/impl/LoginPageComponent.kt

@@ -10,7 +10,7 @@ import com.atmob.keyboard_android.component.page.ILoginPageComponent
 import com.atmob.keyboard_android.constant.Constants
 import com.atmob.keyboard_android.ext.click
 import com.atmob.keyboard_android.util.KeyboardHolder
-import com.blankj.utilcode.util.ToastUtils
+import com.atmob.keyboard_android.util.bridge.FlutterBridgeManager
 
 /**
  * 登录页组件
@@ -37,7 +37,7 @@ class LoginPageComponent @JvmOverloads constructor(
         }
         vLoginBtn.click {
             // 跳转到登录页
-            ToastUtils.showShort("跳转到登录页")
+            FlutterBridgeManager.jump2LoginPage()
         }
         setData()
     }

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

@@ -60,6 +60,10 @@ object FlutterBridgeManager : IBridgeApi {
         )
     }
 
+    override fun jump2LoginPage() {
+        LaunchUtil.startLaunchActivity()
+    }
+
     override fun jump2CustomCharacterPage() {
         LaunchUtil.startLaunchActivity()
     }
@@ -72,6 +76,10 @@ object FlutterBridgeManager : IBridgeApi {
         LaunchUtil.startLaunchActivity()
     }
 
+    override fun jump2IntimacyPage() {
+        LaunchUtil.startLaunchActivity()
+    }
+
     override fun getKeyboardList(
         onSuccess: (resultObj: KeyboardListResp) -> Unit,
         onFail: (msg: String) -> Unit

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

@@ -5,6 +5,11 @@ package com.atmob.keyboard_android.util.bridge.api
  */
 interface RouteJumpApi {
     /**
+     * 跳转到登录页
+     */
+    fun jump2LoginPage()
+
+    /**
      * 跳转到定制人设页
      */
     fun jump2CustomCharacterPage()
@@ -18,4 +23,9 @@ interface RouteJumpApi {
      * 跳转到VIP商店
      */
     fun jump2VipStore()
+
+    /**
+     * 跳转去亲密度界面
+     */
+    fun jump2IntimacyPage()
 }