2020-07-23 1.移动网络也支持检测。 2.设置菜单页面，增加滑动效果，解决不显示Help按钮问题。

JLChen

2020-07-23 3ee2d0d1a8ebe8f53fb3a1e31cc547e39645c335

2020-07-23 1.移动网络也支持检测。 2.设置菜单页面，增加滑动效果，解决不显示Help按钮问题。

 Crabtree/.vs/SmartHome/xs/UserPrefs.xml

@@ -1,12 +1,14 @@
<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
  <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.4b65c46595" />
<Properties StartupConfiguration="{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}|Default">
  <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
  <MonoDevelop.Ide.Workbench>
    <Files>
      <File FileName="SmartHome/HDL/Operation/UserConfig.cs" Line="1" Column="1" />
      <File FileName="SmartHome/UI/SimpleControl/EquipmentPublicClass.cs" Line="208" Column="12" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/System/SystemRemote.cs" Line="186" Column="28" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs" Line="1" Column="1" />
      <File FileName="ON/Properties/AndroidManifest.xml" />
      <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs" />
      <File FileName="SmartHome/UI/SimpleControl/MqttCommon.cs" />
      <File FileName="SmartHome/HDL/Operation/UserConfig.cs" />
      <File FileName="ON.Ios/Info.plist" />
      <File FileName="ON.Ios/IosMethod.cs" Line="1" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -24,6 +26,7 @@
                    <Node name="Guide" expanded="True" />
                    <Node name="Register" expanded="True" />
                    <Node name="System" expanded="True" />
                    <Node name="User" expanded="True" />
                  </Node>
                </Node>
              </Node>

 Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide

Binary files differ

 Crabtree/ON.Ios/Info.plist

@@ -17,9 +17,9 @@
    <key>CFBundleIdentifier</key>
    <string>com.CrabtreeOn</string>
    <key>CFBundleShortVersionString</key>
    <string>2.5200722</string>
    <string>2.5200723</string>
    <key>CFBundleVersion</key>
    <string>2.50722</string>
    <string>2.50723</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.crabtree" android:versionCode="202007221" android:versionName="2.507221">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtree" android:versionCode="202007231" android:versionName="2.507231">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="28" />
    <!-- 在安卓P版本之后，必须要授予FOREGROUND_SERVICE权限，才能够使用前台服务 -->
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

 Crabtree/SmartHome/UI/SimpleControl/MainPage.cs

@@ -39,7 +39,7 @@

        //public static Button LogoButton = new Button ();

        public static string CodeIDString = "20200722";
        public static string CodeIDString = "20200723";
        public static UserInfo LoginUser;



 Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs

@@ -70,7 +70,7 @@
            Width = Application.GetRealWidth (640),
            Height = Application.GetRealHeight (1136 - 126 - 90 - 90),
            BackgroundColor = SkinStyle.Current.ViewColor,
            ScrollEnabled = false
            ScrollEnabled = true
        };
        public static Button btnVersion = new Button () {
            Y = Application.GetRealHeight (1136 - 90 - 90),

 Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs

@@ -399,8 +399,9 @@
            #endregion


            #region ---数据接收---
            if (UserConfig.Instance.internetStatus == 2) {
            #region ---测试按钮---
            //if (UserConfig.Instance.internetStatus == 2) {
            if (true) {
                var ConmmunicationTestView = new FrameLayout () {
                    Width = Application.GetRealWidth (640),
                    Height = Application.GetRealHeight (100),
@@ -619,6 +620,8 @@
                    MainPage.Loading.Start ();
                });

                //2020-07-23 连接WiFi才检测本地
                if (UserConfig.Instance.internetStatus == 2) {
                CommonPage.IsRemote = false;
                CommonPage.FindGateway = true;
                var result = Control.ControlBytesSendHasReturn (Command.ReadDeviceMac, common.SubnetID, common.DeviceID, new byte [] { }, false);
@@ -632,6 +635,9 @@
                        btnLocalTest.Text = "Local UDP communication : failed.";
                    });
                }

                }

                //UDP communication to Sever : succeeded.
                var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<GatewayBase> (gateWayString);

@@ -668,13 +674,18 @@
                                    btnSeverTest.Text = "Gateway UDP communication to Sever : failed.";
                                    return;
                                });
                            }
                        }
                            } else {
                        Application.RunOnMainThread (() => {
                            btnSeverTest.Text = "UDP communication to Sever : succeeded.";
                            return;
                        });
                    }
                        }
                        //Application.RunOnMainThread (() => {
                        //    btnSeverTest.Text = "UDP communication to Sever : succeeded.";
                        //    return;
                        //});
                    }
                } catch (Exception ex) {
                    Console.WriteLine (ex.Message);
                } finally {