.DS_StoreBinary files differ
.vs/HDL_APP_Project/xs/.DS_StoreBinary files differ
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,38 +1,30 @@ <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.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" /> <MonoDevelop.Ide.Workbench> <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/DAL/Mqtt/MqttClient.cs" Line="550" Column="17" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs" Line="533" Column="14" /> <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/DriverLayer/Control.cs" Line="89" Column="85" /> <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="611" Column="53" /> <File FileName="HDL-ON_iOS/Info.plist" /> <File FileName="HDL_ON/Entity/Function/Function.cs" Line="157" Column="32" /> <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="727" Column="18" /> <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" Line="209" Column="46" /> <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="402" Column="24" /> <File FileName="HDL-ON_iOS/Resources/zh-Hans.lproj/InfoPlist.strings" Line="7" Column="1" /> <File FileName="HDL-ON_iOS/Entitlements.plist" /> </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="UI" expanded="True"> <Node name="UI1-Login" expanded="True" /> <Node name="UI2" expanded="True"> <Node name="FuntionControlView" expanded="True"> <Node name="Light" expanded="True" /> </Node> </Node> </Node> </Node> <Node name="HDL-ON_Android" selected="True" /> <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> @@ -45,7 +37,7 @@ <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> 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="202012255" android:versionName="1.0.202012255" 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.202012254</string> <key>CFBundleVersion</key> <string>202012251</string> <string>202012254</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/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 }; if (function.spk != SPK.LightSwitch) { view.AddChidren(btnState); } Button btnCollection; btnCollection = new Button() HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -202,6 +202,8 @@ } else { if (function.spk != SPK.LightSwitch) { btn.Text = function.lastState; } } @@ -211,6 +213,7 @@ } } } } catch (Exception ex) { MainPage.Log($"HomePage updata funciton states error {ex.Message}"); 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/FuntionControlView/.DS_StoreBinary files differ
