更改提交

lib/ui/home/home_page.dart

@@ -113,9 +113,9 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
       child: GestureDetector(
         onTap: () {
           if(!(sms && plone && callLog && kg)){
-            if(!kg){
+            if(!(sms && plone && callLog )){
               BotToast.showText(text: '功能开关未开启');
-              Get.to(()=>const TabNavigator(index: 1,));
+              // Get.to(()=>const TabNavigator(index: 1,));
             }else{
               Get.to(()=>const PrivacyRightsPage(name: "权限说明"));
             }
@@ -125,8 +125,8 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
         },
         child:
         Container(
-          // width: 622.w,
+          width: 622.w,
-          margin: EdgeInsets.only(left:!kg? 200.w:64.w,right: 64.w),
+          margin: EdgeInsets.symmetric(horizontal: 64.w),
           padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 20.w),
           height: 88.w,
           decoration: BoxDecoration(
@@ -142,17 +142,17 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
               ),
               16.wb,
               Text(
-                !kg ? "功能开关未开启":"必须权限没有授予，本APP无法正常使用",
+                !(sms && plone && callLog ) ? "必须权限没有授予，本APP无法正常使用":"功能开关未开启,请到我的页面开启",
                 style:
                     TextStyle(color: const Color(0xFFFF3F3F), fontSize: 24.sp),
               ),
-              32.wb,
+              !(sms && plone && callLog ) ?32.wb:  0.wb,
-              Image(
+              !(sms && plone && callLog )? Image(
                 image: AssetImage(Assets.icons.right.path),
                 width: 28.w,
                 height: 28.w,
                 fit: BoxFit.fill,
-              )
+              ):const SizedBox()
             ],
           ),
         ),

lib/ui/login/login_page.dart

@@ -308,7 +308,8 @@ class _LoginPageState extends State<LoginPage> {
     final TapGestureRecognizer recognizer = TapGestureRecognizer();
     recognizer.onTap = () {
       if (kDebugMode) {
-        print("点击协议了");
+        Get.to(()=>const ContentAuthorityPage());
+        // print("点击协议了");
       }
       ///跳转到用户协议页面
     };
@@ -336,9 +337,7 @@ class _LoginPageState extends State<LoginPage> {
                     size: 18, color: Colors.blue),
           ),
 
-          GestureDetector(onTap: (){
+          RichText(
-            Get.to(()=>const ContentAuthorityPage());
-          },child: RichText(
               text: TextSpan(
                   text: "我已阅读并同意",
                   style: TextStyle(
@@ -354,11 +353,10 @@ class _LoginPageState extends State<LoginPage> {
                     //       color: BaseStyle.colorcccccc, fontSize: 12 * 2.sp),
                     // ),
                     TextSpan(
-                        text: '《隐私协议》',
+                        text: '《短信帮手隐私协议》',
                         style: TextStyle(color: kPrimaryColor, fontSize: 12 * 2.sp),
                         recognizer: _recognizer(context, 1)),
-                  ])),)
+                  ]))
-          ,
         ],
       ),
     );

lib/ui/user/user_page.dart

@@ -45,12 +45,8 @@ class _UserPageState extends State<UserPage> {
   final userProvider = Provider.of<UserProvider>(Get.context!, listen: false);
   bool isVip = false;
   String? endDate;
-  final service = FlutterBackgroundService();
-
   late bool vle = false;
-
+  final service = FlutterBackgroundService();
-
-
   final EasyRefreshController _easyRefreshController = EasyRefreshController();
 
   @override
@@ -59,33 +55,15 @@ class _UserPageState extends State<UserPage> {
     super.dispose();
   }
   // _load() async {
+  //   // print("123123131313131231231231231313123131232311313131231231");
   //   vle = await service.isRunning();
   // }
   @override
   void initState() {
     super.initState();
-    UserTool.userProvider.updateUserInfo();
+    // _easyRefreshController.callRefresh();
-    Future.delayed(
+    // UserTool.userProvider.updateUserInfo();
-        const Duration(milliseconds: 0),
+
-            () => setState(() async{
-          if (UserTool.userProvider.isLogin) {
-            // print(UserTool.userProvider.userInfo.end * 1000);
-            // print(DateTime.now().millisecondsSinceEpoch);
-            if (UserTool.userProvider.userInfo.isVip != 1) {
-              isVip = false;
-              vle = false;
-            } else {
-              isVip = true;
-              vle = await service.isRunning();
-            }
-            //service.isRunning() as bool;
-            endDate = DateUtil.formatDateMs(
-                UserTool.userProvider.userInfo.end * 1000,
-                format: DateFormats.y_mo_d);
-          } else {
-            vle = false;
-          }
-        }));
   }
 
   @override
@@ -98,8 +76,34 @@ class _UserPageState extends State<UserPage> {
       path: Assets.images.bg.path,
       bodyColor: Colors.white,
       extendBody: true,
-      body: Column(
+      body: Expanded(child:  Column(
         children: [
+      Expanded(
+      child:EasyRefresh(
+            firstRefresh: true,
+            header: MaterialHeader(),
+            onRefresh: () async {
+              // _load();
+              // await UserTool.userProvider.updateUserInfo();
+                    if (UserTool.userProvider.isLogin) {
+                      // print(UserTool.userProvider.userInfo.end * 1000);
+                      // print(DateTime.now().millisecondsSinceEpoch);
+                      if (UserTool.userProvider.userInfo.isVip != 1) {
+                        isVip = false;
+                        vle = false;
+                      } else {
+                        isVip = true;
+                        vle = await service.isRunning();
+                      }
+                      //service.isRunning() as bool;
+                      // endDate = DateUtil.formatDateMs(
+                      //     UserTool.userProvider.userInfo.end * 1000,
+                      //     format: DateFormats.y_mo_d);
+                    } else {
+                      vle = false;
+                    }
+              setState(() {});
+            },child:ListView(children: [
           _getUser(),
           72.hb,
           _getBanner(),
@@ -112,25 +116,29 @@ class _UserPageState extends State<UserPage> {
           182.hb,
           UserTool.userProvider.isLogin
               ? PloneBottom(
-                  border: false,
+            border: false,
-                  onTap: () async {
+            onTap: () async {
-                    var cancel = CloudToast.loading;
+              var cancel = CloudToast.loading;
-                    var base = await apiClient.request(API.app.logout,
+              var base = await apiClient.request(API.app.logout,
-                        showMessage: true);
+                  showMessage: true);
-                    if (base.code == 0) {
+              if (base.code == 0) {
-                      UserTool.userProvider.logout();
+                UserTool.userProvider.logout();
-                      Get.offAll(const TabNavigator());
+                Get.offAll(const TabNavigator());
-                    }
+              }
-                    cancel();
+              cancel();
-                  },
+            },
-                  textColor: const Color(0xFF1890FF),
+            textColor: const Color(0xFF1890FF),
-                  color1: const Color(0xFFEBF5FF),
+            color1: const Color(0xFFEBF5FF),
-                  color2: const Color(0xFFEBF5FF),
+            color2: const Color(0xFFEBF5FF),
-                  text: "退出登录",
+            text: "退出登录",
-                )
+          )
-              : const SizedBox()
+              : const SizedBox()],) )
-        ],
+
-      ),
+
+      ),],
+      ),)
+
+
     );
   }
 
@@ -270,7 +278,7 @@ class _UserPageState extends State<UserPage> {
         _getVip(),
         16.hb,
         Text(
-          isVip ? "$endDate到期" : "解锁全部功能",
+          isVip ? "${DateUtil.formatDateMs(UserTool.userProvider.userInfo.end * 1000, format: DateFormats.y_mo_d)}到期" : "解锁全部功能",
           style: TextStyle(color: Colors.white, fontSize: BaseStyle.fontSize24),
         )
       ],