From 1abb88e79c293770474017a4b0b7bc4b7d95c53d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 23 三月 2022 15:14:00 +0800
Subject: [PATCH] 去掉在离线状态
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs | 40
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 47
HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerSetTimePage.cs | 80 +-
HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs | 142 +-
HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs | 20
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs | 22
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs | 2
HDL_ON/DAL/Mqtt/MqttClient.cs | 28
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 200 ++--
HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs | 62
HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs | 40
HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotPage.cs | 20
HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs | 40
HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotConsumablesMagPage.cs | 20
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs | 60
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/FhControlPage.cs | 58
HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs | 2
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 140 +-
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs | 54
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs | 36
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs | 130 +-
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 50
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaFanPage.cs | 22
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs | 36
HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs | 59
HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs | 40
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs | 4
HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs | 362 ++++----
HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs | 42
HDL_ON/Entity/Function/Function.cs | 2
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 30
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 27
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Electrical/IrLearnPage.cs | 20
HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaAirCleanerPage.cs | 100 +-
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 4
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs | 20
HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs | 260 +++---
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | 4
41 files changed, 1,150 insertions(+), 1,181 deletions(-)
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index ce11f48..01d44d8 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -357,20 +357,20 @@
{
try
{
- var mMes = Encoding.UTF8.GetString(e.ApplicationMessage.Payload);
- Newtonsoft.Json.Linq.JObject pairs = Newtonsoft.Json.Linq.JObject.Parse(mMes);
- var pairSid = pairs.GetValue("sid").ToString();
- var pairOnline = pairs.GetValue("online");
- if (!string.IsNullOrEmpty(pairSid.ToString()))
- {
- var function_online = FunctionList.List.Functions.Find((obj) => obj.sid == pairSid);
- if (function_online != null){
- function_online.online2d = (bool)pairOnline;
- HomePage.LoadEvent_RefreshDevcieOnline(function_online);
- FunctionPage.UpdataOnline(function_online);
- RoomPage.UpdataOnline(function_online);
- }
- }
+ //var mMes = Encoding.UTF8.GetString(e.ApplicationMessage.Payload);
+ //Newtonsoft.Json.Linq.JObject pairs = Newtonsoft.Json.Linq.JObject.Parse(mMes);
+ //var pairSid = pairs.GetValue("sid").ToString();
+ //var pairOnline = pairs.GetValue("online");
+ //if (!string.IsNullOrEmpty(pairSid.ToString()))
+ //{
+ // var function_online = FunctionList.List.Functions.Find((obj) => obj.sid == pairSid);
+ // if (function_online != null){
+ // function_online.online = (bool)pairOnline;
+ // HomePage.LoadEvent_RefreshDevcieOnline(function_online);
+ // FunctionPage.UpdataOnline(function_online);
+ // RoomPage.UpdataOnline(function_online);
+ // }
+ //}
}
catch(Exception ex)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index dd7d4e2..b64d1e6 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -338,7 +338,7 @@
/// <summary>
/// 鏄惁鍦ㄧ嚎
/// </summary>
- public bool online2d = true;
+ public bool online = true;
/// <summary>
/// 浜戠鏁版嵁鍒涘缓鐨勬椂闂�
/// </summary>
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 15e8fd4..ecea303 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -206,19 +206,6 @@
// Control.Ins.OneKeyUnlocking(new Function(), UserInfo.Current.doorPasswordString);
//}
- ddd++;
- Function function_online = FunctionList.List.GetLightList().Find((obj) => obj.sid == "0001017DB92D2602020100010101");
- if(ddd%2 == 0)
- {
- function_online.online2d = true;
- }
- else
- {
- function_online.online2d = false;
- }
- HomePage.LoadEvent_RefreshDevcieOnline(function_online);
-
-
};
#endif
@@ -953,10 +940,10 @@
index++;
- if (!function.online2d)
- {
- btnbg.UnSelectedImagePath = "Collection/FunctionOfflineBg.png";
- }
+ //if (!function.online)
+ //{
+ // btnbg.UnSelectedImagePath = "Collection/FunctionOfflineBg.png";
+ //}
}
if (index == 0)
@@ -1340,19 +1327,19 @@
UpdataFunctionStates(function);
}
- var btnOffline = new Button()
- {
- X = btnIcon.Right,
- Y = Application.GetRealWidth(16),
- Height = Application.GetMinRealAverage(32),
- TextID = StringId.DeviceOffline,
- TextColor = CSS_Color.WarningColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextAlignment = TextAlignment.CenterLeft,
- Tag = "OnlineTag",
- Visible = !function.online2d
- };
- view.AddChidren(btnOffline);
+ //var btnOffline = new Button()
+ //{
+ // X = btnIcon.Right,
+ // Y = Application.GetRealWidth(16),
+ // Height = Application.GetMinRealAverage(32),
+ // TextID = StringId.DeviceOffline,
+ // TextColor = CSS_Color.WarningColor,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ // TextAlignment = TextAlignment.CenterLeft,
+ // Tag = "OnlineTag",
+ // Visible = !function.online
+ //};
+ //view.AddChidren(btnOffline);
}
catch (Exception ex)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index aa6c95d..8177983 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -14,46 +14,46 @@
/// </summary>
public static void LoadEvent_RefreshDevcieOnline(Function function)
{
- Application.RunOnMainThread(() =>
- {
- if (bodyView != null)
- {
- foreach (var view in bodyView.functionViews)
- {
- if (view.Tag.ToString() == function.sid)
- {
- for (int i = 0; i < view.ChildrenCount; i++)
- {
- if (view.GetChildren(i).GetType() == typeof(Button))
- {
- var btn = view.GetChildren(i) as Button;
- if(btn.Tag == null)
- {
- continue;
- }
- if (btn.Tag.ToString() == function.sid)
- {
- if (function.online2d)
- {
- btn.UnSelectedImagePath = "Collection/Functionbg.png";
- btn.IsSelected = false;
- }
- else
- {
- btn.UnSelectedImagePath = "Collection/FunctionOfflineBg.png";
- btn.IsSelected = false;
- }
- }
- else if (btn.Tag.ToString() == "OnlineTag")
- {
- btn.Visible = !function.online2d;
- }
- }
- }
- }
- }
- }
- });
+ //Application.RunOnMainThread(() =>
+ //{
+ // if (bodyView != null)
+ // {
+ // foreach (var view in bodyView.functionViews)
+ // {
+ // if (view.Tag.ToString() == function.sid)
+ // {
+ // for (int i = 0; i < view.ChildrenCount; i++)
+ // {
+ // if (view.GetChildren(i).GetType() == typeof(Button))
+ // {
+ // var btn = view.GetChildren(i) as Button;
+ // if(btn.Tag == null)
+ // {
+ // continue;
+ // }
+ // if (btn.Tag.ToString() == function.sid)
+ // {
+ // if (function.online)
+ // {
+ // btn.UnSelectedImagePath = "Collection/Functionbg.png";
+ // btn.IsSelected = false;
+ // }
+ // else
+ // {
+ // btn.UnSelectedImagePath = "Collection/FunctionOfflineBg.png";
+ // btn.IsSelected = false;
+ // }
+ // }
+ // else if (btn.Tag.ToString() == "OnlineTag")
+ // {
+ // btn.Visible = !function.online;
+ // }
+ // }
+ // }
+ // }
+ // }
+ // }
+ //});
}
/// <summary>
/// 鏇存柊涓婚〉澶╂皵
@@ -514,16 +514,16 @@
{
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnSwitch.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
{
@@ -577,16 +577,16 @@
{
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
if (DB_ResidenceData.Instance.GatewayType == 1)
{
btnSwitch.IsSelected = !btnSwitch.IsSelected;
@@ -621,16 +621,16 @@
{
btnClose.MouseUpEventHandler = (sender, e) =>
{
- if (!curtain.online2d)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!curtain.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnClose.IsSelected = true;
curtain.trait_on_off.curValue = "off";
curtain.SetAttrState(FunctionAttributeKey.Percent, 0);
@@ -641,16 +641,16 @@
btnOpen.MouseUpEventHandler = (sender, e) =>
{
- if (!curtain.online2d)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!curtain.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnOpen.IsSelected = true;
curtain.trait_on_off.curValue = "on";
curtain.SetAttrState(FunctionAttributeKey.Percent, 100);
@@ -671,16 +671,16 @@
};
btnUp.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(2000);
@@ -702,16 +702,16 @@
};
btnDown.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(2000);
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
index 1173a63..db8ee37 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
@@ -215,7 +215,7 @@
{
if (scrolView.GetChildren(i).GetType() == typeof(FunctionControlZone)) {
var fcView = scrolView.GetChildren(i) as FunctionControlZone;
- fcView.UpdataOnline(updataFunction.online2d);
+ //fcView.UpdataOnline(updataFunction.online);
}
}
}
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index df24dfd..cff1381 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -230,21 +230,21 @@
bodyDiv.AddChidren(btnCollectionIcon);
}
- if (!function.online2d)
- {
- bodyDiv.BackgroundColor = CSS_Color.PromptingColor2;
- btnOffline = new Button()
- {
- X = Application.GetRealWidth(8 + 10 + 32),
- Y = Application.GetRealHeight(28 + 24),
- Height = Application.GetRealHeight(30),
- TextID = StringId.DeviceOffline,
- TextColor = CSS_Color.WarningColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextAlignment = TextAlignment.CenterLeft
- };
- bodyDiv.AddChidren(btnOffline);
- }
+ //if (!function.online)
+ //{
+ // bodyDiv.BackgroundColor = CSS_Color.PromptingColor2;
+ // btnOffline = new Button()
+ // {
+ // X = Application.GetRealWidth(8 + 10 + 32),
+ // Y = Application.GetRealHeight(28 + 24),
+ // Height = Application.GetRealHeight(30),
+ // TextID = StringId.DeviceOffline,
+ // TextColor = CSS_Color.WarningColor,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ // TextAlignment = TextAlignment.CenterLeft
+ // };
+ // bodyDiv.AddChidren(btnOffline);
+ //}
}
/// <summary>
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index c117f58..d243d7d 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -86,16 +86,16 @@
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnSwitch.IsSelected = !btnSwitch.IsSelected;
if(SPK.NotStatusSpkList.Contains( function.spk ))
@@ -133,16 +133,16 @@
/// </summary>
void LoadEvent_LightDimming(DiyImageSeekBar dimmerControlBar)
{
- if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
- {
- //new Tip()
- //{
- // CloseTime = 1,
- // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- // Direction = AMPopTipDirection.None,
- //}.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // //new Tip()
+ // //{
+ // // CloseTime = 1,
+ // // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // // Direction = AMPopTipDirection.None,
+ // //}.Show(MainPage.BaseView);
+ // return;
+ //}
if (function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
{
dimmerControlBar.OnStartTrackingTouchEvent = (sender, e) => {
@@ -203,16 +203,16 @@
{
btnClose.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnClose.IsSelected = true;
btnStop.IsSelected = false;
btnOpen.IsSelected = false;
@@ -225,16 +225,16 @@
btnStop.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnStop.IsSelected = true;
btnClose.IsSelected = false;
btnOpen.IsSelected = false;
@@ -246,16 +246,16 @@
btnOpen.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnOpen.IsSelected = true;
btnClose.IsSelected = false;
btnStop.IsSelected = false;
@@ -280,16 +280,16 @@
};
btnUp.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(2000);
@@ -311,16 +311,16 @@
};
btnDown.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(2000);
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 1726484..82dbf52 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -70,32 +70,7 @@
#if DEBUG
- Button testBtn = new Button()
- {
- X = Application.GetRealWidth(80),
- Height = Application.GetRealHeight(64),
- BackgroundColor = 0xFFFF0000
- };
- bodyView.AddChidren(testBtn);
- int ddd = 0;
- testBtn.MouseUpEventHandler = (sender, e) => {
- ddd++;
-
- Function function_online = FunctionList.List.GetLightList().Find((obj) => obj.sid == "0001017DB92D2602020100010101");
- if (ddd % 2 == 0)
- {
- function_online.online2d = true;
- }
- else
- {
- function_online.online2d = false;
- }
- HomePage.LoadEvent_RefreshDevcieOnline(function_online);
- FunctionPage.UpdataOnline(function_online);
- RoomPage.UpdataOnline(function_online);
-
-
- };
+
#endif
/// <summary>
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index f70fc3b..df83a81 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -563,7 +563,7 @@
EventHandler<MouseEventArgs> skipEvent = (sender, e) =>
{
- var ssf = new SceneFunctionInfoEditPage(scene, scenefunction.localFunction.ConvertSceneFunction(), refreshFunctionRowAction);
+ var ssf = new SceneFunctionInfoEditPage(scene, scenefunction, refreshFunctionRowAction);
MainPage.BasePageView.AddChidren(ssf);
ssf.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 3887a17..703cb02 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -856,7 +856,7 @@
#endregion
#region Siri
- #if __IOS__
+#if __IOS__
//if (Application.PhoneType >= 12)
{
supportViewCellCount++;
@@ -925,7 +925,7 @@
};
siriView.AddChidren(btnSmartSpeakerViewLine);
}
- #endif
+#endif
#endregion
#region 鑾峰彇鏀寔
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
index b82a859..38b713e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
@@ -169,7 +169,7 @@
//绾㈠瀹濆綋鍓嶆湁澶氬皯涓仴鎺у櫒
pirView.geBtn.Text = Pir.currPir.FunctioList.Count.ToString();
//绾㈠瀹濇槸鍚﹀湪绾�-绂荤嚎
- if (Pir.currPir.online2d)
+ if (Pir.currPir.online)
{
pirView.stateIconBtn.IsSelected = true;
pirView.stateTextBtn.IsSelected = true;
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs
index 5a5d2d2..4d7538c 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs
@@ -21,7 +21,7 @@
pirDevice.name = function.name;
pirDevice.deviceId = function.deviceId;
pirDevice.sid = function.sid;
- pirDevice.online2d = function.online2d;
+ pirDevice.online = function.online;
pirDevice.versions = function.versions;
}
Pir.currPir = pirDevice;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index 0bdab9a..bdc7f95 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -358,15 +358,15 @@
};
EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ //}
btnModeIcon.IsSelected = btnModeText.IsSelected = true;
device.SetAttrState(FunctionAttributeKey.Mode, m);
btnMode.UnSelectedImagePath = acFunction.GetModeIconPath(m);
@@ -494,15 +494,15 @@
};
EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ //}
btnModeIcon.IsSelected = btnModeText.IsSelected = true;
device.SetAttrState(FunctionAttributeKey.Swing, m);
btnSwing.UnSelectedImagePath = acFunction.GetSwingIconPath(m);
@@ -618,15 +618,15 @@
};
EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ //}
btnFanIcon.IsSelected = btnFanText.IsSelected = true;
device.SetAttrState(FunctionAttributeKey.FanSpeed, m);
btnWindSpeed.UnSelectedImagePath = acFunction.GetFanIconPath(m);
@@ -814,15 +814,15 @@
btn.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ //}
Dictionary<string, string> d = new Dictionary<string, string>();
d.Add(attr.key, "");
Control.Ins.SendWriteCommand(device, d);
@@ -877,15 +877,15 @@
{
btnMinus.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ //}
if (device.trait_on_off.curValue.ToString() == "off" || device.GetAttrState(FunctionAttributeKey.Mode) == "fan")
{
return;
@@ -907,15 +907,15 @@
};
btnPlus.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ //}
if (device.trait_on_off.curValue.ToString() == "off" || device.GetAttrState(FunctionAttributeKey.Mode) == "fan")
{
return;
@@ -933,7 +933,7 @@
d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
Control.Ins.SendWriteCommand(device, d);
};
- if (!device.online2d)
+ //if (device.online)
{
arcBar.OnStopTrackingTouchEvent = (sender, e) =>
{
@@ -941,7 +941,7 @@
device.SetAttrState(FunctionAttributeKey.SetTemp, arcBar.Progress.ToString());
btnTemp.Text = arcBar.Progress.ToString();
controlTime = DateTime.Now;
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ Dictionary<string, string> d = new Dictionary<string, string>();
d.Add(FunctionAttributeKey.SetTemp, arcBar.Progress.ToString());
Control.Ins.SendWriteCommand(device, d);
};
@@ -994,15 +994,15 @@
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ //}
btnSwitch.IsSelected = !btnSwitch.IsSelected;
device.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
if (device.trait_on_off.curValue.ToString() == "on")
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs
index 7992fa6..a4aefbd 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs
@@ -759,15 +759,15 @@
/// <param name="comadValue">鍛戒护</param>
private void SendOtherComand(IconViewControl btnIcon, string comadKey, string comadValue)
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ //}
btnIcon.CanClick = false;
HdlThreadLogic.Current.RunThread(() =>
@@ -788,15 +788,15 @@
/// </summary>
private void SendSwitchComand()
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ //}
this.btnSwitch.CanClick = false;
string statu = this.btnSwitch.IsSelected == true ? "off" : "on";
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs
index 597610f..ca2a6d6 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs
@@ -89,15 +89,15 @@
FrameWhiteCentet1.AddChidren(btnSwitch);
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ //}
btnSwitch.IsSelected = !btnSwitch.IsSelected;
device.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
new System.Threading.Thread(() =>
@@ -289,15 +289,15 @@
/// <param name="comadValue">鍛戒护</param>
private void SendOtherComand(IconViewControl btnIcon, string comadKey, string comadValue)
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ //}
btnIcon.CanClick = false;
HdlThreadLogic.Current.RunThread(() =>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/FhControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/FhControlPage.cs
index 085c95f..b05b80e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/FhControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/FhControlPage.cs
@@ -305,15 +305,15 @@
};
EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ //}
btnModeIcon.IsSelected = btnModeText.IsSelected = true;
device.SetAttrState(FunctionAttributeKey.Mode, m);
btnMode.UnSelectedImagePath = fhTemp.GetModeIconPath(m);
@@ -371,15 +371,16 @@
{
btnMinus.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
if (device.trait_on_off.curValue.ToString() == "off" || device.GetAttrState(FunctionAttributeKey.Mode) == "fan")
{
return;
@@ -399,15 +400,16 @@
};
btnPlus.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
if (device.trait_on_off.curValue.ToString() == "off" || device.GetAttrState(FunctionAttributeKey.Mode) == "fan")
{
return;
@@ -426,7 +428,7 @@
Control.Ins.SendWriteCommand(device, d);
};
- if (!device.online2d)
+ //if (device.online)
{
arcBar.OnStopTrackingTouchEvent = (sender, e) =>
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
index 050f0b1..39fee50 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
@@ -122,8 +122,8 @@
Y= Application.GetRealHeight(130),
Width = Application.GetRealWidth(250),
Height = Application.GetRealHeight(177),
- UnSelectedImagePath = "FunctionIcon/Curtain/CurtainBgIcon.png",
- SelectedImagePath = "FunctionIcon/Curtain/CurtainBgOnIcon.png",
+ SelectedImagePath = "FunctionIcon/Curtain/CurtainBgIcon.png",
+ UnSelectedImagePath = "FunctionIcon/Curtain/CurtainBgOnIcon.png",
};
controlView.AddChidren(btnCurtainBgIcon);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
index 29114f4..5c2383a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
@@ -72,15 +72,15 @@
void LoadEvent_ControlEvent()
{
btnCurtainClose.MouseUpEventHandler = (sender, e) => {
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ //}
new System.Threading.Thread(() => {
System.Threading.Thread.Sleep(2000);
Application.RunOnMainThread(() => {
@@ -116,15 +116,15 @@
btnCurtainStop.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ //}
new System.Threading.Thread(() => {
System.Threading.Thread.Sleep(2000);
Application.RunOnMainThread(() => {
@@ -139,15 +139,15 @@
};
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ //}
new System.Threading.Thread(() => {
System.Threading.Thread.Sleep(2000);
Application.RunOnMainThread(() => {
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
index 6689c98..a7b399d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
@@ -137,15 +137,16 @@
{
btnCurtainClose.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(2000);
@@ -165,15 +166,16 @@
btnCurtainStop.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
onCurtainAnimation = false;
new System.Threading.Thread(() =>
{
@@ -192,15 +194,16 @@
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(2000);
@@ -218,7 +221,7 @@
CurtainAnimation(100);
};
- if (!function.online2d)
+ //if (function.online)
{
btnCurtainStop.MouseDownEventHandler = (sender, e) =>
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
index 20ef14c..1f752b7 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
@@ -138,15 +138,16 @@
{
btnCurtainClose.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(2000);
@@ -166,15 +167,16 @@
btnCurtainStop.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
new System.Threading.Thread(() => {
System.Threading.Thread.Sleep(2000);
Application.RunOnMainThread(() => {
@@ -191,15 +193,16 @@
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(2000);
@@ -235,9 +238,8 @@
// DriverLayer.Control.Ins.SendWriteCommand(function, d);
//};
- if (!function.online2d)
+ //if (function.online)
{
-
btnCurtainStop.MouseDownEventHandler = (sender, e) =>
{
btnCurtainStop.IsSelected = true;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
index e9eeac7..7d9146c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
@@ -980,7 +980,7 @@
/// </summary>
private void RefreshNowDeviceStatuMemory(Function i_LocalDevice)
{
- this.doorLockData.IsOnline = i_LocalDevice.online2d;
+ this.doorLockData.IsOnline = i_LocalDevice.online;
for (int i = 0; i < i_LocalDevice.attributes.Count; i++)
{
var data = i_LocalDevice.attributes[i];
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs
index 657b49f..bfcf8d4 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs
@@ -417,16 +417,16 @@
{
btnSwitchIcon.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnSwitch.IsSelected = btnSwitchIcon.IsSelected = !btnSwitchIcon.IsSelected;
new System.Threading.Thread(() =>
{
@@ -439,16 +439,16 @@
};
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnSwitchIcon.IsSelected = btnSwitch.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs
index 09b25af..89d64ae 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs
@@ -126,16 +126,16 @@
#region 鎺у埗
btnUp.MouseUpEventHandler = (sender, e) => {
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(2000);
@@ -151,16 +151,16 @@
};
//----
btnStop.MouseUpEventHandler = (sender, e) => {
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(2000);
@@ -174,7 +174,7 @@
d.Add(FunctionAttributeKey.Position, "stop");
Control.Ins.SendWriteCommand(device, d);
};
- if (!device.online2d)
+ //if (!device.online)
{
btnUp.MouseDownEventHandler = (sender, e) => {
btnUp.IsSelected = true;
@@ -189,16 +189,16 @@
};
}
btnDown.MouseUpEventHandler = (sender, e) => {
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(2000);
@@ -242,16 +242,16 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
string onoff = hotDryView.Lighting ? "false" : "true";
device.SetAttrState(FunctionAttributeKey.HotDry, onoff);
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -281,16 +281,16 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
string onoff = windDryView.Lighting ? "false" : "true";
device.SetAttrState(FunctionAttributeKey.WindDry, onoff);
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -326,16 +326,16 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
string onoff = disinfectView.Lighting ? "false" : "true";
device.SetAttrState(FunctionAttributeKey.Disinfect, onoff);
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -376,16 +376,16 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
string onoff = lightingView.Lighting ? "off" : "on";
device.SetAttrState(FunctionAttributeKey.OnOff, onoff);
Dictionary<string, string> d = new Dictionary<string, string>();
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerSetTimePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerSetTimePage.cs
index 480a84d..330147b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerSetTimePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerSetTimePage.cs
@@ -74,16 +74,16 @@
functionListView.AddChidren(hotDryTimeCell);
hotDryTimeCell.GoAction = () =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
BottomTimeSelectControl timeControl = new BottomTimeSelectControl(hRange, mRange,3, Language.StringByID(StringId.HotDryTime));
timeControl.RowHeight = Application.GetRealHeight(50);
timeControl.InitControl(0, 1, 162);
@@ -130,16 +130,16 @@
functionListView.AddChidren(windDryCell);
windDryCell.GoAction = () =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
BottomTimeSelectControl timeControl = new BottomTimeSelectControl(hRange, mRange,3,Language.StringByID(StringId.WindDryTime));
timeControl.RowHeight = Application.GetRealHeight(50);
timeControl.InitControl(0, 1, 162);
@@ -187,16 +187,16 @@
functionListView.AddChidren(disinfectTimeCell);
disinfectTimeCell.GoAction = () => {
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
BottomTimeSelectControl timeControl = new BottomTimeSelectControl(hRange, mRange,3, Language.StringByID(StringId.DisinfectTime));
timeControl.RowHeight = Application.GetRealHeight(50);
timeControl.InitControl(0, 1, 162);
@@ -245,16 +245,16 @@
anionTimeCell.LineView.RemoveFromParent();
anionTimeCell.GoAction = () => {
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
BottomTimeSelectControl timeControl = new BottomTimeSelectControl(hRange, mRange,3,Language.StringByID(StringId.AnionTime));
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
index e2dd0c7..8b2c58c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
@@ -62,16 +62,16 @@
{
btnSwitchIcon.MouseUpEventHandler += (sender, e) =>
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnSwitchIcon.IsSelected = btnSwitch.IsSelected = !btnSwitchIcon.IsSelected;
new System.Threading.Thread(() =>
@@ -86,16 +86,16 @@
};
btnSwitch.MouseUpEventHandler += (sender, e) =>
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnSwitch.IsSelected = btnSwitchIcon.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
@@ -108,7 +108,7 @@
{ IsBackground = true }.Start();
};
- if (!function.online2d)
+ //if (function.online)
{
barGradualChange.OnProgressChangedEvent = (sender, e) =>
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrLearnPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrLearnPage.cs
index ea2486c..b32280c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrLearnPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrLearnPage.cs
@@ -90,16 +90,16 @@
btn.MouseUpEventHandler = (sender, e) => {
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(attr.key, "");
Control.Ins.SendWriteCommand(device, d);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs
index aa43e99..ce95adc 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs
@@ -480,16 +480,16 @@
btn.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
Dictionary<string, string> d = new Dictionary<string, string>();
d.Add(attr.key, "");
Control.Ins.SendWriteCommand(device, d);
@@ -548,16 +548,16 @@
btnChlPlus.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -567,16 +567,16 @@
};
btnChlReduce.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -586,16 +586,16 @@
};
btnVolPlus.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -605,16 +605,16 @@
};
btnVolReduce.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -624,16 +624,16 @@
};
btnBack.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -643,16 +643,16 @@
};
btnPower.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -679,16 +679,16 @@
};
btnMenu.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIcon.png";
if (DB_ResidenceData.Instance.GatewayType == 1)
{
@@ -699,16 +699,16 @@
};
btnTopMenuUp.MouseUpEventHandler = (sender, e) => {
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIcon.png";
if (DB_ResidenceData.Instance.GatewayType == 1)
{
@@ -719,16 +719,16 @@
};
btnTopMenuLeft.MouseUpEventHandler = (sender, e) => {
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIcon.png";
if (DB_ResidenceData.Instance.GatewayType == 1)
{
@@ -739,16 +739,16 @@
};
btnTopMenuRight.MouseUpEventHandler = (sender, e) => {
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIcon.png";
if (DB_ResidenceData.Instance.GatewayType == 1)
{
@@ -759,16 +759,16 @@
};
btnTopMenuDown.MouseUpEventHandler = (sender, e) => {
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIcon.png";
if (DB_ResidenceData.Instance.GatewayType == 1)
{
@@ -779,16 +779,16 @@
};
btnOk.MouseUpEventHandler = (sender, e) => {
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIcon.png";
if (DB_ResidenceData.Instance.GatewayType == 1)
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
index f7fcdf2..2177666 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
@@ -290,16 +290,16 @@
{
btnSwitchIcon.MouseUpEventHandler += (sender, e) =>
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnSwitchIcon.IsSelected = btnSwitch.IsSelected = !btnSwitchIcon.IsSelected;
new System.Threading.Thread(() =>
@@ -316,16 +316,16 @@
};
btnSwitch.MouseUpEventHandler += (sender, e) =>
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnSwitch.IsSelected = btnSwitchIcon.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs
index 7a4e85b..0559e90 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs
@@ -421,16 +421,16 @@
}
numberView.AddChidren(btn);
btn.MouseUpEventHandler = (sender, e) => {
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
string index = (sender as Button).Text;
btn.IsSelected = false;
if (DB_ResidenceData.Instance.GatewayType == 1)
@@ -484,16 +484,16 @@
{
btnMenu.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -503,16 +503,16 @@
};
btnChlPlus.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -522,16 +522,16 @@
};
btnChlReduce.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -541,16 +541,16 @@
};
btnVolPlus.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -560,16 +560,16 @@
};
btnVolReduce.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -579,16 +579,16 @@
};
btnBack.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -599,16 +599,16 @@
btnMenu.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -618,30 +618,30 @@
};
btn123.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
ShowNumberView();
};
btnMute.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -651,16 +651,16 @@
};
btnPower.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
if (DB_ResidenceData.Instance.GatewayType == 1)
{
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -670,7 +670,7 @@
};
- if (!device.online2d)
+ //if (device.online)
{
btnTopMenuUp.MouseDownEventHandler = (sender, e) =>
{
@@ -695,16 +695,16 @@
}
btnMenu.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIcon.png";
if (DB_ResidenceData.Instance.GatewayType == 1)
{
@@ -715,16 +715,16 @@
};
btnTopMenuUp.MouseUpEventHandler = (sender, e) => {
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIcon.png";
if (DB_ResidenceData.Instance.GatewayType == 1)
{
@@ -735,16 +735,16 @@
};
btnTopMenuLeft.MouseUpEventHandler = (sender, e) => {
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIcon.png";
if (DB_ResidenceData.Instance.GatewayType == 1)
{
@@ -755,16 +755,16 @@
};
btnTopMenuRight.MouseUpEventHandler = (sender, e) => {
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIcon.png";
if (DB_ResidenceData.Instance.GatewayType == 1)
{
@@ -775,16 +775,16 @@
};
btnTopMenuDown.MouseUpEventHandler = (sender, e) => {
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIcon.png";
if (DB_ResidenceData.Instance.GatewayType == 1)
{
@@ -795,16 +795,16 @@
};
btnOk.MouseUpEventHandler = (sender, e) => {
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
topMenuView.BackgroundImagePath = "FunctionIcon/Electrical/TV/TVOkIcon.png";
if (DB_ResidenceData.Instance.GatewayType == 1)
{
@@ -971,16 +971,16 @@
btn.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
Dictionary<string, string> d = new Dictionary<string, string>();
d.Add(attr.key, "");
Control.Ins.SendWriteCommand(device, d);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs
index 2b991b2..86bb29e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs
@@ -40,16 +40,16 @@
/// </summary>
void LoadControlEvent()
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnChangeTVAV.MouseUpEventHandler = (sender, e) =>
{
if (DB_ResidenceData.Instance.GatewayType == 1)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaAirCleanerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaAirCleanerPage.cs
index d7ebc0c..5632784 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaAirCleanerPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaAirCleanerPage.cs
@@ -540,16 +540,16 @@
/// <param name="value">auto:鑷姩 sleep:鐫＄湢 manual:鎵嬪姩 strong:寮虹儓</param>
private void SendModeComand(string value)
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
this.btnMode.CanClick = false;
HdlThreadLogic.Current.RunThread(() =>
{
@@ -569,16 +569,16 @@
/// <param name="value">canel:鍙栨秷 1:1灏忔椂 2:2灏忔椂 3:4灏忔椂 4:8灏忔椂</param>
private void SendTimingComand(string value)
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
this.btnTime.CanClick = false;
HdlThreadLogic.Current.RunThread(() =>
{
@@ -598,16 +598,16 @@
/// <param name="value">1:浣庢。 2:涓。 3:楂樻。</param>
private void SendFanSpeedComand(string value)
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
this.btnFan.CanClick = false;
HdlThreadLogic.Current.RunThread(() =>
{
@@ -626,16 +626,16 @@
/// </summary>
private void SendSwitchComand()
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
this.btnPictrue.CanClick = false;
this.btnSwitch.CanClick = false;
@@ -663,16 +663,16 @@
/// </summary>
private void SendEnableComand(MostRightIconControl btnSwitch, string sendKey, string value)
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
if (btnSwitch != null)
{
btnSwitch.CanClick = false;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaFanPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaFanPage.cs
index dd82c98..af53681 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaFanPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaFanPage.cs
@@ -99,7 +99,7 @@
//妗�
var strView = Language.StringByID(StringId.Gear);
- if (device.online2d)
+ //if (device.online)
{
seekBarContr.ProgressChangedEvent += (div, value) =>
{
@@ -179,16 +179,16 @@
/// </summary>
private void SendSwitchComand()
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
this.btnSwitch.CanClick = false;
string statu = this.btnSwitch.IsSelected == true ? "off" : "on";
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs
index 88ebf92..491651a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs
@@ -167,16 +167,16 @@
/// </summary>
private void SendSwitchComand()
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
this.btnPictrue.CanClick = false;
this.btnSwitch.CanClick = false;
@@ -282,16 +282,16 @@
private void SetControlTime()
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
var timeControl = new BottomTimeSelectControl();
timeControl.RowCount = 5;
timeControl.InitControl(0,0);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotConsumablesMagPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotConsumablesMagPage.cs
index d300190..524ae5b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotConsumablesMagPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotConsumablesMagPage.cs
@@ -86,16 +86,16 @@
btnSwitch.IsSelected = i_brushStatu;
btnSwitch.ButtonClickEvent += (sender, e) =>
{
- if (!i_device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!i_device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
if (btnSwitch.IsSelected == true)
{
//鍙栨秷鐨勮瘽鐩存帴鍙栨秷
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotPage.cs
index 6f91731..b9b0dc1 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotPage.cs
@@ -455,16 +455,16 @@
/// </summary>
private void SendComand(string key, string i_value)
{
- if (!device.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
HdlThreadLogic.Current.RunThread(() =>
{
var dic = new Dictionary<string, string>();
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
index fed9f4c..c4f3c87 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
@@ -129,16 +129,16 @@
/// </summary>
void LoadEvent_TempChange()
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnMinus.MouseUpEventHandler = (sender, e) =>
{
if(function.trait_on_off.curValue.ToString() == "off")
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
index fca751a..8593e14 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
@@ -86,16 +86,16 @@
/// </summary>
void LoadEvet_ChangeColorTemplatrue()
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
barColorTemplatrue.OnProgressChangedEvent += (sender, value) =>
{
new System.Threading.Thread(() =>
@@ -141,16 +141,16 @@
{
dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
onDimmerBar = false;
function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
@@ -161,7 +161,7 @@
dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
};
- if (function.online2d)
+ //if (function.online)
{
dimmerBar.OnStartTrackingTouchEvent = (sender, e) =>
{
@@ -217,16 +217,16 @@
{
btnSwitch.MouseUpEventHandler += (sender, e) =>
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
//function.fadeTime = barFadeTime.Progress;
btnSwitch.IsSelected = !btnSwitch.IsSelected;
if (btnSwitch.IsSelected)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index 4b989e4..c64dfcd 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -88,7 +88,7 @@
/// </summary>
void LoadEvent_DimmerBar()
{
- if (function.online2d)
+ //if (function.online)
{
dimmerBar.OnStartTrackingTouchEvent = (sender, e) =>
{
@@ -148,16 +148,16 @@
{
btnSwitch.MouseUpEventHandler += (sender, e) =>
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnSwitch.IsSelected = !btnSwitch.IsSelected;
if (btnSwitch.IsSelected)
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index b945f83..4826777 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -88,16 +88,16 @@
/// </summary>
void LoadColorChangeEvent()
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
DateTime colorChangeTime = DateTime.MinValue;
//bool send = false;
@@ -215,16 +215,16 @@
dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(200);
@@ -237,7 +237,7 @@
Control.Ins.SendWriteCommand(function, d);
};
- if (function.online2d)
+ //if (function.online)
{
dimmerBar.OnStartTrackingTouchEvent = (sender, e) =>
{
@@ -336,10 +336,10 @@
{
btnRestoredPoint.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)
- {
- return;
- }
+ //if (!function.online)
+ //{
+ // return;
+ //}
if(function.trait_on_off.curValue.ToString() == "off")
{
return;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
index 80d8890..86d183f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
@@ -62,16 +62,16 @@
{
btnSwitchIcon.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnSwitch.IsSelected = btnSwitchIcon.IsSelected = !btnSwitchIcon.IsSelected;
new System.Threading.Thread(() =>
{
@@ -84,16 +84,16 @@
};
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online2d)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!function.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
btnSwitchIcon.IsSelected = btnSwitch.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
index 0bd0d09..0556fea 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -157,7 +157,7 @@
{
var a31player = A31MusicModel.A31MusicModelList[i];
- if (a31player.functionMusic.online2d == false)
+ if (a31player.functionMusic.online == false)
{
//涓嶅湪绾夸笉璇诲彇
continue;
@@ -275,7 +275,7 @@
{
while (true)
{
- if (!player.functionMusic.online2d)
+ if (!player.functionMusic.online)
{
///涓嶅湪绾夸笉璇荤姸鎬�
continue;
--
Gitblit v1.8.0