From 820fd0c33ad960bacc855c4fffbbb86ecb8f309b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 23 三月 2021 15:42:20 +0800
Subject: [PATCH] 2021-03-23 1.问题修复
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs | 37 +++++++++++++-----
Crabtree/ON.Ios/Info.plist | 4 +-
Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs | 2
Crabtree/ON/Properties/AndroidManifest.xml | 2
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 23 ++++++-----
Crabtree/SmartHome/HDL/Common/HttpUtil/HttpUtil.cs | 2
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs | 10 +++--
Crabtree/SmartHome/UI/SimpleControl/MainPage.cs | 7 +--
8 files changed, 53 insertions(+), 34 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index 5c6eea0..f59afad 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,13 +1,8 @@
锘�<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
<MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
- <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/HDL/Common/HttpUtil/NewApiRes.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/MainPage.cs">
<Files>
- <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserHomePage.cs" Line="25" Column="11" />
- <File FileName="SmartHome/HDL/Common/HttpUtil/HttpUtil.cs" Line="1" Column="1" />
- <File FileName="SmartHome/HDL/Common/HttpUtil/IMessageCommon.cs" Line="1" Column="1" />
- <File FileName="SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs" Line="1" Column="1" />
- <File FileName="SmartHome/HDL/Common/HttpUtil/NewAPI.cs" Line="1" Column="1" />
- <File FileName="SmartHome/HDL/Common/HttpUtil/NewApiRes.cs" Line="1" Column="1" />
+ <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" Line="41" Column="58" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -16,16 +11,20 @@
<Node name="Shared" expanded="True">
<Node name="HDL" expanded="True">
<Node name="Common" expanded="True">
- <Node name="HttpUtil" expanded="True">
- <Node name="NewApiRes.cs" selected="True" />
- </Node>
+ <Node name="HttpUtil" expanded="True" />
+ </Node>
+ <Node name="Operation" expanded="True">
+ <Node name="Device" expanded="True" />
</Node>
</Node>
<Node name="UI" expanded="True">
<Node name="SimpleControl" expanded="True">
<Node name="Phone" expanded="True">
+ <Node name="Guide" expanded="True" />
+ <Node name="Register" expanded="True" />
<Node name="User" expanded="True" />
</Node>
+ <Node name="MainPage.cs" selected="True" />
</Node>
</Node>
</Node>
@@ -45,7 +44,9 @@
<MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
<MonoDevelop.Ide.ItemProperties.ON.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore />
+ <BreakpointStore>
+ <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/CrabtreeOnNew/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs" relfile="SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs" line="153" column="1" />
+ </BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
diff --git a/Crabtree/ON.Ios/Info.plist b/Crabtree/ON.Ios/Info.plist
index 4678814..7d34202 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.603191</string>
+ <string>2.603231</string>
<key>CFBundleVersion</key>
- <string>2.603191</string>
+ <string>2.603231</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MinimumOSVersion</key>
diff --git a/Crabtree/ON/Properties/AndroidManifest.xml b/Crabtree/ON/Properties/AndroidManifest.xml
index a28a8df..7ba3d58 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.603191" android:versionCode="202103191">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtreenew" android:versionName="2.603231" android:versionCode="202103231">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" />
<!-- 鍦ㄥ畨鍗揚鐗堟湰涔嬪悗锛屽繀椤昏鎺堜簣FOREGROUND_SERVICE鏉冮檺锛屾墠鑳藉浣跨敤鍓嶅彴鏈嶅姟 -->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
diff --git a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs b/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
index 996d34e..a460f6c 100644
--- a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
+++ b/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
@@ -150,7 +150,7 @@
requestObj.memberEmail = account;
}
var requestJson = HttpUtil.GetSignRequestJson(requestObj);
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_Register, requestJson);
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_Register, requestJson, "", "", HttpUtil.TIME_OUT_LONG);
}
/// <summary>
diff --git a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpUtil.cs b/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpUtil.cs
index 5d79482..ef699e5 100644
--- a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpUtil.cs
+++ b/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpUtil.cs
@@ -56,7 +56,7 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "bahrain-gateway.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://bahrain-gateway.hdlcontrol.com";
/// <summary>
///
/// </summary>
diff --git a/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs b/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs
index 94c2640..5e830d2 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.603191";
+ public static string RequestVersion = "2.603231";
public static UserInfo LoginUser;
/// <summary>
/// 鏄惁鏄鐞嗗憳鏉冮檺(鍙樻洿浜�,鎴愬憳鐨勬椂鍊�,杩欎釜涔熶负ture銆備负浠�涔堜細澹版槑杩欐牱鍙橀噺,鍥犱负鏈変簺鎺ュ彛蹇呴』浣跨敤鍘熸潵鐨凾oken)
@@ -135,9 +135,8 @@
Application.DesignHeight = 1136;
}
//鍗板害瀹㈡埛瀹氬埗APP榛樿浣跨敤鑻辨枃
- //Language.CurrentLanguage = "English";
- Language.CurrentLanguage = "Chinese";
-
+ Language.CurrentLanguage = "English";
+
Shared.BusSocket.Start (6000);
CommonPage.InitReceiveEvent ();
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
index d0e8116..6200b11 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
@@ -82,7 +82,9 @@
//etAccount.Text = "551775569@qq.com";
//etAccount.Text = "18824864143";
- etAccount.Text = "cjl@hdlchina.com.cn";
+ //etAccount.Text = "cjl@hdlchina.com.cn";
+ //etAccount.Text = "2791308028@qq.com";
+ etAccount.Text = "858539859@qq.com";
#endif
accountView.AddChidren (etAccount);
@@ -135,8 +137,8 @@
Text = password,
};
#if DEBUG
- etPasswrod.Text = "123456";
- //etPasswrod.Text = "123456-Aa";
+ //etPasswrod.Text = "123456";
+ etPasswrod.Text = "123456-Aa";
#endif
passwrodView.AddChidren (etPasswrod);
@@ -536,8 +538,8 @@
} else {
Application.RunOnMainThread (() => {
- UserMiddle.Init (false, true);
Close ();
+ UserMiddle.Init (false, true);
});
}
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
index 187b6f7..0b48fd0 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
@@ -220,7 +220,26 @@
UserMiddle.updateSensorhreadList.Clear ();
}
- //2020-01-11
+ /// <summary>
+ /// 绉婚櫎GuidePageView
+ /// </summary>
+ static void removeGuidePageView ()
+ {
+ if (guidePageView != null) {
+ if (guidePageView.Parent != null) {
+ Utlis.WriteLine ("绉婚櫎GuidePageView Parent 涓嶄负");
+ }
+
+ guidePageView.RemoveFromParent ();
+
+ }
+ }
+
+ /// <summary>
+ /// 2020-01-11
+ /// </summary>
+ /// <param name="isGuide">鏄惁Guide</param>
+ /// <param name="bFromLogin">鏄惁鏉ヨ嚜鐧诲綍鐣岄潰</param>
public static void Init (bool isGuide = false, bool bFromLogin = false)
{
if (MainPage.LoginUser == null)
@@ -230,14 +249,14 @@
new AccountLogin ().Show ();
UserConfig.Instance.TipVersionBackup = UserConfig.Instance.VersionNumber;
} else {
+ //2021-03-23 绉婚櫎GuidePageView
+ removeGuidePageView ();
+
//if (UserConfig.Instance.GatewayList.Count == 0) {
//2020-01-11 Mac娌＄粦瀹� 鏄惁鏉ュ彧鐧诲綍鐣岄潰
if (bFromLogin) {
if (!UserConfig.Instance.CheckHomeGatewaysNotEmpty ()) {
- if (guidePageView != null) {
- guidePageView.RemoveAll ();
- guidePageView.RemoveFromParent ();
- }
+
UserHomePage.FrameLayoutMain.AddChidren (guidePageView);
var guide = new GuideAddResidence ();
guide.IsHideBack = true;
@@ -338,12 +357,10 @@
/// </summary>
static void InitHomePageView ()
{
- //SystemRemote.LinkRemote ("", "", "",true);
+ //SystemRemote.LinkRemote ("", "", "",true);
+
if (null != UserPageView.Parent) {
- if (guidePageView.Parent != null) {
- guidePageView.RemoveAll ();
- guidePageView.RemoveFromParent ();
- }
+
CleanPageView (FavoriteBodyView);
UserPageView.AddChidren (FavoritePageView);
FavoritePageView.AddChidren (FavoriteBodyView);
--
Gitblit v1.8.0