合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs

@@ -43,8 +43,8 @@
        FrameLayout bottomFrameLayout;
        #endregion

        /// <summary>

        /// UI显示 
        /// <summary>
        /// UI显示 
        /// </summary>
        public void Show()
        {
@@ -69,8 +69,8 @@
            {
                X = Application.GetRealWidth(297),
                Y = Application.GetRealHeight(268),
                Height = Application.GetRealHeight(363),
                Width = Application.GetRealWidth(452),
                Height = Application.GetMinRealAverage(363),
                Width = Application.GetMinRealAverage(452),
                UnSelectedImagePath = "DoorLock/EntrySuccessIcon.png",
            };
            this.midFrameLayout.AddChidren(entryStatusPic);
@@ -94,6 +94,14 @@
            else if (currentType == "fingerprint")
            {
                btnPicTip.Text = Language.StringByID(R.MyInternationalizationString.EntryFingerprintSuccess);
            }
            else if (currentType == "faceID")
            {
                btnPicTip.Text = Language.StringByID(R.MyInternationalizationString.EntryFaceIDSuccess);
            }
            else if (currentType == "calmFingerprint")
            {
                btnPicTip.Text = Language.StringByID(R.MyInternationalizationString.EntryCalmFingerprintSuccess);
            }
            else
            {
@@ -227,6 +235,22 @@
                btnPasswordRemark.Text = Language.StringByID(R.MyInternationalizationString.FingerprintRemark);
                btnPasswordRemarkContent.PlaceholderText = Language.StringByID(R.MyInternationalizationString.Fingerprint) + "ID" + doorLock.doorLockProgrammingEventNotificationCommand.UserID;
            }
            else if (currentType == "faceID")
            {
                btnPasswordRemark.Width = Application.GetRealWidth(222 + 75);
                btnPasswordRemarkContent.Width = Application.GetRealWidth(965 - 222 - 75);
                btnPasswordRemarkContent.X = Application.GetRealWidth(222 + 75 + 1);
                btnPasswordRemark.Text = Language.StringByID(R.MyInternationalizationString.FaceIDRemark);
                btnPasswordRemarkContent.PlaceholderText = Language.StringByID(R.MyInternationalizationString.FaceIDMark) + "ID" + doorLock.doorLockProgrammingEventNotificationCommand.UserID;
            }
            else if (currentType == "calmFingerprint")
            {
                btnPasswordRemark.Width = Application.GetRealWidth(222 + 25);
                btnPasswordRemarkContent.Width = Application.GetRealWidth(965 - 222 - 25);
                btnPasswordRemarkContent.X = Application.GetRealWidth(222 + 25 + 1);
                btnPasswordRemark.Text = Language.StringByID(R.MyInternationalizationString.CalmFingerprintRemark);
                btnPasswordRemarkContent.PlaceholderText = Language.StringByID(R.MyInternationalizationString.CalmFingerprintMark) + "ID" + doorLock.doorLockProgrammingEventNotificationCommand.UserID;
            }
            else
            {
                btnPasswordRemark.Text = Language.StringByID(R.MyInternationalizationString.ProximityRemark);