From 3c39cae2733988262689df7cbd06ba987cd24583 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期三, 24 三月 2021 17:39:09 +0800 Subject: [PATCH] 2021-03-24 1.测试反馈问题修复优化。 --- Crabtree/ON.Ios/Info.plist | 4 +- Crabtree/ON/Properties/AndroidManifest.xml | 2 Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 29 ++++---------- Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs | 20 ++++++---- Crabtree/SmartHome/UI/SimpleControl/Phone/Curtain/UserDeviceToCurtains.cs | 6 +- Crabtree/SmartHome/UI/SimpleControl/MainPage.cs | 2 6 files changed, 28 insertions(+), 35 deletions(-) diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml index ddaa76b..10175da 100644 --- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml +++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml @@ -1,34 +1,23 @@ 锘�<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default"> <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" /> - <MonoDevelop.Ide.Workbench> + <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/Curtain/UserDeviceToCurtains.cs"> + <Files> + <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" Line="144" Column="23" /> + <File FileName="SmartHome/UI/SimpleControl/Phone/Curtain/UserCurtainPage.cs" Line="123" Column="5" /> + <File FileName="SmartHome/UI/SimpleControl/Phone/Curtain/UserDeviceToCurtains.cs" Line="1" Column="1" /> + </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="SmartHome" expanded="True"> - <Node name="ON.Droid" expanded="True"> - <Node name="Assets" expanded="True" /> - </Node> <Node name="Shared" expanded="True"> - <Node name="DLL" expanded="True" /> - <Node name="HDL" expanded="True"> - <Node name="Common" expanded="True"> - <Node name="HttpUtil" expanded="True" /> - </Node> - <Node name="Operation" expanded="True"> - <Node name="ResponseEntity" expanded="True" /> - </Node> - </Node> - <Node name="IO" expanded="True" /> - <Node name="Net" expanded="True" /> <Node name="UI" expanded="True"> <Node name="SimpleControl" expanded="True"> <Node name="Phone" expanded="True"> - <Node name="Register" expanded="True" /> - <Node name="Scene" expanded="True" /> - <Node name="Schedule" expanded="True"> - <Node name="Method.cs" selected="True" /> + <Node name="Curtain" expanded="True"> + <Node name="UserDeviceToCurtains.cs" selected="True" /> </Node> - <Node name="User" expanded="True" /> + <Node name="Schedule" expanded="True" /> </Node> </Node> </Node> diff --git a/Crabtree/ON.Ios/Info.plist b/Crabtree/ON.Ios/Info.plist index 7d34202..c274da2 100755 --- a/Crabtree/ON.Ios/Info.plist +++ b/Crabtree/ON.Ios/Info.plist @@ -17,9 +17,9 @@ <key>CFBundleIdentifier</key> <string>com.hdl.on</string> <key>CFBundleShortVersionString</key> - <string>2.603231</string> + <string>2.603241</string> <key>CFBundleVersion</key> - <string>2.603231</string> + <string>2.603241</string> <key>LSRequiresIPhoneOS</key> <true/> <key>MinimumOSVersion</key> diff --git a/Crabtree/ON/Properties/AndroidManifest.xml b/Crabtree/ON/Properties/AndroidManifest.xml index 656d133..b9b049a 100644 --- a/Crabtree/ON/Properties/AndroidManifest.xml +++ b/Crabtree/ON/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@ 锘�<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtreenew" android:versionName="2.603231" android:versionCode="202103232"> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtreenew" android:versionName="2.603241" android:versionCode="202103241"> <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" /> <!-- 鍦ㄥ畨鍗揚鐗堟湰涔嬪悗锛屽繀椤昏鎺堜簣FOREGROUND_SERVICE鏉冮檺锛屾墠鑳藉浣跨敤鍓嶅彴鏈嶅姟 --> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> diff --git a/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs b/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs index 5e830d2..023bf42 100644 --- a/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs +++ b/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs @@ -38,7 +38,7 @@ //public static Button LogoButton = new Button (); - public static string RequestVersion = "2.603231"; + public static string RequestVersion = "2.603241"; public static UserInfo LoginUser; /// <summary> /// 鏄惁鏄鐞嗗憳鏉冮檺(鍙樻洿浜�,鎴愬憳鐨勬椂鍊�,杩欎釜涔熶负ture銆備负浠�涔堜細澹版槑杩欐牱鍙橀噺,鍥犱负鏈変簺鎺ュ彛蹇呴』浣跨敤鍘熸潵鐨凾oken) diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Curtain/UserDeviceToCurtains.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Curtain/UserDeviceToCurtains.cs index 374326a..b239f87 100644 --- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Curtain/UserDeviceToCurtains.cs +++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Curtain/UserDeviceToCurtains.cs @@ -153,7 +153,7 @@ Height = Application.GetMinRealAverage (100), X = Application.GetRealWidth (280), Y = Application.GetRealHeight (35), - Gravity = Gravity.CenterVertical, + //Gravity = Gravity.CenterVertical, UnSelectedImagePath = "Curtain/CurtainOpen.png", SelectedImagePath = "Curtain/CurtainOpenSelected.png", Tag = CurtainStatus.Open @@ -165,7 +165,7 @@ Height = Application.GetMinRealAverage (100), X = Application.GetRealWidth (400), Y = Application.GetRealHeight (35), - Gravity = Gravity.CenterVertical, + //Gravity = Gravity.CenterVertical, UnSelectedImagePath = "Curtain/CurtainTimeOut.png", SelectedImagePath = "Curtain/CurtainTimeOutSelected.png", Tag = CurtainStatus.Stop @@ -177,7 +177,7 @@ Height = Application.GetMinRealAverage (100), X = Application.GetRealWidth (520), Y = Application.GetRealHeight (35), - Gravity = Gravity.CenterVertical, + //Gravity = Gravity.CenterVertical, UnSelectedImagePath = "Curtain/CurtainClose.png", SelectedImagePath = "Curtain/CurtainCloseSelected.png", Tag = CurtainStatus.Close diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs index 6046110..dc2fb48 100644 --- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs +++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs @@ -1119,6 +1119,7 @@ TextColor = SkinStyle.Current.TextColor1, SelectedTextColor = SkinStyle.Current.TextColor1, Text = "OFF", + //Text = "", TextAlignment = TextAlignment.CenterLeft, }; deviceRowView.AddChidren (btnFanLevel); @@ -1160,6 +1161,11 @@ btnChoose.IsSelected = true; } value = e.ToString (); + if (value == "0") { + btnFanLevel.Text = "OFF"; + } else { + btnFanLevel.Text = value; + } DeviceDateFun (btnChoose.Tag as Function, value, btnChoose.IsSelected); }; @@ -1177,15 +1183,13 @@ for (int a = 0; a < dev.attributes.Count; a++) { var fundev = dev.attributes [a]; if (fundev.key == "fan_speed_percent") { - // if (fundev.value == "0") { - // btnLevel.Text = "OFF"; - // } else { - fanLevel.Progress = int.Parse (fundev.value); - // } + fanLevel.Progress = int.Parse (fundev.value); + if (fundev.value == "0") { + btnFanLevel.Text = "OFF"; + } else { + btnFanLevel.Text = fundev.value; + } } - - - } } } catch { } -- Gitblit v1.8.0