二维码颜色

matteriot · matteriot · commit f51d67f8632c · 2025-04-18T23:40:02.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [1.0.5+66]
+
+* huawei v1.3.75
+
 ## [1.0.5+65]
 
 * i18n
diff --git a/lib/l10n/generated/openiothub_common_localizations.dart b/lib/l10n/generated/openiothub_common_localizations.dart
@@ -289,6 +289,12 @@ abstract class OpenIoTHubCommonLocalizations {
   /// **'Cancel'**
   String get cancel;
 
+  /// No description provided for @ok.
+  ///
+  /// In en, this message translates to:
+  /// **'OK'**
+  String get ok;
+
   /// No description provided for @cancel_my_account.
   ///
   /// In en, this message translates to:
@@ -906,6 +912,18 @@ abstract class OpenIoTHubCommonLocalizations {
   /// In en, this message translates to:
   /// **'Success!'**
   String get success;
+
+  /// No description provided for @location_req_name.
+  ///
+  /// In en, this message translates to:
+  /// **'申請位置權限說明'**
+  String get location_req_name;
+
+  /// No description provided for @location_req_desc.
+  ///
+  /// In en, this message translates to:
+  /// **'申請位置權限，以獲取WiFi信息用於智能設備配網'**
+  String get location_req_desc;
 }
 
 class _OpenIoTHubCommonLocalizationsDelegate
diff --git a/lib/l10n/generated/openiothub_common_localizations_en.dart b/lib/l10n/generated/openiothub_common_localizations_en.dart
@@ -106,6 +106,9 @@ class OpenIoTHubCommonLocalizationsEn extends OpenIoTHubCommonLocalizations {
   @override
   String get cancel => 'Cancel';
 
+  @override
+  String get ok => 'OK';
+
   @override
   String get cancel_my_account => 'Cancel my account';
 
@@ -443,4 +446,10 @@ class OpenIoTHubCommonLocalizationsEn extends OpenIoTHubCommonLocalizations {
 
   @override
   String get success => 'Success!';
+
+  @override
+  String get location_req_name => '申請位置權限說明';
+
+  @override
+  String get location_req_desc => '申請位置權限，以獲取WiFi信息用於智能設備配網';
 }
diff --git a/lib/l10n/generated/openiothub_common_localizations_zh.dart b/lib/l10n/generated/openiothub_common_localizations_zh.dart
@@ -101,6 +101,9 @@ class OpenIoTHubCommonLocalizationsZh extends OpenIoTHubCommonLocalizations {
   @override
   String get cancel => '取消';
 
+  @override
+  String get ok => '确定';
+
   @override
   String get cancel_my_account => '删除我的账号';
 
@@ -414,6 +417,14 @@ class OpenIoTHubCommonLocalizationsZh extends OpenIoTHubCommonLocalizations {
 
   @override
   String get success => '成功!';
+
+  @override
+  String get location_req_name =>
+      'Explanation of Location Permission Application';
+
+  @override
+  String get location_req_desc =>
+      'Apply for location permission to obtain WiFi information for smart device distribution network';
 }
 
 /// The translations for Chinese, as used in China (`zh_CN`).
@@ -514,6 +525,9 @@ class OpenIoTHubCommonLocalizationsZhCn
   @override
   String get cancel => '取消';
 
+  @override
+  String get ok => '确定';
+
   @override
   String get cancel_my_account => '删除我的账号';
 
@@ -827,6 +841,12 @@ class OpenIoTHubCommonLocalizationsZhCn
 
   @override
   String get success => '成功!';
+
+  @override
+  String get location_req_name => '申请位置权限说明';
+
+  @override
+  String get location_req_desc => '申请位置权限，以获取WiFi信息用于智能设备配网';
 }
 
 /// The translations for Chinese, using the Han script (`zh_Hans`).
@@ -927,6 +947,9 @@ class OpenIoTHubCommonLocalizationsZhHans
   @override
   String get cancel => '取消';
 
+  @override
+  String get ok => '确定';
+
   @override
   String get cancel_my_account => '删除我的账号';
 
@@ -1240,6 +1263,12 @@ class OpenIoTHubCommonLocalizationsZhHans
 
   @override
   String get success => '成功!';
+
+  @override
+  String get location_req_name => '申请位置权限说明';
+
+  @override
+  String get location_req_desc => '申请位置权限，以获取WiFi信息用于智能设备配网';
 }
 
 /// The translations for Chinese, using the Han script (`zh_Hant`).
@@ -1340,6 +1369,9 @@ class OpenIoTHubCommonLocalizationsZhHant
   @override
   String get cancel => '取消';
 
+  @override
+  String get ok => '確定';
+
   @override
   String get cancel_my_account => '刪除我的賬號';
 
@@ -1653,6 +1685,12 @@ class OpenIoTHubCommonLocalizationsZhHant
 
   @override
   String get success => '成功!';
+
+  @override
+  String get location_req_name => '申請位置權限說明';
+
+  @override
+  String get location_req_desc => '申請位置權限，以獲取WiFi信息用於智能設備配網';
 }
 
 /// The translations for Chinese, as used in Taiwan (`zh_TW`).
@@ -1753,6 +1791,9 @@ class OpenIoTHubCommonLocalizationsZhTw
   @override
   String get cancel => '取消';
 
+  @override
+  String get ok => '確定';
+
   @override
   String get cancel_my_account => '刪除我的賬號';
 
@@ -2066,4 +2107,10 @@ class OpenIoTHubCommonLocalizationsZhTw
 
   @override
   String get success => '成功!';
+
+  @override
+  String get location_req_name => '申請位置權限說明';
+
+  @override
+  String get location_req_desc => '申請位置權限，以獲取WiFi信息用於智能設備配網';
 }
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
@@ -34,6 +34,7 @@
   "please_input_new_value": "Please input new value",
   "new_value": "New value",
   "cancel": "Cancel",
+  "ok": "OK",
 
   "cancel_my_account": "Cancel my account",
   "cancel_my_account_notify1": "Please note that after confirming the deletion, the deletion operation will take effect immediately and cannot be restored!",
@@ -144,5 +145,7 @@
   "as_config_file": "Consistent with the configuration files in the server-go server",
   "add_to_server": "Add to server",
   "add_server": "Add server",
-  "success": "Success!"
+  "success": "Success!",
+  "location_req_name": "申請位置權限說明",
+  "location_req_desc": "申請位置權限，以獲取WiFi信息用於智能設備配網"
 }
diff --git a/lib/l10n/intl_zh.arb b/lib/l10n/intl_zh.arb
@@ -34,6 +34,7 @@
   "please_input_new_value": "请输入新的",
   "new_value": "新值",
   "cancel": "取消",
+  "ok": "确定",
 
   "cancel_my_account": "删除我的账号",
   "cancel_my_account_notify1": "请注意，确认删除之后删除操作立马生效，且不可恢复！",
@@ -144,5 +145,7 @@
   "as_config_file": "跟server-go服务器里面的配置文件一致",
   "add_to_server": "添加到服务器",
   "add_server": "添加服务器",
-  "success": "成功!"
+  "success": "成功!",
+  "location_req_name": "Explanation of Location Permission Application",
+  "location_req_desc": "Apply for location permission to obtain WiFi information for smart device distribution network"
 }
diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb
@@ -34,6 +34,7 @@
   "please_input_new_value": "请输入新的",
   "new_value": "新值",
   "cancel": "取消",
+  "ok": "确定",
 
   "cancel_my_account": "删除我的账号",
   "cancel_my_account_notify1": "请注意，确认删除之后删除操作立马生效，且不可恢复！",
@@ -144,5 +145,7 @@
   "as_config_file": "跟server-go服务器里面的配置文件一致",
   "add_to_server": "添加到服务器",
   "add_server": "添加服务器",
-  "success": "成功!"
+  "success": "成功!",
+  "location_req_name": "申请位置权限说明",
+  "location_req_desc": "申请位置权限，以获取WiFi信息用于智能设备配网"
 }
diff --git a/lib/l10n/intl_zh_Hans.arb b/lib/l10n/intl_zh_Hans.arb
@@ -34,6 +34,7 @@
   "please_input_new_value": "请输入新的",
   "new_value": "新值",
   "cancel": "取消",
+  "ok": "确定",
 
   "cancel_my_account": "删除我的账号",
   "cancel_my_account_notify1": "请注意，确认删除之后删除操作立马生效，且不可恢复！",
@@ -144,5 +145,7 @@
   "as_config_file": "跟server-go服务器里面的配置文件一致",
   "add_to_server": "添加到服务器",
   "add_server": "添加服务器",
-  "success": "成功!"
+  "success": "成功!",
+  "location_req_name": "申请位置权限说明",
+  "location_req_desc": "申请位置权限，以获取WiFi信息用于智能设备配网"
 }
diff --git a/lib/l10n/intl_zh_Hant.arb b/lib/l10n/intl_zh_Hant.arb
@@ -34,6 +34,7 @@
   "please_input_new_value": "請輸入新的",
   "new_value": "新值",
   "cancel": "取消",
+  "ok": "確定",
 
   "cancel_my_account": "刪除我的賬號",
   "cancel_my_account_notify1": "請注意，確認刪除之後刪除操作立馬生效，且不可恢復！",
@@ -144,5 +145,7 @@
   "as_config_file": "跟server-go服務器裏面的配置文件一致",
   "add_to_server": "添加到服務器",
   "add_server": "添加服務器",
-  "success": "成功!"
+  "success": "成功!",
+  "location_req_name": "申請位置權限說明",
+  "location_req_desc": "申請位置權限，以獲取WiFi信息用於智能設備配網"
 }
diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb
@@ -34,6 +34,7 @@
   "please_input_new_value": "請輸入新的",
   "new_value": "新值",
   "cancel": "取消",
+  "ok": "確定",
 
   "cancel_my_account": "刪除我的賬號",
   "cancel_my_account_notify1": "請注意，確認刪除之後刪除操作立馬生效，且不可恢復！",
@@ -144,5 +145,7 @@
   "as_config_file": "跟server-go服務器裏面的配置文件一致",
   "add_to_server": "添加到服務器",
   "add_server": "添加服務器",
-  "success": "成功!"
+  "success": "成功!",
+  "location_req_name": "申請位置權限說明",
+  "location_req_desc": "申請位置權限，以獲取WiFi信息用於智能設備配網"
 }
diff --git a/lib/user/LoginPage.dart b/lib/user/LoginPage.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 import 'dart:math';
 
 import 'package:dio/dio.dart';
@@ -196,6 +197,10 @@ class _State extends State<LoginPage> {
   }
 
   Future<void> _checkWechat() async {
+    if (Platform.isIOS) {
+      // TODO iOS支持第三方登录就得支持苹果登录
+      return;
+    }
     setState(() {
       // TODO 在pc上使用二维码扫码登录，可以使用网页一套Api
       _list.add(IconButton(
@@ -225,7 +230,9 @@ class _State extends State<LoginPage> {
                 scope: <String>[WechatScope.kSNSApiUserInfo],
                 state: 'auth',
               );
-            } else {
+            } else if (!Platform.isIOS) {
+              // 由于iOS审核，可能需要在iOS上屏蔽二维码登录
+              https://pub.dev/packages/sign_in_with_apple
               //显示二维码扫描登录
               loginFlag = generateRandomString(12);
               String qrUrl = await getPicUrl(loginFlag!);
diff --git a/lib/wifiConfig/airkiss.dart b/lib/wifiConfig/airkiss.dart
@@ -11,6 +11,7 @@ import 'package:network_info_plus/network_info_plus.dart';
 import 'package:permission_handler/permission_handler.dart';
 
 import 'package:openiothub_common_pages/openiothub_common_pages.dart';
+import 'package:tdesign_flutter/tdesign_flutter.dart';
 
 class Airkiss extends StatefulWidget {
   Airkiss({required Key key, required this.title}) : super(key: key);
@@ -126,8 +127,7 @@ class _AirkissState extends State<Airkiss> {
                                   readOnly: true,
                                   onTap: () async {
                                     showToast("onTap");
-                                    await requestPermission();
-                                    await _updateConnectionStatus();
+                                    await _reqWiFiInfo();
                                   },
                                 ),
                                 TextField(
@@ -137,15 +137,13 @@ class _AirkissState extends State<Airkiss> {
                                   readOnly: true,
                                   onTap: () async {
                                     showToast("onTap");
-                                    await requestPermission();
-                                    await _updateConnectionStatus();
+                                    await _reqWiFiInfo();
                                   },
                                 ),
                               ]),
                           onTap: () async {
                             showToast("onTap");
-                            await requestPermission();
-                            await _updateConnectionStatus();
+                            await _reqWiFiInfo();
                           },
                         ),
                         Container(
@@ -177,6 +175,47 @@ class _AirkissState extends State<Airkiss> {
                     ))));
   }
 
+  Future<void> _reqWiFiInfo() async {
+    showGeneralDialog(
+      context: context,
+      pageBuilder: (BuildContext buildContext, Animation<double> animation,
+          Animation<double> secondaryAnimation) {
+        return TDAlertDialog(
+          title: OpenIoTHubCommonLocalizations.of(context).location_req_name,
+            // 说明权限申请的使用目的，包括但不限于申请权限的名称、服务的具体功能、用途
+          content: OpenIoTHubCommonLocalizations.of(context).location_req_desc,
+          titleColor: Colors.black,
+          contentColor: Colors.redAccent,
+          // backgroundColor: AppTheme.blockBgColor,
+          leftBtn: TDDialogButtonOptions(
+            title: OpenIoTHubCommonLocalizations.of(context).cancel,
+            // titleColor: AppTheme.color999,
+            style: TDButtonStyle(
+              backgroundColor: Colors.grey,
+            ),
+            action: (){
+              Navigator.of(context).pop();
+            },
+          ),
+          rightBtn: TDDialogButtonOptions(
+            title: OpenIoTHubCommonLocalizations.of(context).ok,
+            style: TDButtonStyle(
+              backgroundColor: Colors.blue,
+            ),
+            action: (){
+              Navigator.of(context).pop();
+              requestPermission().then((ret){_updateConnectionStatus();});
+            },
+          ),
+          rightBtnAction: (){
+            Navigator.of(context).pop();
+            requestPermission().then((ret){_updateConnectionStatus();});
+          },
+        );
+      },
+    );
+  }
+
   Future<void> _updateConnectionStatus() async {
     String? wifiName, wifiBSSID;
 
diff --git a/pubspec.yaml b/pubspec.yaml
