From 07466c19110693e3e439a7d7c8ad0bc21d9b3287 Mon Sep 17 00:00:00 2001 From: xm <1271024303@qq.com> Date: 星期三, 29 四月 2020 09:14:01 +0800 Subject: [PATCH] 优化代码,更改门锁需求接口 --- ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs b/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs old mode 100644 new mode 100755 index cf7e7a4..3e38a1c --- a/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs +++ b/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs @@ -86,11 +86,9 @@ btnPic.InitControl(device.DeviceAddr, device.DeviceEpoint); btnPic.ButtonClickEvent += (sender, e) => { - var localPic = new Device.CommonForm.DeviceIconSelectedIMGByLocal(); - UserView.HomePage.Instance.AddChidren(localPic); - UserView.HomePage.Instance.PageIndex += 1; - localPic.Show(); - localPic.action = (unSelectedImagePath, selectedImagePath) => + var form = new SelectLocalDeviceImageForm(); + form.AddForm(); + form.FinishSelectEvent = (unSelectedImagePath) => { //鍙樻洿鍥剧墖 device.IconPath = unSelectedImagePath; @@ -151,7 +149,7 @@ } //鎵�灞炴ā鍧� - caption = Language.StringByID(R.MyInternationalizationString.BelongModel); + caption = Language.StringByID(R.MyInternationalizationString.BelongDevice); deviceName = Common.LocalDevice.Current.GetDeviceMacName(device); var rowBelongModul = new FrameCaptionViewControl(caption, deviceName, listview.rowSpace / 2); listview.AddChidren(rowBelongModul); @@ -248,7 +246,7 @@ } //鎵�灞炴ā鍧� - caption = Language.StringByID(R.MyInternationalizationString.BelongModel); + caption = Language.StringByID(R.MyInternationalizationString.BelongDevice); nameValue = Common.LocalDevice.Current.GetDeviceMacName(device); var rowBelongModul = new FrameCaptionViewControl(caption, nameValue, listview.rowSpace / 2); rowBelongModul.UseClickStatu = false; @@ -362,17 +360,17 @@ } //濡傛灉鏄柊椋� - if (device.Type == DeviceType.FreshAir) - { - //鍔熻兘绫诲瀷 - string caption = Language.StringByID(R.MyInternationalizationString.uFunctionType); + if (device.Type == DeviceType.FreshAir) + { + //鍔熻兘绫诲瀷 + string caption = Language.StringByID(R.MyInternationalizationString.uFunctionType); string strType = Language.StringByID(R.MyInternationalizationString.FreshAir); var btnFunction = new FrameCaptionViewControl(caption, strType, listview.rowSpace / 2); btnFunction.UseClickStatu = false; listview.AddChidren(btnFunction); btnFunction.InitControl(); //搴曠嚎 - btnFunction.AddBottomLine(); + btnFunction.AddBottomLine(); } } -- Gitblit v1.8.0