2022-6-27

lss

2022-06-27 e0a0e3dc5c665a54a94cc170d99ce7404d774885

2022-6-27

 HDL-ON_Android/Assets/Language.ini

@@ -529,6 +529,8 @@
541=Monitoring
542=Wandering alarm
543=Get more

2532=Visitor Invitation Record
2533=Visitor management
2534=Visitor Invitation
2535=Record
@@ -1709,7 +1711,8 @@
541=监控中
542=徘徊报警
543=获取更多
 

2532=访客邀请记录
2533=访客管理
2534=访客邀请
2535=访客记录
@@ -2870,6 +2873,8 @@
541=Monitoring
542=Wandering alarm
543=Get more

2532=Visitor Invitation Record
2533=Visitor management
2534=Visitor Invitation
2535=Record

 HDL-ON_Android/Properties/AndroidManifest.xml

@@ -88,7 +88,13 @@
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
    <uses-permission android:name="android.permission.READ_LOGS" />
    <!-- 极光推送结束 -->
    <application android:allowBackup="true" android:debuggable="false" android:icon="@drawable/Icon" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="On Pro">
    <application android:allowBackup="true"
        android:debuggable="false"
        android:icon="@drawable/Icon"
        android:requestLegacyExternalStorage="true"
        android:networkSecurityConfig="@xml/network_security_config"
        android:largeHeap="true"
        android:label="On Pro">
        <!--/扫描二维码activity-->
        <!--<activity
            android:name="com.journeyapps.barcodescanner.CaptureActivity"
@@ -99,6 +105,7 @@
            android:name=".CustomCaptureActivity"
            android:screenOrientation="portrait"
            tools:replace="screenOrientation" />-->

        <provider android:name="android.support.v4.content.FileProvider" android:authorities="com.hdl.onpro.fileProvider" android:grantUriPermissions="true" android:exported="false">
            <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
        </provider>

 HDL_ON/Common/R.cs

@@ -107,6 +107,10 @@
        /// </summary>
        public const int VisitorTip = 2536;
        /// <summary>
        /// 访客邀请记录
        /// </summary>
        public const int VisitorInvitationRecord = 2532;
        /// <summary>
        /// 访客记录
        /// </summary>
        public const int VisitorRecord = 2535;

 HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorHistoryPage.cs

@@ -37,7 +37,7 @@

            #region 访客记录按钮
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(StringId.VisitorInvitation)).LoadTopView();
            new TopViewDiv(bodyView, Language.StringByID(StringId.VisitorRecord)).LoadTopView();
            #endregion

            bodyScrolView = new VerticalScrolViewLayout()
@@ -62,7 +62,7 @@
                {
                    Height = Application.GetRealWidth(20),
                    Y = Application.GetRealWidth(6),
                    Text = Language.StringByID(StringId.VisitorQRCode),
                    Text = Language.StringByID(StringId.VisitorInvitationRecord),
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = CSS_Color.text1Color,
                    TextSize = CSS_FontSize.TextFontSize,

 HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs

@@ -46,7 +46,7 @@
        public void LoadPage()
        {
            #region 顶部导航栏
            if (tempPassword == null|| tempPassword.id==null)
            if (tempPassword == null || tempPassword.id == null)
            {
                tempPassword = new VisitorTempPassword();

@@ -112,34 +112,17 @@
                Width = Application.GetRealWidth(335),
                TextSize = CSS_FontSize.TextFontSize,
                TextColor = CSS_Color.FirstLevelTitleColor,
                

                PlaceholderText = Language.StringByID(StringId.InputPhoneNumberOfTheVisitor),
                Text = tempPassword.phone,
                IsNumberKeyboardType = true,
                PlaceholderTextColor = CSS_Color.PromptingColor1,
            };
            bodyScrolView.AddChidren(phoneNumberEditText);
            phoneNumberEditText.Foucs = true;
            phoneNumberEditText.FoucsChanged = (sender, e) =>
            {
                if (!phoneNumberEditText.Foucs)
                {
                    //手机号码错误提示
                    if (!Utlis.CheckPhoneNumber(phoneNumberEditText.Text.Trim(), "86"))
                    {
                        var tip_dialog = new Tip()
                        {
                            Text = Language.StringByID(StringId.PhoneNumberErrorTip),
                            CloseTime = 2,
                            Direction = AMPopTipDirection.None
                        };
                        tip_dialog.Show(MainPage.BaseView);
                    }
                }
            };
            //phoneNumberEditText.Foucs = true;

             // 分割线
             bodyScrolView.AddChidren(new Button()
            // 分割线
            bodyScrolView.AddChidren(new Button()
            {
                X = Application.GetRealWidth(20),
                Width = Application.GetRealWidth(335),
@@ -177,20 +160,6 @@
                PlaceholderTextColor = CSS_Color.PromptingColor1,
            };
            pwdLayout.AddChidren(pwdEditText);
            pwdEditText.FoucsChanged = (sender, e) =>
            {
                if (!pwdEditText.Foucs)
                {
                    // 6位密码验证
                    var tip_dialog = new Tip()
                    {
                        Text = Language.StringByID(StringId.Input6_DigitsTemporaryPassword),
                        CloseTime = 2,
                        Direction = AMPopTipDirection.None
                    };
                    tip_dialog.Show(MainPage.BaseView);
                }
            };

            //随机密码Btn
            randomBtn = new Button()
@@ -204,11 +173,6 @@
            };
            pwdLayout.AddChidren(randomBtn);
            bodyScrolView.AddChidren(pwdLayout);
            randomBtn.MouseUpEventHandler += (sender, e) =>
            {
                string tPwd = getRandomPwd();
                pwdEditText.Text = tPwd;
            };

            // 分割线
            bodyScrolView.AddChidren(new Button()
@@ -413,7 +377,6 @@
            };
            bodyScrolView.AddChidren(visitorVoucherBtn);

            //
            Action voucher_action = () =>
            {
                if (codeIV.ImageBytes == null)
@@ -516,12 +479,68 @@
                {
                    msg = Language.StringByID(StringId.saveFail);
                }
                EmptyTipView tipView = new EmptyTipView(msg, 160);
                tipView.Gravity = Gravity.CenterHorizontal;
                bodyView.AddChidren(tipView);

                var tip_dialog = new Tip()
                {
                    Text = msg,
                    CloseTime = 2,
                    Direction = AMPopTipDirection.None
                };
                tip_dialog.Show(MainPage.BaseView);
#endif
            };

            if (tempPassword != null && tempPassword.id != null && tempPassword.id != "")
            {
                pwdEditText.Text = tempPassword.tempPwd;
                pwdEditText.Enable = false;
                phoneNumberEditText.Enable = false;
                randomBtn.Enable = false;
                startTimeBtn.Enable = false;
                endTimeBtn.Enable = false;
            }
            else
            {
                pwdEditText.FoucsChanged = (sender, e) =>
                {
                    if (!pwdEditText.Foucs)
                    {
                        // 6位密码验证
                        var tip_dialog = new Tip()
                        {
                            Text = Language.StringByID(StringId.Input6_DigitsTemporaryPassword),
                            CloseTime = 2,
                            Direction = AMPopTipDirection.None
                        };
                        tip_dialog.Show(MainPage.BaseView);
                    }
                };

                randomBtn.MouseUpEventHandler += (sender, e) =>
                {
                    string tPwd = getRandomPwd();
                    pwdEditText.Text = tPwd;
                };

                phoneNumberEditText.FoucsChanged = (sender, e) =>
                {
                    if (!phoneNumberEditText.Foucs)
                    {
                        //手机号码错误提示
                        if (!Utlis.CheckPhoneNumber(phoneNumberEditText.Text.Trim(), "86"))
                        {
                            var tip_dialog = new Tip()
                            {
                                Text = Language.StringByID(StringId.PhoneNumberErrorTip),
                                CloseTime = 2,
                                Direction = AMPopTipDirection.None
                            };
                            tip_dialog.Show(MainPage.BaseView);
                        }
                    }
                };
            }

            RefreshVisitorVoucherBtn();
        }