上传合并后的代码

黄学彪

2020-04-28 e22fdb94322e6cec38e5e4a9aec13d431a133fde

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

@@ -74,10 +74,11 @@
            {
                RemoveFromParent();

                var userDoorLockPage = new UserDoorLockPage(currentRoom, deviceUI);
                HomePage.Instance.AddChidren(userDoorLockPage);
                HomePage.Instance.PageIndex += 1;
                userDoorLockPage.Show();
                //暂时不考虑下级界面等推送导致常开模式失效的问题
                //var userDoorLockPage = new UserDoorLockPage(currentRoom, deviceUI);
                //HomePage.Instance.AddChidren(userDoorLockPage);
                //HomePage.Instance.PageIndex += 1;
                //userDoorLockPage.Show();
            };
            this.btnBack.MouseUpEventHandler += eHandlerBack;
            this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
@@ -215,7 +216,7 @@
            };

            //设备模块
            caption = Language.StringByID(R.MyInternationalizationString.BelongModel);
            caption = Language.StringByID(R.MyInternationalizationString.BelongDevice);
            deviceName = Common.LocalDevice.Current.GetDeviceObjectText(listNewDevice);
            var btnType = new FrameCaptionViewControl(caption, deviceName, listview.rowSpace / 2);
            btnType.UseClickStatu = false;