From 56b417e5bcdf4f34ddcda8c7e56fbac6584e615e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 07 十二月 2020 17:24:54 +0800
Subject: [PATCH] 2020-12-7-02
---
HDL-ON_Android/Assets/.DS_Store | 0
HDL-ON_iOS/Resources/Language.ini | 12 +++
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 104 +++----------------------
HDL_ON/Entity/Enumerative/MyEnum.cs | 21 +---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 12 +-
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 12 +-
HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | 22 ++--
.vs/HDL_APP_Project/xs/sqlite3/storage.ide | 0
.vs/HDL_APP_Project/xs/UserPrefs.xml | 18 +++-
HDL_ON/Entity/FunctionList.cs | 5 +
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 14 +-
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal | 0
12 files changed, 80 insertions(+), 140 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index f656f4a..8772f8c 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,16 +1,19 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.D4411691-F5B8-40F4-97C1-964F33115DBC" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" Line="20" Column="71" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" Line="1123" Column="58" />
<File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="478" Column="44" />
- <File FileName="HDL-ON_Android/Assets/Language.ini" Line="507" Column="1" />
+ <File FileName="HDL-ON_Android/Assets/Language.ini" Line="490" Column="14" />
<File FileName="HDL_ON/Common/R.cs" Line="495" Column="43" />
<File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/FunTypeView.cs" Line="5" Column="18" />
<File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs" Line="48" Column="46" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="70" Column="18" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="73" Column="35" />
<File FileName="HDL_ON/Entity/Enumerative/MyEnum.cs" Line="6" Column="17" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="523" Column="80" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" Line="28" Column="66" />
+ <File FileName="HDL_ON/Entity/FunctionList.cs" Line="116" Column="52" />
+ <File FileName="HDL_ON/UI/MainPage.cs" Line="188" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -25,7 +28,7 @@
<Node name="UI2" expanded="True">
<Node name="3-Intelligence" expanded="True">
<Node name="Automation" expanded="True">
- <Node name="InpOrOutLogicMethod.cs" selected="True" />
+ <Node name="LogicMethod.cs" selected="True" />
</Node>
</Node>
</Node>
@@ -34,6 +37,9 @@
<Node name="HDL-ON_Android" expanded="True">
<Node name="Assets" expanded="True" />
</Node>
+ <Node name="HDL-ON_iOS" expanded="True">
+ <Node name="Resources" expanded="True" />
+ </Node>
</Node>
</State>
</Pad>
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
index a309c1e..1a6b9f1 100644
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
+++ b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
Binary files differ
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
index 07fe6ca..2529a51 100644
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
+++ b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
Binary files differ
diff --git a/HDL-ON_Android/Assets/.DS_Store b/HDL-ON_Android/Assets/.DS_Store
new file mode 100644
index 0000000..bdf1fa8
--- /dev/null
+++ b/HDL-ON_Android/Assets/.DS_Store
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 7b6b259..7c6347f 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -490,6 +490,18 @@
7054=鏆傚仠
7055=浜害
7056=鐧惧垎姣�
+7057=妯″紡
+7058=鍒跺喎
+7059=鍒剁儹
+7060=鑷姩
+7061=闄ゆ箍
+7062=娓╁害
+7063=椋庨��
+7064=鐧藉ぉ
+7065=澶滄櫄
+7066=绂诲紑
+7067=涓�鑸�
+7068=鏃堕棿
9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
diff --git a/HDL_ON/Entity/Enumerative/MyEnum.cs b/HDL_ON/Entity/Enumerative/MyEnum.cs
index 7ca71d6..eaa4801 100644
--- a/HDL_ON/Entity/Enumerative/MyEnum.cs
+++ b/HDL_ON/Entity/Enumerative/MyEnum.cs
@@ -65,17 +65,17 @@
/// 鑹叉俯
/// cct
/// </summary>
- ColorTemperature = 0x0203,
+ ColorTemperature= 0x0203,
RGB = 0x0204,
Curtain = 0x0301,
/// <summary>
/// 寮�鍚堝笜
/// </summary>
- MotorCurtain = 0x0303,
+ MotorCurtain= 0x0303,
/// <summary>
/// 鍗峰笜
/// </summary>
- RollingShutter = 0x0304,
+ RollingShutter= 0x0304,
AC = 0x0401,
FloorHeating = 0x0402,
@@ -96,18 +96,9 @@
/// RGBW
/// </summary>
RGBW = 0x0102,
- /// <summary>
- /// CCT鐏�
- /// </summary>
- CCT = 0x0103,
- /// <summary>
- /// 寮�鍚堝笜
- /// </summary>
- TrietexCurtain = 0x0104,
- /// <summary>
- /// 鍗峰笜
- /// </summary>
- RollerCurtain = 0x0105,
+
+
+
}
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index a48047a..d029aea 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -111,6 +111,11 @@
var functionDataBytes = FileUtils.ReadFile(filePath);
var functionDataString = System.Text.Encoding.UTF8.GetString(functionDataBytes);
var tempFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
+ if (tempFunction == null)
+ {
+ FileUtils.DeleteFile(filePath);
+ return;
+ }
if (tempFunction.DeleteSign)
{
//todo 鍒犻櫎浜戠鏁版嵁 20201203--App涓嶈兘鍒犻櫎鍔熻兘鏁版嵁
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 5474311..ce1e8f8 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -46,12 +46,12 @@
case FunctionType.Dimmer:
case FunctionType.RGB:
case FunctionType.RGBW:
- case FunctionType.CCT:
+ case FunctionType.ColorTemperature:
case FunctionType.Relay:
//绐楀笜
case FunctionType.Curtain:
- case FunctionType.RollerCurtain:
- case FunctionType.TrietexCurtain:
+ case FunctionType.RollingShutter:
+ case FunctionType.MotorCurtain:
//绌鸿皟
case FunctionType.AC:
//鍦扮儹
@@ -166,12 +166,12 @@
case FunctionType.Dimmer:
case FunctionType.RGB:
case FunctionType.RGBW:
- case FunctionType.CCT:
+ case FunctionType.ColorTemperature:
case FunctionType.Relay:
//绐楀笜
case FunctionType.Curtain:
- case FunctionType.RollerCurtain:
- case FunctionType.TrietexCurtain:
+ case FunctionType.RollingShutter:
+ case FunctionType.MotorCurtain:
//绌鸿皟
case FunctionType.AC:
//鍦扮儹
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 7a6bcc0..7e510d5 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -67,12 +67,12 @@
case FunctionType.Dimmer:
case FunctionType.RGB:
case FunctionType.RGBW:
- case FunctionType.CCT:
+ case FunctionType.ColorTemperature:
case FunctionType.Relay:
//绐楀笜
case FunctionType.Curtain:
- case FunctionType.RollerCurtain:
- case FunctionType.TrietexCurtain:
+ case FunctionType.RollingShutter:
+ case FunctionType.MotorCurtain:
//绌鸿皟
case FunctionType.AC:
//鍦扮儹
@@ -214,7 +214,7 @@
break;
case FunctionType.RGB:
case FunctionType.RGBW:
- case FunctionType.CCT:
+ case FunctionType.ColorTemperature:
case FunctionType.Dimmer:
{
string on_off = GetKeyValue("on_off", dicList);
@@ -275,8 +275,8 @@
targetView.btnState.Text = stateStr;
}
break;
- case FunctionType.TrietexCurtain:
- case FunctionType.RollerCurtain:
+ case FunctionType.MotorCurtain:
+ case FunctionType.RollingShutter:
{//寮�鍏崇伅
string on_off = GetKeyValue("on_off", dicList);
string brightness = GetKeyValue("brightness", dicList);
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index a8ec927..81b0ae6 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -129,81 +129,7 @@
/// <returns></returns>
public static List<HDL_ON.Entity.Function> GetGatewayDeviceList()
{
- List<HDL_ON.Entity.Function> list = new List<Entity.Function>();
- for (int i=0;i<10;i++) {
- HDL_ON.Entity.Function function = new Entity.Function();
- switch (i) {
- case 0: {
- function.sid = "1234560001212121020182";
- function.name ="鐏厜";
- list.Add(function);
- }
- break;
- case 1: {
-
- function.sid = "1234560001212121030182";
- function.name = "绐楀笜";
- list.Add(function);
- } break;
- case 2: {
- function.sid = "1234560001212121040182";
- function.name = "绌鸿皟";
- list.Add(function);
- } break;
- case 3:
- {
- function.sid = "1234560001212121010282";
- function.name = "RGBW";
- list.Add(function);
- }
- break;
- case 4:
- {
-
- function.sid = "1234560001212121010382";
- function.name = "CCT鐏�";
- list.Add(function);
- }
- break;
- case 5:
- {
- function.sid = "1234560001212121010482";
- function.name = "寮�鍚堝笜";
- list.Add(function);
- }
- break;
- case 6:
- {
- function.sid = "1234560001212121010582";
- function.name = "鍗峰笜";
- list.Add(function);
- }
- break;
- case 7:
- {
- function.sid = "1234560001212121040282";
- function.name = "鍦扮儹";
- list.Add(function);
- }
- break;
- case 8:
- {
- function.sid = "1234560001212121020282";
- function.name = "璋冨叧";
- list.Add(function);
- }
- break;
- case 9:
- {
- function.sid = "1234560001212121020482";
- function.name = "RGB";
- list.Add(function);
- }
- break;
- }
- }
- return list;
- //return HDL_ON.Entity.DB_ResidenceData.functionList.GetAllFunction();
+ return HDL_ON.Entity.DB_ResidenceData.functionList.GetAllFunction();
}
/// <summary>
/// 鑾峰彇缃戝叧鍦烘櫙鍒楄〃
@@ -310,15 +236,15 @@
case FunctionType.Relay:
case FunctionType.RGB:
case FunctionType.RGBW:
- case FunctionType.CCT:
+ case FunctionType.ColorTemperature:
case FunctionType.Dimmer:
{
strPath = "LogicIcon/lightloguc.png";
}
break;
case FunctionType.Curtain:
- case FunctionType.RollerCurtain:
- case FunctionType.TrietexCurtain:
+ case FunctionType.RollingShutter:
+ case FunctionType.MotorCurtain:
{
strPath = "LogicIcon/curtainlogic.png";
}
@@ -346,13 +272,13 @@
{
List<string> deviceStrTypeList = new List<string>();
deviceStrTypeList.Clear();
- var lightjosn = deviceList.Find((device) => device.functionType == FunctionType.Relay || device.functionType == FunctionType.Dimmer|| device.functionType == FunctionType.CCT || device.functionType == FunctionType.RGB|| device.functionType == FunctionType.RGBW);
+ var lightjosn = deviceList.Find((device) => device.functionType == FunctionType.Relay || device.functionType == FunctionType.Dimmer|| device.functionType == FunctionType.ColorTemperature || device.functionType == FunctionType.RGB|| device.functionType == FunctionType.RGBW);
if (lightjosn != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.Lights));
}
- var curtainjosn = deviceList.Find((device) => device.functionType ==FunctionType.Curtain|| device.functionType == FunctionType.TrietexCurtain|| device.functionType == FunctionType.RollerCurtain);
+ var curtainjosn = deviceList.Find((device) => device.functionType ==FunctionType.Curtain|| device.functionType == FunctionType.MotorCurtain|| device.functionType == FunctionType.RollingShutter);
if (curtainjosn != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.Curtain));
@@ -385,13 +311,13 @@
functionTypeList.Add(FunctionType.Dimmer);
functionTypeList.Add(FunctionType.RGB);
functionTypeList.Add(FunctionType.RGBW);
- functionTypeList.Add(FunctionType.CCT);
+ functionTypeList.Add(FunctionType.ColorTemperature);
}
else if (deviceType == Language.StringByID(StringId.Curtain))
{
functionTypeList.Add(FunctionType.Curtain);
- functionTypeList.Add(FunctionType.RollerCurtain);
- functionTypeList.Add(FunctionType.TrietexCurtain);
+ functionTypeList.Add(FunctionType.RollingShutter);
+ functionTypeList.Add(FunctionType.MotorCurtain);
}
else if (deviceType == Language.StringByID(StringId.AC))
{
@@ -417,10 +343,10 @@
deviceTypeList.Add(FunctionType.RGB);
deviceTypeList.Add(FunctionType.RGBW);
deviceTypeList.Add(FunctionType.Dimmer);
- deviceTypeList.Add(FunctionType.CCT);
+ deviceTypeList.Add(FunctionType.ColorTemperature);
deviceTypeList.Add(FunctionType.Curtain);
- deviceTypeList.Add(FunctionType.RollerCurtain);
- deviceTypeList.Add(FunctionType.TrietexCurtain);
+ deviceTypeList.Add(FunctionType.RollingShutter);
+ deviceTypeList.Add(FunctionType.MotorCurtain);
deviceTypeList.Add(FunctionType.AC);
deviceTypeList.Add(FunctionType.FloorHeating);
}
@@ -431,10 +357,10 @@
deviceTypeList.Add(FunctionType.RGB);
deviceTypeList.Add(FunctionType.RGBW);
deviceTypeList.Add(FunctionType.Dimmer);
- deviceTypeList.Add(FunctionType.CCT);
+ deviceTypeList.Add(FunctionType.ColorTemperature);
deviceTypeList.Add(FunctionType.Curtain);
- deviceTypeList.Add(FunctionType.RollerCurtain);
- deviceTypeList.Add(FunctionType.TrietexCurtain);
+ deviceTypeList.Add(FunctionType.RollingShutter);
+ deviceTypeList.Add(FunctionType.MotorCurtain);
deviceTypeList.Add(FunctionType.AC);
deviceTypeList.Add(FunctionType.FloorHeating);
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
index 5807ebf..7dfdb0f 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -9,23 +9,23 @@
{
public class Send
{
- ///// <summary>
- ///// 浣忓畢ID
- ///// </summary>
- //public static string homeId = Entity.DB_ResidenceData.residenceData.CurReginID;
- ///// <summary>
- ///// 缃戝叧ID
- ///// </summary>
- //public static string gatewayId = DriverLayer.Control.Ins.GatewayId;
-
/// <summary>
/// 浣忓畢ID
/// </summary>
- public static string homeId = "1333723044544233473";
+ public static string homeId = Entity.DB_ResidenceData.residenceData.CurReginID;
/// <summary>
/// 缃戝叧ID
/// </summary>
- public static string gatewayId = "1333723647223775233";
+ public static string gatewayId = DriverLayer.Control.Ins.GatewayId;
+
+ ///// <summary>
+ ///// 浣忓畢ID
+ ///// </summary>
+ //public static string homeId = "1333723044544233473";
+ ///// <summary>
+ ///// 缃戝叧ID
+ ///// </summary>
+ //public static string gatewayId = "1333723647223775233";
/// <summary>
/// 鑾峰彇閫昏緫ID鍒楄〃
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 01a8209..95c6385 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -49,7 +49,7 @@
case FunctionType.Dimmer:
case FunctionType.RGB:
case FunctionType.RGBW:
- case FunctionType.CCT:
+ case FunctionType.ColorTemperature:
{
//2琛ㄧず(寮�锛屽叧)鍔熻兘
SwitchBrightnessView(fLayout, device, index, edit, 2);
@@ -68,8 +68,8 @@
SwitchView(fLayout, device, index, edit, 3);
}
break;
- case FunctionType.TrietexCurtain:
- case FunctionType.RollerCurtain:
+ case FunctionType.MotorCurtain:
+ case FunctionType.RollingShutter:
{
//3琛ㄧず(寮�锛屽叧锛屾殏鍋�)鍔熻兘
SwitchBrightnessView(fLayout, device, index, edit, 3);
@@ -664,7 +664,7 @@
///浜害
LogicView.FunTypeView brightnessView = new LogicView.FunTypeView();
brightnessView.frameLayout.Y = lightSwitchView.frameLayout.Bottom;
- if (device.functionType == FunctionType.TrietexCurtain || device.functionType == FunctionType.RollerCurtain)
+ if (device.functionType == FunctionType.MotorCurtain || device.functionType == FunctionType.RollingShutter)
{
brightnessView.btnText.TextID = StringId.percentum;
@@ -887,7 +887,7 @@
case FunctionType.Dimmer:
case FunctionType.RGB:
case FunctionType.RGBW:
- case FunctionType.CCT:
+ case FunctionType.ColorTemperature:
{
foreach (var dic in dicList)
{
@@ -943,8 +943,8 @@
}
}
break;
- case FunctionType.TrietexCurtain:
- case FunctionType.RollerCurtain:
+ case FunctionType.MotorCurtain:
+ case FunctionType.RollingShutter:
{
foreach (var dic in dicList)
--
Gitblit v1.8.0