[feat]1.升级版本名称1.0.2

2.修改我的页面的间距
3.删除的时候，对键盘选中跟着清空
4.华为渠道增加多一个会员服务协议展示

lib/data/repository/keyboard_repository.dart

@@ -15,6 +15,7 @@ import '../../di/get_it.dart';
 import '../../module/keyboard_manage/keyboard_manage_controller.dart';
 import '../../utils/async_util.dart';
 import '../../utils/http_handler.dart';
+import '../../utils/mmkv_util.dart';
 import '../api/atmob_api.dart';
 import '../api/request/keyboard_character_list_request.dart';
 import '../api/request/keyboard_character_start_request.dart';
@@ -26,6 +27,7 @@ import '../api/response/keyboard_character_list_response.dart';
 import '../api/response/keyboard_home_info_response.dart';
 import '../api/response/keyboard_list_response.dart';
 import '../bean/keyboard_info.dart';
+import '../consts/constants.dart';
 import '../consts/error_code.dart';
 
 @lazySingleton
@@ -74,6 +76,7 @@ class KeyboardRepository {
     await Future.delayed(const Duration(milliseconds: 300));
     refreshKeyboardList();
     refreshLoveIndex();
+
   }
 
   void refreshUserInfo() async {
@@ -116,11 +119,19 @@ class KeyboardRepository {
       if(chosen==null&&_chooseKeyboardInfo.value!=null){
         _chooseKeyboardInfo.value=null;
       }
+      if (chooseKeyboardInfo.value != null) {
+        KVUtil.putString(
+          Constants.keyboardSelect,
+          jsonEncode(chooseKeyboardInfo.value?.toJson()),
+        );
+      }
+
       // 过滤掉系统键盘
       _customKeyboardInfoList.value =
           response.keyboardInfos
               .where((keyboard) => keyboard.type != KeyboardType.system.name)
               .toList();
+
     });
   }
 

lib/module/intro/intro_controller.dart

@@ -85,7 +85,9 @@ class IntroController extends BaseController {
   void onReady() {
     super.onReady();
     _startAutoSwitchTimer();
-    EventHandler.report(EventId.event_01000);
+    Future.delayed(Duration(seconds: 3), () {
+      EventHandler.report(EventId.event_01000);
+    });
     // 监听登录状态
     _loginSubscription= ever(AccountRepository.getInstance().isLogin, (bool isLogin) {
       if (isLogin) {

lib/module/mine/mine_view.dart

@@ -281,7 +281,7 @@ class MineView extends BaseView<MineController> {
       onLongPress: onLongTap,
       behavior: HitTestBehavior.opaque,
       child: Padding(
-        padding: EdgeInsets.only(bottom: 12.h),
+        padding: EdgeInsets.only(bottom: 20.h),
         child: Row(
           crossAxisAlignment: CrossAxisAlignment.center,
           mainAxisAlignment: MainAxisAlignment.center,

lib/module/profile/edit/profile_edit_controller.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:get/get.dart';
 import 'package:injectable/injectable.dart';
 import 'package:keyboard/base/base_controller.dart';
@@ -12,12 +14,14 @@ import 'package:keyboard/utils/atmob_log.dart';
 import 'package:keyboard/utils/toast_util.dart';
 
 import '../../../data/bean/character_info.dart';
+import '../../../data/consts/constants.dart';
 import '../../../data/consts/event_report.dart';
 import '../../../data/repository/config_repository.dart';
 import '../../../handler/event_handler.dart';
 import '../../../resource/assets.gen.dart';
 import '../../../utils/error_handler.dart';
 import '../../../utils/http_handler.dart';
+import '../../../utils/mmkv_util.dart';
 import '../../change/birthday/change_birthday_page.dart';
 import '../../change/nickname/change_nickname_page.dart';
 import '../../keyboard_manage/keyboard_manage_page.dart';
@@ -179,6 +183,25 @@ class ProfileEditController extends BaseController {
       await keyboardRepository.keyboardDelete(
         KeyboardDeleteRequest(keyboardId: keyboardId),
       );
+      final selectedKeyboardJson = KVUtil.getString(
+        Constants.keyboardSelect,
+        null,
+      );
+      if (selectedKeyboardJson != null) {
+        try {
+          final Map<String, dynamic> keyboardMap = jsonDecode(
+            selectedKeyboardJson,
+          );
+          final String? keyboardId = keyboardMap['id'] as String?;
+          if (keyboardId != null) {
+            if (keyboardId == _currentCustomKeyboardInfo.value.id) {
+              KVUtil.putString(Constants.keyboardSelect, null);
+            }
+          }
+        } catch (e) {
+          AtmobLog.e(tag, "解析本地选中键盘失败: $e");
+        }
+      }
       Get.back(result: true);
     });
   }

lib/module/store/new_discount/new_discount_page.dart

@@ -8,6 +8,7 @@ import 'package:carousel_slider/carousel_slider.dart';
 import 'package:get/get.dart';
 
 import '../../../data/bean/character_info.dart';
+import '../../../data/consts/constants.dart';
 import '../../../data/consts/payment_type.dart';
 import '../../../data/consts/web_url.dart';
 import '../../../resource/assets.gen.dart';
@@ -17,6 +18,7 @@ import '../../../router/app_pages.dart';
 import '../../../utils/styles.dart';
 import '../../../widget/auto_scroll_list_view.dart';
 import '../../../widget/click_text_span.dart';
+import '../../browser/browser_page.dart';
 
 class NewDiscountPage extends BasePage<NewDiscountController> {
   const NewDiscountPage({super.key});
@@ -566,23 +568,44 @@ class NewDiscountPage extends BasePage<NewDiscountController> {
   }
 
   _buildSelectedDesc() {
-    return Obx(() {
-      return Container(
-        margin: EdgeInsets.symmetric(horizontal: 16.w),
-        child: Row(
-          children: [
-            Text(
-              controller.selectedGoodsInfoItem?.selectDesc ?? "",
+    return Column(
+      children: [
+        Obx(() {
+          return Container(
+            margin: EdgeInsets.symmetric(horizontal: 16.w),
+            child: Row(
+              children: [
+                Text(
+                  controller.selectedGoodsInfoItem?.selectDesc ?? "",
+                  style: TextStyle(
+                    color: Colors.black.withAlpha(102),
+                    fontSize: 12.sp,
+                    fontWeight: FontWeight.w400,
+                  ),
+                ),
+              ],
+
+            ),
+          );
+        }),
+        Visibility(visible:!isNotHWChannel(),child:       Container(
+          margin: EdgeInsets.symmetric(horizontal: 16.w),
+          alignment: Alignment.centerLeft,
+          child: GestureDetector(
+            onTap: () {
+              BrowserPage.start(WebUrl.memberServiceAgreement);
+            },
+            child:Text(
+              StringName.textSpanMembershipAgreement,
               style: TextStyle(
-                color: Colors.black.withAlpha(102),
-                fontSize: 12.sp,
+                color: const Color(0xFF459FFF),
+                fontSize: 10.sp,
                 fontWeight: FontWeight.w400,
               ),
-            ),
-          ],
-        ),
-      );
-    });
+            ),),
+        ), )
+      ],
+    );
   }
 
   Widget _buildMemberCard() {

lib/module/store/store_page.dart

@@ -10,12 +10,14 @@ import 'package:keyboard/module/store/store_controller.dart';
 import 'package:keyboard/module/store/store_user_reviews_bean.dart';
 import 'package:keyboard/resource/string.gen.dart';
 
+import '../../data/consts/constants.dart';
 import '../../resource/assets.gen.dart';
 import '../../router/app_pages.dart';
 import '../../utils/date_util.dart';
 import '../../widget/horizontal_dashed_line.dart';
 import '../../utils/styles.dart';
 import '../../widget/click_text_span.dart';
+import '../browser/browser_page.dart';
 
 class StorePage extends BasePage<StoreController> {
   const StorePage({super.key});
@@ -475,9 +477,8 @@ class StorePage extends BasePage<StoreController> {
     return Container(
       alignment: Alignment.centerLeft,
       margin: EdgeInsets.symmetric(horizontal: 16.w),
-      padding: EdgeInsets.symmetric(horizontal: 16.w),
+      padding: EdgeInsets.symmetric(horizontal: 16.w,vertical: 8.w),
       width: double.infinity,
-      height: 36.h,
       decoration: ShapeDecoration(
         gradient: LinearGradient(
           begin: Alignment(0.00, 0.50),
@@ -499,13 +500,34 @@ class StorePage extends BasePage<StoreController> {
           ),
         ],
       ),
+      child: Column(
 
-      child: Obx(() {
-        return Text(
-          controller.selectedGoodsInfoItem?.selectDesc ?? "",
-          style: Styles.getTextStyle99673300W400(12.sp),
-        );
-      }),
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Obx(() {
+            return Text(
+              controller.selectedGoodsInfoItem?.selectDesc ?? "",
+              style: Styles.getTextStyle99673300W400(12.sp),
+            );
+          }),
+          Visibility(visible:!isNotHWChannel(),child:       Container(
+            alignment: Alignment.centerLeft,
+            child: GestureDetector(
+              onTap: () {
+                BrowserPage.start(WebUrl.memberServiceAgreement);
+              },
+              child:Text(
+                StringName.textSpanMembershipAgreement,
+                style: TextStyle(
+                  color: const Color(0xFF459FFF),
+                  fontSize: 10.sp,
+                  fontWeight: FontWeight.w400,
+                ),
+              ),),
+          ), )
+
+        ],
+      ),
     );
   }
 

lib/plugins/keyboard_method_handler.dart

@@ -129,7 +129,7 @@ class KeyboardMethodHandler {
       Constants.keyboardSelect,
       null,
     );
-    if (keyboardJsonStr != null) {
+    if (keyboardJsonStr != null&& keyboardJsonStr.isNotEmpty) {
       try {
         final jsonMap = jsonDecode(keyboardJsonStr);
         return jsonEncode(jsonMap);

pubspec.yaml

@@ -3,7 +3,7 @@ description: "A new Flutter project."
 
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 1.0.1+102
+version: 1.0.2+102
 
 environment:
   sdk: ^3.7.0