diff --git a/android/app/build.gradle b/android/app/build.gradle index 587f16e3..87be9e46 100755 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -78,6 +78,13 @@ android { keyAlias = 'upload' keyPassword 'xhj8872' } + + xhj_bundle { + storeFile file("xhj_bundle.jks") + storePassword 'xhj8872' + keyAlias = 'xhj' + keyPassword 'xhj8872' + } } // ----- BEGIN flavorDimensions (autogenerated by flutter_flavorizr) ----- @@ -135,6 +142,16 @@ android { manifestPlaceholders.JPUSH_PKGNAME = "com.xhjcn.lock" proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules-xhj.pro' } + + xhj_bundle { + dimension "flavor-type" + applicationId "ltd.xhjcn.lock" + signingConfig signingConfigs.xhj_bundle + resValue "string", "app_name", "Star Lock" + manifestPlaceholders.JPUSH_PKGNAME = "ltd.xhjcn.lock" + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules-xhj.pro' + } + xhj_pre { dimension "flavor-type" applicationId "com.xhjcn.lock.pre" diff --git a/android/app/src/sky_dev/google-services.json b/android/app/src/sky_dev/google-services.json new file mode 100644 index 00000000..6eaa86af --- /dev/null +++ b/android/app/src/sky_dev/google-services.json @@ -0,0 +1,48 @@ +{ + "project_info": { + "project_number": "281500445726", + "project_id": "skychip2023-ecdff", + "storage_bucket": "skychip2023-ecdff.firebasestorage.app" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:281500445726:android:ddf52ac7b7f83cf5c4d20f", + "android_client_info": { + "package_name": "com.skychip.lock.dev" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyC-3-ABWuy9LrYyAw_KxDRto4DanQ0sq9g" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:281500445726:android:468195b9cc68dd6cc4d20f", + "android_client_info": { + "package_name": "com.starlock.lock.local" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyC-3-ABWuy9LrYyAw_KxDRto4DanQ0sq9g" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/android/app/src/sky_pre/google-services.json b/android/app/src/sky_pre/google-services.json new file mode 100644 index 00000000..2a7a6dbe --- /dev/null +++ b/android/app/src/sky_pre/google-services.json @@ -0,0 +1,48 @@ +{ + "project_info": { + "project_number": "281500445726", + "project_id": "skychip2023-ecdff", + "storage_bucket": "skychip2023-ecdff.firebasestorage.app" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:281500445726:android:ddf52ac7b7f83cf5c4d", + "android_client_info": { + "package_name": "com.skychip.lock.pre" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyC-3-ABWuy9LrYyAw_KxDRto4DanQ" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:281500445726:android:468195b9cc68dd6cc", + "android_client_info": { + "package_name": "com.starlock.lock.local" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyC-3-ABWuy9LrYyAw_KxDRto4DanQ0sq9g" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/android/app/src/xhj_dev/google-services.json b/android/app/src/xhj_dev/google-services.json new file mode 100644 index 00000000..791f2d92 --- /dev/null +++ b/android/app/src/xhj_dev/google-services.json @@ -0,0 +1,48 @@ +{ + "project_info": { + "project_number": "28150044todo", + "project_id": "skychip2023-etodo", + "storage_bucket": "skychip2023-etodo.firebasestorage.app" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:281500445726:android:ddf52ac7b7f83cf5c4todo", + "android_client_info": { + "package_name": "com.xhjcn.lock" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyC-3-ABWuy9LrYyAw_KxDRto4DanQ0todo" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:281500445726:android:468195b9cc68dd6cc4todo", + "android_client_info": { + "package_name": "com.xhjcn.lock.local" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyC-3-ABWuy9LrYyAw_KxDRto4Dank9todo" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/android/app/src/xhj_pre/google-services.json b/android/app/src/xhj_pre/google-services.json new file mode 100644 index 00000000..791f2d92 --- /dev/null +++ b/android/app/src/xhj_pre/google-services.json @@ -0,0 +1,48 @@ +{ + "project_info": { + "project_number": "28150044todo", + "project_id": "skychip2023-etodo", + "storage_bucket": "skychip2023-etodo.firebasestorage.app" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:281500445726:android:ddf52ac7b7f83cf5c4todo", + "android_client_info": { + "package_name": "com.xhjcn.lock" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyC-3-ABWuy9LrYyAw_KxDRto4DanQ0todo" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:281500445726:android:468195b9cc68dd6cc4todo", + "android_client_info": { + "package_name": "com.xhjcn.lock.local" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyC-3-ABWuy9LrYyAw_KxDRto4Dank9todo" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/android/app/xhj_bundle.jks b/android/app/xhj_bundle.jks new file mode 100644 index 00000000..50f0c2c2 Binary files /dev/null and b/android/app/xhj_bundle.jks differ diff --git a/android/build.sh b/android/build.sh index 6482e5a0..4b598959 100755 --- a/android/build.sh +++ b/android/build.sh @@ -18,7 +18,7 @@ elif [[ $ENV_BUILD_TAG =~ $regex ]]; then echo "===build release===$ENV_BUILD_TAG" bundle exec fastlane release_apk flavor:xhj --verbose bundle exec fastlane release_apk flavor:sky --verbose - bundle exec fastlane release_bundle flavor:xhj --verbose + bundle exec fastlane release_bundle flavor:xhj_bundle --verbose bundle exec fastlane release_bundle flavor:sky --verbose elif [[ "${ENV_BUILD_BRANCH}" == "develop" ]]; then echo "===build dev===${NEXT_VERSION}" diff --git a/lan/lan_ar.json b/lan/lan_ar.json index cc05a60a..f550d3eb 100644 --- a/lan/lan_ar.json +++ b/lan/lan_ar.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "اتبع النظام", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "بعد إعادة الضبط ، سيتم حذف بصمات القفل. هل أنت متأكد أنك تريد إعادة ضبطه ؟", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "بعد إعادة الضبط ، سيتم حذف جهاز التحكم عن بعد للقفل. هل تريد إعادة ضبطه ؟" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "بعد إعادة الضبط ، سيتم حذف جهاز التحكم عن بعد للقفل. هل تريد إعادة ضبطه ؟", + "版本说明": "تعليمات الإصدار" } \ No newline at end of file diff --git a/lan/lan_bg.json b/lan/lan_bg.json index 1ff0814d..2f3d144b 100644 --- a/lan/lan_bg.json +++ b/lan/lan_bg.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Следете система", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "След нулиране, пръстовите отпечатъци на заключването ще бъдат изтрити. Сигурен ли сте, че искате да го нулирате?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "След нулиране, дистанционното управление на ключалката ще бъде изтрито. Искате ли да го нулирате?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "След нулиране, дистанционното управление на ключалката ще бъде изтрито. Искате ли да го нулирате?", + "版本说明": "Обяснение на версията" } \ No newline at end of file diff --git a/lan/lan_bn.json b/lan/lan_bn.json index 795fae0c..03eafc2b 100644 --- a/lan/lan_bn.json +++ b/lan/lan_bn.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "এক্ফক্লোসিস্টেম", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "ব্যান্ডোটারট্রাসেট, thelock'sferprinতা?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "ব্যান্ডোটারপ্রাসেট, নিয়ন্ত্রণের নিয়ন্ত্রণ। ডোডো ডাইভান্টটুরে?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "ব্যান্ডোটারপ্রাসেট, নিয়ন্ত্রণের নিয়ন্ত্রণ। ডোডো ডাইভান্টটুরে?", + "版本说明": "ভার্সনপরিচিতি", } \ No newline at end of file diff --git a/lan/lan_cs.json b/lan/lan_cs.json index 7481a2b9..d0eb38e6 100644 --- a/lan/lan_cs.json +++ b/lan/lan_cs.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Sledovat systém", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Po resetování budou otisky prstů zámku odstraněny. Opravdu ho chcete obnovit?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Po resetu bude dálkové ovládání zámku odstraněno. Chcete ho obnovit?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Po resetu bude dálkové ovládání zámku odstraněno. Chcete ho obnovit?", + "版本说明": "Verze" } \ No newline at end of file diff --git a/lan/lan_da.json b/lan/lan_da.json index d31899a2..768ec600 100644 --- a/lan/lan_da.json +++ b/lan/lan_da.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Følg systemet", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Efter nulstilling vil låsens fingeraftryk blive slettet. Er du sikker på at du vil nulstille den?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Efter nulstilling, fjernbetjeningen af låsen vil blive slettet. Vil du nulstille den?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Efter nulstilling, fjernbetjeningen af låsen vil blive slettet. Vil du nulstille den?", + "版本说明": "Versionsbeskrivelse", } \ No newline at end of file diff --git a/lan/lan_de.json b/lan/lan_de.json index 049563a7..e6e2f250 100644 --- a/lan/lan_de.json +++ b/lan/lan_de.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "System folgen", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Nach dem Zurücksetzen werden die Finger abdrücke des Schlosses gelöscht. Sind Sie sicher, dass Sie es zurücksetzen wollen?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Nach dem Zurücksetzen wird die Fernbedienung des Schlosses gelöscht. Willst du es zurücksetzen?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Nach dem Zurücksetzen wird die Fernbedienung des Schlosses gelöscht. Willst du es zurücksetzen?", + "版本说明": "Versionsbeschreibung" } \ No newline at end of file diff --git a/lan/lan_el.json b/lan/lan_el.json index 82a15dfe..a076aac3 100644 --- a/lan/lan_el.json +++ b/lan/lan_el.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Ακολουθήστε το σύστημα", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Μετά την επαναφορά, τα αποτυπώματα της κλειδαριάς θα διαγραφούν. Είστε σίγουροι ότι θέλετε να το επαναφέρετε;", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Μετά την επαναφορά, το τηλεχειριστήριο της κλειδαριάς θα διαγραφεί. Θέλεις να το επαναφέρεις;" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Μετά την επαναφορά, το τηλεχειριστήριο της κλειδαριάς θα διαγραφεί. Θέλεις να το επαναφέρεις;", + "版本说明": "Περιγραφή έκδοσης", } \ No newline at end of file diff --git a/lan/lan_en.json b/lan/lan_en.json index 90e0294b..30a82507 100644 --- a/lan/lan_en.json +++ b/lan/lan_en.json @@ -1126,4 +1126,6 @@ "通话连接失败": "Call connection failed", "已挂断": "Hanging up", "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "After reset, the remote control of the lock will be deleted. Do you want to reset it?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "After reset, the remote control of the lock will be deleted. Do you want to reset it?", + "版本说明": "Version description" } diff --git a/lan/lan_es.json b/lan/lan_es.json index b9c06ea5..3e47d880 100644 --- a/lan/lan_es.json +++ b/lan/lan_es.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Seguir sistema", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Después de restablecer, se eliminarán las huellas dactilares del bloqueo. ¿Está seguro de que desea restablecerlo?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Después del reinicio, se eliminará el control remoto de la cerradura. ¿Quieres resetearlo?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Después del reinicio, se eliminará el control remoto de la cerradura. ¿Quieres resetearlo?", + "版本说明": "Instrucciones de versión" } \ No newline at end of file diff --git a/lan/lan_et.json b/lan/lan_et.json index e7209737..63e90c7a 100644 --- a/lan/lan_et.json +++ b/lan/lan_et.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Süsteemi jälgimine", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Pärast lähtestamist kustutatakse luku sõrmejäljed. Kas tõesti soovid see lähtestada?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Pärast lähtestamist kustutatakse luku kaugjuhtimine. Kas sa tahad seda lähtestada?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Pärast lähtestamist kustutatakse luku kaugjuhtimine. Kas sa tahad seda lähtestada?", + "版本说明": "Versiooniteave", } \ No newline at end of file diff --git a/lan/lan_fi.json b/lan/lan_fi.json index 727a8557..53aee63c 100644 --- a/lan/lan_fi.json +++ b/lan/lan_fi.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Seuraa järjestelmää", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Lukon sormenjäljet poistetaan. Haluatko varmasti nollataa sen?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Nollauksen jälkeen lukon kaukosäädin poistetaan. Haluatko palauttaa sen?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Nollauksen jälkeen lukon kaukosäädin poistetaan. Haluatko palauttaa sen?", + "版本说明": "Versio", } \ No newline at end of file diff --git a/lan/lan_fr.json b/lan/lan_fr.json index f630b6df..36f4918d 100644 --- a/lan/lan_fr.json +++ b/lan/lan_fr.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Suivre le système", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Après réinitialisation, les empreintes digitales de la serrure seront supprimées. Êtes-vous sûr de vouloir le réinitialiser?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Après réinitialisation, la télécommande du verrou sera supprimée. Voulez-vous le réinitialiser?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Après réinitialisation, la télécommande du verrou sera supprimée. Voulez-vous le réinitialiser?", + "版本说明": "Explication de la version", } \ No newline at end of file diff --git a/lan/lan_he.json b/lan/lan_he.json index 4ed3a79a..2214efd6 100644 --- a/lan/lan_he.json +++ b/lan/lan_he.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "מערכת מעקב", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "לאחר איפוס, טביעות האצבעות של המנעול יימחקו. אתה בטוח שברצונך לאפס את זה?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "לאחר איפוס, השליטה מרחוק של המנעול יימחק. אתה רוצה לאפס את זה?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "לאחר איפוס, השליטה מרחוק של המנעול יימחק. אתה רוצה לאפס את זה?", + "版本说明": "המידע על גרסה", } \ No newline at end of file diff --git a/lan/lan_hk.json b/lan/lan_hk.json index e774f098..10f8f20f 100644 --- a/lan/lan_hk.json +++ b/lan/lan_hk.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "跟隨系統", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "重置之後,鎖嘅指紋將被刪除。 你確定要重置它啊?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "重置之後,鎖嘅遙控器將被刪除。 是否要重置它?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "重置之後,鎖嘅遙控器將被刪除。 是否要重置它?", + "版本说明": "版本說明" } \ No newline at end of file diff --git a/lan/lan_hr.json b/lan/lan_hr.json index 756e9c3d..2b46ae3f 100644 --- a/lan/lan_hr.json +++ b/lan/lan_hr.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Prati sistem:", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Nakon resetovanja, otisci brave će biti izbrisani. Jeste li sigurni da ga želite resetirati?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Nakon resetovanja, daljinski upravljač brave će biti izbrisan. Hoæeš da ga resetuješ?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Nakon resetovanja, daljinski upravljač brave će biti izbrisan. Hoæeš da ga resetuješ?", + "版本说明": "Informacije o verziji", } \ No newline at end of file diff --git a/lan/lan_hu.json b/lan/lan_hu.json index 5e47b0c3..5f6c38c9 100644 --- a/lan/lan_hu.json +++ b/lan/lan_hu.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Follow system", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "A reset után a zár ujjlenyomatai törlődnek. Biztos vagy benne, hogy vissza szeretné állítani?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "A reset után a zár távirányítója törlődik. Szeretné visszaállítani?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "A reset után a zár távirányítója törlődik. Szeretné visszaállítani?", + "版本说明": "Versió leírás", } \ No newline at end of file diff --git a/lan/lan_id.json b/lan/lan_id.json index 698dbd83..872dcb41 100644 --- a/lan/lan_id.json +++ b/lan/lan_id.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Sistem mengikuti", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Setelah mengulang, sidik jari kunci akan dihapus. Yakin ingin meresetnya?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Setelah reset, remote control kunci akan dihapus. Ingin mengatur ulang?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Setelah reset, remote control kunci akan dihapus. Ingin mengatur ulang?", + "版本说明": "Catatan versi", } \ No newline at end of file diff --git a/lan/lan_it.json b/lan/lan_it.json index cd375d3c..7bb5d872 100644 --- a/lan/lan_it.json +++ b/lan/lan_it.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Seguire il sistema", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Dopo il reset, le impronte digitali del lucchetto verranno cancellate. Sei sicuro di volerlo resettare?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Dopo il reset, il telecomando del lucchetto verrà eliminato. Vuoi resettarlo?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Dopo il reset, il telecomando del lucchetto verrà eliminato. Vuoi resettarlo?", + "版本说明": "Versione" } \ No newline at end of file diff --git a/lan/lan_ja.json b/lan/lan_ja.json index ef2509f4..6c2f6de7 100644 --- a/lan/lan_ja.json +++ b/lan/lan_ja.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "システムに従う", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "リセット後、ロックの指紋は削除されます。リセットしてもよろしいですか。", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "リセット後、ロックのリモコンが削除されます。リセットしますか?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "リセット後、ロックのリモコンが削除されます。リセットしますか?", + "版本说明": "バージョン説明", } \ No newline at end of file diff --git a/lan/lan_keys.json b/lan/lan_keys.json index 1c8efc7d..5405fdc4 100755 --- a/lan/lan_keys.json +++ b/lan/lan_keys.json @@ -1126,4 +1126,6 @@ "通话连接失败": "通话连接失败", "已挂断": "已挂断", "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "重置后,该锁的遥控都将被删除哦,确认要重置吗?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "重置后,该锁的遥控都将被删除哦,确认要重置吗?", + "版本说明": "版本说明", } diff --git a/lan/lan_kk.json b/lan/lan_kk.json index 9e6961bc..ee063c9e 100644 --- a/lan/lan_kk.json +++ b/lan/lan_kk.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Жүйені қолдану", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Қайта ысырып тастау Шынымен ысырып тастауды қалайсыз ба?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Қайта ысырып ысырып тасымалдауын өшіріледі. Оны ысырып тастауды қалайсыз ба?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Қайта ысырып ысырып тасымалдауын өшіріледі. Оны ысырып тастауды қалайсыз ба?", + "版本说明": "Версиятын көрсету", } \ No newline at end of file diff --git a/lan/lan_ko.json b/lan/lan_ko.json index eddb7629..0240269d 100644 --- a/lan/lan_ko.json +++ b/lan/lan_ko.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "시스템을 따르십시오", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "재설정 후 잠금 장치의 지문이 삭제됩니다. 당신은 그것을 재설정 하시겠습니까?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "재설정 후 잠금 장치의 리모컨이 삭제됩니다. 당신은 그것을 재설정 하시겠습니까?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "재설정 후 잠금 장치의 리모컨이 삭제됩니다. 당신은 그것을 재설정 하시겠습니까?", + "版本说明": "버전 설명", } \ No newline at end of file diff --git a/lan/lan_lt.json b/lan/lan_lt.json index 3be128da..d9e18b00 100644 --- a/lan/lan_lt.json +++ b/lan/lan_lt.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Sekti sistema", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Po reset užrakto pirštų atspaudai bus ištrinti. Ar tikrai norite jį atkurti?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Po reset, nuotolinis valdymo pultas užraktas bus ištrintas. Ar norite jį atkurti?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Po reset, nuotolinis valdymo pultas užraktas bus ištrintas. Ar norite jį atkurti?", + "版本说明": "Versijos aprašymas", } \ No newline at end of file diff --git a/lan/lan_ms.json b/lan/lan_ms.json index 9e382f28..05ed0ebd 100644 --- a/lan/lan_ms.json +++ b/lan/lan_ms.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Ikut system", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Selepas menetapkan semula, cap jari kunci akan dipadamkan. Adakah anda pasti anda mahu menetapkan semula?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Selepas menetapkan semula, kawalan jauh kunci akan dipadamkan. Adakah anda mahu menetapkan semula?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Selepas menetapkan semula, kawalan jauh kunci akan dipadamkan. Adakah anda mahu menetapkan semula?", + "版本说明": "Penerangan versi", } \ No newline at end of file diff --git a/lan/lan_nl.json b/lan/lan_nl.json index 545dd0a9..ceb6ec0e 100644 --- a/lan/lan_nl.json +++ b/lan/lan_nl.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Systeem volgen", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Na het resetten worden de vingerafdrukken van het slot verwijderd. Weet je zeker dat je het wilt resetten?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Na het resetten wordt de afstandsbediening van het slot verwijderd. Wilt u het resetten?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Na het resetten wordt de afstandsbediening van het slot verwijderd. Wilt u het resetten?", + "版本说明": "Versieomschrijving", } \ No newline at end of file diff --git a/lan/lan_pl.json b/lan/lan_pl.json index cb25c002..18cfb3d6 100644 --- a/lan/lan_pl.json +++ b/lan/lan_pl.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Śledź system", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Po zresetowaniu odciski palców zamka zostaną usunięte. Czy na pewno chcesz go zresetować?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Po zresetowaniu zdalne sterowanie zamkiem zostanie usunięte. Czy chcesz go zresetować?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Po zresetowaniu zdalne sterowanie zamkiem zostanie usunięte. Czy chcesz go zresetować?", + "版本说明": "Wersja", } \ No newline at end of file diff --git a/lan/lan_pt.json b/lan/lan_pt.json index d77d3b0e..22636d1e 100644 --- a/lan/lan_pt.json +++ b/lan/lan_pt.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Siga o sistema", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Após a redefinição, as impressões digitais do bloqueio serão apagadas. Tens a certeza que queres redefini-lo?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Após a reinicialização, o controle remoto do bloqueio será excluído. Você quer redefini-lo?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Após a reinicialização, o controle remoto do bloqueio será excluído. Você quer redefini-lo?", + "版本说明": "Descrição da versão", } \ No newline at end of file diff --git a/lan/lan_ro.json b/lan/lan_ro.json index e0f4f397..3fe81f0f 100644 --- a/lan/lan_ro.json +++ b/lan/lan_ro.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Urmează sistemul:", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "După resetare, amprentele încuietorii vor fi şterse. Sigur doriți să-l resetați?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "După resetare, telecomanda de blocare va fi ştersă. Vrei să-l resetezi?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "După resetare, telecomanda de blocare va fi ştersă. Vrei să-l resetezi?", + "版本说明": "Descrierea versiunii", } \ No newline at end of file diff --git a/lan/lan_ru.json b/lan/lan_ru.json index be2e5622..cfba1ebf 100644 --- a/lan/lan_ru.json +++ b/lan/lan_ru.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Следуйте системе", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "После сброса отпечатки пальцев замка будут удалены. Вы уверены, что хотите его перезагрузить?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "После сброса пульт дистанционного управления замком будет удален. А вы хотите его сбросить?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "После сброса пульт дистанционного управления замком будет удален. А вы хотите его сбросить?", + "版本说明": "Объяснение версии", } \ No newline at end of file diff --git a/lan/lan_sk.json b/lan/lan_sk.json index b72ccb15..7606e642 100644 --- a/lan/lan_sk.json +++ b/lan/lan_sk.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Sledovať systém", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Po resetovaní budú prstové odtlačky zámku vymazané. Ste si istí, že chcete obnoviť?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Po resetovaní bude diaľkové ovládanie zámku vymazané. Chcete ho obnoviť?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Po resetovaní bude diaľkové ovládanie zámku vymazané. Chcete ho obnoviť?", + "版本说明": "Popis verzie" } \ No newline at end of file diff --git a/lan/lan_sr_cyrl.json b/lan/lan_sr_cyrl.json index 381e1bcc..076b29b3 100644 --- a/lan/lan_sr_cyrl.json +++ b/lan/lan_sr_cyrl.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Пратите систем", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Након ресетовања, отисци прстију браве ће бити избрисани. Да ли сте сигурни да желите да га ресетујете?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Након ресетовања, даљински управљач браве ће бити избрисан. Да ли желите да га ресетујете?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Након ресетовања, даљински управљач браве ће бити избрисан. Да ли желите да га ресетујете?", + "版本说明": "Опис верзије" } \ No newline at end of file diff --git a/lan/lan_sv.json b/lan/lan_sv.json index b1f95839..c81b013b 100644 --- a/lan/lan_sv.json +++ b/lan/lan_sv.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Följ system", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Efter återställd, kommer låsets fingeravtryck tas bort. Är du säker på att du vill återställa den?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Efter återställd, fjärrkontrollen på låset tas bort. Vill du återställa den?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Efter återställd, fjärrkontrollen på låset tas bort. Vill du återställa den?", + "版本说明": "Versionsbeskrivning" } \ No newline at end of file diff --git a/lan/lan_th.json b/lan/lan_th.json index 45abbb64..bf4bdf0c 100644 --- a/lan/lan_th.json +++ b/lan/lan_th.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "ระบบติดตามผล", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "หลังจากรีเซ็ตแล้วลายนิ้วมือของล็อคจะถูกลบออกคุณแน่ใจว่าอยากจะรีเซ็ต?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "หลังจากรีเซ็ตแล้วรีโมทคอนโทรลของล็อคจะถูกลบออกคุณต้องการรีเซ็ตไหม" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "หลังจากรีเซ็ตแล้วรีโมทคอนโทรลของล็อคจะถูกลบออกคุณต้องการรีเซ็ตไหม", + "版本说明": "คำอธิบายรุ่น" } \ No newline at end of file diff --git a/lan/lan_tr.json b/lan/lan_tr.json index 53ae8ad3..035738ba 100644 --- a/lan/lan_tr.json +++ b/lan/lan_tr.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Sistemi takip et", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Sıfırlamadan sonra, kilidin parmak izleri silinecektir. Sıfırlamak istediğine emin misin?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Sıfırladıktan sonra, kilidin uzaktan kumandası silinecektir. Sıfırlamak ister misin?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Sıfırladıktan sonra, kilidin uzaktan kumandası silinecektir. Sıfırlamak ister misin?", + "版本说明": "Sürüm açıklaması", } \ No newline at end of file diff --git a/lan/lan_tw.json b/lan/lan_tw.json index 9b69c146..7347b2c4 100644 --- a/lan/lan_tw.json +++ b/lan/lan_tw.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "跟蹤系統", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "重置後,鎖的指紋將被刪除。 是否確實要重置它?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "重置後,鎖的遙控器將被刪除。 是否要重置它?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "重置後,鎖的遙控器將被刪除。 是否要重置它?", + "版本说明": "版本說明", } \ No newline at end of file diff --git a/lan/lan_uk.json b/lan/lan_uk.json index fc64e240..1df767a6 100644 --- a/lan/lan_uk.json +++ b/lan/lan_uk.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Система стеження за", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Після скидання відбитки пальців замка будуть видалені. Ви впевнені, що хочете скинути налаштування?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Після скидання пульт дистанційного керування замком буде видалено. Хочете його скинути?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Після скидання пульт дистанційного керування замком буде видалено. Хочете його скинути?", + "版本说明": "Опис версії", } \ No newline at end of file diff --git a/lan/lan_vi.json b/lan/lan_vi.json index b83db737..5e8939b7 100644 --- a/lan/lan_vi.json +++ b/lan/lan_vi.json @@ -1120,5 +1120,6 @@ "分简称": "M", "跟随系统": "Hệ thống theo dõi", "重置后,该锁的指纹都将被删除哦,确认要重置吗?": "Sau khi đặt lại, dấu vân tay của khóa sẽ bị xóa. Bạn có chắc chắn muốn thiết lập lại nó?", - "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Sau khi đặt lại, điều khiển từ xa của khóa sẽ bị xóa. Bạn có muốn đặt lại không?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "Sau khi đặt lại, điều khiển từ xa của khóa sẽ bị xóa. Bạn có muốn đặt lại không?", + "版本说明": "Thông tin phiên bản" } \ No newline at end of file diff --git a/lan/lan_zh.json b/lan/lan_zh.json index 58e4a01b..bd4dc8d8 100755 --- a/lan/lan_zh.json +++ b/lan/lan_zh.json @@ -1126,4 +1126,6 @@ "通话连接失败": "通话连接失败", "已挂断": "已挂断", "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "重置后,该锁的遥控都将被删除哦,确认要重置吗?" + "重置后,该锁的遥控都将被删除哦,确认要重置吗?": "重置后,该锁的遥控都将被删除哦,确认要重置吗?", + "版本说明": "版本说明" } diff --git a/lib/flavors.dart b/lib/flavors.dart index 6479398a..5334def5 100755 --- a/lib/flavors.dart +++ b/lib/flavors.dart @@ -199,28 +199,28 @@ class F { switch (appFlavor) { case Flavor.local: return const UmengKey( - androidKey: '671244cf80464b33f6df9648', - iosKey: '671244ae80464b33f6df9646', + androidKey: 'local-671244cf80464b33f6df9648', + iosKey: 'local-671244ae80464b33f6df9646', channel: 'Product'); case Flavor.dev: return const UmengKey( - androidKey: '671244cf80464b33f6df9648', - iosKey: '671244ae80464b33f6df9646', + androidKey: 'dev-671244cf80464b33f6df9648', + iosKey: 'dev-671244ae80464b33f6df9646', channel: 'Product'); case Flavor.pre: return const UmengKey( - androidKey: '671244cf80464b33f6df9648', - iosKey: '671244ae80464b33f6df9646', + androidKey: 'pre-671244cf80464b33f6df9648', + iosKey: 'pre-671244ae80464b33f6df9646', channel: 'Product'); case Flavor.sky_dev: return const UmengKey( - androidKey: '671244cf80464b33f6df9648', - iosKey: '671244ae80464b33f6df9646', + androidKey: 'sky_dev-671244cf80464b33f6df9648', + iosKey: 'sky_dev-671244ae80464b33f6df9646', channel: 'Product'); case Flavor.sky_pre: return const UmengKey( - androidKey: '671244cf80464b33f6df9648', - iosKey: '671244ae80464b33f6df9646', + androidKey: 'sky_pre-671244cf80464b33f6df9648', + iosKey: 'sky_pre-671244ae80464b33f6df9646', channel: 'Product'); case Flavor.sky: return const UmengKey( @@ -229,13 +229,13 @@ class F { channel: 'Product'); case Flavor.xhj_dev: return const UmengKey( - androidKey: '671244cf80464b33f6df9648', - iosKey: '671244ae80464b33f6df9646', + androidKey: 'xhj_dev-671244cf80464b33f6df9648', + iosKey: 'xhj_dev-671244ae80464b33f6df9646', channel: 'Product'); case Flavor.xhj_pre: return const UmengKey( - androidKey: '671244cf80464b33f6df9648', - iosKey: '671244ae80464b33f6df9646', + androidKey: 'xhj_pre-671244cf80464b33f6df9648', + iosKey: 'xhj_pre-671244ae80464b33f6df9646', channel: 'Product'); case Flavor.xhj: return const UmengKey( @@ -244,8 +244,8 @@ class F { channel: 'Product'); default: return const UmengKey( - androidKey: '671244cf80464b33f6df9648', - iosKey: '671244ae80464b33f6df9646', + androidKey: 'default-671244cf80464b33f6df9648', + iosKey: 'default-671244ae80464b33f6df9646', channel: 'Product'); } } diff --git a/lib/login/login/app_get_version.dart b/lib/login/login/app_get_version.dart index fb738b60..de2a642c 100644 --- a/lib/login/login/app_get_version.dart +++ b/lib/login/login/app_get_version.dart @@ -29,10 +29,12 @@ class Data { Data.fromJson(Map json) { wechatServiceUrl = json['wechat_service_url']; appSiteUrl = json['app_site_url']; + appVersionHistoryUrl = json['appVersionHistoryUrl']; } String? wechatServiceUrl; String? appSiteUrl; + String? appVersionHistoryUrl; Map toJson() { final Map data = {}; diff --git a/lib/mine/about/about_page.dart b/lib/mine/about/about_page.dart index 91c2dd68..46632a87 100755 --- a/lib/mine/about/about_page.dart +++ b/lib/mine/about/about_page.dart @@ -1,3 +1,6 @@ +import 'dart:io'; + +import 'package:device_info_plus/device_info_plus.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; @@ -9,7 +12,9 @@ import 'package:star_lock/mine/about/about_console.dart'; import '../../app_settings/app_colors.dart'; import '../../flavors.dart'; import '../../tools/commonItem.dart'; +import '../../tools/storage.dart'; import '../../tools/titleAppBar.dart'; +import '../../tools/wechat/wechatManageTool.dart'; class AboutPage extends StatefulWidget { const AboutPage({Key? key}) : super(key: key); @@ -80,6 +85,44 @@ class _AboutPageState extends State { Widget listView() { Widget view = Column( children: [ + CommonItem( + leftTitel: '版本说明'.tr, + rightTitle: '', + isHaveLine: false, + isHaveDirection: true, + action: () async { + WechatManageTool.getAppInfo(() async { + final String? appVersionHistoryBaseUrl = + await Storage.getString(appVersionHistoryUrl); + if (appVersionHistoryBaseUrl == null) { + return; + } + String brandName = ''; + if (Platform.isAndroid) { + final AndroidDeviceInfo androidDeviceInfo = + await DeviceInfoPlugin().androidInfo; + brandName = androidDeviceInfo.manufacturer; + } else { + final IosDeviceInfo iosDeviceInfo = + await DeviceInfoPlugin().iosInfo; + brandName = iosDeviceInfo.systemName ?? 'ios'; + } + final PackageInfo packageInfo = + await PackageInfo.fromPlatform(); + Navigator.pushNamed(context, Routers.webviewShowPage, + arguments: { + 'url': appVersionHistoryBaseUrl + + '?version=${packageInfo.version}&brandName=${brandName}', + 'title': '版本说明'.tr + }); + }); + }), + Divider( + height: 1, + color: AppColors.greyLineColor, + indent: 20.w, + endIndent: 20.w, + ), CommonItem( leftTitel: '介绍'.tr, rightTitle: '', diff --git a/lib/tools/storage.dart b/lib/tools/storage.dart index 34a9e425..2a251a44 100755 --- a/lib/tools/storage.dart +++ b/lib/tools/storage.dart @@ -36,6 +36,7 @@ const String starChartRegisterNodeInfo = 'starChartRegisterNodeInfo'; //星图 const String relayInfo = 'relayInfo'; //星图中继服务器信息 const String lockNetWorkInfo = 'lockNetWorkInfo'; //锁板配网信息 +const String appVersionHistoryUrl = 'appVersionHistoryUrl'; //是否同意隐私协议弹窗 class Storage { factory Storage() => _instance; diff --git a/lib/tools/wechat/wechatManageTool.dart b/lib/tools/wechat/wechatManageTool.dart index 9f77c6dc..fa548669 100644 --- a/lib/tools/wechat/wechatManageTool.dart +++ b/lib/tools/wechat/wechatManageTool.dart @@ -1,7 +1,6 @@ - - import '../../login/login/app_get_version.dart'; import '../../network/api_repository.dart'; +import '../storage.dart'; import 'customer_tool.dart'; import 'pay/wx_pay_tool.dart'; @@ -13,12 +12,12 @@ class WechatManageTool { static Future getAppInfo(void Function() action) async { // AppLog.log('AppFirstEnterHandle调用了获取App信息接口'); final GetAppInfo entity = await ApiRepository.to.getAppInfo(); - if(entity.errorCode == 0) { + if (entity.errorCode == 0) { + Storage.setString( + appVersionHistoryUrl, entity.data?.appVersionHistoryUrl ?? ''); CustomerTool.init(entity.data?.wechatServiceUrl ?? ''); WxPayTool.setAssociationUrl(entity.data!.appSiteUrl!); action(); } - } - -} \ No newline at end of file +}