From 52ee15533255c42d7939df8490a20e9fad528f7b Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 25 十二月 2020 11:27:30 +0800
Subject: [PATCH] 删除ds临时文件
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 5 ++
/dev/null | 0
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL-ON_iOS/Info.plist | 4 +-
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 6 ++
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 4 ++
.vs/HDL_APP_Project/xs/UserPrefs.xml | 44 +++++++++-------------
HDL_ON/DAL/Mqtt/MqttClient.cs | 4 +-
8 files changed, 36 insertions(+), 33 deletions(-)
diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 9730424..0000000
--- a/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/.vs/HDL_APP_Project/xs/.DS_Store b/.vs/HDL_APP_Project/xs/.DS_Store
deleted file mode 100644
index 89d1edb..0000000
--- a/.vs/HDL_APP_Project/xs/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 4382ae3..2577f88 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.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>
diff --git a/HDL-ON_Android/.DS_Store b/HDL-ON_Android/.DS_Store
deleted file mode 100644
index e7c2ee1..0000000
--- a/HDL-ON_Android/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/.DS_Store b/HDL-ON_Android/Assets/.DS_Store
deleted file mode 100644
index 6b4055b..0000000
--- a/HDL-ON_Android/Assets/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/.DS_Store b/HDL-ON_Android/Assets/Phone/.DS_Store
deleted file mode 100644
index 770e268..0000000
--- a/HDL-ON_Android/Assets/Phone/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/.DS_Store b/HDL-ON_Android/Assets/Phone/FunctionIcon/.DS_Store
deleted file mode 100644
index 3a94891..0000000
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/LogicIcon/.DS_Store b/HDL-ON_Android/Assets/Phone/LogicIcon/.DS_Store
deleted file mode 100644
index 6f78e25..0000000
--- a/HDL-ON_Android/Assets/Phone/LogicIcon/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/Public/.DS_Store b/HDL-ON_Android/Assets/Phone/Public/.DS_Store
deleted file mode 100644
index 3cc30ee..0000000
--- a/HDL-ON_Android/Assets/Phone/Public/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index c66f3bf..7c4c85d 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/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" />
diff --git a/HDL-ON_Android/Resources/.DS_Store b/HDL-ON_Android/Resources/.DS_Store
deleted file mode 100644
index e726e58..0000000
--- a/HDL-ON_Android/Resources/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/.DS_Store b/HDL-ON_iOS/.DS_Store
deleted file mode 100644
index d6ef0db..0000000
--- a/HDL-ON_iOS/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/.DS_Store b/HDL-ON_iOS/Assets.xcassets/.DS_Store
deleted file mode 100644
index 947522f..0000000
--- a/HDL-ON_iOS/Assets.xcassets/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index 421aebb..86d5463 100755
--- a/HDL-ON_iOS/Info.plist
+++ b/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>
diff --git a/HDL-ON_iOS/Resources/.DS_Store b/HDL-ON_iOS/Resources/.DS_Store
deleted file mode 100644
index bdf1fa8..0000000
--- a/HDL-ON_iOS/Resources/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/.DS_Store b/HDL-ON_iOS/Resources/Phone/.DS_Store
deleted file mode 100644
index ffae593..0000000
--- a/HDL-ON_iOS/Resources/Phone/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/.DS_Store b/HDL-ON_iOS/Resources/Phone/FunctionIcon/.DS_Store
deleted file mode 100644
index 94397ee..0000000
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/LogicIcon/.DS_Store b/HDL-ON_iOS/Resources/Phone/LogicIcon/.DS_Store
deleted file mode 100644
index 6e54d8c..0000000
--- a/HDL-ON_iOS/Resources/Phone/LogicIcon/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL_ON/.DS_Store b/HDL_ON/.DS_Store
deleted file mode 100755
index b34cc2b..0000000
--- a/HDL_ON/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL_ON/Common/.DS_Store b/HDL_ON/Common/.DS_Store
deleted file mode 100644
index da7acbe..0000000
--- a/HDL_ON/Common/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL_ON/DAL/.DS_Store b/HDL_ON/DAL/.DS_Store
deleted file mode 100644
index 6e1acff..0000000
--- a/HDL_ON/DAL/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index 7dee091..8b725d6 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/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;//鏄嚜宸辩殑鐧诲綍鎺ㄩ�佷笉澶勭悊
//鏂紑杩滅▼杩炴帴
diff --git a/HDL_ON/Entity/.DS_Store b/HDL_ON/Entity/.DS_Store
deleted file mode 100644
index b104da3..0000000
--- a/HDL_ON/Entity/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL_ON/UI/.DS_Store b/HDL_ON/UI/.DS_Store
deleted file mode 100755
index 7467d0f..0000000
--- a/HDL_ON/UI/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL_ON/UI/UI2/.DS_Store b/HDL_ON/UI/UI2/.DS_Store
deleted file mode 100644
index 866aed9..0000000
--- a/HDL_ON/UI/UI2/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 7b6c9f4..fc554b2 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/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()
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index de323c9..eb0a593 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/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;
+ }
}
}
}
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 23de300..836d78b 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/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),
diff --git a/HDL_ON/UI/UI2/3-Intelligence/.DS_Store b/HDL_ON/UI/UI2/3-Intelligence/.DS_Store
deleted file mode 100755
index 5c32cca..0000000
--- a/HDL_ON/UI/UI2/3-Intelligence/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/.DS_Store b/HDL_ON/UI/UI2/3-Intelligence/Automation/.DS_Store
deleted file mode 100755
index e28334d..0000000
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Automation/.DS_Store b/HDL_ON/UI/UI2/3-Intelligence/Automation/Automation/.DS_Store
deleted file mode 100755
index f14f384..0000000
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Automation/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/.DS_Store b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/.DS_Store
deleted file mode 100755
index afb4543..0000000
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL_ON/UI/UI2/FuntionControlView/.DS_Store b/HDL_ON/UI/UI2/FuntionControlView/.DS_Store
deleted file mode 100644
index 93f01ab..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/.DS_Store
+++ /dev/null
Binary files differ
--
Gitblit v1.8.0