| Crabtree/.vs/SmartHome/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Crabtree/ON.Ios/Info.plist | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Crabtree/ON/Properties/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Crabtree/SmartHome/HDL/Common/HttpUtil/HttpUtil.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Crabtree/SmartHome/UI/SimpleControl/MainPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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> 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> 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" /> <!-- 在安卓P版本之后，必须要授予FOREGROUND_SERVICE权限，才能够使用前台服务 --> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> 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> 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> 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。为什么会声明这样变量,因为有些接口必须使用原来的Token) @@ -135,9 +135,8 @@ Application.DesignHeight = 1136; } //印度客户定制APP默认使用英文 //Language.CurrentLanguage = "English"; Language.CurrentLanguage = "Chinese"; Language.CurrentLanguage = "English"; Shared.BusSocket.Start (6000); CommonPage.InitReceiveEvent (); 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); }); }
@@ -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);
