From 30ebeb780347d7cfd076edac9a0ccf90c7edc7b9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 30 八月 2021 10:39:23 +0800
Subject: [PATCH] 新风单控
---
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL-ON_Android/Assets/Language.ini | 7 ++
HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs | 11 ---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs | 68 ----------------------
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 32 ----------
HDL-ON_iOS/Info.plist | 4
HDL-ON_iOS/Resources/Language.ini | 7 ++
HDL_ON/DAL/Server/HttpUtil.cs | 4
HDL_ON/Common/R.cs | 9 +++
.vs/HDL_APP_Project/xs/UserPrefs.xml | 14 +---
HDL_ON/DAL/DriverLayer/Control.cs | 2
HDL_ON/UI/MainPage.cs | 4
HDL_ON/UI/UI1-Login/LoginPage.cs | 2
HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs | 4
14 files changed, 42 insertions(+), 128 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 3fa92c5..5811ce9 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,20 +1,15 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
- <MonoDevelop.Ide.Workbench>
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/MainPage.cs">
<Files>
- <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="211" Column="14" />
<File FileName="HDL-ON_iOS/Info.plist" />
- <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="2060" Column="9" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" Line="113" Column="13" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="768" Column="14" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs" Line="461" Column="14" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="908" Column="25" />
+ <File FileName="HDL_ON/UI/MainPage.cs" Line="28" Column="55" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
- <Node name="HDL-ON_Android" selected="True" />
+ <Node name="HDL-ON_Android" expanded="True" selected="True" />
</Node>
</State>
</Pad>
@@ -35,8 +30,7 @@
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs" line="747" column="1" />
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferUserConfirmPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferUserConfirmPage.cs" line="106" column="1" />
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" line="168" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs" line="71" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs" line="468" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs" line="461" column="1" />
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="481" column="1" />
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="541" column="1" />
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="314" column="1" />
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 076b1a7..c27f087 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -494,6 +494,9 @@
506=Face input succeeded
507=Face input failed
508=Formaldehyde
+509=Please enter security name.
+510=Please select the deployment target.
+
1000=Room Humidity
1001=V-chip
@@ -1607,6 +1610,10 @@
506=浜鸿劯褰曞叆鎴愬姛
507=浜鸿劯褰曞叆澶辫触
508=鐢查啗
+509=璇疯緭鍏ュ畨闃插悕绉般��
+510=璇烽�夋嫨甯冮槻鐩爣銆�
+
+
1000=瀹ゅ唴婀垮害
1001=绔ラ攣
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 184c188..c6c4f33 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="202108285" android:versionName="1.2.2021082785" package="com.hdl.onpro">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202108301" android:versionName="1.2.202108301" package="com.hdl.onpro">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" />
<!-- 涔愭鍙瀵硅闇�瑕佺殑鏉冮檺 -->
<!--<uses-permission android:name="android.permission.INTERNET" />-->
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index a865841..8cc4834 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.2.202108285</string>
+ <string>1.2.202108301</string>
<key>CFBundleVersion</key>
- <string>1.2.08285</string>
+ <string>1.2.08301</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Use geographic location to provide services such as weather</string>
<key>NSAppleMusicUsageDescription</key>
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 076b1a7..c27f087 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -494,6 +494,9 @@
506=Face input succeeded
507=Face input failed
508=Formaldehyde
+509=Please enter security name.
+510=Please select the deployment target.
+
1000=Room Humidity
1001=V-chip
@@ -1607,6 +1610,10 @@
506=浜鸿劯褰曞叆鎴愬姛
507=浜鸿劯褰曞叆澶辫触
508=鐢查啗
+509=璇疯緭鍏ュ畨闃插悕绉般��
+510=璇烽�夋嫨甯冮槻鐩爣銆�
+
+
1000=瀹ゅ唴婀垮害
1001=绔ラ攣
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index bb86f24..3eef3cc 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,15 @@
{
public static class StringId
{
+
+ /// <summary>
+ ///
+ /// </summary>
+ public const int PleaseSelectTheDeploymentTarget = 510;
+ /// <summary>
+ /// 璇疯緭鍏ュ畨闃插悕绉�
+ /// </summary>
+ public const int PleaseEnterSecurityName = 509;
/// <summary>
/// 鐢查啗
/// </summary>
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 3c5196e..214efec 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -772,7 +772,7 @@
{
Ins.GatewayId = device.device_mac;
}
- reportIp = "255.255.255.255";//"239.0.168.188";// device.ip_address;//涓绘挱鍦板潃涔熻兘鎺у埗璁惧
+ reportIp = device.ip_address;//涓绘挱鍦板潃涔熻兘鎺у埗璁惧//"239.0.168.188";//
}
}
else if (receiveObj.Topic == CommunicationTopic.ct.ReadStatus + "_reply" ||
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 48d5724..67c665d 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>
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 5730447..eea6c81 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -25,7 +25,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.2.0828";
+ public static string VersionString = "1.2.0830";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -108,7 +108,7 @@
SPK.AcIr,SPK.AcStandard,
SPK.FloorHeatStandard,
SPK.AirFreshStandard,
-
+ SPK.AirSwitch,
};
/// <summary>
/// 鎴块棿鍔熻兘鍒楄〃涓嶅姞杞界殑鍔熻兘鍒楄〃
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index def2395..f5bcaac 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -232,7 +232,7 @@
//etAccount.Text = "15217626103";//鏄嗘槑閲戣寕椤圭洰
//etAccount.Text = "18598273624";
etAccount.Text = "fslcjm5@163.com";
- etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
+ //etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
}
b = !b;
etPassword.Text = "123456";
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 2e43f26..1cbfa1d 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -461,38 +461,6 @@
}
}
break;
- case SPK.AirFreshStandard:
- {
- //鍋氫簡涓�涓壒娈婂鐞嗭紱
- bool _bool = false;
- for (int i = 0; i < dicSateteList.Count; i++)
- {
- var dic = dicSateteList[i];
- if (dic.ContainsValue("on_off"))
- {
- if (dic["value"] == "on")
- {
- //鍒ゆ柇鏄惁瀛樺湪涓旀槸寮�鐘舵��
- _bool = true;
- break;
- }
- }
- }
-
- if (!_bool)
- {
- //濡傛灉鏂伴涓哄惈鏈夊紑鍏冲睘鎬т笖鏄叧=鐘舵�侊紱
- //娓呯┖鍒楄〃鎵�鏈夋暟鎹紝閲嶆柊鍗曠嫭閰嶇疆涓�涓紑鍏冲睘鎬т笖鏄叧=鐘舵�侊紱
- //(鏂伴灞炴�ф槸鍗曠嫭鎺у埗鐨�,濡傛灉閰嶇疆鍏筹紝鍐嶉厤缃竴涓閫燂紝椋庨�熶竴鏍锋墽琛�)
- dicSateteList.Clear();
- //娌℃湁寮�鍏冲氨榛樿娣诲姞-寮�-灞炴��
- Dictionary<string, string> diction = new Dictionary<string, string>();
- diction.Add("key", "on_off");
- diction.Add("value", "off");
- dicSateteList.Add(diction);
- }
- }
- break;
}
outputDevice.status = dicSateteList;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs
index e6f08bd..1a7fb2e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs
@@ -67,20 +67,6 @@
btnFan.MouseUpEventHandler += (sender, e) =>
{
ShowFanSelectView();
- //return;
- //if ( !btnSwitch.IsSelected){return;}
- //var curFanSpeedIndex = fanSpeedList.IndexOf(device.GetAttrState(FunctionAttributeKey.FanSpeed));
- //var sendFanSpeedIndex = curFanSpeedIndex == fanSpeedList.Count - 1 ? 0 : 1+curFanSpeedIndex;
-
- //device.SetAttrState(FunctionAttributeKey.FanSpeed, fanSpeedList[sendFanSpeedIndex]);
- //new System.Threading.Thread(() =>
- //{
- // Dictionary<string, string> d = new Dictionary<string, string>();
- // d.Add(FunctionAttributeKey.FanSpeed, fanSpeedList[sendFanSpeedIndex]);
- // Control.Ins.SendWriteCommand(device, d);
- //})
- //{ IsBackground = true }.Start();
- //RefreshFanSpeed();
};
//椋庨�熸枃鏈�
this.btnFanView = new NormalViewControl(this.FrameWhiteCentet1.Width / 3, Application.GetRealHeight(18), false);
@@ -208,41 +194,6 @@
});
}
- //if (fanAttr.value.Contains("low"))
- //{
- // //1妗�
- // var iconPath = this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "low" ? "FunctionIcon/AirFresh/Fan1Select.png" : "FunctionIcon/AirFresh/Fan1.png";
- // menuContr.AddRowMenu(Language.StringByID(StringId.FanOneGear), iconPath, this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "low", () =>
- // {
- // frameBack.Close();
- // //鍙戦�佹。浣嶅懡浠�
- // this.SendOtherComand(this.btnFan, FunctionAttributeKey.FanSpeed, "low");
- // });
- //}
-
- //if (fanAttr.value.Contains("medium"))
- //{
- // //2妗�
- // var iconPath = this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "medium" ? "FunctionIcon/AirFresh/Fan2Select.png" : "FunctionIcon/AirFresh/Fan2.png";
- // menuContr.AddRowMenu(Language.StringByID(StringId.FanTwoGear), iconPath, this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "medium", () =>
- // {
- // frameBack.Close();
- // //鍙戦�佹。浣嶅懡浠�
- // this.SendOtherComand(this.btnFan, FunctionAttributeKey.FanSpeed, "medium");
- // });
- //}
-
- //if (fanAttr.value.Contains("high"))
- //{
- // //3妗�
- // var iconPath = this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "high" ? "FunctionIcon/AirFresh/Fan3Select.png" : "FunctionIcon/AirFresh/Fan3.png";
- // menuContr.AddRowMenu(Language.StringByID(StringId.FanThreeGear), iconPath, this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "high", () =>
- // {
- // frameBack.Close();
- // //鍙戦�佹。浣嶅懡浠�
- // this.SendOtherComand(this.btnFan, FunctionAttributeKey.FanSpeed, "high");
- // });
- //}
}
#endregion
@@ -323,29 +274,14 @@
HdlThreadLogic.Current.RunThread(() =>
{
//鑾峰彇鍙戦�佸懡浠ょ殑鏍锋澘(bus鍗忚鏄渶瑕佷竴娆℃�ф妸鍏ㄩ儴鍛戒护涓�璧峰彂閫佺殑)
- var dic = this.GetSendComandSample();
- dic[comadKey] = comadValue;
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ dic.Add(comadKey, comadValue);
Control.Ins.SendWriteCommand(this.device, dic);
HdlThreadLogic.Current.RunMain(() =>
{
btnIcon.CanClick = true;
});
});
- }
-
- /// <summary>
- /// 鑾峰彇鍙戦�佸懡浠ょ殑鏍锋澘(bus鍗忚鏄渶瑕佷竴娆℃�ф妸鍏ㄩ儴鍛戒护涓�璧峰彂閫佺殑)
- /// </summary>
- /// <returns></returns>
- private Dictionary<string, string> GetSendComandSample()
- {
- var dic = new Dictionary<string, string>();
- //寮�鍏�
- dic[FunctionAttributeKey.OnOff] = this.device.GetAttrState(FunctionAttributeKey.OnOff);
- //椋庨��
- dic[FunctionAttributeKey.FanSpeed] = this.device.GetAttrState(FunctionAttributeKey.FanSpeed);
-
- return dic;
}
#endregion
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs
index eac2055..91f18dc 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs
@@ -190,7 +190,7 @@
{
var tip = new Tip()
{
- Text = "璇疯緭鍏ュ畨闃插悕绉�",
+ Text = Language.StringByID(StringId.PleaseEnterSecurityName),// = "璇疯緭鍏ュ畨闃插悕绉�",
CloseTime = 3,
Direction = AMPopTipDirection.None
};
@@ -202,7 +202,7 @@
{
var tip = new Tip()
{
- Text = "璇烽�夋嫨甯冮槻鐩爣",
+ Text = Language.StringByID(StringId.PleaseSelectTheDeploymentTarget),// "璇烽�夋嫨甯冮槻鐩爣",
CloseTime = 3,
Direction = AMPopTipDirection.None
};
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
index c3506ee..c56f5c7 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
@@ -141,20 +141,13 @@
BackgroundColor = CSS_Color.MainColor,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.MainBackgroundColor,
- Text = "鎾ら槻",
+ TextID = StringId.chefang,// = "鎾ら槻",
Radius = (uint)Application.GetRealWidth(20),
Gravity = Gravity.CenterHorizontal,
};
disarmView.AddChidren(btnDisarm);
+
btnDisarm.MouseUpEventHandler = (sender, e) => {
- //foreach (var temp in FunctionList.List.securities)
- //{
- // if (temp.status == "enable")
- // {
- // Control.Ins.ControlSecurity(temp, "disable");
- // break;
- // }
- //}
if(InDefenseMode!= null)
{
Control.Ins.ControlSecurity(InDefenseMode, "disable");
--
Gitblit v1.8.0