| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Properties/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Info.plist | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/ApiUtlis.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/DriverLayer/Control.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/Mqtt/MqttClient.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/MainPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,28 +1,24 @@ <Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_iOS/Info.plist"> <MonoDevelop.Ide.Workbench> <Files> <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="330" Column="54" /> <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="261" Column="55" /> <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="352" Column="65" /> <File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" Line="81" Column="8" /> <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="599" Column="53" /> <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs" Line="416" Column="79" /> <File FileName="HDL_ON/Entity/Function/Function.cs" Line="498" Column="41" /> <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="246" Column="16" /> <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs" Line="404" Column="64" /> <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="164" Column="57" /> <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="147" Column="33" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" Line="549" Column="30" /> <File FileName="HDL-ON_iOS/Info.plist" /> <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="641" Column="12" /> <File FileName="HDL_ON/UI/MainPage.cs" Line="24" Column="1" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="HDL_APP_Project" expanded="True"> <Node name="HDL-ON_Android" expanded="True"> <Node name="Assets" expanded="True" /> </Node> <Node name="HDL-ON_Android" selected="True" /> <Node name="HDL-ON_iOS" expanded="True"> <Node name="Resources" expanded="True" /> <Node name="Info.plist" selected="True" /> </Node> </Node> </State> @@ -35,6 +31,7 @@ <Value>e2[0]</Value> <Value>e2[1]</Value> <Value>e2[2]</Value> <Value>deviceList</Value> </State> </Pad> </Pads> 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="202012234" android:versionName="1.0.202012234" package="com.hdl.onpro"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202012241" android:versionName="1.0.202012241" 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
@@ -96,9 +96,9 @@ <key>UIStatusBarStyle</key> <string>UIStatusBarStyleLightContent</string> <key>CFBundleShortVersionString</key> <string>1.0.202012234</string> <string>1.0.202012241</string> <key>CFBundleVersion</key> <string>202012234</string> <string>202012241</string> <key>NSLocationWhenInUseUsageDescription</key> <string>Use geographic location to provide services such as weather</string> <key>NSAppleMusicUsageDescription</key> HDL_ON/Common/ApiUtlis.cs
@@ -159,8 +159,8 @@ { deviceList = new DevcieApiPack(); } if (FunctionList.List.GetDeviceFunctionList().Count > 0) { if (FunctionList.List.GetDeviceFunctionList().Count > 0) { for (int i = 0; i < FunctionList.List.GetDeviceFunctionList().Count;) { var localFunction = FunctionList.List.GetDeviceFunctionList()[i]; @@ -191,12 +191,12 @@ deviceList.list.Remove(newFunction);//操作完的数据清理掉，剩下的就是新增的功能 } } //处理剩下的新增功能 foreach (var newFunction in deviceList.list) { newFunction.SaveFunctionFile(); FunctionList.List.IniFunctionList(newFunction.savePath); } } //处理剩下的新增功能 foreach (var newFunction in deviceList.list) { newFunction.SaveFunctionFile(); FunctionList.List.IniFunctionList(newFunction.savePath); } endTime = DateTime.Now.AddSeconds(5); } @@ -216,15 +216,15 @@ { sceneList = new List<Scene>(); } for (int i = 0; i < FunctionList.List.scenes.Count;) for (int i = 0; i < FunctionList.List.scenes.Count;) { var localScene = FunctionList.List.scenes[i]; if (localScene == null) { var localScene = FunctionList.List.scenes[i]; if (localScene == null) { FunctionList.List.scenes.Remove(localScene); continue; } var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId); FunctionList.List.scenes.Remove(localScene); continue; } var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId); if (newScene == null)//如果云端最新数据没有该条数据，则本地需要删掉该数据记录 { FunctionList.List.DeleteScene(localScene, false); @@ -242,12 +242,12 @@ } sceneList.Remove(newScene);//操作完的数据清理掉，剩下的就是新增的功能 } //处理剩下的新增功能 foreach (var tempScene in sceneList) { tempScene.SaveSceneFile(); FunctionList.List.scenes.Add(tempScene); } } //处理剩下的新增功能 foreach (var tempScene in sceneList) { tempScene.SaveSceneFile(); FunctionList.List.scenes.Add(tempScene); } //如果是一端口需要提前下载场景数据，否则控制不了一端口场景 if (DB_ResidenceData.Instance.GatewayType == 0) HDL_ON/DAL/DriverLayer/Control.cs
@@ -342,14 +342,14 @@ public void SwtichFunctions(bool open,List<Function> functions) { var count = 0; var logString = open ? "打开" : "关闭"; var logString = open ? "打开\r\n" : "关闭\r\n"; List<ApiAlinkControlActionObj> actionObjs = new List<ApiAlinkControlActionObj>(); Dictionary<string, string> d = new Dictionary<string, string>(); d.Add(FunctionAttributeKey.OnOff, open ? "on" : "off"); var pm = new DAL.Server.HttpServerRequest(); foreach (var temp in functions) { logString += temp.spk + ":" + temp.sid; logString += temp.spk + ":" + temp.sid + "\r\n"; var apiControlData = temp.GetApiControlData(d); actionObjs.Add(apiControlData); count++; HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -291,12 +291,12 @@ packet.Bytes = e.ApplicationMessage.Payload; } #if DEBUG string ddd = ""; foreach (var bb in packet.Bytes) { ddd += bb + ","; } MainPage.Log($"mqtt bus data:{ddd}"); //string ddd = ""; //foreach (var bb in packet.Bytes) //{ // ddd += bb + ","; //} //MainPage.Log($"mqtt bus data:{ddd}"); #endif packet.Manager(); } HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@ /// <summary> /// 版本号 /// </summary> public static string VersionString = "1.0.1223"; public static string VersionString = "1.0.1241"; ///// <summary> ///// 客户端类型 ///// </summary>
