[fix]去除微信登录

ios/AiKeyboard/KeyboardViewController.swift

@@ -257,8 +257,14 @@ class KeyboardViewController: UIInputViewController {
         checkFullAccess()
         
         KeyboardApi.initParams()
-        requestKeyboardList()
-        requestPrologueList()
+        
+        let isFullAccess = self.hasFullAccess
+        
+        if isFullAccess {
+            requestKeyboardList()
+            requestPrologueList()
+        }
+       
         startMonitoringPasteboard()
         startListenGuide()
 //        self.nextKeyboardButton.leftAnchor.constraint(equalTo: self.view.leftAnchor).isActive = true
@@ -317,18 +323,21 @@ class KeyboardViewController: UIInputViewController {
     // 开始监听是否需要打开引导页
     func startListenGuide() {
         
-        // 创建定时器定期检查命令
-        guideCheckTimer = Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { [weak self] _ in
-            self?.popGuideView()
+        let isNotFirstOpen = UserDefaults.standard.bool(forKey: "isNotFirstOpenKey")
+        if !isNotFirstOpen {
+            // 创建定时器定期检查命令
+            guideCheckTimer = Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { [weak self] _ in
+                self?.popGuideView()
+            }
         }
     }
     
     func popGuideView() {
         
         let hasFullAccess = self.hasFullAccess
-        let isNotFirstOpen = UserDefaults.standard.bool(forKey: "isNotFirstOpenKey")
+        
         let showGuide = KeyboardSharedDataManager.shared.getIsShowGuide()
-        if !isNotFirstOpen && hasFullAccess && (showGuide == true) {
+        if hasFullAccess && (showGuide == true) {
             
             let guideView = KeyboardGuideView()
             self.view.addSubview(guideView)
@@ -613,25 +622,39 @@ extension KeyboardViewController: KeyboardMenuViewDelegate, KeyboardExchangeView
     func exchangeViewSaveClickAction(keyboardList: [KeyboardModel], success: @escaping (() -> ())) {
         
         var keyboardId = ""
+        var selectKeyboard: KeyboardModel?
         for keyboard in keyboardList {
             if keyboard.isChoose == true {
                 keyboardId = keyboard.id ?? ""
+                selectKeyboard = keyboard
                 break
             }
         }
         
-        requestChooseKeyboard(keyboardId: keyboardId) {
-            self.keyboardList = keyboardList
-            for keyboard in keyboardList {
-                if keyboard.isChoose == true {
-                    self.chooseKeyboard = keyboard
-                    break
+        if let selectKeyboard = selectKeyboard {
+            // 当为系统键盘时不需要调接口
+            if selectKeyboard.type == "system" {
+                
+                self.keyboardList = keyboardList
+                self.chooseKeyboard = selectKeyboard
+                self.requestCharacterList()
+                success()
+                self.userChangeLabel.text = self.chooseKeyboard?.name
+                self.clearPopView()
+                self.nowShowView?.isHidden = false
+            } else {
+                
+                requestChooseKeyboard(keyboardId: keyboardId) {
+                    
+                    self.keyboardList = keyboardList
+                    self.chooseKeyboard = selectKeyboard
+                    self.requestCharacterList()
+                    success()
+                    self.userChangeLabel.text = self.chooseKeyboard?.name
+                    self.clearPopView()
+                    self.nowShowView?.isHidden = false
                 }
             }
-            success()
-            self.userChangeLabel.text = self.chooseKeyboard?.name
-            self.clearPopView()
-            self.nowShowView?.isHidden = false
         }
     }
     

ios/AiKeyboard/View/MainView/KeyboardHelpView.swift

@@ -76,6 +76,8 @@ extension KeyboardHelpView: UICollectionViewDelegate, UICollectionViewDataSource
         } else {
             
             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: KeyboardCharacterCell.reuseIdentifier(), for: indexPath) as! KeyboardCharacterCell
+            cell.titleLabel.isHidden = false
+            cell.addBtn.isHidden = true
             if let model = self.characterList?[indexPath.row] {
                 cell.config(model: model)
             }

ios/Runner.xcodeproj/project.pbxproj

@@ -933,11 +933,15 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.qihuan.zhuiaijianpan.AiKeyboard;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
 		};
@@ -975,9 +979,13 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.qihuan.zhuiaijianpan.AiKeyboard;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;
 		};
@@ -1015,9 +1023,13 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.qihuan.zhuiaijianpan.AiKeyboard;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Profile;
 		};

lib/module/character/character_controller.dart

@@ -64,7 +64,6 @@ class CharacterController extends BaseController
         orElse: () => keyboardInfoList.first,
       );
     }
-
     _dataLoad();
   }
 

lib/module/character/content/character_group_content_controller.dart

@@ -11,6 +11,7 @@ import 'package:keyboard/data/repository/characters_repository.dart';
 import 'package:keyboard/dialog/character_details_dialog.dart';
 import 'package:keyboard/dialog/login/login_dialog.dart';
 import 'package:keyboard/module/character/character_controller.dart';
+import 'package:keyboard/module/login/login_page.dart';
 import 'package:keyboard/module/store/store_page.dart';
 import 'package:keyboard/module/store/ticket/discount_ticket_dialog.dart';
 import 'package:keyboard/utils/atmob_log.dart';
@@ -138,7 +139,11 @@ class CharacterGroupContentController extends BaseController {
     AtmobLog.d(tag, 'characterInfo ${characterInfo.toJson()} ');
     if (isLogin == false) {
       ToastUtil.show('请先登录~');
-      LoginDialog.show();
+      if (PlatformUtil.isIOS) {
+        LoginPage.start();
+      } else {
+        LoginDialog.show();
+      }
       return;
     }
     CharacterDetailsDialog.show(

lib/module/character_custom/detail/character_custom_detail_controller.dart

@@ -6,9 +6,11 @@ import 'package:keyboard/data/repository/characters_repository.dart';
 import 'package:get/get.dart';
 import 'package:keyboard/data/repository/config_repository.dart';
 import 'package:keyboard/module/character_custom/character_custom_controller.dart';
+import 'package:keyboard/module/login/login_page.dart';
 import 'package:keyboard/module/store/store_page.dart';
 import 'package:keyboard/resource/string.gen.dart';
 import 'package:keyboard/utils/atmob_log.dart';
+import 'package:keyboard/widget/platform_util.dart';
 
 import '../../../data/consts/error_code.dart';
 import '../../../data/consts/event_report.dart';
@@ -329,7 +331,11 @@ class CharacterCustomDetailController extends BaseController {
           StorePage.start();
           ToastUtil.show(error.message);
         } else if (error.code == ErrorCode.noLoginError) {
-          LoginDialog.show();
+          if (PlatformUtil.isIOS) {
+            LoginPage.start();
+          } else {
+            LoginDialog.show();
+          }
         } else {
           ErrorHandler.toastError(error);
         }

lib/module/character_custom/list/character_custom_list_controller.dart

@@ -7,6 +7,7 @@ import 'package:keyboard/data/repository/characters_repository.dart';
 import 'package:keyboard/data/repository/keyboard_repository.dart';
 import 'package:keyboard/dialog/login/login_dialog.dart';
 import 'package:keyboard/utils/toast_util.dart';
+import 'package:keyboard/widget/platform_util.dart';
 
 import '../../../data/bean/character_info.dart';
 import '../../../data/bean/keyboard_info.dart';
@@ -114,7 +115,11 @@ class CharacterCustomListController extends BaseController {
       if (error is ServerErrorException) {
         if (error.code == ErrorCode.noLoginError) {
           ErrorHandler.toastError(error);
-          LoginDialog.show();
+          if (PlatformUtil.isIOS) {
+            LoginPage.start();
+          } else {
+            LoginDialog.show();
+          }
         } else {
           ToastUtil.show(error.message);
         }

lib/module/intimacy_scale/intimacy_scale_controller.dart

@@ -2,6 +2,7 @@ import 'package:injectable/injectable.dart';
 import 'package:keyboard/base/base_controller.dart';
 import 'package:get/get.dart';
 import 'package:keyboard/data/repository/keyboard_repository.dart';
+import 'package:keyboard/dialog/loading_dialog.dart';
 import 'package:keyboard/module/profile/profile_page.dart';
 import 'package:keyboard/utils/toast_util.dart';
 import '../../data/bean/keyboard_info.dart';
@@ -73,6 +74,7 @@ class IntimacyScaleController extends BaseController {
       return;
     }
 
+    CustomLoadingDialog.show();
     try {
       await keyboardRepository.updateKeyboardInfo(
         keyboardId: currentKeyboardInfo.value!.id!,
@@ -88,6 +90,7 @@ class IntimacyScaleController extends BaseController {
       });
       Get.back();
     } catch (error) {
+      CustomLoadingDialog.hide();
       if (error is ServerErrorException) {
         if (error.code == ErrorCode.noLoginError) {
           ErrorHandler.toastError(error);

lib/module/intro/intro_controller.dart

@@ -135,7 +135,11 @@ class IntroController extends BaseController {
         ToastUtil.show("您已登录~");
         return;
       }
-      LoginDialog.show();
+      if (PlatformUtil.isIOS) {
+        LoginPage.start();
+      } else {
+        LoginDialog.show();
+      }
     });
     EventHandler.report(EventId.event_01002);
   }

lib/module/keyboard_guide/keyboard_guide_controller.dart

@@ -61,6 +61,12 @@ class KeyboardGuidePageController extends BaseController {
     KeyboardDetectIOSUtil.initialize();
     // 进入页面，就获取输入框焦点
     // requestInputFocus();
+
+    editingController.addListener(() {
+      if (!isDefaultKeyboard.value) {
+        editingController.text = "";
+      }
+    });
   }
 
   @override

lib/module/keyboard_manage/keyboard_manage_controller.dart

@@ -12,9 +12,11 @@ import 'package:keyboard/dialog/custom_character/custom_character_add_dialog.dar
 import 'package:keyboard/dialog/login/login_dialog.dart';
 import 'package:keyboard/handler/event_handler.dart';
 import 'package:keyboard/module/character/content/character_group_content_controller.dart';
+import 'package:keyboard/module/login/login_page.dart';
 import 'package:keyboard/resource/string.gen.dart';
 import 'package:keyboard/utils/atmob_log.dart';
 import 'package:keyboard/utils/toast_util.dart';
+import 'package:keyboard/widget/platform_util.dart';
 
 import '../../data/bean/keyboard_info.dart';
 import '../../data/consts/error_code.dart';
@@ -453,7 +455,11 @@ class KeyboardManageController extends BaseController
             if (error is ServerErrorException) {
               ErrorHandler.toastError(error);
               if (error.code == ErrorCode.noLoginError) {
-                LoginDialog.show();
+                if (PlatformUtil.isIOS) {
+                  LoginPage.start();
+                } else {
+                  LoginDialog.show();
+                }
               }
             } else {
               ToastUtil.show(StringName.keyboardSaveFailed);
@@ -480,7 +486,11 @@ class KeyboardManageController extends BaseController
             if (error is ServerErrorException) {
               ErrorHandler.toastError(error);
               if (error.code == ErrorCode.noLoginError) {
-                LoginDialog.show();
+                if (PlatformUtil.isIOS) {
+                  LoginPage.start();
+                } else {
+                  LoginDialog.show();
+                }
               }
             } else {
               ToastUtil.show(StringName.keyboardSaveFailed);
@@ -512,7 +522,11 @@ class KeyboardManageController extends BaseController
   clickAddCharacter({required bool isCustom}) {
     if (!isLogin) {
       ToastUtil.show("请先登录");
-      LoginDialog.show();
+      if (PlatformUtil.isIOS) {
+        LoginPage.start();
+      } else {
+        LoginDialog.show();
+      }
       return;
     }
     if (isCustom) {
@@ -538,7 +552,11 @@ class KeyboardManageController extends BaseController
   clickCustomCharacter() {
     if (!isLogin) {
       ToastUtil.show("请先登录");
-      LoginDialog.show();
+      if (PlatformUtil.isIOS) {
+        LoginPage.start();
+      } else {
+        LoginDialog.show();
+      }
       return;
     }
     AtmobLog.i(tag, 'clickCustomCharacter');

lib/module/login/login_page.dart

@@ -8,6 +8,7 @@ import 'package:keyboard/module/login/login_controller.dart';
 import 'package:get/get.dart';
 import 'package:keyboard/router/app_pages.dart';
 import 'package:keyboard/utils/common_expand.dart';
+import 'package:keyboard/widget/platform_util.dart';
 
 import '../../data/consts/web_url.dart';
 import '../../resource/assets.gen.dart';
@@ -59,7 +60,7 @@ class LoginPage extends BasePage<LoginController> {
               SizedBox(height: 25.w),
               _buildPrivacy(),
               Spacer(),
-              buildOtherLogin(),
+              PlatformUtil.isAndroid ? buildOtherLogin() : Container(),
               SizedBox(height: 20.w),
             ],
           ),

lib/module/mine/mine_controller.dart

@@ -69,8 +69,11 @@ class MineController extends BaseController {
     if (isLogin) {
       UserInfoPage.start();
     } else {
-      LoginPage.start();
-      // LoginDialog.show();
+      if (PlatformUtil.isIOS) {
+        LoginPage.start();
+      } else {
+        LoginDialog.show();
+      }
     }
     // KeyboardAndroidPlatform.enableFloatingWindow(true);
     // KeyboardAndroidPlatform.openInputMethodSettings();
@@ -85,7 +88,11 @@ class MineController extends BaseController {
       goToCustomerService();
     } else {
       ToastUtil.show('请先登录');
-      LoginDialog.show();
+      if (PlatformUtil.isIOS) {
+        LoginPage.start();
+      } else {
+        LoginDialog.show();
+      }
       return;
     }
   }
@@ -116,8 +123,13 @@ class MineController extends BaseController {
       EventHandler.report(EventId.event_14001);
       UserInfoPage.start();
     } else {
+      if (PlatformUtil.isIOS) {
+        LoginPage.start();
+      } else {
+        LoginDialog.show();
+      }
       // LoginPage.start();
-      LoginDialog.show();
+      // LoginDialog.show();
     }
   }
 

lib/module/profile/profile_controller.dart

@@ -3,11 +3,13 @@ import 'package:injectable/injectable.dart';
 import 'package:keyboard/base/base_controller.dart';
 import 'package:keyboard/data/repository/account_repository.dart';
 import 'package:keyboard/dialog/login/login_dialog.dart';
+import 'package:keyboard/module/login/login_page.dart';
 import 'package:keyboard/module/profile/edit/profile_edit_page.dart';
 import 'package:keyboard/module/user_info/user_info_page.dart';
 import 'package:keyboard/module/user_profile/user_profile_page.dart';
 import 'package:keyboard/utils/atmob_log.dart';
 import 'package:get/get.dart';
+import 'package:keyboard/widget/platform_util.dart';
 import '../../data/api/response/user_info_response.dart';
 import '../../data/bean/keyboard_info.dart';
 import '../../data/consts/error_code.dart';
@@ -108,7 +110,11 @@ class ProfileController extends BaseController {
         if (error is ServerErrorException) {
           ErrorHandler.toastError(error);
           if (error.code == ErrorCode.noLoginError) {
-            LoginDialog.show();
+            if (PlatformUtil.isIOS) {
+              LoginPage.start();
+            } else {
+              LoginDialog.show();
+            }
           }
         } else {
           AtmobLog.d(tag, " $error");
@@ -124,7 +130,11 @@ class ProfileController extends BaseController {
     if (!isUser) {
       if (isLogin == false) {
         ToastUtil.show('请先登录~');
-        LoginDialog.show();
+        if (PlatformUtil.isIOS) {
+          LoginPage.start();
+        } else {
+          LoginDialog.show();
+        }
         return;
       }
 

lib/module/store/new_discount/new_discount_controller.dart

@@ -9,6 +9,7 @@ import 'package:get/get.dart';
 import 'package:injectable/injectable.dart';
 import 'package:keyboard/base/base_controller.dart';
 import 'package:keyboard/data/bean/character_info.dart';
+import 'package:keyboard/module/login/login_page.dart';
 import 'package:keyboard/module/store/new_discount/member_card_bean.dart';
 import 'package:keyboard/widget/platform_util.dart';
 import '../../../data/api/response/user_info_response.dart';
@@ -297,7 +298,11 @@ class NewDiscountController extends BaseController
               ToastUtil.show(error.message);
             } else if (error.code == ErrorCode.noLoginError) {
               ToastUtil.show(StringName.accountNoLogin);
-              LoginDialog.show();
+              if (PlatformUtil.isIOS) {
+                LoginPage.start();
+              } else {
+                LoginDialog.show();
+              }
             } else {
               ToastUtil.show(error.message);
               paymentFail();

lib/module/store/store_controller.dart

@@ -312,7 +312,11 @@ class StoreController extends BaseController implements PaymentStatusCallback {
               ToastUtil.show(error.message);
             } else if (error.code == ErrorCode.noLoginError) {
               ToastUtil.show(StringName.accountNoLogin);
-              LoginDialog.show();
+              if (PlatformUtil.isIOS) {
+                LoginPage.start();
+              } else {
+                LoginDialog.show();
+              }
             } else {
               ToastUtil.show(error.message);
               paymentFail();
@@ -550,7 +554,7 @@ class StoreController extends BaseController implements PaymentStatusCallback {
     if (PlatformUtil.isIOS) {
       accountRepository.refreshUserInfo();
       // 300ms后关闭弹窗
-      Future.delayed(Duration(seconds: 2), () {
+      Future.delayed(Duration(seconds: 3), () {
         LoadingDialog.hide();
         Get.back();
         PaymentSuccessDialog.show(