1，上架审核类注释

2，注册页面隐私协议勾选框及逻辑修改

star_lock/lib/login/login/starLock_login_page.dart

@@ -198,7 +198,7 @@ class _StarLockLoginPageState extends State<StarLockLoginPage> {
                     child: SizedBox(
                   width: 10.sp,
                 )),
-                //提交Google暂时屏蔽
+                //上架审核注释 提交Google暂时屏蔽
                 // GestureDetector(
                 //   child: SizedBox(
                 //     // width: 150.w,

star_lock/lib/login/login/starLock_login_state.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
-import '../../tools/store_service.dart';
-
 class StarLockLoginState {
   var passwordShow = true.obs;
   var agree = false.obs;

star_lock/lib/login/register/starLock_register_logic.dart

@@ -30,11 +30,11 @@ class StarLockRegisterLogic extends BaseGetXController {
 
   void register() async {
     var entity = await ApiRepository.to.register(
-        receiverType:state.isIphoneType.value == true ? 1 : 2,
+        receiverType: state.isIphoneType.value == true ? 1 : 2,
-        countryCode:state.countryCode.value,
+        countryCode: state.countryCode.value,
-        account:state.phoneOrEmailStr.value,
+        account: state.phoneOrEmailStr.value,
-        password:state.pwd.value,
+        password: state.pwd.value,
-        verificationCode:state.verificationCode.value);
+        verificationCode: state.verificationCode.value);
     if (entity.errorCode!.codeIsSuccessful) {
       // await loginSuccess(loginEntity: entity);
       // Toast.show(msg: "注册成功");
@@ -46,16 +46,18 @@ class StarLockRegisterLogic extends BaseGetXController {
   void sendValidationCode() async {
     var entity = await ApiRepository.to.sendValidationCode(
         // state.countryCode.value,
-        countryCode:state.countryCode.value.toString(),
+        countryCode: state.countryCode.value.toString(),
-        account:state.phoneOrEmailStr.value,
+        account: state.phoneOrEmailStr.value,
-        channel:state.isIphoneType.value ? "1" : "2",
+        channel: state.isIphoneType.value ? "1" : "2",
-        codeType:'1',
+        codeType: '1',
-        xWidth:state.xWidth.value.toString());
+        xWidth: state.xWidth.value.toString());
     if (entity.errorCode!.codeIsSuccessful) {
       _startTimer();
-    } else {
+    } else {}
+  }
 
-    }
+  void changeAgreeState() {
+    _resetCanSub();
   }
 
   void checkNext(TextEditingController controller) {

star_lock/lib/login/register/starLock_register_page.dart

@@ -1,4 +1,3 @@
-
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -51,7 +50,12 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
                   isDisabled: state.canSub.value,
                   onClick: state.canSub.value
                       ? () {
-                          logic.register();
+                          if (state.agree.value == false) {
+                            logic.showToast('请先同意用户协议及隐私政策');
+                            return;
+                          } else {
+                            logic.register();
+                          }
                         }
                       : null);
             }),
@@ -294,7 +298,8 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
                                 "countryCode": state.countryCode,
                                 "account": state.phoneOrEmailStr.value
                               });
-                          state.xWidth.value = (result as Map<String, dynamic>)['xWidth'];
+                          state.xWidth.value =
+                              (result as Map<String, dynamic>)['xWidth'];
                           logic.sendValidationCode();
                         }
                       : null,
@@ -303,7 +308,9 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
                     height: 60.h,
                     padding: EdgeInsets.all(5.h),
                     decoration: BoxDecoration(
-                        color: state.phoneOrEmailStrIsOK.value ? AppColors.mainColor : Colors.grey,
+                        color: state.phoneOrEmailStrIsOK.value
+                            ? AppColors.mainColor
+                            : Colors.grey,
                         borderRadius: BorderRadius.circular(5)),
                     child: Center(
                       child: Text(state.btnText.value,
@@ -326,15 +333,18 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
     return Row(
       mainAxisAlignment: MainAxisAlignment.start,
       children: [
-        Image.asset(
+        Obx(() => GestureDetector(
-          'images/icon_select_circle.png',
+            onTap: () {
-          width: 28.w,
+              state.agree.value = !state.agree.value;
-          height: 28.w,
+              logic.changeAgreeState();
-        ),
+            },
-        // SizedBox(
+            child: Image.asset(
-        //     height: 20.h,
+              state.agree.value
-        //     width: 26.w,
+                  ? 'images/icon_round_select.png'
-        //     child: Checkbox(value: false, onChanged: (value) {})),
+                  : 'images/icon_round_unSelect.png',
+              width: 30.w,
+              height: 30.w,
+            ))),
         SizedBox(
           width: 15.w,
         ),
@@ -352,11 +362,10 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
                         style: TextStyle(
                             color: AppColors.mainColor, fontSize: 20.sp)),
                     onTap: () {
-                      Get.toNamed(Routers.webviewShowPage,
+                      Get.toNamed(Routers.webviewShowPage, arguments: {
-                          arguments: {
+                        "url": XSConstantMacro.userAgreementURL,
-                            "url": XSConstantMacro.userAgreementURL,
+                        "title": '用户协议'
-                            "title": '用户协议'
+                      });
-                          });
                     },
                   )),
               WidgetSpan(
@@ -368,9 +377,9 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
                             color: AppColors.mainColor, fontSize: 20.sp)),
                     onTap: () {
                       Get.toNamed(Routers.webviewShowPage, arguments: {
-                            "url": XSConstantMacro.privacyPolicyURL,
+                        "url": XSConstantMacro.privacyPolicyURL,
-                            "title": '隐私政策'
+                        "title": '隐私政策'
-                          });
+                      });
                     },
                   )),
             ],

star_lock/lib/login/register/starLock_register_state.dart

@@ -21,6 +21,7 @@ class StarLockRegisterState {
   var xWidth = ''.obs; // 滑动验证码滑动位置
   var isIphoneType = true.obs;
   var canSub = false.obs;
+  var agree = false.obs;
 
   bool get isEmail => RegexUtil.isEmail(phoneOrEmailStr.value);
   bool get isIphone => RegexUtil.isMobileSimple(phoneOrEmailStr.value);

star_lock/lib/main.dart

@@ -36,6 +36,7 @@ Future _initTranslation() async => TranslationLoader.loadTranslation(
 Future _setCommonServices() async {
   await Get.putAsync(() => StoreService().init());
   await Get.putAsync(() => PlatformInfoService().init());
+  //上架审核注释
   // await Get.putAsync(() => DeviceInfoService().init());
   // Get.log(PlatformInfoService.to.info.version);
 }

star_lock/lib/main/lockMian/lockMain/lockMain_page.dart

@@ -198,7 +198,7 @@ class _StarLockMainPageState extends State<StarLockMainPage> with BaseWidget {
             SizedBox(
               height: 160.h,
             ),
-            //提交Google暂时屏蔽
+            //上架审核注释 提交Google暂时屏蔽
             // SubmitBtn(
             //   btnName: '演示模式',
             //   onClick: () {

star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart

@@ -184,30 +184,31 @@ class _MineSetPageState extends State<MineSetPage> {
         SizedBox(
           height: 10.h,
         ),
-        CommonItem(
+        //上架审核注释
-            leftTitel: "Amazon Alexa",
+        // CommonItem(
-            rightTitle: "",
+        //     leftTitel: "Amazon Alexa",
-            isHaveLine: true,
+        //     rightTitle: "",
-            isHaveDirection: true,
+        //     isHaveLine: true,
-            action: () {
+        //     isHaveDirection: true,
-              logic.showToast("功能暂未开放");
+        //     action: () {
-            }),
+        //       logic.showToast("功能暂未开放");
-        CommonItem(
+        //     }),
-            leftTitel: "Google Home",
+        // CommonItem(
-            rightTitle: "",
+        //     leftTitel: "Google Home",
-            isHaveLine: true,
+        //     rightTitle: "",
-            isHaveDirection: true,
+        //     isHaveLine: true,
-            action: () {
+        //     isHaveDirection: true,
-              logic.showToast("功能暂未开放");
+        //     action: () {
-            }),
+        //       logic.showToast("功能暂未开放");
-        CommonItem(
+        //     }),
-            leftTitel: TranslationLoader.lanKeys!.xiaomiIOTPlatform!.tr,
+        // CommonItem(
-            rightTitle: "",
+        //     leftTitel: TranslationLoader.lanKeys!.xiaomiIOTPlatform!.tr,
-            isHaveLine: false,
+        //     rightTitle: "",
-            isHaveDirection: true,
+        //     isHaveLine: false,
-            action: () {
+        //     isHaveDirection: true,
-              logic.showToast("功能暂未开放");
+        //     action: () {
-            }),
+        //       logic.showToast("功能暂未开放");
+        //     }),
         // CommonItem(leftTitel:TranslationLoader.lanKeys!.valueAddedServices!.tr, rightTitle:"", isHaveDirection: true, action: (){
         //
         // }),

star_lock/lib/network/request_interceptor.dart

@@ -4,16 +4,13 @@ import 'package:get/get.dart';
 import 'package:get/get_connect/http/src/request/request.dart';
 import 'package:star_lock/login/login/entity/LoginData.dart';
 
-import '../login/login/entity/LoginData.dart';
-import '../login/login/entity/LoginEntity.dart';
 import '../tools/platform_info_services.dart';
 import '../tools/storage.dart';
-import '../tools/store_service.dart';
 
 FutureOr<Request> requestInterceptor(Request request) async {
   request.headers['User-Agent'] =
       'StarLock/${PlatformInfoService.to.info.version}/${PlatformInfoService.to.info.buildNumber}/${GetPlatform.isAndroid ? 'Android' : 'iOS'}';
-  request.headers['Accept-Language'] = 'zh_CN';
+  request.headers['Accept-Language'] = 'zh-CN';
   // request.headers['Content-Type'] = 'application/json';
   // request.headers['token'] = StoreService.to.userToken!;
   // print("11111${StoreService.to.userToken}");