From 07b0239f824ddb5a0cadf93f20ff6247f72baca2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 一月 2022 11:32:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr0114' into wjc
---
HDL_ON/UI/BindingResidence/BindingResidencePage.cs | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/BindingResidence/BindingResidencePage.cs b/HDL_ON/UI/BindingResidence/BindingResidencePage.cs
index bf2f329..44f9643 100644
--- a/HDL_ON/UI/BindingResidence/BindingResidencePage.cs
+++ b/HDL_ON/UI/BindingResidence/BindingResidencePage.cs
@@ -91,7 +91,15 @@
btnAddNewResidence.MouseUpEventHandler = (sender, e) =>
{
- Scan.OpenScan((scanString) =>
+ if (Language.CurrentLanguage == "Chinese")
+ {
+ Scan.Ins.TipMsg = "鎮ㄥ凡鎷掔粷App鐩告満璁块棶鏉冮檺锛岃繖灏嗗鑷存偍鏃犳硶浣跨敤鎵弿浜岀淮鐮佺粦瀹氭垜鐨勫搴紝浣嗘偍鍙互閫氳繃鍔犲叆鍏朵粬鐢ㄦ埛鐨勫搴紝浣撻獙鏅鸿兘瀹跺眳鏈嶅姟锛屽闇�鍚敤缁戝畾鎴戠殑瀹跺涵鏈嶅姟锛岃鍓嶅線鎵嬫満绯荤粺璁剧疆鎵撳紑鐩稿叧鏉冮檺";
+ }
+ else
+ {
+ Scan.Ins.TipMsg = "You have denied access to the app camera, which will make you unable to bind my family with the scanned QR code, but you can experience smart home services by joining other users' families. To enable the bind my family service, please go to the mobile phone system settings to open the relevant permissions";
+ }
+ Scan.Ins.OpenScan((scanString) =>
{
//鎵ц缁戝畾浣忓畢
this.DoBindResidence(scanString);
@@ -218,7 +226,7 @@
btnRedo.MouseUpEventHandler += (sender, e) =>
{
- Scan.OpenScan((scanString) =>
+ Scan.Ins.OpenScan((scanString) =>
{
frameBack.Close();
//鎵ц缁戝畾浣忓畢
--
Gitblit v1.8.0