From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs b/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs
old mode 100755
new mode 100644
index fc9b3c8..b185742
--- a/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs
@@ -206,7 +206,7 @@
{
deviceinof = new CommonDevice();
}
- actiondevice.deviceNameBtn.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(deviceinof);
+ actiondevice.deviceNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(deviceinof);
actiondevice.deviceNameBtn.Visible = true;
actiondevice.regionNameBtn.Visible = true;
Method.RoomNmae(actiondevice.regionNameBtn, deviceinof);
@@ -300,7 +300,7 @@
var cycle = new Cycle(() => { Method.UpdateWeek(weekBtn, Common.Logic.CurrentLogic); });
UserView.HomePage.Instance.AddChidren(cycle);
UserView.HomePage.Instance.PageIndex += 1;
- cycle.Show();
+ cycle.Show(LogicView.IfString._LockLogic, Yes);
};
weekBtn.MouseUpEventHandler += cycleclick;
weekview.clickBtn.MouseUpEventHandler += cycleclick;
@@ -342,7 +342,7 @@
this.AddChidren(flMain);
CompleteView completeView = new CompleteView();
flMain.AddChidren(completeView.Show(1));
- // completeView.Btntitle.Text =HdlDeviceCommonLogic.Current.GetDeviceEpointName(common);
+ // completeView.Btntitle.Text =LocalDevice.Current.GetDeviceEpointName(common);
completeView.Btntitle.TextID = MyInternationalizationString.openmode;
EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
{
--
Gitblit v1.8.0