Merge branch 'v1.0.3' into v1.1.4_ios

# Conflicts:
#	pubspec.yaml

lib/module/keyboard/keyboard_view.dart

@@ -1,6 +1,6 @@
+import 'dart:io';
+
 import 'package:auto_size_text/auto_size_text.dart';
-import 'package:cached_network_image/cached_network_image.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
@@ -173,7 +173,7 @@ class KeyBoardView extends BaseView<KeyBoardController> {
   Widget _buildLoveIndexCard() {
     return GestureDetector(
       onTap: () {
-        controller.clickZodiacLoveIntimacy();
+        Platform.isIOS ? {} : controller.clickZodiacLoveIntimacy();
       },
       child: Stack(
         clipBehavior: Clip.none,
@@ -197,10 +197,10 @@ class KeyBoardView extends BaseView<KeyBoardController> {
             ),
             child: Row(
               children: [
-                Assets.images.iconKeyboardLoveIndex.image(
-                  width: 72.w,
-                  height: 23.h,
-                ),
+                (Platform.isIOS
+                        ? Assets.images.iconKeyboardLoveIndexIos
+                        : Assets.images.iconKeyboardLoveIndex)
+                    .image(width: 72.w, height: 23.h),
                 SizedBox(width: 10.w),
                 Expanded(
                   child: Obx(() {

lib/module/main/main_controller.dart

@@ -112,6 +112,18 @@ class MainController extends BaseController {
   Future<void> onReady() async {
     super.onReady();
 
+    // 进来的时候可能就为true了。导致新人完成引导不展示
+    if(isRequest.value){
+      if (memberStatusInfo != null && memberStatusInfo!.isMember && isLogin) {
+        return;
+      }
+      AtmobLog.i(_tag, "memberStatusInfo ${memberStatusInfo?.isMember}");
+      if (!accountRepository.isVipUser) {
+        AtmobLog.i(_tag, "memberStatusInfo ${accountRepository.isVipUser}");
+        await NewDiscountPage.start();
+      }
+    }
+
     once(isRequest, (value) async {
       if (value) {
         if (memberStatusInfo != null && memberStatusInfo!.isMember) {
@@ -119,7 +131,7 @@ class MainController extends BaseController {
         }
         AtmobLog.i(_tag, "memberStatusInfo ${memberStatusInfo?.isMember}");
         if (!accountRepository.isVipUser) {
-
+          AtmobLog.i(_tag, "memberStatusInfo ${accountRepository.isVipUser}");
           await NewDiscountPage.start();
         }
       }

lib/resource/assets.gen.dart

@@ -827,6 +827,10 @@ class $AssetsImagesGen {
   AssetGenImage get iconKeyboardLoveIndex =>
       const AssetGenImage('assets/images/icon_keyboard_love_Index.webp');
 
+  /// File path: assets/images/icon_keyboard_love_Index_ios.webp
+  AssetGenImage get iconKeyboardLoveIndexIos =>
+      const AssetGenImage('assets/images/icon_keyboard_love_Index_ios.webp');
+
   /// File path: assets/images/icon_keyboard_love_logo.webp
   AssetGenImage get iconKeyboardLoveLogo =>
       const AssetGenImage('assets/images/icon_keyboard_love_logo.webp');
@@ -1573,6 +1577,7 @@ class $AssetsImagesGen {
     iconKeyboardGuideOverlay1,
     iconKeyboardHitPlay,
     iconKeyboardLoveIndex,
+    iconKeyboardLoveIndexIos,
     iconKeyboardLoveLogo,
     iconKeyboardManageCustom,
     iconKeyboardManageFavorite,

pubspec.yaml

@@ -178,7 +178,7 @@ dev_dependencies:
   #Retrofit代码生成器
   retrofit_generator: '>=8.0.0 <10.0.0' # for Dart 3.3 use ^9.0.0
   #json序列化
-  json_serializable: 6.9.4
+  json_serializable: 6.9.5
   #  代码生成
   build_runner: 2.4.15