1

lss

2022-06-13 68051add9f0c92a430711acbe75b4f225a6f4d33

1

 HDL-ON_Android/Assets/Phone/FunctionIcon/CAC/DataIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/CAC/JinMaoIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/hvaccac_blue.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/hvaccac_white.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_blue.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_white.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/hvaccac.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/screenpanel.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorhelp.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Panel/PanelEnviBg.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Panel/PanelHelpAlarmBgIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Panel/PanelHelpNormalBgIcon.png

 HDL-ON_Android/Assets/Phone/Public/MsgIcon/AnswerIcon.png

 HDL-ON_Android/Assets/Phone/Public/MsgIcon/CallIcon.png

 HDL-ON_Android/Assets/Phone/Public/MsgIcon/HangUpIcon.png

 HDL-ON_Android/Assets/Phone/Public/dialogBg2.png

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

@@ -11,34 +11,33 @@
        private VerticalScrolViewLayout bodyScrolView;
        private List<VisitorTempPassword> pwdList;

        Action action1;
        Action backAction;// 后退按键，刷新UI
        Action action;

        public override void RemoveFromParent()
        {
            action1?.Invoke();
            backAction?.Invoke();
            base.RemoveFromParent();
        }

        public VisitorHistoryPage(Action action)
        {
            action1 = action;
            backAction = action;
            bodyView = this;
        }

        public void LoadPage()
        {
            action = () =>
            {
                LoadPage();
            };

            pwdList = getVisitorPasswordData();

            #region 访客记录按钮
            Action click = () =>
            {
                VisitorHistoryPage page = new VisitorHistoryPage(null);
                MainPage.BasePageView.AddChidren(page);
                page.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(StringId.VisitorInvitation)).LoadTopView_SettingText(click, "");
            new TopViewDiv(bodyView, Language.StringByID(StringId.VisitorInvitation)).LoadTopView();
            #endregion

            bodyScrolView = new VerticalScrolViewLayout()
@@ -102,7 +101,7 @@
                itemLayout.AddChidren(btn);//+= (sender, e)
                btn.MouseUpEventHandler += (sender, e) =>
                {
                    VisitorQRCodePage page = new VisitorQRCodePage(temPwd);
                    VisitorQRCodePage page = new VisitorQRCodePage(action, temPwd);
                    MainPage.BasePageView.AddChidren(page);
                    page.LoadPage();
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -137,7 +136,5 @@
            }
            return dataList;
        }

        private List<TempPasswordInfo> infoList;
    }
}

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

@@ -22,18 +22,24 @@
        private Button visitorVoucherBtn;
        private VisitorTempPassword tempPassword;

        Action backAction;// 后退按键，刷新UI

        public VisitorQRCodePage()
        {
            bodyView = this;
        }




        public VisitorQRCodePage(VisitorTempPassword pwd)
        public VisitorQRCodePage(Action action,VisitorTempPassword pwd)
        {
            bodyView = this;
            this.tempPassword = pwd;
            backAction = action;
        }

        public override void RemoveFromParent()
        {
            backAction?.Invoke();
            base.RemoveFromParent();
        }

        public void LoadPage()