From 3ee2d0d1a8ebe8f53fb3a1e31cc547e39645c335 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 23 七月 2020 16:23:43 +0800
Subject: [PATCH] 2020-07-23 1.移动网络也支持检测。 2.设置菜单页面，增加滑动效果，解决不显示Help按钮问题。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs | 2
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs | 47 ++++++++++++++---------
Crabtree/ON.Ios/Info.plist | 4 +-
Crabtree/ON/Properties/AndroidManifest.xml | 2
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 15 ++++---
Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide | 0
Crabtree/SmartHome/UI/SimpleControl/MainPage.cs | 2
7 files changed, 43 insertions(+), 29 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index f584b5e..d2aaf4a 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/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>
diff --git a/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide b/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide
index 977ec23..4de9618 100644
--- a/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide
+++ b/Crabtree/.vs/SmartHome/xs/sqlite3/storage.ide
Binary files differ
diff --git a/Crabtree/ON.Ios/Info.plist b/Crabtree/ON.Ios/Info.plist
index eb68be4..9f4da62 100755
--- a/Crabtree/ON.Ios/Info.plist
+++ b/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>
diff --git a/Crabtree/ON/Properties/AndroidManifest.xml b/Crabtree/ON/Properties/AndroidManifest.xml
index 78be9ed..782fec7 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.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" />
<!-- 鍦ㄥ畨鍗揚鐗堟湰涔嬪悗锛屽繀椤昏鎺堜簣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 ce62d16..9d38dfb 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs
+++ b/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;
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
index a1e2738..f02d961 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
+++ b/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),
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
index 2f3909b..2101637 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
+++ b/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,19 +620,24 @@
MainPage.Loading.Start ();
});
- CommonPage.IsRemote = false;
- CommonPage.FindGateway = true;
- var result = Control.ControlBytesSendHasReturn (Command.ReadDeviceMac, common.SubnetID, common.DeviceID, new byte [] { }, false);
- CommonPage.FindGateway = false;
- if (result != null) {
- Application.RunOnMainThread (() => {
- btnLocalTest.Text = "Local UDP communication : succeeded.";
- });
- } else {
- Application.RunOnMainThread (() => {
- btnLocalTest.Text = "Local UDP communication : failed.";
- });
+ //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);
+ CommonPage.FindGateway = false;
+ if (result != null) {
+ Application.RunOnMainThread (() => {
+ btnLocalTest.Text = "Local UDP communication : succeeded.";
+ });
+ } else {
+ Application.RunOnMainThread (() => {
+ btnLocalTest.Text = "Local UDP communication : failed.";
+ });
+ }
+
}
+
//UDP communication to Sever : succeeded.
var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<GatewayBase> (gateWayString);
@@ -668,12 +674,17 @@
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;
- });
+ //Application.RunOnMainThread (() => {
+ // btnSeverTest.Text = "UDP communication to Sever : succeeded.";
+ // return;
+ //});
}
} catch (Exception ex) {
Console.WriteLine (ex.Message);
--
Gitblit v1.8.0