lss
2022-05-26 12adafe94205aa858e832fa2702958631c6873bf
Revert "自测无问题"

This reverts commit 5012c5e0bf77ee179541c5b31f2a8ee70c92e59a.
6个文件已修改
161 ■■■■ 已修改文件
HDL-ON_Android/Assets/Language.ini 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Common/R.cs 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI0-Public/TopViewDiv.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs 43 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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=Влажность в Помещении
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;
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -65,7 +65,7 @@
        /// false:收到推送并且已经收到sip呼叫才跳转呼叫页面
        /// true:原生收到呼叫马上跳转呼叫页面,不等待推送过来
        /// </summary>
        bool IsAutoJumpCallView = true;
        bool IsAutoJumpCallView = false;
        /// <summary>
        /// 是否初始化了SDK
        /// </summary>
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,
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,
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 = "生成访客凭证";
            }
        }