Forráskód Böngészése

[fix]首页,键盘页,根据是否选择为默认键盘,键盘教程入口,显示不同的图片

hezihao 7 hónapja
szülő
commit
c5f0867ecf

BIN
assets/images/bg_keyboard_start_using.webp


BIN
assets/images/bg_keyboard_try_experience.webp


+ 5 - 0
lib/module/keyboard/keyboard_controller.dart

@@ -15,6 +15,8 @@ import 'package:keyboard/module/user_profile/user_profile_page.dart';
 
 import '../../data/api/response/keyboard_love_index_response.dart';
 import '../../data/bean/member_info.dart';
+import '../../plugins/keyboard_android_platform.dart';
+import '../../utils/default_keyboard_helper.dart';
 import '../../utils/keyboard_tutorial_util.dart';
 import '../intimacy_analyse/intimacy_analyse_page.dart';
 import '../intimacy_scale/intimacy_scale_page.dart';
@@ -43,6 +45,9 @@ class KeyBoardController extends BaseController {
 
   final RxBool isShowBanner = true.obs;
 
+  /// 是否选择为了默认键盘
+  RxBool get isDefaultKeyboard => DefaultKeyboardHelper.isDefaultKeyboard;
+
   // 各项指标数据
 
   KeyBoardController(this.keyboardRepository, this.accountRepository);

+ 58 - 45
lib/module/keyboard/keyboard_view.dart

@@ -291,34 +291,36 @@ class KeyBoardView extends BaseView<KeyBoardController> {
               ),
               Container(
                 padding: EdgeInsets.symmetric(horizontal: 10.w, vertical: 4.w),
-                constraints: BoxConstraints(
-                  maxWidth: 76.w,
-                ),
+                constraints: BoxConstraints(maxWidth: 76.w),
                 decoration: BoxDecoration(
                   color: Colors.white,
                   borderRadius: BorderRadius.circular(22.r),
                 ),
-                child: isUser
-                    ? AutoSizeText(
-                  controller.homeInfo?.name ?? StringName.keyboardNoLogin,
-                  style: Styles.getTextStyleBlack204W400(14.sp),
-                  maxLines: 1,
-                  minFontSize: 10,
-                  overflow: TextOverflow.clip,
-                )
-                    : AutoSizeText(
-                  controller.homeInfo?.targetName ?? StringName.keyboardAdd,
-                  style: controller.homeInfo?.targetName != null
-                      ? Styles.getTextStyleBlack204W400(14.sp)
-                      : TextStyle(
-                    color: const Color(0xFF8651FF),
-                    fontSize: 14.sp,
-                    fontWeight: FontWeight.w400,
-                  ),
-                  maxLines: 1,
-                  minFontSize: 10,
-                  overflow: TextOverflow.ellipsis,
-                ),
+                child:
+                    isUser
+                        ? AutoSizeText(
+                          controller.homeInfo?.name ??
+                              StringName.keyboardNoLogin,
+                          style: Styles.getTextStyleBlack204W400(14.sp),
+                          maxLines: 1,
+                          minFontSize: 10,
+                          overflow: TextOverflow.clip,
+                        )
+                        : AutoSizeText(
+                          controller.homeInfo?.targetName ??
+                              StringName.keyboardAdd,
+                          style:
+                              controller.homeInfo?.targetName != null
+                                  ? Styles.getTextStyleBlack204W400(14.sp)
+                                  : TextStyle(
+                                    color: const Color(0xFF8651FF),
+                                    fontSize: 14.sp,
+                                    fontWeight: FontWeight.w400,
+                                  ),
+                          maxLines: 1,
+                          minFontSize: 10,
+                          overflow: TextOverflow.ellipsis,
+                        ),
               ),
             ],
           ),
@@ -456,25 +458,44 @@ class KeyBoardView extends BaseView<KeyBoardController> {
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-              GestureDetector(
-                onTap: controller.clickEasyReply,
-                child: Container(
-                  width: 170.w,
-                  height: 155.85.w,
-                  child: Assets.images.bgKeyboardEasyReply.image(
-                    fit: BoxFit.contain,
+              Obx(() {
+                ImageProvider imageProvider;
+                // 已选择为默认键盘,显示启用键盘
+                if (!controller.isDefaultKeyboard.value) {
+                  imageProvider = Assets.images.bgKeyboardStartUsing.provider();
+                } else {
+                  // 未选择为默认键盘,显示体验键盘
+                  imageProvider = Assets.images.bgKeyboardTryExperience.provider();
+                }
+                return GestureDetector(
+                  onTap: controller.clickEasyReply,
+                  child: SizedBox(
+                    width: 170.w,
+                    height: 155.85.w,
+                    child: Image(
+                      image: imageProvider,
+                      fit: BoxFit.contain,
+                    ),
                   ),
-                ),
-              ),
+                );
+              }),
 
               Column(
                 children: [
                   _buildFeatureCard(
-                    bg: Assets.images.bgKeyboardIntimacyAnalyze.image(width: 162.w,height: 77.5.w,fit: BoxFit.contain,),
+                    bg: Assets.images.bgKeyboardIntimacyAnalyze.image(
+                      width: 162.w,
+                      height: 77.5.w,
+                      fit: BoxFit.contain,
+                    ),
                     onTap: controller.clickIntimacyAnalyze,
                   ),
                   _buildFeatureCard(
-                    bg: Assets.images.bgKeyboardScreenshotReply.image(width: 162.w,height: 77.5.w,fit: BoxFit.contain,),
+                    bg: Assets.images.bgKeyboardScreenshotReply.image(
+                      width: 162.w,
+                      height: 77.5.w,
+                      fit: BoxFit.contain,
+                    ),
                     onTap: controller.clickScreenshotReply,
                   ),
                 ],
@@ -487,16 +508,8 @@ class KeyBoardView extends BaseView<KeyBoardController> {
   }
 
   // 功能卡片
-  Widget _buildFeatureCard({
-    required Widget bg,
-    required VoidCallback onTap,
-  }) {
-    return GestureDetector(
-      onTap: onTap,
-      child: Container(
-        child: bg,
-      ),
-    );
+  Widget _buildFeatureCard({required Widget bg, required VoidCallback onTap}) {
+    return GestureDetector(onTap: onTap, child: Container(child: bg));
   }
 
   // 当前键盘人设信息

+ 10 - 0
lib/resource/assets.gen.dart

@@ -222,6 +222,14 @@ class $AssetsImagesGen {
   AssetGenImage get bgKeyboardScreenshotReply =>
       const AssetGenImage('assets/images/bg_keyboard_screenshot_reply.webp');
 
+  /// File path: assets/images/bg_keyboard_start_using.webp
+  AssetGenImage get bgKeyboardStartUsing =>
+      const AssetGenImage('assets/images/bg_keyboard_start_using.webp');
+
+  /// File path: assets/images/bg_keyboard_try_experience.webp
+  AssetGenImage get bgKeyboardTryExperience =>
+      const AssetGenImage('assets/images/bg_keyboard_try_experience.webp');
+
   /// File path: assets/images/bg_keyboard_tutorial_header_mask.webp
   AssetGenImage get bgKeyboardTutorialHeaderMask => const AssetGenImage(
     'assets/images/bg_keyboard_tutorial_header_mask.webp',
@@ -1258,6 +1266,8 @@ class $AssetsImagesGen {
     bgKeyboardManage,
     bgKeyboardManageIntimacy,
     bgKeyboardScreenshotReply,
+    bgKeyboardStartUsing,
+    bgKeyboardTryExperience,
     bgKeyboardTutorialHeaderMask,
     bgKeyboardVideoTutorialHeaderMask,
     bgLogin,