.DS_StoreBinary files differ
.vs/HDL_APP_Project/xs/.DS_StoreBinary files differ
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,40 +1,65 @@ <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/Server/HttpServerRequest.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs"> <Files> <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="164" Column="17" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs" Line="214" Column="63" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs" Line="20" Column="21" /> <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="200" Column="50" /> <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="94" Column="54" /> <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="605" Column="23" /> <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="306" Column="55" /> <File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" Line="368" Column="1" /> <File FileName="HDL_ON/Entity/Enumerative/Command.cs" Line="2030" Column="27" /> <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="251" Column="53" /> <File FileName="HDL-ON_iOS/Info.plist" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" Line="166" Column="45" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs" Line="53" Column="25" /> <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="525" Column="55" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs" Line="47" Column="30" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs" Line="166" Column="37" /> <File FileName="HDL_ON/Entity/Function/Function.cs" Line="161" Column="47" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs" Line="94" Column="22" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs" Line="92" Column="1" /> </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="Mqtt" expanded="True" /> <Node name="Server" expanded="True"> <Node name="HttpServerRequest.cs" selected="True" /> </Node> </Node> <Node name="Entity" expanded="True"> <Node name="Function" expanded="True" /> </Node> <Node name="UI" expanded="True"> <Node name="UI1-Login" expanded="True" /> <Node name="UI2" expanded="True"> <Node name="1-HomePage" expanded="True" /> <Node name="4-PersonalCenter" expanded="True"> <Node name="RoomListManage" expanded="True"> <Node name="AddRoom" expanded="True" /> <Node name="FloorsManagementPage.cs" selected="True" /> </Node> </Node> <Node name="FuntionControlView" expanded="True"> <Node name="Light" expanded="True" /> <Node name="Curtain" expanded="True" /> </Node> </Node> </Node> </Node> <Node name="HDL-ON_iOS" expanded="True"> <Node name="Resources" expanded="True" /> <Node name="Resources" expanded="True"> <Node name="zh-Hans.lproj" expanded="True" /> </Node> </Node> </Node> </State> </Pad> <Pad Id="MonoDevelop.Debugger.WatchPad"> <State> <Value>row.Tag</Value> <Value>btn.Tag</Value> <Value>light.BlueColor</Value> <Value>e2[0]</Value> <Value>e2[1]</Value> <Value>e2[2]</Value> <Value>deviceList</Value> <Value>b1</Value> </State> </Pad> </Pads> @@ -51,6 +76,7 @@ <BreakpointStore> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" line="315" 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="90" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Control.cs" relfile="HDL_ON/DAL/DriverLayer/Control.cs" line="331" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> HDL-ON_Android/.DS_StoreBinary files differ
HDL-ON_Android/Assets/.DS_StoreBinary files differ
HDL-ON_Android/Assets/Phone/.DS_StoreBinary files differ
HDL-ON_Android/Assets/Phone/FunctionIcon/.DS_StoreBinary files differ
HDL-ON_Android/Assets/Phone/LogicIcon/.DS_StoreBinary files differ
HDL-ON_Android/Assets/Phone/Public/.DS_StoreBinary files differ
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="202012251" android:versionName="1.0.202012251" package="com.hdl.onpro"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202012256" android:versionName="1.0.202012256" package="com.hdl.onpro"> <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="26" /> <!-- 定位权限--> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> HDL-ON_Android/Resources/.DS_StoreBinary files differ
HDL-ON_iOS/.DS_StoreBinary files differ
HDL-ON_iOS/Assets.xcassets/.DS_StoreBinary files differ
HDL-ON_iOS/Info.plist
@@ -96,9 +96,9 @@ <key>UIStatusBarStyle</key> <string>UIStatusBarStyleLightContent</string> <key>CFBundleShortVersionString</key> <string>1.0.202012251</string> <string>1.0.202012256</string> <key>CFBundleVersion</key> <string>202012251</string> <string>202012256</string> <key>NSLocationWhenInUseUsageDescription</key> <string>Use geographic location to provide services such as weather</string> <key>NSAppleMusicUsageDescription</key> HDL-ON_iOS/Resources/.DS_StoreBinary files differ
HDL-ON_iOS/Resources/Phone/.DS_StoreBinary files differ
HDL-ON_iOS/Resources/Phone/FunctionIcon/.DS_StoreBinary files differ
HDL-ON_iOS/Resources/Phone/LogicIcon/.DS_StoreBinary files differ
HDL_ON/.DS_StoreBinary files differ
HDL_ON/Common/.DS_StoreBinary files differ
HDL_ON/Common/ApiUtlis.cs
@@ -238,6 +238,7 @@ localScene.collect = newScene.collect; localScene.modifyTime = newScene.modifyTime; localScene.roomIds = newScene.roomIds; localScene.image = newScene.image; localScene.SaveSceneFile(); } sceneList.Remove(newScene);//操作完的数据清理掉，剩下的就是新增的功能 HDL_ON/DAL/.DS_StoreBinary files differ
HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -544,9 +544,9 @@ /// </summary> static void ReceiveNotifySqueezeAsync(string mMes) { #if DEBUG //#if DEBUG return; #endif //#endif if (mMes == PushSignStr) return;//是自己的登录推送不处理 //断开远程连接 HDL_ON/Entity/.DS_StoreBinary files differ
HDL_ON/UI/.DS_StoreBinary files differ
HDL_ON/UI/UI2/.DS_StoreBinary files differ
HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -720,7 +720,11 @@ Tag = "state", Text = function.lastState }; view.AddChidren(btnState); if (function.spk != SPK.LightSwitch) { view.AddChidren(btnState); } Button btnCollection; btnCollection = new Button() HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -202,7 +202,10 @@ } else { btn.Text = function.lastState; if (function.spk != SPK.LightSwitch) { btn.Text = function.lastState; } } } } HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -397,6 +397,10 @@ /// </summary> void LoadLastStatesButton() { if(function.spk == SPK.LightSwitch) { return; } var btnLastStates = new Button() { X = Application.GetRealWidth(10 + 32 + 8), HDL_ON/UI/UI2/3-Intelligence/.DS_StoreBinary files differ
HDL_ON/UI/UI2/3-Intelligence/Automation/.DS_StoreBinary files differ
HDL_ON/UI/UI2/3-Intelligence/Automation/Automation/.DS_StoreBinary files differ
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/.DS_StoreBinary files differ
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs
@@ -139,6 +139,11 @@ Application.RunOnMainThread(() => { LoadFloorRow(f); int count2 = SpatialInfo.CurrentSpatial.FloorList.Count > 8 ? 8 : SpatialInfo.CurrentSpatial.FloorList.Count; var contentViewHeight = (count2 + 1) * Application.GetRealHeight(50); contentView.Height = contentViewHeight; floorsListView.Height = count2 * Application.GetRealHeight(50); }); } } HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs
@@ -100,7 +100,10 @@ if (row.Tag.ToString() == btn.Tag.ToString()) { row.RemoveFromParent(); floorsListView.Height = SpatialInfo.CurrentSpatial.FloorList.Count > 8 ? 8 : SpatialInfo.CurrentSpatial.FloorList.Count; int count = SpatialInfo.CurrentSpatial.FloorList.Count > 8 ? 8 : SpatialInfo.CurrentSpatial.FloorList.Count; var contentViewHeight = (count + 1) * Application.GetRealHeight(50); contentView.Height = contentViewHeight; floorsListView.Height = count * Application.GetRealHeight(50); } } } HDL_ON/UI/UI2/FuntionControlView/.DS_StoreBinary files differ
