Quellcode durchsuchen

[fix]亲密度分析,支持未登录时上传图片,点分析按钮,跳转到会员活动页

hezihao vor 7 Monaten
Ursprung
Commit
c7e4d04bed

+ 6 - 5
lib/module/intimacy_analyse/analyse_report/intimacy_analyse_report_view.dart

@@ -81,7 +81,8 @@ class IntimacyAnalyseReportView
   Widget _buildIntimacyArchives() {
     return Obx(() {
       // 是否要显示添加档案的布局
-      bool isNeedShowAddProfileLayout = !controller.isLogin || controller.currentKeyboardInfo.value == null;
+      bool isNeedShowAddProfileLayout =
+          controller.currentKeyboardInfo.value == null;
 
       // 当前用户的头像
       String myAvatarUrl = controller.userInfo.value?.imageUrl ?? "";
@@ -129,7 +130,8 @@ class IntimacyAnalyseReportView
                     ),
                   ],
                 ),
-              ): SizedBox.shrink(),
+              )
+              : SizedBox.shrink(),
         ],
       );
     });
@@ -190,11 +192,10 @@ class IntimacyAnalyseReportView
   /// 亲密档案切换布局
   Widget _buildIntimacyArchivesSwitchLayout() {
     return Obx(() {
-      // 未登录,不显示
-      if (!controller.isLogin) {
+      String taName = controller.currentKeyboardInfo.value?.name ?? "";
+      if (taName.isEmpty) {
         return SizedBox.shrink();
       }
-      String taName = controller.currentKeyboardInfo.value?.name ?? "";
       return GestureDetector(
         onTap: () {
           controller.clickIntimacyArchivesSwitch();

+ 0 - 6
lib/module/intimacy_analyse/analyse_report/intimacy_analyse_report_view_controller.dart

@@ -101,12 +101,6 @@ class IntimacyAnalyseReportController extends BaseController {
 
   /// 解锁
   void clickUnlockBtn(BuildContext context) async {
-    // 未登录,则跳转去登录
-    if (!isLogin) {
-      LoginDialog.show();
-      return;
-    }
-
     // 如果用户未设置过档案,则跳转到档案选择页
     if (currentKeyboardInfo.value == null) {
       ToastUtil.show(StringName.noCreateIntimacyTaTip);

+ 4 - 3
lib/module/intimacy_analyse/intimacy_analyse_upload/intimacy_analyse_upload_controller.dart

@@ -32,6 +32,7 @@ import '../../../utils/image_picker_util.dart';
 import '../../../utils/intimacy_analyze_config_helper.dart';
 import '../../../utils/upload/upload_file_manager.dart';
 import '../../profile/profile_page.dart';
+import '../../store/new_discount/new_discount_page.dart';
 import '../../store/store_page.dart';
 import 'dialog/direction/custom_direction_edit_dialog.dart';
 import 'dialog/intimacy_generate_character/intimacy_generate_character_edit_dialog.dart';
@@ -322,10 +323,10 @@ class IntimacyAnalyseUploadController extends BaseController {
     bool isVip = accountRepository.memberStatusInfo.value?.isMember ?? false;
 
     if (isNeedForceVip) {
-      // 非Vip,跳转到商店
+      // 非Vip,跳转到会员活动
       if (!isVip) {
         ToastUtil.show(StringName.needVipTip);
-        StorePage.start();
+        NewDiscountPage.start();
         return;
       }
     }
@@ -395,7 +396,7 @@ class IntimacyAnalyseUploadController extends BaseController {
         // 需要Vip权限
         if (error.code == 1005) {
           ToastUtil.show(error.message);
-          StorePage.start();
+          NewDiscountPage.start();
         } else {
           ToastUtil.show(error.message);
         }

+ 5 - 18
lib/module/intimacy_analyse/screenshot_reply/conversation_analysis/conversation_analysis_controller.dart

@@ -7,6 +7,7 @@ import 'package:get/get.dart';
 import 'package:injectable/injectable.dart';
 import 'package:keyboard/base/base_controller.dart';
 import 'package:keyboard/dialog/login/login_dialog.dart';
+import 'package:keyboard/module/store/new_discount/new_discount_page.dart';
 import 'package:keyboard/resource/string.gen.dart';
 import 'package:wechat_assets_picker/wechat_assets_picker.dart';
 
@@ -152,24 +153,17 @@ class ConversationAnalysisController extends BaseController {
 
   /// 点击解锁按钮
   void clickUnlockBtn(BuildContext context) async {
-    // 跳转去Vip商店
-    StorePage.start();
+    // 跳转去会员活动页
+    NewDiscountPage.start();
   }
 
   /// 点击查看分析按钮
   void clickLookAnalyseBtn(BuildContext context) async {
-    // 未登录,提示登录
-    bool isLogin = accountRepository.isLogin.value;
-    if (!isLogin) {
-      LoginDialog.show();
-      return;
-    }
-
     // 非Vip,跳转到商店页
     bool isVip = accountRepository.memberStatusInfo.value?.isMember ?? false;
     if (!isVip) {
       ToastUtil.show(StringName.needVipTip);
-      StorePage.start();
+      NewDiscountPage.start();
       return;
     }
 
@@ -221,7 +215,7 @@ class ConversationAnalysisController extends BaseController {
           // 需要Vip权限
           if (error.code == 1005) {
             ToastUtil.show(error.message);
-            StorePage.start();
+            NewDiscountPage.start();
           } else {
             ToastUtil.show(error.message);
           }
@@ -238,13 +232,6 @@ class ConversationAnalysisController extends BaseController {
 
   /// 点击上传按钮
   void clickUploadBtn(BuildContext context) async {
-    // 未登录,提示登录
-    bool isLogin = accountRepository.isLogin.value;
-    if (!isLogin) {
-      LoginDialog.show();
-      return;
-    }
-
     // 计算还可以上传多少张图片
     int count =
         intimacyAnalyzeConfigHelper.getMaxAssetsCount() - uploadInfoList.length;

+ 4 - 17
lib/module/intimacy_analyse/screenshot_reply/scan_image_reply/scan_image_reply_controller.dart

@@ -29,6 +29,7 @@ import '../../../../utils/sse_parse_util.dart';
 import '../../../../utils/upload/upload_file_manager.dart';
 import '../../../../utils/upload/upload_scene_type.dart';
 import '../../../../utils/upload/upload_state.dart';
+import '../../../store/new_discount/new_discount_page.dart';
 import '../../../store/store_page.dart';
 
 /// 识图回复Controller
@@ -174,13 +175,6 @@ class ScanImageReplyController extends BaseController {
 
   /// 点击上传截图按钮
   void clickUploadScreenshotBtn(BuildContext context) async {
-    // 未登录,提示登录
-    bool isLogin = accountRepository.isLogin.value;
-    if (!isLogin) {
-      LoginDialog.show();
-      return;
-    }
-
     // 分析中,禁止上传
     if (isResultGenerating.value) {
       ToastUtil.show(StringName.intimacyAnalyseIngPleaseWait);
@@ -224,18 +218,11 @@ class ScanImageReplyController extends BaseController {
 
   /// 点击获取回复按钮
   void clickGetReplyBtn() async {
-    // 未登录,提示登录
-    bool isLogin = accountRepository.isLogin.value;
-    if (!isLogin) {
-      LoginDialog.show();
-      return;
-    }
-
-    // 非Vip,跳转到商店页
+    // 非Vip,跳转到会员活动页
     bool isVip = accountRepository.memberStatusInfo.value?.isMember ?? false;
     if (!isVip) {
       ToastUtil.show(StringName.needVipTip);
-      StorePage.start();
+      NewDiscountPage.start();
       return;
     }
 
@@ -299,7 +286,7 @@ class ScanImageReplyController extends BaseController {
         // 需要Vip权限
         if (error.code == 1005) {
           ToastUtil.show(error.message);
-          StorePage.start();
+          NewDiscountPage.start();
         } else {
           ToastUtil.show(error.message);
         }