| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Properties/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Info.plist | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Resources/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/R.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/DriverLayer/Control.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaAirCleanerPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,43 +1,26 @@ <Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/DriverLayer/Control.cs"> <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/HDLCommon.cs"> <Files> <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" /> <File FileName="HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs" /> <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" /> <File FileName="HDL-ON_iOS/Info.plist" /> <File FileName="HDL_ON/UI/MainPage.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs" Line="186" Column="40" /> <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="468" Column="87" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs" Line="124" Column="46" /> <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="616" Column="84" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaAirCleanerPage.cs" Line="331" Column="15" /> <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="758" Column="56" /> <File FileName="HDL_ON/Common/HDLCommon.cs" Line="500" Column="21" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <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="DriverLayer" expanded="True"> <Node name="Control.cs" selected="True" /> </Node> <Node name="Mqtt" expanded="True" /> <Node name="Common" expanded="True"> <Node name="HDLCommon.cs" selected="True" /> </Node> <Node name="Entity" expanded="True"> <Node name="Function" expanded="True" /> </Node> <Node name="UI" expanded="True"> <Node name="UI0-Stan" expanded="True"> <Node name="Logic" expanded="True" /> </Node> <Node name="UI2" expanded="True"> <Node name="FuntionControlView" expanded="True"> <Node name="Electrical" 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" /> @@ -53,13 +36,10 @@ <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String> <String>Shared.IOS/Shared.IOS.csproj</String> </DisabledProjects> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs" line="186" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Control.cs" relfile="HDL_ON/DAL/DriverLayer/Control.cs" line="469" column="1" /> </BreakpointStore> <BreakpointStore /> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> </Properties> HDL-ON_Android/Assets/Language.ini
@@ -416,6 +416,7 @@ 431=You are currently adding any platform devices to 432=Other platform equipment is supported by third party service provider 433=Water valve 434=Time switch 1002=Anion @@ -1098,6 +1099,7 @@ 431=你当前还为添加任何平台设备 432=其他平台设备均由第三方服务商提供支持 433=水阀 434=定时开关 1000=室内湿度 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="202103091" android:versionName="1.1.202103091" package="com.hdl.onpro"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202103094" android:versionName="1.1.202103094" package="com.hdl.onpro"> <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="26" /> <!-- 定位权限--> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> HDL-ON_iOS/Info.plist
@@ -70,6 +70,8 @@ <key>UISupportedInterfaceOrientations</key> <array> <string>UIInterfaceOrientationPortrait</string> <string>UIInterfaceOrientationLandscapeLeft</string> <string>UIInterfaceOrientationLandscapeRight</string> </array> <key>UIAppFonts</key> <array> @@ -102,9 +104,9 @@ <key>UIStatusBarStyle</key> <string>UIStatusBarStyleLightContent</string> <key>CFBundleShortVersionString</key> <string>1.1.202103092</string> <string>1.1.202103093</string> <key>CFBundleVersion</key> <string>202103092</string> <string>202103093</string> <key>NSLocationWhenInUseUsageDescription</key> <string>Use geographic location to provide services such as weather</string> <key>NSAppleMusicUsageDescription</key> HDL-ON_iOS/Resources/Language.ini
@@ -416,6 +416,7 @@ 431=You are currently adding any platform devices to 432=Other platform equipment is supported by third party service provider 433=Water valve 434=Time switch 1002=Anion @@ -1098,6 +1099,7 @@ 431=你当前还为添加任何平台设备 432=其他平台设备均由第三方服务商提供支持 433=水阀 434=定时开关 1000=室内湿度 HDL_ON/Common/R.cs
@@ -4,6 +4,7 @@ { public static class StringId { public const int TimeSwitch = 434; public const int WaterValve = 433; public const int Use3tyBrandListTip = 432; public const int Not3tyBrandListTip = 431; HDL_ON/DAL/DriverLayer/Control.cs
@@ -613,13 +613,14 @@ //} receiveObj.BodyDataString = res[1]; var bodyJObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(res[1]); if (bodyJObj == null) { return receiveObj; } if (receiveObj.Topic == CommunicationTopic.SearchLoaclGatewayReply) { var bodyJObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(res[1]); if (bodyJObj == null) { return receiveObj; } var device = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceModule>(bodyJObj.objects.ToString()); if (device.device_mac == DB_ResidenceData.Instance.residenceGatewayMAC) { HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -755,12 +755,7 @@ btnName.TextID = StringId.SecurityMonitoring; btnFunctionViewBg.MouseUpEventHandler = (sender, e) => { #if __IOS__ EZSDK.IOS.EZSDK.Go2EZvizMonitor(); #else //安卓摄像头 HDLCommon.Current.Go2EZvizMonitor(bodyView); #endif }; break; case ShowFunction.Sensor: HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaAirCleanerPage.cs
@@ -328,7 +328,7 @@ rowReset.Height = Application.GetRealHeight(50); rowReset.Width = FrameWhiteCentet2.Width; rowReset.Y = rowAnion.Bottom; FrameWhiteCentet2.AddChidren(rowReset); //FrameWhiteCentet2.AddChidren(rowReset); rowReset.AddLeftCaption(Language.StringByID(StringId.FilterElementReset), 200); rowReset.AddBottomLine(); rowReset.AddRightArrow(); HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs
@@ -111,6 +111,21 @@ SetControlTime(); }; var btnTimeSetTip = new NormalViewControl(300, 30, true) { Y = btnTimeSet.Bottom , Gravity = Gravity.CenterHorizontal, TextAlignment = TextAlignment.Center, TextSize = CSS_FontSize.TextFontSize, //TextColor = 0x00000000, SelectedTextColor = CSS_Color.TextualColor, TextColor = CSS_Color.TextualColor, TextID = StringId.TimeSwitch, }; FrameWhiteCentet1.AddChidren(btnTimeSetTip); //开关图标 this.btnSwitch = new IconViewControl(40); btnSwitch.Gravity = Gravity.CenterHorizontal;
