From 771e755167fa17de86c774337323cc64465f6ea3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 13 六月 2022 12:01:50 +0800
Subject: [PATCH] Merge branch 'lss' into wxr0114
---
HDL-ON_Android/Assets/Language.ini | 59 ++++++++
HDL_ON/Common/R.cs | 117 +++++++++++++---
HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs | 115 ++++++++++++---
HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs | 81 -----------
4 files changed, 243 insertions(+), 129 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 2e71213..cae01a5 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -529,6 +529,24 @@
541=Monitoring
542=Wandering alarm
543=Get more
+2533=Visitor management
+2534=Visitor Invitation
+2535=Record
+2536=*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.
+2537=Input phone number of the visitor
+2538=Input 6-digits temporary password
+2539=Random Generation
+2540=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.
+2541=Are you sure to delete visitor credentials?
+2542=Long press the QR code to save the QR code to the album
+2543=QR code is invalid
+2544=Generate Visitor Credentials
+2545=Cancle Visitor Credentials
+2546=Visitor QR Code
+2547=Phone Number
+2548=Please enter a correct phone number
+2549=Please select a effective time
+2550=Please select a expire time
1000=Room Humidity
@@ -1692,6 +1710,29 @@
542=寰樺緤鎶ヨ
543=鑾峰彇鏇村
+2533=璁垮绠＄悊
+2534=璁垮閭�璇�
+2535=璁垮璁板綍
+2536=*鎮ㄥ彂璧疯瀹㈠嚟璇佸悗锛岃鍑瘉灏嗗湪鎮ㄨ缃殑鏈夋晥鏈熷唴锛屽彲鑷敱鍒风爜鎴栧瘑鐮佸紑閿佽繘琛岃繘鍑猴紝璇疯皑鎱庡垎浜鍑瘉銆�
+2537=杈撳叆璁垮鎵嬫満鍙风爜
+2538=杈撳叆6浣嶅姩鎬佸瘑鐮�
+2539=闅忔満鐢熸垚
+
+2540=纭鍚庯紝浼氱敓鎴愯瀹簩缁寸爜锛屽悓鏃朵篃浼氬皢6浣嶅姩鎬佹暟瀛楀瘑鐮佺煭淇″彂閫佸埌璁垮鎵嬫満涓娿��
+2541=纭畾鍒犻櫎璁垮鍑瘉锛�
+
+2542=闀挎寜浜岀淮鐮佸彲浠ュ皢浜岀淮鐮佷繚瀛樺埌鐩稿唽
+2543=浜岀淮鐮佸凡澶辨晥
+2544=鐢熸垚璁垮鍑瘉
+2545=鍙栨秷璁垮鍑瘉
+2546=璁垮浜岀淮鐮�
+2547=鎵嬫満鍙�
+2548=璇疯緭鍏ユ纭殑鎵嬫満鍙风爜
+2549=璇烽�夋嫨鐢熸晥鏃堕棿
+2550=璇烽�夋嫨澶辨晥鏃堕棿
+
+
+
1000=瀹ゅ唴婀垮害
1001=绔ラ攣
1002=璐熺瀛�
@@ -2829,6 +2870,24 @@
541=Monitoring
542=Wandering alarm
543=Get more
+2533=Visitor management
+2534=Visitor Invitation
+2535=Record
+2536=*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.
+2537=Input phone number of the visitor
+2538=Input 6-digits temporary password
+2539=Random Generation
+2540=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.
+2541=Are you sure to delete visitor credentials?
+2542=Long press the QR code to save the QR code to the album
+2543=QR code is invalid
+2544=Generate Visitor Credentials
+2545=Cancle Visitor Credentials
+2546=Visitor QR Code
+2547=Phone Number
+2548=Please enter a correct phone number
+2549=Please select a effective time
+2550=Please select a expire time
1000=袙谢邪卸薪芯褋褌褜 胁 袩芯屑械褖械薪懈懈
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 7e86ec4..aab607c 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -47,6 +47,75 @@
/// </summary>
public const int Data = 534;
/// <summary>
+ /// 璁垮浜岀淮鐮佺粨鏉熸椂闂�
+ /// </summary>
+ public const int VisitorEndTime = 2550;
+ /// <summary>
+ /// 璁垮浜岀淮鐮佸紑濮嬫椂闂�
+ /// </summary>
+ public const int VisitorStartTime = 2549;
+ /// <summary>
+ /// 鎵嬫満鍙�
+ /// </summary>
+ public const int PhoneNumberErrorTip = 2548;
+ /// <summary>
+ /// 鎵嬫満鍙�
+ /// </summary>
+ public const int PhoneNumber = 2547;
+ /// <summary>
+ /// 璁垮浜岀淮鐮�
+ /// </summary>
+ public const int VisitorQRCode = 2546;
+ /// <summary>
+ /// 鍙栨秷璁垮鍑瘉
+ /// </summary>
+ public const int CancleVisitorCredentials = 2545;
+ /// <summary>
+ /// 鐢熸垚璁垮鍑瘉
+ /// </summary>
+ public const int GenerateVisitorCredentials = 2544;
+ /// <summary>
+ /// 浜岀淮鐮佸凡澶辨晥
+ /// </summary>
+ public const int QRcodeIsInvalid = 2543;
+ /// <summary>
+ /// 闀挎寜浜岀淮鐮佸彲浠ュ皢浜岀淮鐮佷繚瀛樺埌鐩稿唽
+ /// </summary>
+ public const int LongPressQRCodeSave = 2542;
+ /// <summary>
+ /// 澶辨晥鏃堕棿
+ /// </summary>
+ public const int VisitorDelTipContent = 2541;
+ /// <summary>
+ /// 澶辨晥鏃堕棿
+ /// </summary>
+ public const int VisitorTipContent = 2540;
+ /// <summary>
+ /// 闅忔満鐢熸垚
+ /// </summary>
+ public const int RandomGeneration = 2539;
+ /// <summary>
+ /// 杈撳叆6浣嶅姩鎬佸瘑鐮�
+ /// </summary>
+ public const int Input6_DigitsTemporaryPassword = 2538;
+ /// <summary>
+ /// 杈撳叆璁垮鎵嬫満鍙风爜
+ /// </summary>
+ public const int InputPhoneNumberOfTheVisitor = 2537;
+ /// <summary>
+ /// 鎮ㄥ彂璧疯瀹㈠嚟璇佸悗锛岃鍑瘉灏嗗湪鎮ㄨ缃殑鏈夋晥鏈熷唴锛屽彲鑷敱鍒风爜鎴栧瘑鐮佸紑閿佽繘琛岃繘鍑猴紝璇疯皑鎱庡垎浜鍑瘉
+ /// </summary>
+ public const int VisitorTip = 2536;
+ /// <summary>
+ /// 璁垮璁板綍
+ /// </summary>
+ public const int VisitorRecord = 2535;
+ /// <summary>
+ /// 璁垮閭�璇�
+ /// </summary>
+ public const int VisitorInvitation = 2534;
+ /// <summary>
+ /// 璁垮绠＄悊
/// 24灏忔椂缁熻鍥�
/// </summary>
public const int StatisticalChart24Hour = 533;
@@ -302,7 +371,7 @@
/// <summary>
/// 闃叉姢涓�
/// </summary>
- public const int UnderProtection=470;
+ public const int UnderProtection = 470;
/// <summary>
/// 鏈変汉杩涘叆
/// </summary>
@@ -346,7 +415,7 @@
/// <summary>
/// 瀹炴椂鑳借��
/// </summary>
- public const int RealTimeEnergyConsumption=459;
+ public const int RealTimeEnergyConsumption = 459;
/// <summary>
/// 鏃ユ湡
/// </summary>
@@ -546,7 +615,7 @@
public const int VerificationCodePrompt = 274;
public const int ChangeTheVerificationMethod = 273;
public const int ModifyBindingEmail = 272;
- public const int CurrentEmail =271;
+ public const int CurrentEmail = 271;
public const int Unbind = 270;
public const int ModifyBinding = 269;
public const int EmailAddress = 268;
@@ -568,14 +637,14 @@
public const int SavedSuccessfully = 252;
public const int AddFailedInsufficientPermissions = 251;
public const int OperationFailed = 250;
- public const int MemberAccountHasBeenAddedAndCannotBeAddedAgain =249;
+ public const int MemberAccountHasBeenAddedAndCannotBeAddedAgain = 249;
public const int ThisHomeDoesNotExistForTheUser = 248;
public const int FailedToAddUnableToAddYourself = 247;
public const int FailedToAddTheMemberAccountIsNotRegistered = 246;
public const int DataExceptionPleaseTryAgain = 245;
public const int MemberAddedSuccessfully = 244;
public const int AccountErrorPlsC = 243;
- public const int ConfirmInvitation =242;
+ public const int ConfirmInvitation = 242;
public const int ScanQRCoden = 241;
public const int NewMemberAccount = 240;
public const int AddMember = 239;
@@ -671,7 +740,7 @@
public const int AtStartup = 149;
public const int Unprotected = 148;
public const int VerificationCodeError = 147;
- public const int MultipleChoicesOfPagesYouNeedToProtect= 146;
+ public const int MultipleChoicesOfPagesYouNeedToProtect = 146;
public const int PleaseSelectThePageToBeUnlocked = 145;
public const int UesrName = 144;
public const int UesrNameCannotBeEmpty = 143;
@@ -723,7 +792,7 @@
public const int DefaultGallery = 97;
public const int DeleteRoom = 96;
public const int Save = 95;
- public const int FunctionManagement=94;
+ public const int FunctionManagement = 94;
public const int Floor = 93;
public const int RoomName = 92;
@@ -740,7 +809,7 @@
public const int DelFloorTip = 88;
public const int Tip = 87;
public const int Del = 86;
- public const int Scenes=85;
+ public const int Scenes = 85;
public const int AddFloorFailed_FloorAlreadyExist = 84;
public const int EditFloorName = 83;
public const int AddFloors = 82;
@@ -778,12 +847,12 @@
public const int BoundMobileInfo = 50;
public const int MyQRcode = 49;
public const int Name = 48;
- public const int PersonalCenter=47;
+ public const int PersonalCenter = 47;
public const int InvalidLoginCertificate = 46;
public const int AccountNotExist = 45;
public const int ConfirmReset = 44;
public const int RegistrationFailedPleaseTryAgain = 43;
- public const int NetworkAnomaly=42;
+ public const int NetworkAnomaly = 42;
public const int FailedToSendVerificationCode = 41;
public const int LoginFailed_AccountOrPasswordError = 40;
public const int Personal = 39;
@@ -804,7 +873,7 @@
public const int PlsEntryCorrectEmailAddress = 24;
public const int VerificationCodeWrong = 23;
public const int AccountAlreadyUse = 22;
- public const int PasswordIsUnqualified=21;
+ public const int PasswordIsUnqualified = 21;
public const int IncorrectRepeatPassword = 20;
public const int PlsEntryCorrectMobilNeumber = 19;
public const int PlsEntryVerificationCode = 18;
@@ -1825,7 +1894,7 @@
/// <summary>
/// 鍦ㄧ嚎
/// </summary>
- public const int zaixianhwb= 6015;
+ public const int zaixianhwb = 6015;
/// <summary>
/// 绂荤嚎
/// </summary>
@@ -1853,7 +1922,7 @@
/// <summary>
/// 涓嬩竴姝�
/// </summary>
- public const int xiayibu= 6022;
+ public const int xiayibu = 6022;
/// <summary>
/// 鐢垫簮
/// </summary>
@@ -2081,7 +2150,7 @@
/// <summary>
/// 閫夋嫨绾㈠鍝佺墝
/// </summary>
- public const int xuanzehongwaipinpai= 6081;
+ public const int xuanzehongwaipinpai = 6081;
/// <summary>
/// 鎽囧ご
/// </summary>
@@ -2358,11 +2427,11 @@
/// <summary>
/// 鏆傚仠
/// </summary>
- public const int stop= 7054;
+ public const int stop = 7054;
/// <summary>
/// 浜害
/// </summary>
- public const int brightnesLogic= 7055;
+ public const int brightnesLogic = 7055;
/// <summary>
/// 鐧惧垎姣�
/// </summary>
@@ -2374,7 +2443,7 @@
/// <summary>
/// 鍒跺喎
/// </summary>
- public const int coolLogic= 7058;
+ public const int coolLogic = 7058;
/// <summary>
/// 鍒剁儹
/// </summary>
@@ -2490,7 +2559,7 @@
/// <summary>
/// 瀹ゅ鍙樺寲
/// </summary>
- public const int shiwaibainhua=7087;
+ public const int shiwaibainhua = 7087;
/// <summary>
/// 閫夋嫨瀹ゅ鍙樺寲鏉′欢
/// </summary>
@@ -2534,11 +2603,11 @@
/// <summary>
/// 鏅村ぉ
/// </summary>
- public const int clearday =7098;
+ public const int clearday = 7098;
/// <summary>
/// 澶氫簯
/// </summary>
- public const int cloudy= 7099;
+ public const int cloudy = 7099;
/// <summary>
/// 涓嬮洦
/// </summary>
@@ -2562,7 +2631,7 @@
/// <summary>
/// 杞诲害姹℃煋:76~115ug/m鲁
/// </summary>
- public const int pmqingdu= 7105;
+ public const int pmqingdu = 7105;
/// <summary>
/// 涓害姹℃煋:116~150ug/m鲁
/// </summary>
@@ -2570,11 +2639,11 @@
/// <summary>
/// 閲嶅害姹℃煋:>150ug/m鲁
/// </summary>
- public const int pmzhongduwuran= 7107;
+ public const int pmzhongduwuran = 7107;
/// <summary>
/// 娉勬紡/鏃犳硠婕�
/// </summary>
- public const int xieluoandwuxieluo=7108;
+ public const int xieluoandwuxieluo = 7108;
/// <summary>
/// 娉勬紡
/// </summary>
@@ -2638,7 +2707,7 @@
/// <summary>
/// 浼�
/// </summary>
- public const int kongqiyou= 7124;
+ public const int kongqiyou = 7124;
/// <summary>
/// 鑹�
/// </summary>
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs
index b403b25..9037df3 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs
@@ -28,9 +28,8 @@
page.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
-
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, "璁垮璁板綍").LoadTopView(click);
+ new TopViewDiv(bodyView, Language.StringByID(StringId.VisitorInvitation)).LoadTopView_SettingText(click, "");
#endregion
bodyScrolView = new VerticalScrolViewLayout()
@@ -55,7 +54,7 @@
{
Height = Application.GetRealWidth(20),
Y = Application.GetRealWidth(6),
- Text = "璁垮浜岀淮鐮�",
+ Text = Language.StringByID(StringId.VisitorQRCode),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.text1Color,
TextSize = CSS_FontSize.TextFontSize,
@@ -68,7 +67,7 @@
{
Height = Application.GetRealWidth(14),
Y = Application.GetRealWidth(30),
- Text = "鏃堕棿锛�" + startTime + " - " + endTime,
+ Text = Language.StringByID(StringId.Time) + "锛�" + startTime + " - " + endTime,
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
@@ -131,79 +130,5 @@
}
private List<TempPasswordInfo> infoList;
- private void getTestData()
- {
- infoList = new List<TempPasswordInfo>();
- TempPasswordInfo info = new TempPasswordInfo();
- info.homeId = 11111;
- info.deviceId = 11111;
- info.phone = "1234567890";
- info.tempPwd = "134234";
- info.useCount = 10;
- info.validBeginTime = "2022/5/10 14:21:00";
- info.validEndTime = "2022/5/12 14:21:00";
- infoList.Add(info);
-
- info = new TempPasswordInfo();
- info.homeId = 11111;
- info.deviceId = 11111;
- info.phone = "1234567890";
- info.tempPwd = "134234";
- info.useCount = 10;
- info.validBeginTime = "2022/5/10 14:21:00";
- info.validEndTime = "2022/5/12 14:21:00";
- infoList.Add(info);
-
- info = new TempPasswordInfo();
- info.homeId = 11111;
- info.deviceId = 11111;
- info.phone = "1234567890";
- info.tempPwd = "134234";
- info.useCount = 10;
- info.validBeginTime = "2022/5/10 14:21:00";
- info.validEndTime = "2022/5/12 14:21:00";
- infoList.Add(info);
-
- info = new TempPasswordInfo();
- info.homeId = 11111;
- info.deviceId = 11111;
- info.phone = "1234567890";
- info.tempPwd = "134234";
- info.useCount = 10;
- info.validBeginTime = "2022/5/10 14:21:00";
- info.validEndTime = "2022/5/12 14:21:00";
- infoList.Add(info);
-
- info = new TempPasswordInfo();
- info.homeId = 11111;
- info.deviceId = 11111;
- info.phone = "1234567890";
- info.tempPwd = "134234";
- info.useCount = 10;
- info.validBeginTime = "2022/5/10 14:21:00";
- info.validEndTime = "2022/5/12 14:21:00";
- infoList.Add(info);
-
- info = new TempPasswordInfo();
- info.homeId = 11111;
- info.deviceId = 11111;
- info.phone = "1234567890";
- info.tempPwd = "134234";
- info.useCount = 10;
- info.validBeginTime = "2022/5/10 14:21:00";
- info.validEndTime = "2022/5/12 14:21:00";
- infoList.Add(info);
-
- info = new TempPasswordInfo();
- info.homeId = 11111;
- info.deviceId = 11111;
- info.phone = "1234567890";
- info.tempPwd = "134234";
- info.useCount = 10;
- info.validBeginTime = "2022/5/10 14:21:00";
- info.validEndTime = "2022/5/12 14:21:00";
- infoList.Add(info);
-
- }
}
}
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs
index 68285b6..26a6115 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs
@@ -17,6 +17,7 @@
private Button randomBtn;//闅忔満瀵嗙爜Btn
private FrameLayout codeLayout;
private ImageView codeIV;// 浜岀淮鐮�
+ private Button codeSaveTipBtn;
private Button codeTip;//浜岀淮鐮佹湁鏁堟湡鎻愮ず
private Button visitorVoucherBtn;
private VisitorTempPassword tempPassword;
@@ -48,13 +49,14 @@
};
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, "璁垮閭�璇�").LoadTopView_SettingText(click, "娴嬭瘯璁板綍");
+ new TopViewDiv(bodyView, Language.StringByID(StringId.VisitorInvitation))
+ .LoadTopView_SettingText(click, Language.StringByID(StringId.VisitorRecord));
}
else
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, "璁垮閭�璇�").LoadTopView();
+ new TopViewDiv(bodyView, Language.StringByID(StringId.VisitorInvitation)).LoadTopView();
}
#endregion
@@ -69,7 +71,7 @@
// 鎻愮ず鏂囧瓧
bodyScrolView.AddChidren(new Button()
{
- Text = "*鎮ㄥ彂璧疯瀹簩缁寸爜鍚庯紝璇ヤ簩缁寸爜灏嗗湪鎮ㄨ缃殑鏈夋晥鏈熷唴锛屽彲鑷敱鍒风爜杩涜杩涘嚭锛岃璋ㄦ厧鍒嗕韩璇ヤ簩缁寸爜銆�",
+ Text = Language.StringByID(StringId.VisitorTip),
IsMoreLines = true,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextColor = CSS_Color.PromptingColor1,
@@ -81,7 +83,7 @@
#region 鎵嬫満鍙�
bodyScrolView.AddChidren(new Button()
{
- Text = "鎵嬫満鍙�",
+ Text = Language.StringByID(StringId.PhoneNumber),
Y = Application.GetRealWidth(10),
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
@@ -97,7 +99,8 @@
Width = Application.GetRealWidth(335),
TextSize = CSS_FontSize.TextFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
- PlaceholderText = "杈撳叆璁垮鎵嬫満鍙�",
+
+ PlaceholderText = Language.StringByID(StringId.InputPhoneNumberOfTheVisitor),
Text = tempPassword.phone,
IsNumberKeyboardType = true,
PlaceholderTextColor = CSS_Color.PromptingColor1,
@@ -117,7 +120,7 @@
bodyScrolView.AddChidren(new Button() { Height = Application.GetRealWidth(10), });
bodyScrolView.AddChidren(new Button()
{
- Text = "鍔ㄦ�佸瘑鐮�",
+ Text = Language.StringByID(StringId.linshimima),
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
Height = Application.GetRealHeight(20),
@@ -137,7 +140,7 @@
TextSize = CSS_FontSize.TextFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
Width = Application.GetRealWidth(335),
- PlaceholderText = "杈撳叆璁�6浣嶅瘑鐮�",
+ PlaceholderText = Language.StringByID(StringId.Input6_DigitsTemporaryPassword),
Text = tempPassword.tempPwd,
PlaceholderTextColor = CSS_Color.PromptingColor1,
};
@@ -148,7 +151,7 @@
{
X = Application.GetRealWidth(275),
Width = Application.GetRealWidth(80),
- Text = "闅忔満鐢熸垚",
+ Text = Language.StringByID(StringId.RandomGeneration),
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.TextFontSize,
@@ -181,7 +184,7 @@
startLayout.AddChidren(new Button()
{
- Text = "浜岀淮鐮佺敓鏁堟椂闂�",
+ Text = Language.StringByID(StringId.EffectiveTime),
X = Application.GetRealWidth(20),
Width = Application.GetRealWidth(130),
TextSize = CSS_FontSize.SubheadingFontSize,
@@ -199,7 +202,7 @@
};
if (tempPassword.tempPwd == null || tempPassword.tempPwd == "")
{
- startTimeText.Text = System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ startTimeText.Text = "";// System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
}
else
{
@@ -221,7 +224,7 @@
// dialog鍥炶皟
Action<string> startTimeAction = (str) =>
{
- startTimeText.Text = str +":00";
+ startTimeText.Text = str + ":00";
};
startTimeBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -255,7 +258,7 @@
endLayout.AddChidren(new Button()
{
- Text = "浜岀淮鐮佸け鏁堟椂闂�",
+ Text = Language.StringByID(StringId.FailureTime),
X = Application.GetRealWidth(20),
Width = Application.GetRealWidth(130),
TextSize = CSS_FontSize.SubheadingFontSize,
@@ -274,7 +277,7 @@
};
if (tempPassword.tempPwd == null || tempPassword.tempPwd == "")
{
- endTimeText.Text = System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ endTimeText.Text = "";// System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
}
else
{
@@ -337,15 +340,17 @@
codeLayout.AddChidren(codeIV);
bodyScrolView.AddChidren(new Button() { Height = Application.GetRealWidth(20), });
- bodyScrolView.AddChidren(new Button()
+ codeSaveTipBtn = new Button()
{
X = Application.GetRealWidth(16),
Width = Application.GetRealWidth(343),
Height = Application.GetRealWidth(20),
- Text = "闀挎寜鍙互鎶婁簩缁寸爜淇濆瓨鍒扮浉鍐�",
+ Text = Language.StringByID(StringId.LongPressQRCodeSave),
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
- });
+ Visible = false,
+ };
+ bodyScrolView.AddChidren(codeSaveTipBtn);
#endregion
bodyScrolView.AddChidren(new Button() { Height = Application.GetRealWidth(28), });
@@ -384,21 +389,67 @@
};
visitorVoucherBtn.MouseUpEventHandler += (sender, e) =>
{
- if (phoneNumberEditText.Text == "" || pwdEditText.Text == "")
+ if (startTimeText.Text.Trim() == "")
{
+ var tip_dialog = new Tip()
+ {
+ Text = Language.StringByID(StringId.VisitorStartTime),
+ CloseTime = 2,
+ Direction = AMPopTipDirection.None
+ };
+ tip_dialog.Show(MainPage.BaseView);
return;
}
+
+ if (endTimeText.Text.Trim() == "")
+ {
+ var tip_dialog = new Tip()
+ {
+ Text = Language.StringByID(StringId.VisitorEndTime),
+ CloseTime = 2,
+ Direction = AMPopTipDirection.None
+ };
+ tip_dialog.Show(MainPage.BaseView);
+ return;
+ }
+
+ if (phoneNumberEditText.Text.Trim() == "" || phoneNumberEditText.Text.Trim().Length != 11)
+ {
+ var tip_dialog = new Tip()
+ {
+ Text = Language.StringByID(StringId.PhoneNumberErrorTip),
+ CloseTime = 2,
+ Direction = AMPopTipDirection.None
+ };
+ tip_dialog.Show(MainPage.BaseView);
+ phoneNumberEditText.Foucs = true;
+ return;
+ }
+
+ if (pwdEditText.Text.Trim() == "" || pwdEditText.Text.Trim().Length != 6)
+ {
+ var tip_dialog = new Tip()
+ {
+ Text = Language.StringByID(StringId.linshimima),
+ CloseTime = 2,
+ Direction = AMPopTipDirection.None
+ };
+ tip_dialog.Show(MainPage.BaseView);
+ pwdEditText.Foucs = true;
+ return;
+ }
+
string tip = "";
string message = "";
if (codeIV.ImageBytes == null)
{
- tip = "璁垮鍑瘉";
- message = "鐢熸垚璁垮浜岀淮鐮佸苟灏嗕复鏃跺瘑鐮佸彂閫佽嚦璁垮鎵嬫満.";
+ tip = Language.StringByID(StringId.tip);
+ message = Language.StringByID(StringId.VisitorTipContent);
}
else
{
- tip = "璁垮鍑瘉";
- message = "纭畾鍒犻櫎璁垮鍑瘉锛�";
+ tip = Language.StringByID(StringId.tip);
+ message = Language.StringByID(StringId.VisitorDelTipContent);
}
new LpTipDialog(Application.Activity, tip, message, new LpTipDialogCallBack(voucher_action)).Show();
};
@@ -413,11 +464,11 @@
string msg = "";
if (bol)
{
- msg = "淇濆瓨鎴愬姛锛�";
+ msg = Language.StringByID(StringId.SavedSuccessfully);
}
else
{
- msg = "淇濆瓨澶辫触锛�";
+ msg = Language.StringByID(StringId.saveFail);
}
EmptyTipView tipView = new EmptyTipView(msg, 160);
tipView.Gravity = Gravity.CenterHorizontal;
@@ -447,15 +498,15 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.textWhiteColor,
BackgroundColor = CSS_Color.DialogTransparentColor1,
- Text = "浜岀淮鐮佸凡澶辨晥",
+ Text = Language.StringByID(StringId.QRcodeIsInvalid),
};
codeLayout.AddChidren(codeTip);
}
- visitorVoucherBtn.Text = "鍒犻櫎璁垮鍑瘉";
+ visitorVoucherBtn.Text = Language.StringByID(StringId.CancleVisitorCredentials);
}
else
{
- visitorVoucherBtn.Text = "鐢熸垚璁垮鍑瘉";
+ visitorVoucherBtn.Text = Language.StringByID(StringId.GenerateVisitorCredentials);
}
}
@@ -488,9 +539,19 @@
{
pwd.id = pack.Data.ToString();
codeIV.ImageBytes = Scan.BytesFromText(pwdEditText.Text, codeIV.Width, codeIV.Height);
+ codeSaveTipBtn.Visible = true;
+ RefreshVisitorVoucherBtn();
+ }
+ else {
+ var tip_dialog = new Tip()
+ {
+ Text = pack.message,
+ CloseTime = 2,
+ Direction = AMPopTipDirection.None
+ };
+ tip_dialog.Show(MainPage.BaseView);
}
}
- RefreshVisitorVoucherBtn();
return result;
}
--
Gitblit v1.8.0