Browse Source

[feat]星座恋爱分析,未创建或选择档案时,先让用户操作后,再跳去星座恋爱分析

hezihao 6 months ago
parent
commit
0f7eac4007

+ 1 - 0
assets/string/base/string.xml

@@ -67,6 +67,7 @@
     <string name="logout">退出登录</string>
     <string name="logout">退出登录</string>
 
 
     <string name="user_not_set_birthday_tip">请先设置生日</string>
     <string name="user_not_set_birthday_tip">请先设置生日</string>
+    <string name="user_not_create_profile">请先生成定制键盘</string>
 
 
     <!-- 反馈页面-->
     <!-- 反馈页面-->
     <string name="feedback_content_title">问题描述</string>
     <string name="feedback_content_title">问题描述</string>

+ 11 - 0
lib/module/zodiac_love_intimacy/zodiac_love_intimacy_page.dart

@@ -5,6 +5,7 @@ import 'package:get/get.dart';
 import 'package:keyboard/base/base_page.dart';
 import 'package:keyboard/base/base_page.dart';
 import 'package:keyboard/data/repository/account_repository.dart';
 import 'package:keyboard/data/repository/account_repository.dart';
 import 'package:keyboard/dialog/login/login_dialog.dart';
 import 'package:keyboard/dialog/login/login_dialog.dart';
+import 'package:keyboard/module/profile/profile_page.dart';
 import 'package:keyboard/module/zodiac_love_intimacy/tody/zodiac_love_today_view.dart';
 import 'package:keyboard/module/zodiac_love_intimacy/tody/zodiac_love_today_view.dart';
 import 'package:keyboard/module/zodiac_love_intimacy/zodiac_love_intimacy_controller.dart';
 import 'package:keyboard/module/zodiac_love_intimacy/zodiac_love_intimacy_controller.dart';
 import 'package:keyboard/resource/colors.gen.dart';
 import 'package:keyboard/resource/colors.gen.dart';
@@ -12,6 +13,7 @@ import 'package:keyboard/router/app_page_arguments.dart';
 import 'package:keyboard/utils/toast_util.dart';
 import 'package:keyboard/utils/toast_util.dart';
 import 'package:lottie/lottie.dart';
 import 'package:lottie/lottie.dart';
 import 'package:nested_scroll_views/material.dart';
 import 'package:nested_scroll_views/material.dart';
+import '../../data/repository/keyboard_repository.dart';
 import '../../di/get_it.dart';
 import '../../di/get_it.dart';
 import '../../resource/assets.gen.dart';
 import '../../resource/assets.gen.dart';
 import '../../resource/string.gen.dart';
 import '../../resource/string.gen.dart';
@@ -30,6 +32,8 @@ class ZodiacLoveIntimacyPage extends BasePage<ZodiacLoveIntimacyController> {
 
 
   static start({ZodiacLoveIntimacyTab tab = ZodiacLoveIntimacyTab.today}) {
   static start({ZodiacLoveIntimacyTab tab = ZodiacLoveIntimacyTab.today}) {
     var accountRepository = getIt.get<AccountRepository>();
     var accountRepository = getIt.get<AccountRepository>();
+    var keyboardRepository = getIt.get<KeyboardRepository>();
+
     // 未登录,要求先登录
     // 未登录,要求先登录
     if (!accountRepository.isLogin.value) {
     if (!accountRepository.isLogin.value) {
       ToastUtil.show(StringName.accountNoLogin);
       ToastUtil.show(StringName.accountNoLogin);
@@ -44,6 +48,13 @@ class ZodiacLoveIntimacyPage extends BasePage<ZodiacLoveIntimacyController> {
       return;
       return;
     }
     }
 
 
+    // 未选择档案,要求先创建或选择档案
+    if (keyboardRepository.chooseKeyboardInfo.value == null) {
+      ToastUtil.show(StringName.userNotCreateProfile);
+      ProfilePage.start();
+      return;
+    }
+
     var args = {AppPageArguments.index: tab.tabIndex};
     var args = {AppPageArguments.index: tab.tabIndex};
     Get.toNamed(RoutePath.zodiacLoveIntimacy, arguments: args);
     Get.toNamed(RoutePath.zodiacLoveIntimacy, arguments: args);
   }
   }

+ 2 - 0
lib/resource/string.gen.dart

@@ -55,6 +55,7 @@ class StringName {
   static final String personalInfo = 'personal_info'.tr; // 个人信息
   static final String personalInfo = 'personal_info'.tr; // 个人信息
   static final String logout = 'logout'.tr; // 退出登录
   static final String logout = 'logout'.tr; // 退出登录
   static final String userNotSetBirthdayTip = 'user_not_set_birthday_tip'.tr; // 请先设置生日
   static final String userNotSetBirthdayTip = 'user_not_set_birthday_tip'.tr; // 请先设置生日
+  static final String userNotCreateProfile = 'user_not_create_profile'.tr; // 请先生成定制键盘
   static final String feedbackContentTitle = 'feedback_content_title'.tr; // 问题描述
   static final String feedbackContentTitle = 'feedback_content_title'.tr; // 问题描述
   static final String feedbackContentHint = 'feedback_content_hint'.tr; // 请描述您的问题或建议,或者您可以联系我们在线客服
   static final String feedbackContentHint = 'feedback_content_hint'.tr; // 请描述您的问题或建议,或者您可以联系我们在线客服
   static final String feedbackPhone = 'feedback_phone'.tr; // 联系电话
   static final String feedbackPhone = 'feedback_phone'.tr; // 联系电话
@@ -416,6 +417,7 @@ class StringMultiSource {
       'personal_info': '个人信息',
       'personal_info': '个人信息',
       'logout': '退出登录',
       'logout': '退出登录',
       'user_not_set_birthday_tip': '请先设置生日',
       'user_not_set_birthday_tip': '请先设置生日',
+      'user_not_create_profile': '请先生成定制键盘',
       'feedback_content_title': '问题描述',
       'feedback_content_title': '问题描述',
       'feedback_content_hint': '请描述您的问题或建议,或者您可以联系我们在线客服',
       'feedback_content_hint': '请描述您的问题或建议,或者您可以联系我们在线客服',
       'feedback_phone': '联系电话',
       'feedback_phone': '联系电话',