Browse Source

[fit]1.修改我的页面会员模块的图片,
2.删除选中的键盘时。清空选中键盘

云天逵 6 months ago
parent
commit
ccb788cd7a

BIN
assets/images/bg_mine_vip_card.webp


+ 3 - 0
lib/data/repository/keyboard_repository.dart

@@ -113,6 +113,9 @@ class KeyboardRepository {
       if (chosen != null) {
       if (chosen != null) {
         _chooseKeyboardInfo.value = chosen;
         _chooseKeyboardInfo.value = chosen;
       }
       }
+      if(chosen==null&&_chooseKeyboardInfo.value!=null){
+        _chooseKeyboardInfo.value=null;
+      }
       // 过滤掉系统键盘
       // 过滤掉系统键盘
       _customKeyboardInfoList.value =
       _customKeyboardInfoList.value =
           response.keyboardInfos
           response.keyboardInfos

+ 2 - 2
lib/module/intimacy_scale/intimacy_scale_controller.dart

@@ -36,10 +36,10 @@ class IntimacyScaleController extends BaseController {
   void onInit() {
   void onInit() {
     super.onInit();
     super.onInit();
 
 
-    currentCustomIntimacy.value = currentKeyboardInfo.value?.intimacy ?? 0;
+    currentCustomIntimacy.value = currentKeyboardInfo.value?.intimacy ?? 30;
     rulerPickerController =
     rulerPickerController =
         RulerPickerController(
         RulerPickerController(
-          value: currentKeyboardInfo.value?.intimacy ?? 0,
+          value: currentKeyboardInfo.value?.intimacy ?? 30,
         ).obs;
         ).obs;
     rulerPickerController.value.addListener(() {
     rulerPickerController.value.addListener(() {
       currentCustomIntimacy.value = rulerPickerController.value.value.toInt();
       currentCustomIntimacy.value = rulerPickerController.value.value.toInt();

+ 40 - 33
lib/module/intro/intro_controller.dart

@@ -6,6 +6,7 @@ import 'package:get/get.dart';
 import 'package:keyboard/base/base_controller.dart';
 import 'package:keyboard/base/base_controller.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:keyboard/data/repository/account_repository.dart';
 import 'package:keyboard/data/repository/account_repository.dart';
+import 'package:keyboard/module/main/main_controller.dart';
 import 'package:keyboard/utils/toast_util.dart';
 import 'package:keyboard/utils/toast_util.dart';
 import '../../data/consts/constants.dart';
 import '../../data/consts/constants.dart';
 import '../../data/consts/event_report.dart';
 import '../../data/consts/event_report.dart';
@@ -23,49 +24,54 @@ class IntroController extends BaseController {
   var currentPage = 0.obs;
   var currentPage = 0.obs;
   Timer? _autoPageTimer;
   Timer? _autoPageTimer;
 
 
+  late Worker  _loginSubscription;
   IntroController();
   IntroController();
 
 
   /// 页面数据列表
   /// 页面数据列表
   final List<PageBean> pageList = [
   final List<PageBean> pageList = [
     PageBean(
     PageBean(
-      title: Text.rich(
-        textAlign: TextAlign.center,
-        TextSpan(
-          children: [
-            TextSpan(
-              text: '想知道\n',
-              style: TextStyle(
-                color: Colors.black.withAlpha(153),
-                fontSize: 14.sp,
-                fontWeight: FontWeight.w500,
+      title: () {
+        return Text.rich(
+          textAlign: TextAlign.center,
+          TextSpan(
+            children: [
+              TextSpan(
+                text: '想知道\n',
+                style: TextStyle(
+                  color: Colors.black.withAlpha(153),
+                  fontSize: 14.sp,
+                  fontWeight: FontWeight.w500,
+                ),
               ),
               ),
-            ),
-            TextSpan(
-              text: 'Ta ',
-              style: TextStyle(
-                color: const Color(0xFF7D46FC),
-                fontSize: 24.sp,
-                fontWeight: FontWeight.w600,
+              TextSpan(
+                text: 'Ta ',
+                style: TextStyle(
+                  color: const Color(0xFF7D46FC),
+                  fontSize: 24.sp,
+                  fontWeight: FontWeight.w600,
+                ),
               ),
               ),
-            ),
-            TextSpan(
-              text: '对你到底是‘朋友’还是‘心动’?',
-              style: TextStyle(
-                color: Colors.black.withAlpha(153),
-                fontSize: 14.sp,
-                fontWeight: FontWeight.w500,
+              TextSpan(
+                text: '对你到底是‘朋友’还是‘心动’?',
+                style: TextStyle(
+                  color: Colors.black.withAlpha(153),
+                  fontSize: 14.sp,
+                  fontWeight: FontWeight.w500,
+                ),
               ),
               ),
-            ),
-          ],
-        ),
-      ),
+            ],
+          ),
+        );
+      },
       animUrl: Assets.anim.animIntroFirstData,
       animUrl: Assets.anim.animIntroFirstData,
-      stayDuration: const Duration(milliseconds:4100),
+      stayDuration: const Duration(milliseconds: 4100),
     ),
     ),
     PageBean(
     PageBean(
-      title: const SizedBox(),
+      title: () {
+        return const SizedBox();
+      },
       animUrl: Assets.anim.animIntroSecondData,
       animUrl: Assets.anim.animIntroSecondData,
-      stayDuration:const Duration(milliseconds: 5500)
+      stayDuration: const Duration(milliseconds: 5500),
     ),
     ),
   ];
   ];
 
 
@@ -81,7 +87,7 @@ class IntroController extends BaseController {
     _startAutoSwitchTimer();
     _startAutoSwitchTimer();
     EventHandler.report(EventId.event_01000);
     EventHandler.report(EventId.event_01000);
     // 监听登录状态
     // 监听登录状态
-    ever(AccountRepository.getInstance().isLogin, (bool isLogin) {
+    _loginSubscription= ever(AccountRepository.getInstance().isLogin, (bool isLogin) {
       if (isLogin) {
       if (isLogin) {
         // 登录后跳转新用户页
         // 登录后跳转新用户页
         Future.delayed(const Duration(milliseconds: 300), () {
         Future.delayed(const Duration(milliseconds: 300), () {
@@ -146,13 +152,14 @@ class IntroController extends BaseController {
 
 
   @override
   @override
   void onClose() {
   void onClose() {
+    _loginSubscription.dispose();
     _autoPageTimer?.cancel();
     _autoPageTimer?.cancel();
     super.onClose();
     super.onClose();
   }
   }
 }
 }
 
 
 class PageBean {
 class PageBean {
-  final Widget title;
+  final WidgetFunction title;
   final String animUrl;
   final String animUrl;
   final Duration stayDuration; // 每页停留时间
   final Duration stayDuration; // 每页停留时间
 
 

+ 1 - 1
lib/module/intro/intro_page.dart

@@ -127,7 +127,7 @@ class IntroPage extends BasePage<IntroController> {
       crossAxisAlignment: CrossAxisAlignment.center,
       crossAxisAlignment: CrossAxisAlignment.center,
       mainAxisAlignment: MainAxisAlignment.start,
       mainAxisAlignment: MainAxisAlignment.start,
       children: [
       children: [
-        pageBean.title,
+        pageBean.title(),
         SizedBox(height: 20.h),
         SizedBox(height: 20.h),
 
 
         Lottie.asset(
         Lottie.asset(