Merge remote-tracking branch 'origin/develop' into develop_liyi

android/app/src/xhj_bundle/agconnect-services.json

@@ -0,0 +1,96 @@
+{
+	"agcgw":{
+		"backurl":"connect-drcn.hispace.hicloud.com",
+		"url":"connect-drcn.dbankcloud.cn",
+		"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com",
+		"websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn"
+	},
+	"agcgw_all":{
+		"CN":"connect-drcn.dbankcloud.cn",
+		"CN_back":"connect-drcn.hispace.hicloud.com",
+		"DE":"connect-dre.dbankcloud.cn",
+		"DE_back":"connect-dre.hispace.hicloud.com",
+		"RU":"connect-drru.hispace.dbankcloud.ru",
+		"RU_back":"connect-drru.hispace.dbankcloud.cn",
+		"SG":"connect-dra.dbankcloud.cn",
+		"SG_back":"connect-dra.hispace.hicloud.com"
+	},
+	"websocketgw_all":{
+		"CN":"connect-ws-drcn.hispace.dbankcloud.cn",
+		"CN_back":"connect-ws-drcn.hispace.dbankcloud.com",
+		"DE":"connect-ws-dre.hispace.dbankcloud.cn",
+		"DE_back":"connect-ws-dre.hispace.dbankcloud.com",
+		"RU":"connect-ws-drru.hispace.dbankcloud.ru",
+		"RU_back":"connect-ws-drru.hispace.dbankcloud.cn",
+		"SG":"connect-ws-dra.hispace.dbankcloud.cn",
+		"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
+	},
+	"client":{
+		"cp_id":"30086000752967166",
+		"product_id":"388421841222116270",
+		"client_id":"1406555529261648640",
+		"client_secret":"843E8191B02B692239726CF0ED990E1EC2B31928F825AA012B932A128FD2C516",
+		"project_id":"388421841222116270",
+		"app_id":"110798531",
+		"api_key":"DQEDAALnPCtuCgoYOyZfsIDa9/YZZhQ+buDGpypeurXhQUGMajWcVyYLQgXXqV3x2HbI6oyG+Wm2Gf+1hPs6j+wA3B6ylYAXG4aAQA==",
+		"package_name":"ltd.xhjcn.lock"
+	},
+	"oauth_client":{
+		"client_id":"110798531",
+		"client_type":1
+	},
+	"app_info":{
+		"app_id":"110798531",
+		"package_name":"ltd.xhjcn.lock"
+	},
+	"service":{
+		"analytics":{
+			"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+			"collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
+			"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
+			"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
+			"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+			"resource_id":"p1",
+			"channel_id":""
+		},
+		"edukit":{
+			"edu_url":"edukit.cloud.huawei.com.cn",
+			"dh_url":"edukit.cloud.huawei.com.cn"
+		},
+		"search":{
+			"url":"https://search-drcn.cloud.huawei.com"
+		},
+		"cloudstorage":{
+			"storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia",
+			"storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru",
+			"storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru",
+			"storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu",
+			"storage_url_de":"https://ops-dre.agcstorage.link",
+			"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn",
+			"storage_url_sg":"https://ops-dra.agcstorage.link",
+			"storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn",
+			"storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn"
+		},
+		"ml":{
+			"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
+		}
+	},
+	"region":"CN",
+	"configuration_version":"3.0",
+	"appInfos":[
+		{
+			"package_name":"ltd.xhjcn.lock",
+			"client":{
+				"app_id":"110798531"
+			},
+			"app_info":{
+				"package_name":"ltd.xhjcn.lock",
+				"app_id":"110798531"
+			},
+			"oauth_client":{
+				"client_type":1,
+				"client_id":"110798531"
+			}
+		}
+	]
+}

android/app/src/xhj_bundle/google-services.json

@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "448746601330",
+    "project_id": "smart-lock-12b8c",
+    "storage_bucket": "smart-lock-12b8c.firebasestorage.app"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:448746601330:android:1a8056175e1dad5e317beb",
+        "android_client_info": {
+          "package_name": "ltd.xhjcn.lock"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAm8dJlBY5hjslJDVDBNd2bkWrJlGjAMqw"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/app/src/xhj_bundle/res/values-en-rUS/string.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Star Lock</string>
+</resources>

android/app/src/xhj_bundle/res/values-zh-rCN/string.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">星星锁</string>
+</resources>

lan/lan_en.json

@@ -1,6 +1,6 @@
 {
   "星锁": "Star Lock",
-  "锁通通": "Lock Through",
+  "锁通通": "TTLock Pro",
   "点击开锁，长按闭锁": "Touch to Unlock,Hold to Lock",
   "考勤": "Attendance",
   "考勤设置": "Attendance Settings",

lan/lan_hu.json

@@ -1,6 +1,6 @@
 {
     "星锁": "Star lock",
-    "锁通通": "Lock through",
+    "锁通通": "TTLock Pro",
     "点击开锁，长按闭锁": "Érintse fel, hogy kinyit, tartsa zárni",
     "考勤": "Látogatottság",
     "考勤设置": "Látogatottsági beállítások",

lan/lan_lt.json

@@ -1,6 +1,6 @@
 {
     "星锁": "Žvaigždžių užraktas",
-    "锁通通": "Lock through",
+    "锁通通": "TTLock Pro",
     "点击开锁，长按闭锁": "Palieskite atrakinti, laikykite užrakinti",
     "考勤": "Lankomumas",
     "考勤设置": "Lankomumo nustatymai",

lib/main_xhj_bundle_lite.dart

@@ -0,0 +1,11 @@
+import 'app_settings/app_settings.dart';
+import 'flavors.dart';
+
+import 'main.dart' as runner;
+
+Future<void> main() async {
+  F.appFlavor = Flavor.xhj;
+  F.isLite = true;
+  // AppLog.log('xhj_lite调用了main函数');
+  await runner.main();
+}