From 12adafe94205aa858e832fa2702958631c6873bf Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期四, 26 五月 2022 16:57:59 +0800
Subject: [PATCH] Revert "自测无问题"
---
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | 2
HDL-ON_Android/Assets/Language.ini | 49 ----------------
HDL_ON/Common/R.cs | 56 ------------------
HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs | 43 +++++++-------
HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs | 7 +-
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 4
6 files changed, 29 insertions(+), 132 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index f9dded8..a48482d 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -518,21 +518,6 @@
530=In order to prevent the wrong touch and click of opening and closing the door and ensure family safety, please enter your door lock password.
531=Password free unlocking within five minutes
532=The device is offline and cannot be operated temporarily
-533=Visitor management
-534=Visitor Invitation
-535=Record
-536=*After you initiate the visitor certificate, you can unlock the door by password or swipe the code freely within the validity period you set. Please share the certificate carefully.
-537=Input phone number of the visitor
-538=Input 6-digits temporary password
-539=Random Generation
-540=After confirmation, the visitor QR code will be generated, and the 6-digit dynamic digital password SMS will also be sent to the visitor mobile phone.
-541=Are you sure to delete visitor credentials?
-542=Long press the QR code to save the QR code to the album
-543=QR code is invalid
-544=Generate Visitor Credentials
-545=Cancle Visitor Credentials
-546=Visitor QR Code
-547=Phone Number
1000=Room Humidity
@@ -1675,24 +1660,6 @@
531=浜斿垎閽熷唴鍏嶅瘑鐮佸紑閿�
532=璁惧绂荤嚎涓紝鏆傛椂鏃犳硶鎿嶄綔
533=璁垮绠＄悊
-534=璁垮閭�璇�
-535=璁垮璁板綍
-536=*鎮ㄥ彂璧疯瀹㈠嚟璇佸悗锛岃鍑瘉灏嗗湪鎮ㄨ缃殑鏈夋晥鏈熷唴锛屽彲鑷敱鍒风爜鎴栧瘑鐮佸紑閿佽繘琛岃繘鍑猴紝璇疯皑鎱庡垎浜鍑瘉銆�
-537=杈撳叆璁垮鎵嬫満鍙风爜
-538=杈撳叆6浣嶅姩鎬佸瘑鐮�
-539=闅忔満鐢熸垚
-
-540=纭鍚庯紝浼氱敓鎴愯瀹簩缁寸爜锛屽悓鏃朵篃浼氬皢6浣嶅姩鎬佹暟瀛楀瘑鐮佺煭淇″彂閫佸埌璁垮鎵嬫満涓娿��
-541=纭畾鍒犻櫎璁垮鍑瘉锛�
-
-542=闀挎寜浜岀淮鐮佸彲浠ュ皢浜岀淮鐮佷繚瀛樺埌鐩稿唽
-543=浜岀淮鐮佸凡澶辨晥
-544=鐢熸垚璁垮鍑瘉
-545=鍙栨秷璁垮鍑瘉
-546=璁垮浜岀淮鐮�
-547=鎵嬫満鍙�
-
-
1000=瀹ゅ唴婀垮害
1001=绔ラ攣
@@ -2815,21 +2782,7 @@
530=In order to prevent the wrong touch and click of opening and closing the door and ensure family safety, please enter your door lock password.
531=Password free unlocking within five minutes
532=The device is offline and cannot be operated temporarily
-533=Visitor management
-534=Visitor Invitation
-535=Record
-536=*After you initiate the visitor certificate, you can unlock the door by password or swipe the code freely within the validity period you set. Please share the certificate carefully.
-537=Input phone number of the visitor
-538=Input 6-digits temporary password
-539=Random Generation
-540=After confirmation, the visitor QR code will be generated, and the 6-digit dynamic digital password SMS will also be sent to the visitor mobile phone.
-541=Are you sure to delete visitor credentials?
-542=Long press the QR code to save the QR code to the album
-543=QR code is invalid
-544=Generate Visitor Credentials
-545=Cancle Visitor Credentials
-546=Visitor QR Code
-547=Phone Number
+
1000=袙谢邪卸薪芯褋褌褜 胁 袩芯屑械褖械薪懈懈
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index e646310..b290247 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -5,62 +5,6 @@
public static class StringId
{
/// <summary>
- /// 鎵嬫満鍙�
- /// </summary>
- public const int PhoneNumber = 547;
- /// <summary>
- /// 璁垮浜岀淮鐮�
- /// </summary>
- public const int VisitorQRCode = 546;
- /// <summary>
- /// 鍙栨秷璁垮鍑瘉
- /// </summary>
- public const int CancleVisitorCredentials = 545;
- /// <summary>
- /// 鐢熸垚璁垮鍑瘉
- /// </summary>
- public const int GenerateVisitorCredentials = 544;
- /// <summary>
- /// 浜岀淮鐮佸凡澶辨晥
- /// </summary>
- public const int QRcodeIsInvalid = 543;
- /// <summary>
- /// 闀挎寜浜岀淮鐮佸彲浠ュ皢浜岀淮鐮佷繚瀛樺埌鐩稿唽
- /// </summary>
- public const int LongPressQRCodeSave= 542;
- /// <summary>
- /// 澶辨晥鏃堕棿
- /// </summary>
- public const int VisitorDelTipContent = 541;
- /// <summary>
- /// 澶辨晥鏃堕棿
- /// </summary>
- public const int VisitorTipContent = 540;
- /// <summary>
- /// 闅忔満鐢熸垚
- /// </summary>
- public const int RandomGeneration = 539;
- /// <summary>
- /// 杈撳叆6浣嶅姩鎬佸瘑鐮�
- /// </summary>
- public const int Input6_DigitsTemporaryPassword = 538;
- /// <summary>
- /// 杈撳叆璁垮鎵嬫満鍙风爜
- /// </summary>
- public const int InputPhoneNumberOfTheVisitor = 537;
- /// <summary>
- /// 鎮ㄥ彂璧疯瀹㈠嚟璇佸悗锛岃鍑瘉灏嗗湪鎮ㄨ缃殑鏈夋晥鏈熷唴锛屽彲鑷敱鍒风爜鎴栧瘑鐮佸紑閿佽繘琛岃繘鍑猴紝璇疯皑鎱庡垎浜鍑瘉
- /// </summary>
- public const int VisitorTip = 536;
- /// <summary>
- /// 璁垮璁板綍
- /// </summary>
- public const int VisitorRecord = 535;
- /// <summary>
- /// 璁垮閭�璇�
- /// </summary>
- public const int VisitorInvitation = 534;
- /// <summary>
/// 璁垮绠＄悊
/// </summary>
public const int VisitorManage = 533;
diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
index 9fa20e5..f05d092 100644
--- a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -65,7 +65,7 @@
/// false锛氭敹鍒版帹閫佸苟涓斿凡缁忔敹鍒皊ip鍛煎彨鎵嶈烦杞懠鍙〉闈�
/// true锛氬師鐢熸敹鍒板懠鍙┈涓婅烦杞懠鍙〉闈紝涓嶇瓑寰呮帹閫佽繃鏉�
/// </summary>
- bool IsAutoJumpCallView = true;
+ bool IsAutoJumpCallView = false;
/// <summary>
/// 鏄惁鍒濆鍖栦簡SDK
/// </summary>
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index 7cedd9d..c85c12c 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -261,9 +261,9 @@
var btnSetting = new Button()
{
- X = Application.GetRealWidth(270),
+ X = Application.GetRealWidth(337-100),
Y = Application.GetRealHeight(29),
- Width = Application.GetMinRealAverage(80),
+ Width = Application.GetMinRealAverage(100),
Height = Application.GetMinRealAverage(28),
TextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.TextFontSize,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs
index 93907ac..b403b25 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs
@@ -28,8 +28,9 @@
page.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
+
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.VisitorRecord)).LoadTopView(click);
+ new TopViewDiv(bodyView, "璁垮璁板綍").LoadTopView(click);
#endregion
bodyScrolView = new VerticalScrolViewLayout()
@@ -54,7 +55,7 @@
{
Height = Application.GetRealWidth(20),
Y = Application.GetRealWidth(6),
- Text = Language.StringByID(StringId.VisitorQRCode),
+ Text = "璁垮浜岀淮鐮�",
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.text1Color,
TextSize = CSS_FontSize.TextFontSize,
@@ -67,7 +68,7 @@
{
Height = Application.GetRealWidth(14),
Y = Application.GetRealWidth(30),
- Text = Language.StringByID(StringId.Time)+ "锛�" + startTime + " - " + endTime,
+ Text = "鏃堕棿锛�" + startTime + " - " + endTime,
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs
index 2f90442..68285b6 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs
@@ -48,14 +48,13 @@
};
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.VisitorInvitation))
- .LoadTopView_SettingText(click, Language.StringByID(StringId.VisitorRecord));
+ new TopViewDiv(bodyView, "璁垮閭�璇�").LoadTopView_SettingText(click, "娴嬭瘯璁板綍");
}
else
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.VisitorInvitation)).LoadTopView();
+ new TopViewDiv(bodyView, "璁垮閭�璇�").LoadTopView();
}
#endregion
@@ -70,7 +69,7 @@
// 鎻愮ず鏂囧瓧
bodyScrolView.AddChidren(new Button()
{
- Text = Language.StringByID(StringId.VisitorTip),
+ Text = "*鎮ㄥ彂璧疯瀹簩缁寸爜鍚庯紝璇ヤ簩缁寸爜灏嗗湪鎮ㄨ缃殑鏈夋晥鏈熷唴锛屽彲鑷敱鍒风爜杩涜杩涘嚭锛岃璋ㄦ厧鍒嗕韩璇ヤ簩缁寸爜銆�",
IsMoreLines = true,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextColor = CSS_Color.PromptingColor1,
@@ -82,7 +81,7 @@
#region 鎵嬫満鍙�
bodyScrolView.AddChidren(new Button()
{
- Text = Language.StringByID(StringId.PhoneNumber),
+ Text = "鎵嬫満鍙�",
Y = Application.GetRealWidth(10),
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
@@ -98,7 +97,7 @@
Width = Application.GetRealWidth(335),
TextSize = CSS_FontSize.TextFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
- PlaceholderText = Language.StringByID(StringId.InputPhoneNumberOfTheVisitor),
+ PlaceholderText = "杈撳叆璁垮鎵嬫満鍙�",
Text = tempPassword.phone,
IsNumberKeyboardType = true,
PlaceholderTextColor = CSS_Color.PromptingColor1,
@@ -118,7 +117,7 @@
bodyScrolView.AddChidren(new Button() { Height = Application.GetRealWidth(10), });
bodyScrolView.AddChidren(new Button()
{
- Text = Language.StringByID(StringId.linshimima),
+ Text = "鍔ㄦ�佸瘑鐮�",
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
Height = Application.GetRealHeight(20),
@@ -138,7 +137,7 @@
TextSize = CSS_FontSize.TextFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
Width = Application.GetRealWidth(335),
- PlaceholderText = Language.StringByID(StringId.Input6_DigitsTemporaryPassword),
+ PlaceholderText = "杈撳叆璁�6浣嶅瘑鐮�",
Text = tempPassword.tempPwd,
PlaceholderTextColor = CSS_Color.PromptingColor1,
};
@@ -149,7 +148,7 @@
{
X = Application.GetRealWidth(275),
Width = Application.GetRealWidth(80),
- Text = Language.StringByID(StringId.RandomGeneration),
+ Text = "闅忔満鐢熸垚",
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.TextFontSize,
@@ -182,7 +181,7 @@
startLayout.AddChidren(new Button()
{
- Text = Language.StringByID(StringId.EffectiveTime),
+ Text = "浜岀淮鐮佺敓鏁堟椂闂�",
X = Application.GetRealWidth(20),
Width = Application.GetRealWidth(130),
TextSize = CSS_FontSize.SubheadingFontSize,
@@ -256,7 +255,7 @@
endLayout.AddChidren(new Button()
{
- Text = Language.StringByID(StringId.FailureTime),
+ Text = "浜岀淮鐮佸け鏁堟椂闂�",
X = Application.GetRealWidth(20),
Width = Application.GetRealWidth(130),
TextSize = CSS_FontSize.SubheadingFontSize,
@@ -343,7 +342,7 @@
X = Application.GetRealWidth(16),
Width = Application.GetRealWidth(343),
Height = Application.GetRealWidth(20),
- Text = Language.StringByID(StringId.LongPressQRCodeSave),
+ Text = "闀挎寜鍙互鎶婁簩缁寸爜淇濆瓨鍒扮浉鍐�",
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
});
@@ -393,13 +392,13 @@
string message = "";
if (codeIV.ImageBytes == null)
{
- tip = Language.StringByID(StringId.tip);
- message = Language.StringByID(StringId.VisitorTipContent);
+ tip = "璁垮鍑瘉";
+ message = "鐢熸垚璁垮浜岀淮鐮佸苟灏嗕复鏃跺瘑鐮佸彂閫佽嚦璁垮鎵嬫満.";
}
else
{
- tip = Language.StringByID(StringId.tip);
- message = Language.StringByID(StringId.VisitorDelTipContent);
+ tip = "璁垮鍑瘉";
+ message = "纭畾鍒犻櫎璁垮鍑瘉锛�";
}
new LpTipDialog(Application.Activity, tip, message, new LpTipDialogCallBack(voucher_action)).Show();
};
@@ -414,11 +413,11 @@
string msg = "";
if (bol)
{
- msg = Language.StringByID(StringId.SavedSuccessfully);
+ msg = "淇濆瓨鎴愬姛锛�";
}
else
{
- msg = Language.StringByID(StringId.saveFail);
+ msg = "淇濆瓨澶辫触锛�";
}
EmptyTipView tipView = new EmptyTipView(msg, 160);
tipView.Gravity = Gravity.CenterHorizontal;
@@ -448,15 +447,15 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.textWhiteColor,
BackgroundColor = CSS_Color.DialogTransparentColor1,
- Text = Language.StringByID(StringId.QRcodeIsInvalid),
- };
+ Text = "浜岀淮鐮佸凡澶辨晥",
+ };
codeLayout.AddChidren(codeTip);
}
- visitorVoucherBtn.Text = Language.StringByID(StringId.CancleVisitorCredentials);
+ visitorVoucherBtn.Text = "鍒犻櫎璁垮鍑瘉";
}
else
{
- visitorVoucherBtn.Text = Language.StringByID(StringId.GenerateVisitorCredentials);
+ visitorVoucherBtn.Text = "鐢熸垚璁垮鍑瘉";
}
}
--
Gitblit v1.8.0