From 9281822c02a3b2b7f7f6b4215505095e9ff12fe1 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期日, 06 六月 2021 13:52:26 +0800 Subject: [PATCH] 2021-6-6-1 --- HDL-ON_iOS/Resources/Language.ini | 148 ++++++++++++++++++++ HDL_ON/Entity/Function/Function.cs | 4 HDL-ON_Android/Assets/Language.ini | 143 ++++++++++++++++++++ HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 6 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 16 ++ HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 44 +++++ HDL_ON/Common/R.cs | 2 .vs/HDL_APP_Project/xs/UserPrefs.xml | 30 ++-- HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs | 1 9 files changed, 371 insertions(+), 23 deletions(-) diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml index 318d5ac..85dc0b7 100644 --- a/.vs/HDL_APP_Project/xs/UserPrefs.xml +++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml @@ -1,12 +1,14 @@ 锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.FE1D0763-7181-4B0C-AB18-E30AA773A6FA" /> - <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs"> + <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs"> <Files> - <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" Line="218" Column="36" /> - <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="272" Column="51" /> - <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs" Line="12" Column="34" /> - <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs" Line="75" Column="18" /> - <File FileName="HDL_ON/Entity/Function/Function.cs" Line="1222" Column="23" /> + <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="266" Column="24" /> + <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs" Line="22" Column="105" /> + <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs" /> + <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs" Line="387" Column="36" /> + <File FileName="HDL_ON/Entity/Function/Function.cs" Line="1142" Column="22" /> + <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="986" Column="72" /> + <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="1" Column="1" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -14,27 +16,27 @@ <Node name="HDL_APP_Project" expanded="True"> <Node name="HDL_ON" expanded="True"> <Node name="Common" expanded="True" /> - <Node name="DAL" expanded="True"> - <Node name="Mqtt" expanded="True" /> - </Node> <Node name="Entity" expanded="True"> <Node name="Function" expanded="True" /> </Node> <Node name="UI" expanded="True"> <Node name="UI2" expanded="True"> <Node name="3-Intelligence" expanded="True"> - <Node name="Automation" expanded="True" /> + <Node name="Automation" expanded="True"> + <Node name="LogicMethod.cs" selected="True" /> + </Node> </Node> <Node name="4-PersonalCenter" expanded="True"> - <Node name="PirDevice" expanded="True"> - <Node name="Matching.cs" selected="True" /> - </Node> + <Node name="PirDevice" expanded="True" /> </Node> <Node name="FuntionControlView" expanded="True"> <Node name="Video" expanded="True" /> </Node> </Node> </Node> + </Node> + <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" /> @@ -51,7 +53,7 @@ <String>Shared.IOS/Shared.IOS.csproj</String> </DisabledProjects> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> - <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" /> + <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore /> </MonoDevelop.Ide.DebuggingService.Breakpoints> diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini index 59b5396..cb32ce9 100644 --- a/HDL-ON_Android/Assets/Language.ini +++ b/HDL-ON_Android/Assets/Language.ini @@ -515,6 +515,22 @@ 1085=2nd Gear 1086=3rd Gear +4000=Video intercom +4001=Call record +4002=*Cloud photos are only kept for 30 days +4003=Door phone call +4004=Answered +4005=Unlocked +4006=year +4007=From +4008=Call +4009=Unlocked +4010=Missed +4011=Rejected +4012=The configuration parameters are abnormal! +4013=Access Control QR Code +4014=Temporary password + 5000=Music 5001=Group 5002=Setting @@ -564,7 +580,101 @@ 5046=Adjust volume 5047="QQ music" has not installed in your cell phone, please proceed in App center. - + +6000=normal +6001=Device status +6002=pcs +6003=Current IR control device +6004=Remote controller has been added +6005=AC +6006=TV +6007=Fan +6008=Set-top box +6009=DVD +6010=Projector +6011=Custom +6012=IR control +6013=Device Management +6014=Add remote controller +6015=Online +6016=Offline +6017=Version number +6018=Please enter the name of the remote controller +6019=Reminder: After the remote controller is created, it can be found and used in Function-Electrical Category{\r\n} +6020=Recommended button +6021=Please enter the button name +6022=Next +6023=Power +6024=Volume+ +6025=Volume- +6026=channel+ +6027=Channel- +6028=up +6029=down +6030=Left +6031=right +6032=Mute +6034=Confirm +6035=Play +6037=Exit +6038=Menu +6039=Pause +6040=Back +6041=Stop +6042=Homepage +6043=Fast forward +6044=Rewind +6045=Timing +6046=Copy remote control function +6047=Aim at the center of the remote controller and press the same button +6048=Smart remote controller +6049=Add button +6050=*Long press for custom sorting +6051=Done +6052=Added successfully +6053=Can be classified-function-electrical operation and use +6054=Classification +6055=Remote controller name +6056=Region +6057=Continue to add +6058=Electrical +6059=Failed to add +6060=Retry +6061=Match the remote control +6062=Please click the button below +6063=Confirm whether the device is responding +6064=Control failed +6065=Control success +6066=Power on +6067=Mode cooling +6068=Wind speed stroke +6069=Temperature 26鈩� +6070=Delete device +6071=Modify name +6072=Confirm deletion +6073=Cancel +6074=The remote controller cannot exceed 10 pcs +6075=The area where the remote control belongs: +6076=Edit information +6077=Version upgrade +6078=System is under maintenance~Please try again later~ +6079=Failed to get data +6080=This function is temporarily not supported +6081=Select IR brand +6082=Shaking +6083=Low speed +6084=Medium speed +6085=High speed +6086=Auto +6087=Temperature+ +6088=Temperature- +6089=Air purifier +6090=Water heater +6091=Product that does not exist +6092=The device does not exist +6093=The device is not online +6094=The gateway device does not exist + 7000=Create automation 7001=Edit automation 7002=If @@ -673,6 +783,34 @@ 7105=Light pollution: 75 ~ 115ug/m3 7106=Moderate pollution: 115 ~ 150ug/m3 7107=Heavy pollution: > 150ug/m3 +7108=Leak/No Leak +7109=Leak +7110=No leak +7111=Water leaking/no water leaking +7112=Water leaking +7113=No water leaking +7114=Someone/Nobody +7115=Someone +7116=Nobody +7117=Open/Close +7118=On +7119=Close +7120=Anti-dismantling function +7121=Online +7122=Not online +7123=Air quality +7124=Excellent +7125=Good +7126=Poor +7127=Send notification +7128=Notification content +7129=(within 100 characters) +7130=Account selection +7131=App push +7132=Automation +7133=Executed +7134=Target State +7135=Tumble 9000=Please sign in with new cell phone number. 9001=Please sign in with new email address. @@ -1588,6 +1726,9 @@ 7131=App鎺ㄩ�� 7132=鑷姩鍖� 7133=宸叉墽琛� +7134=鐩爣鐘舵�� +7135=璺屽�� + 9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP 9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini index 6ca7646..327a6a5 100644 --- a/HDL-ON_iOS/Resources/Language.ini +++ b/HDL-ON_iOS/Resources/Language.ini @@ -424,7 +424,9 @@ 437=Device List 438=humidity:{0}% air:{1} wind:{2} -1000=Room Humidity + + +1000=Indoor Humidity 1001=V-chip 1002=Anion 1003=Sterilization @@ -513,6 +515,22 @@ 1085=2nd Gear 1086=3rd Gear +4000=Video intercom +4001=Call record +4002=*Cloud photos are only kept for 30 days +4003=Door phone call +4004=Answered +4005=Unlocked +4006=year +4007=From +4008=Call +4009=Unlocked +4010=Missed +4011=Rejected +4012=The configuration parameters are abnormal! +4013=Access Control QR Code +4014=Temporary password + 5000=Music 5001=Group 5002=Setting @@ -562,7 +580,101 @@ 5046=Adjust volume 5047="QQ music" has not installed in your cell phone, please proceed in App center. - + +6000=normal +6001=Device status +6002=pcs +6003=Current IR control device +6004=Remote controller has been added +6005=AC +6006=TV +6007=Fan +6008=Set-top box +6009=DVD +6010=Projector +6011=Custom +6012=IR control +6013=Device Management +6014=Add remote controller +6015=Online +6016=Offline +6017=Version number +6018=Please enter the name of the remote controller +6019=Reminder: After the remote controller is created, it can be found and used in Function-Electrical Category{\r\n} +6020=Recommended button +6021=Please enter the button name +6022=Next +6023=Power +6024=Volume+ +6025=Volume- +6026=channel+ +6027=Channel- +6028=up +6029=down +6030=Left +6031=right +6032=Mute +6034=Confirm +6035=Play +6037=Exit +6038=Menu +6039=Pause +6040=Back +6041=Stop +6042=Homepage +6043=Fast forward +6044=Rewind +6045=Timing +6046=Copy remote control function +6047=Aim at the center of the remote controller and press the same button +6048=Smart remote controller +6049=Add button +6050=*Long press for custom sorting +6051=Done +6052=Added successfully +6053=Can be classified-function-electrical operation and use +6054=Classification +6055=Remote controller name +6056=Region +6057=Continue to add +6058=Electrical +6059=Failed to add +6060=Retry +6061=Match the remote control +6062=Please click the button below +6063=Confirm whether the device is responding +6064=Control failed +6065=Control success +6066=Power on +6067=Mode cooling +6068=Wind speed stroke +6069=Temperature 26鈩� +6070=Delete device +6071=Modify name +6072=Confirm deletion +6073=Cancel +6074=The remote controller cannot exceed 10 pcs +6075=The area where the remote control belongs: +6076=Edit information +6077=Version upgrade +6078=System is under maintenance~Please try again later~ +6079=Failed to get data +6080=This function is temporarily not supported +6081=Select IR brand +6082=Shaking +6083=Low speed +6084=Medium speed +6085=High speed +6086=Auto +6087=Temperature+ +6088=Temperature- +6089=Air purifier +6090=Water heater +6091=Product that does not exist +6092=The device does not exist +6093=The device is not online +6094=The gateway device does not exist + 7000=Create automation 7001=Edit automation 7002=If @@ -671,6 +783,34 @@ 7105=Light pollution: 75 ~ 115ug/m3 7106=Moderate pollution: 115 ~ 150ug/m3 7107=Heavy pollution: > 150ug/m3 +7108=Leak/No Leak +7109=Leak +7110=No leak +7111=Water leaking/no water leaking +7112=Water leaking +7113=No water leaking +7114=Someone/Nobody +7115=Someone +7116=Nobody +7117=Open/Close +7118=On +7119=Close +7120=Anti-dismantling function +7121=Online +7122=Not online +7123=Air quality +7124=Excellent +7125=Good +7126=Poor +7127=Send notification +7128=Notification content +7129=(within 100 characters) +7130=Account selection +7131=App push +7132=Automation +7133=Executed +7134=Target State +7135=Tumble 9000=Please sign in with new cell phone number. 9001=Please sign in with new email address. @@ -1288,6 +1428,7 @@ 1086=椋庨��3妗� + 4000=鍙瀵硅 4001=閫氳瘽璁板綍 4002=*浜戠鐓х墖鍙繚鐣�30澶� @@ -1303,6 +1444,7 @@ 4012=閰嶇疆鍙傛暟鏈夊紓甯�! 4013=闂ㄧ浜岀淮鐮� 4014=涓存椂瀵嗙爜 + 5000=闊充箰 5001=缁勫悎 @@ -1584,6 +1726,8 @@ 7131=App鎺ㄩ�� 7132=鑷姩鍖� 7133=宸叉墽琛� +7134=鐩爣鐘舵�� +7135=璺屽�� 9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP 9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs index 9166e5a..dde34d9 100644 --- a/HDL_ON/Common/R.cs +++ b/HDL_ON/Common/R.cs @@ -1076,6 +1076,8 @@ public const int apptuisong = 7131; public const int zidontghua = 7132; public const int yizhixing = 7133; + public const int mubiaozhuangtai = 7134; + public const int diedao = 7135; #region LE鏂板 /// <summary> diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs index 17bec36..3d4b239 100644 --- a/HDL_ON/Entity/Function/Function.cs +++ b/HDL_ON/Entity/Function/Function.cs @@ -1147,6 +1147,10 @@ /// 锛堝共鎺ョ偣锛� /// </summary> public const string SensorDryContact = "sensor.dryContact"; + /// <summary> + /// 姣背娉紶鎰熷櫒 + /// </summary> + public const string SenesorMegahealth = "sensor.megahealth"; /// <summary> /// 瀹夐槻浼犳劅鍣╯pk鍒楄〃 diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs index 47f2d15..b1dd561 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs @@ -175,6 +175,21 @@ } } break; + case SPK.SenesorMegahealth: + { + LogicView.FunTypeView view = new LogicView.FunTypeView(); + view.btnText.TextID = StringId.kaiqiandbihe;//鐩爣鐘舵�� + fLayout.AddChidren(view.FLayoutView()); + view.btnClick.MouseUpEventHandler += (sender, e) => + { + DeviceView(device, view.btnState, StringId.kaiqi, StringId.bihe); + }; + if (edit) + { + GetEditState(device, index, view.btnState, null, null, null); + } + } + break; } #region 淇濆瓨 @@ -268,6 +283,11 @@ keyVlaue = "status"; } break; + case SPK.SenesorMegahealth: + { + keyVlaue = "action_state"; + } + break; } switch (intValue) @@ -294,12 +314,21 @@ value = "off"; } break; - case StringId.youren: { + case StringId.youren: + { value = "true"; } break; - case StringId.wuren: { - value = "false"; + case StringId.wuren: + { + if (device.spk == SPK.SenesorMegahealth) + { + value = "uninhabited"; + } + else + { + value = "false"; + } } break; case StringId.kaiqi: @@ -312,15 +341,20 @@ value = "close"; } break; - case StringId.zaixian: { + case StringId.zaixian: + { keyVlaue = "dismantle"; value = "true"; - };break; + }; break; case StringId.buzaixian: { keyVlaue = "dismantle"; value = "false"; }; break; + case StringId.diedao: + { + value = "fall"; + }; break; } //鏄剧ず鏂囨湰 button.TextID = intValue; diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs index 3de977d..3e5dbea 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs @@ -1371,6 +1371,22 @@ } } break; + case SPK.SenesorMegahealth: + { + foreach (var dic in dicList) + { + string value = dic["value"]; + if (value == "fall") + { + button1.Text = Language.StringByID(StringId.diedao); + } + else + { + button1.Text = Language.StringByID(StringId.wuren); + } + } + } + break; } } /// <summary> diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs index 85fd063..9b8487e 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs @@ -308,6 +308,7 @@ case SPK.SensorPir: case SPK.SensorDoorWindow: case SPK.SensoruUtrasonic: + case SPK.SenesorMegahealth: { strPath = "LogicIcon/sensor.png"; } @@ -365,6 +366,7 @@ || device.spk == SPK.SensorPir || device.spk == SPK.SensorDoorWindow || device.spk == SPK.SensoruUtrasonic + || device.spk == SPK.SenesorMegahealth ); if (sensor != null) { @@ -414,7 +416,8 @@ functionTypeList.Add(SPK.SensorPir); functionTypeList.Add(SPK.SensorDoorWindow); functionTypeList.Add(SPK.SensoruUtrasonic); - + functionTypeList.Add(SPK.SenesorMegahealth); + } return functionTypeList; @@ -449,6 +452,7 @@ deviceTypeList.Add(SPK.SensorPir); deviceTypeList.Add(SPK.SensorDoorWindow); deviceTypeList.Add(SPK.SensoruUtrasonic); + deviceTypeList.Add(SPK.SenesorMegahealth); } break; case target_if: diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs index ee6fefc..b684f7e 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs @@ -148,6 +148,7 @@ }; fLayout.AddChidren(succeedBtn); #endregion + #region 鐐瑰嚮浜嬩欢 //琛ㄧず搴撳垪琛ㄧ储寮曞��(鐩墠鍙�20涓簱) int index = 1; -- Gitblit v1.8.0