Merge branch 'master' into release

images/lan/lan_en.json

@@ -816,6 +816,7 @@
   "身份证号":"ID number",
   "请输入真实姓名":"Please enter your real name",
   "请输入身份证号":"Please enter your ID number",
+  "请输入身份证号和真实姓名":"Please enter your ID number and real name",
   "点击返回设备配对":"Tap Back to device pairing",
   "无法连接？尝试升级":"Can't connect?Upgrade attempted",
   "固件升级提示":"Firmware upgrade prompt",

images/lan/lan_keys.json

@@ -844,6 +844,7 @@
   "身份证号":"身份证号",
   "请输入真实姓名":"请输入真实姓名",
   "请输入身份证号":"请输入身份证号",
+  "请输入身份证号和真实姓名":"请输入身份证号和真实姓名",
 
   "点击返回设备配对":"点击返回设备配对",
   "无法连接？尝试升级":"无法连接？尝试升级",

images/lan/lan_zh.json

@@ -815,6 +815,7 @@
   "身份证号": "身份证号",
   "请输入真实姓名": "请输入真实姓名",
   "请输入身份证号": "请输入身份证号",
+  "请输入身份证号和真实姓名":"请输入身份证号和真实姓名",
   "点击返回设备配对": "点击返回设备配对",
   "无法连接？尝试升级": "无法连接？尝试升级",
   "固件升级提示": "固件升级提示",

lib/mine/mineSet/authorizedAdministrator/authorizedAdministrator/authorizedAdministratorList_page.dart

@@ -5,6 +5,7 @@ import 'package:get/get.dart';
 import 'package:star_lock/mine/mineSet/authorizedAdministrator/authorizedAdministrator/authorizedAdminListEntity.dart';
 import 'package:star_lock/tools/noData.dart';
 import 'package:star_lock/tools/showCupertinoAlertView.dart';
+import 'package:star_lock/tools/submitBtn.dart';
 
 import '../../../../../appRouters.dart';
 import '../../../../../app_settings/app_colors.dart';
@@ -92,13 +93,35 @@ class _AuthorizedAdministratorListPageState
   }
 
   Widget _buildMainUI() {
-    return Obx(() => state.itemDataList.value.isEmpty
+    return Obx(() => state.itemDataList.isEmpty
-        ? NoData(
+        ? Stack(
-            noDataHeight: 1.sh -
+            children: [
-                ScreenUtil().statusBarHeight -
+              NoData(
-                ScreenUtil().bottomBarHeight -
+                  noDataHeight: 1.sh -
-                190.h -
+                      ScreenUtil().statusBarHeight -
-                64.h)
+                      ScreenUtil().bottomBarHeight -
+                      190.h -
+                      64.h),
+              Align(
+                alignment: const Alignment(0.0, 0.2),
+                child: SizedBox(
+                  width: 360.w,
+                  child: SubmitBtn(
+                      btnName: '添加授权管理员',
+                      onClick: () {
+                        Navigator.pushNamed(
+                                context, Routers.addAuthorizedAdministratorPage)
+                            .then((value) {
+                          setState(() {
+                            logic.pageNo = 1;
+                            getHttpData();
+                          });
+                        });
+                      }),
+                ),
+              ),
+            ],
+          )
         : SlidableAutoCloseBehavior(
             child: ListView.separated(
               itemCount: state.itemDataList.value.length,

lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart

@@ -3,6 +3,7 @@ import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_logic.dart';
+import 'package:star_lock/tools/commonDataManage.dart';
 import 'package:star_lock/tools/storage.dart';
 
 import '../../../appRouters.dart';

lib/tools/showCupertinoAlertView.dart

@@ -221,14 +221,14 @@ class ShowCupertinoAlertView {
         String name = '';
 
         return CupertinoAlertDialog(
-          title: const Text('请输入身份证号和真实姓名'),
+          title: Text('请输入身份证号和真实姓名'.tr),
           content: Column(
             children: <Widget>[
               SizedBox(
                 height: 10.h,
               ),
               CupertinoTextField(
-                placeholder: '请输入身份证号',
+                placeholder: '请输入身份证号'.tr,
                 onChanged: (value) {
                   idCard = value;
                 },
@@ -237,7 +237,7 @@ class ShowCupertinoAlertView {
                 height: 10.h,
               ),
               CupertinoTextField(
-                placeholder: '请输入真实姓名',
+                placeholder: '请输入真实姓名'.tr,
                 onChanged: (value) {
                   name = value;
                 },