2021-03-24 1.测试反馈问题修复优化。

JLChen

2021-03-24 3c39cae2733988262689df7cbd06ba987cd24583

2021-03-24 1.测试反馈问题修复优化。

 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>

 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>

 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" />
    <!-- 在安卓P版本之后，必须要授予FOREGROUND_SERVICE权限，才能够使用前台服务 -->
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

 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。为什么会声明这样变量,因为有些接口必须使用原来的Token)

 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

 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);
                                                           // }
                                                            if (fundev.value == "0") {
                                                                btnFanLevel.Text = "OFF";
                                                            } else {
                                                                btnFanLevel.Text = fundev.value;
                                                        }

                                                       

                                                        }
                                                    }
                                                }
                                            } catch { }