From 8aa777aedd7492b7f2e28a172c2874f4ee7366a1 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 三月 2022 10:46:27 +0800
Subject: [PATCH] 暂时移除离线功能
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs | 4
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 8
HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerSetTimePage.cs | 8
HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs | 16 +-
HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs | 4
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs | 2
HDL_ON/DAL/Mqtt/MqttClient.cs | 2
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 16 +-
HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs | 8
HDL-ON_iOS/Info.plist | 4
HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs | 4
HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotPage.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs | 4
HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotConsumablesMagPage.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs | 8
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/FhControlPage.cs | 8
HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs | 2
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 14 +-
SiriIntents/Server/HttpUtil.cs | 4
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs | 6
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs | 4
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs | 16 +-
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 8
HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaFanPage.cs | 4
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs | 4
HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs | 8
HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs | 4
HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs | 38 +++---
HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs | 6
HDL_ON/Entity/Function/Function.cs | 2
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 2
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 4
HDL_ON/DAL/Server/HttpUtil.cs | 10 +-
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Electrical/IrLearnPage.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaAirCleanerPage.cs | 10 +-
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs | 26 ++--
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | 4
42 files changed, 144 insertions(+), 144 deletions(-)
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 94b0eb4..a2a1833 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202203152" android:versionName="1.5.5" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202203171" android:versionName="1.5.5" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools">
<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="30" />
<!--鍙嬬洘-->
<!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index f177a01..fa35b4a 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -100,9 +100,9 @@
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleLightContent</string>
<key>CFBundleShortVersionString</key>
- <string>1.5.502203151</string>
+ <string>1.5.502203171</string>
<key>CFBundleVersion</key>
- <string>1.5.503151</string>
+ <string>1.5.503171</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Use geographic location to provide services such as weather</string>
<key>NSAppleMusicUsageDescription</key>
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index 2adbeba..ce11f48 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -365,7 +365,7 @@
{
var function_online = FunctionList.List.Functions.Find((obj) => obj.sid == pairSid);
if (function_online != null){
- function_online.online = (bool)pairOnline;
+ function_online.online2d = (bool)pairOnline;
HomePage.LoadEvent_RefreshDevcieOnline(function_online);
FunctionPage.UpdataOnline(function_online);
RoomPage.UpdataOnline(function_online);
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 4917487..ce16936 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -17,8 +17,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
/// <summary>
/// RegionMark
/// </summary>
@@ -31,9 +31,9 @@
/// 鐗规畩鎺ュ彛璇锋眰瓒呮椂鏃堕棿
/// </summary>
public const int TIME_OUT_LONG = 20;
- /////// <summary>
- /////// Bearer 鏆傛椂璁句负绌猴紝浠庣櫥闄嗘垚鍔熺殑杩斿洖鐨刪eaderPrefix鍙傛暟鍔ㄦ�佽幏鍙�
- /////// </summary>
+ ///// <summary>
+ ///// Bearer 鏆傛椂璁句负绌猴紝浠庣櫥闄嗘垚鍔熺殑杩斿洖鐨刪eaderPrefix鍙傛暟鍔ㄦ�佽幏鍙�
+ ///// </summary>
//public const string TOKEN_BEARER = "Bearer ";
#endregion
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index b64d1e6..dd7d4e2 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -338,7 +338,7 @@
/// <summary>
/// 鏄惁鍦ㄧ嚎
/// </summary>
- public bool online = true;
+ public bool online2d = true;
/// <summary>
/// 浜戠鏁版嵁鍒涘缓鐨勬椂闂�
/// </summary>
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index d93097d..15e8fd4 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -210,11 +210,11 @@
Function function_online = FunctionList.List.GetLightList().Find((obj) => obj.sid == "0001017DB92D2602020100010101");
if(ddd%2 == 0)
{
- function_online.online = true;
+ function_online.online2d = true;
}
else
{
- function_online.online = false;
+ function_online.online2d = false;
}
HomePage.LoadEvent_RefreshDevcieOnline(function_online);
@@ -953,7 +953,7 @@
index++;
- if (!function.online)
+ if (!function.online2d)
{
btnbg.UnSelectedImagePath = "Collection/FunctionOfflineBg.png";
}
@@ -1350,7 +1350,7 @@
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
Tag = "OnlineTag",
- Visible = !function.online
+ Visible = !function.online2d
};
view.AddChidren(btnOffline);
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 342d1d5..aa6c95d 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -33,7 +33,7 @@
}
if (btn.Tag.ToString() == function.sid)
{
- if (function.online)
+ if (function.online2d)
{
btn.UnSelectedImagePath = "Collection/Functionbg.png";
btn.IsSelected = false;
@@ -46,7 +46,7 @@
}
else if (btn.Tag.ToString() == "OnlineTag")
{
- btn.Visible = !function.online;
+ btn.Visible = !function.online2d;
}
}
}
@@ -514,7 +514,7 @@
{
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
{
new Tip()
{
@@ -577,7 +577,7 @@
{
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
{
new Tip()
{
@@ -621,7 +621,7 @@
{
btnClose.MouseUpEventHandler = (sender, e) =>
{
- if (!curtain.online)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!curtain.online2d)//绂荤嚎涓嶅厑璁告搷浣�
{
new Tip()
{
@@ -641,7 +641,7 @@
btnOpen.MouseUpEventHandler = (sender, e) =>
{
- if (!curtain.online)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!curtain.online2d)//绂荤嚎涓嶅厑璁告搷浣�
{
new Tip()
{
@@ -671,7 +671,7 @@
};
btnUp.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
{
new Tip()
{
@@ -702,7 +702,7 @@
};
btnDown.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
index 2cb9b13..1173a63 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.online);
+ fcView.UpdataOnline(updataFunction.online2d);
}
}
}
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 8185dc9..df24dfd 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -230,7 +230,7 @@
bodyDiv.AddChidren(btnCollectionIcon);
}
- if (!function.online)
+ if (!function.online2d)
{
bodyDiv.BackgroundColor = CSS_Color.PromptingColor2;
btnOffline = new Button()
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index ac47acd..c117f58 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -86,7 +86,7 @@
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
{
new Tip()
{
@@ -133,7 +133,7 @@
/// </summary>
void LoadEvent_LightDimming(DiyImageSeekBar dimmerControlBar)
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
{
//new Tip()
//{
@@ -203,7 +203,7 @@
{
btnClose.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
{
new Tip()
{
@@ -225,7 +225,7 @@
btnStop.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
{
new Tip()
{
@@ -246,7 +246,7 @@
btnOpen.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
{
new Tip()
{
@@ -280,7 +280,7 @@
};
btnUp.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
{
new Tip()
{
@@ -311,7 +311,7 @@
};
btnDown.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)//绂荤嚎涓嶅厑璁告搷浣�
+ if (!function.online2d)//绂荤嚎涓嶅厑璁告搷浣�
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 0d410f0..1726484 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -84,11 +84,11 @@
Function function_online = FunctionList.List.GetLightList().Find((obj) => obj.sid == "0001017DB92D2602020100010101");
if (ddd % 2 == 0)
{
- function_online.online = true;
+ function_online.online2d = true;
}
else
{
- function_online.online = false;
+ function_online.online2d = false;
}
HomePage.LoadEvent_RefreshDevcieOnline(function_online);
FunctionPage.UpdataOnline(function_online);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
index 38b713e..b82a859 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.online)
+ if (Pir.currPir.online2d)
{
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 4d7538c..5a5d2d2 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.online = function.online;
+ pirDevice.online2d = function.online2d;
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 cd5aefc..0bdab9a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -358,7 +358,7 @@
};
EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -494,7 +494,7 @@
};
EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -618,7 +618,7 @@
};
EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -814,7 +814,7 @@
btn.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -877,7 +877,7 @@
{
btnMinus.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -907,7 +907,7 @@
};
btnPlus.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -933,7 +933,7 @@
d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
Control.Ins.SendWriteCommand(device, d);
};
- if (!device.online)
+ if (!device.online2d)
{
arcBar.OnStopTrackingTouchEvent = (sender, e) =>
{
@@ -994,7 +994,7 @@
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs
index 7075c77..7992fa6 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs
@@ -759,7 +759,7 @@
/// <param name="comadValue">鍛戒护</param>
private void SendOtherComand(IconViewControl btnIcon, string comadKey, string comadValue)
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -788,7 +788,7 @@
/// </summary>
private void SendSwitchComand()
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs
index 7ea9ab3..597610f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs
@@ -89,7 +89,7 @@
FrameWhiteCentet1.AddChidren(btnSwitch);
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -289,7 +289,7 @@
/// <param name="comadValue">鍛戒护</param>
private void SendOtherComand(IconViewControl btnIcon, string comadKey, string comadValue)
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/FhControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/FhControlPage.cs
index f2de9ff..085c95f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/FhControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/FhControlPage.cs
@@ -305,7 +305,7 @@
};
EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -371,7 +371,7 @@
{
btnMinus.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -399,7 +399,7 @@
};
btnPlus.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -426,7 +426,7 @@
Control.Ins.SendWriteCommand(device, d);
};
- if (!device.online)
+ if (!device.online2d)
{
arcBar.OnStopTrackingTouchEvent = (sender, e) =>
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
index 242fb61..29114f4 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
@@ -72,7 +72,7 @@
void LoadEvent_ControlEvent()
{
btnCurtainClose.MouseUpEventHandler = (sender, e) => {
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
@@ -116,7 +116,7 @@
btnCurtainStop.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
@@ -139,7 +139,7 @@
};
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
index 87044d5..6689c98 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
@@ -137,7 +137,7 @@
{
btnCurtainClose.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
@@ -165,7 +165,7 @@
btnCurtainStop.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
@@ -192,7 +192,7 @@
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
@@ -218,7 +218,7 @@
CurtainAnimation(100);
};
- if (!function.online)
+ if (!function.online2d)
{
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 94bfddc..20ef14c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
@@ -138,7 +138,7 @@
{
btnCurtainClose.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
@@ -166,7 +166,7 @@
btnCurtainStop.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
@@ -191,7 +191,7 @@
btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
@@ -235,7 +235,7 @@
// DriverLayer.Control.Ins.SendWriteCommand(function, d);
//};
- if (!function.online)
+ if (!function.online2d)
{
btnCurtainStop.MouseDownEventHandler = (sender, e) =>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
index 7d9146c..e9eeac7 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.online;
+ this.doorLockData.IsOnline = i_LocalDevice.online2d;
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 7021c55..657b49f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs
@@ -417,7 +417,7 @@
{
btnSwitchIcon.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
@@ -439,7 +439,7 @@
};
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs
index d93b021..09b25af 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs
@@ -126,7 +126,7 @@
#region 鎺у埗
btnUp.MouseUpEventHandler = (sender, e) => {
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -151,7 +151,7 @@
};
//----
btnStop.MouseUpEventHandler = (sender, e) => {
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -174,7 +174,7 @@
d.Add(FunctionAttributeKey.Position, "stop");
Control.Ins.SendWriteCommand(device, d);
};
- if (!device.online)
+ if (!device.online2d)
{
btnUp.MouseDownEventHandler = (sender, e) => {
btnUp.IsSelected = true;
@@ -189,7 +189,7 @@
};
}
btnDown.MouseUpEventHandler = (sender, e) => {
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -242,7 +242,7 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -281,7 +281,7 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -326,7 +326,7 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -376,7 +376,7 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerSetTimePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerSetTimePage.cs
index e9ec37c..480a84d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerSetTimePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerSetTimePage.cs
@@ -74,7 +74,7 @@
functionListView.AddChidren(hotDryTimeCell);
hotDryTimeCell.GoAction = () =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -130,7 +130,7 @@
functionListView.AddChidren(windDryCell);
windDryCell.GoAction = () =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -187,7 +187,7 @@
functionListView.AddChidren(disinfectTimeCell);
disinfectTimeCell.GoAction = () => {
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -245,7 +245,7 @@
anionTimeCell.LineView.RemoveFromParent();
anionTimeCell.GoAction = () => {
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
index 7dab158..e2dd0c7 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
@@ -62,7 +62,7 @@
{
btnSwitchIcon.MouseUpEventHandler += (sender, e) =>
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
@@ -86,7 +86,7 @@
};
btnSwitch.MouseUpEventHandler += (sender, e) =>
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
@@ -108,7 +108,7 @@
{ IsBackground = true }.Start();
};
- if (!function.online)
+ if (!function.online2d)
{
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 c8041d3..ea2486c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrLearnPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrLearnPage.cs
@@ -90,7 +90,7 @@
btn.MouseUpEventHandler = (sender, e) => {
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs
index df0f1d1..aa43e99 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs
@@ -480,7 +480,7 @@
btn.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -548,7 +548,7 @@
btnChlPlus.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -567,7 +567,7 @@
};
btnChlReduce.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -586,7 +586,7 @@
};
btnVolPlus.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -605,7 +605,7 @@
};
btnVolReduce.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -624,7 +624,7 @@
};
btnBack.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -643,7 +643,7 @@
};
btnPower.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -679,7 +679,7 @@
};
btnMenu.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -699,7 +699,7 @@
};
btnTopMenuUp.MouseUpEventHandler = (sender, e) => {
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -719,7 +719,7 @@
};
btnTopMenuLeft.MouseUpEventHandler = (sender, e) => {
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -739,7 +739,7 @@
};
btnTopMenuRight.MouseUpEventHandler = (sender, e) => {
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -759,7 +759,7 @@
};
btnTopMenuDown.MouseUpEventHandler = (sender, e) => {
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -779,7 +779,7 @@
};
btnOk.MouseUpEventHandler = (sender, e) => {
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
index c5c93da..f7fcdf2 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
@@ -290,7 +290,7 @@
{
btnSwitchIcon.MouseUpEventHandler += (sender, e) =>
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
@@ -316,7 +316,7 @@
};
btnSwitch.MouseUpEventHandler += (sender, e) =>
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs
index cf97d88..7a4e85b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs
@@ -421,7 +421,7 @@
}
numberView.AddChidren(btn);
btn.MouseUpEventHandler = (sender, e) => {
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -484,7 +484,7 @@
{
btnMenu.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -503,7 +503,7 @@
};
btnChlPlus.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -522,7 +522,7 @@
};
btnChlReduce.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -541,7 +541,7 @@
};
btnVolPlus.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -560,7 +560,7 @@
};
btnVolReduce.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -579,7 +579,7 @@
};
btnBack.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -599,7 +599,7 @@
btnMenu.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -618,7 +618,7 @@
};
btn123.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -632,7 +632,7 @@
};
btnMute.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -651,7 +651,7 @@
};
btnPower.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -670,7 +670,7 @@
};
- if (!device.online)
+ if (!device.online2d)
{
btnTopMenuUp.MouseDownEventHandler = (sender, e) =>
{
@@ -695,7 +695,7 @@
}
btnMenu.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -715,7 +715,7 @@
};
btnTopMenuUp.MouseUpEventHandler = (sender, e) => {
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -735,7 +735,7 @@
};
btnTopMenuLeft.MouseUpEventHandler = (sender, e) => {
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -755,7 +755,7 @@
};
btnTopMenuRight.MouseUpEventHandler = (sender, e) => {
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -775,7 +775,7 @@
};
btnTopMenuDown.MouseUpEventHandler = (sender, e) => {
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -795,7 +795,7 @@
};
btnOk.MouseUpEventHandler = (sender, e) => {
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -971,7 +971,7 @@
btn.MouseUpEventHandler = (sender, e) =>
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs
index ff71d51..2b991b2 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs
@@ -40,7 +40,7 @@
/// </summary>
void LoadControlEvent()
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaAirCleanerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaAirCleanerPage.cs
index 0bc953c..d7ebc0c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaAirCleanerPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaAirCleanerPage.cs
@@ -540,7 +540,7 @@
/// <param name="value">auto:鑷姩 sleep:鐫＄湢 manual:鎵嬪姩 strong:寮虹儓</param>
private void SendModeComand(string value)
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -569,7 +569,7 @@
/// <param name="value">canel:鍙栨秷 1:1灏忔椂 2:2灏忔椂 3:4灏忔椂 4:8灏忔椂</param>
private void SendTimingComand(string value)
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -598,7 +598,7 @@
/// <param name="value">1:浣庢。 2:涓。 3:楂樻。</param>
private void SendFanSpeedComand(string value)
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -626,7 +626,7 @@
/// </summary>
private void SendSwitchComand()
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -663,7 +663,7 @@
/// </summary>
private void SendEnableComand(MostRightIconControl btnSwitch, string sendKey, string value)
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaFanPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaFanPage.cs
index df3ecc3..dd82c98 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.online)
+ if (device.online2d)
{
seekBarContr.ProgressChangedEvent += (div, value) =>
{
@@ -179,7 +179,7 @@
/// </summary>
private void SendSwitchComand()
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs
index 3d08b88..88ebf92 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs
@@ -167,7 +167,7 @@
/// </summary>
private void SendSwitchComand()
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
@@ -282,7 +282,7 @@
private void SetControlTime()
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotConsumablesMagPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotConsumablesMagPage.cs
index 0b3bf1b..d300190 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotConsumablesMagPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotConsumablesMagPage.cs
@@ -86,7 +86,7 @@
btnSwitch.IsSelected = i_brushStatu;
btnSwitch.ButtonClickEvent += (sender, e) =>
{
- if (!i_device.online)
+ if (!i_device.online2d)
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotPage.cs
index 1fa0b85..6f91731 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWeepRobotPage.cs
@@ -455,7 +455,7 @@
/// </summary>
private void SendComand(string key, string i_value)
{
- if (!device.online)
+ if (!device.online2d)
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
index 5782d56..fed9f4c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
@@ -129,7 +129,7 @@
/// </summary>
void LoadEvent_TempChange()
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
index 8ab3dc2..fca751a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
@@ -86,7 +86,7 @@
/// </summary>
void LoadEvet_ChangeColorTemplatrue()
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
@@ -141,7 +141,7 @@
{
dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
@@ -161,7 +161,7 @@
dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
};
- if (function.online)
+ if (function.online2d)
{
dimmerBar.OnStartTrackingTouchEvent = (sender, e) =>
{
@@ -217,7 +217,7 @@
{
btnSwitch.MouseUpEventHandler += (sender, e) =>
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index a8d34a9..4b989e4 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.online)
+ if (function.online2d)
{
dimmerBar.OnStartTrackingTouchEvent = (sender, e) =>
{
@@ -148,7 +148,7 @@
{
btnSwitch.MouseUpEventHandler += (sender, e) =>
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index ef4bf1b..b945f83 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -88,7 +88,7 @@
/// </summary>
void LoadColorChangeEvent()
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
@@ -215,7 +215,7 @@
dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
@@ -237,7 +237,7 @@
Control.Ins.SendWriteCommand(function, d);
};
- if (function.online)
+ if (function.online2d)
{
dimmerBar.OnStartTrackingTouchEvent = (sender, e) =>
{
@@ -336,7 +336,7 @@
{
btnRestoredPoint.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)
+ if (!function.online2d)
{
return;
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
index d71f38a..80d8890 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
@@ -62,7 +62,7 @@
{
btnSwitchIcon.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
@@ -84,7 +84,7 @@
};
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)
+ if (!function.online2d)
{
new Tip()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
index 0556fea..0bd0d09 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.online == false)
+ if (a31player.functionMusic.online2d == false)
{
//涓嶅湪绾夸笉璇诲彇
continue;
@@ -275,7 +275,7 @@
{
while (true)
{
- if (!player.functionMusic.online)
+ if (!player.functionMusic.online2d)
{
///涓嶅湪绾夸笉璇荤姸鎬�
continue;
diff --git a/SiriIntents/Server/HttpUtil.cs b/SiriIntents/Server/HttpUtil.cs
index f61de04..56a78a0 100644
--- a/SiriIntents/Server/HttpUtil.cs
+++ b/SiriIntents/Server/HttpUtil.cs
@@ -16,8 +16,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
/// <summary>
/// RegionMark
/// </summary>
--
Gitblit v1.8.0