HDL-ON_Android/HDL-ON_Android.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL-ON_iOS/HDL-ON_iOS.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL-ON_iOS/Resources/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL-ON_iOS/Resources/Phone/ErrorIcon.png | 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/DAL/Server/HttpServerRequest.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/UI/BindingResidence/BindingResidencePage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/UI/BindingResidence/WellcomToHomeForm.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/UI/MainPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HDL-ON_Android/HDL-ON_Android.csproj
@@ -219,7 +219,9 @@ </Generator> </AndroidResource> </ItemGroup> <ItemGroup /> <ItemGroup> <AndroidAsset Include="Assets\Phone\LogicIcon\selected+.png" /> </ItemGroup> <ItemGroup> <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" /> <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" /> @@ -660,7 +662,6 @@ <AndroidAsset Include="Assets\Phone\LogicIcon\-.png" /> <AndroidAsset Include="Assets\Phone\LogicIcon\+.png" /> <AndroidAsset Include="Assets\Phone\LogicIcon\point.png" /> <AndroidAsset Include="Assets\Phone\LogicIcon\ selected+.png" /> <AndroidAsset Include="Assets\Phone\LogicIcon\selected-.png" /> <AndroidAsset Include="Assets\Phone\LogicIcon\link.png" /> <AndroidAsset Include="Assets\Phone\LogicIcon\selectTheFun.png" /> @@ -679,6 +680,9 @@ <ItemGroup> <AndroidAsset Include="Assets\Phone\RoomListBg.png" /> </ItemGroup> <ItemGroup> <AndroidAsset Include="Assets\Phone\ErrorIcon.png" /> </ItemGroup> <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -253,29 +253,7 @@ </ImageAsset> </ItemGroup> <ItemGroup> <Folder Include="Resources\" /> <Folder Include="Resources\Phone\" /> <Folder Include="Assets.xcassets\LaunchImage.launchimage\" /> <Folder Include="Resources\Phone\Public\" /> <Folder Include="Resources\Phone\PersonalCenter\" /> <Folder Include="Resources\Phone\Navigation\" /> <Folder Include="Resources\Phone\PersonalCenter\PersonalData\" /> <Folder Include="Resources\Phone\Classification\" /> <Folder Include="Resources\Phone\Classification\Room\" /> <Folder Include="Resources\Phone\Collection\" /> <Folder Include="Resources\Phone\Public\DeviceInfoIcon\" /> <Folder Include="Resources\Phone\FunctionIcon\" /> <Folder Include="Resources\Phone\FunctionIcon\Scene\" /> <Folder Include="Resources\Phone\Public\MsgIcon\" /> <Folder Include="Resources\Phone\PersonalCenter\AppUnlockSetting\" /> <Folder Include="Resources\Phone\FunctionIcon\Electrical\" /> <Folder Include="Resources\Phone\FunctionIcon\Socket\" /> <Folder Include="Resources\Phone\FunctionIcon\EnvironmentalScience\" /> <Folder Include="Resources\Phone\Public\AirIcon\" /> <Folder Include="Resources\Phone\PersonalCenter\ResetPassword\" /> <Folder Include="Resources\Phone\Intelligence\Gallery\" /> <Folder Include="Resources\Phone\FunctionIcon\DeviceIcon\" /> <Folder Include="Other\" /> </ItemGroup> <ItemGroup> <InterfaceDefinition Include="LaunchScreen.storyboard" /> @@ -728,6 +706,9 @@ <ITunesArtwork Include="iTunesArtwork" /> <ITunesArtwork Include="iTunesArtwork%402x" /> </ItemGroup> <ItemGroup> <BundleResource Include="Resources\Phone\ErrorIcon.png" /> </ItemGroup> <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> </Project> HDL-ON_iOS/Resources/Language.ini
@@ -395,6 +395,9 @@ 373=添加楼层失败。 374=住宅数据已被删除,APP将自动切换到另一住宅。 375=网关未连接服务器,无法创建场景。 376=欢迎回家 377=二维码失效,请重试 378=重试 5000=音乐 5001=组合 HDL-ON_iOS/Resources/Phone/ErrorIcon.png
HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -135,6 +135,11 @@ { try { if (strUrl.Contains("app/home/deliver") == false) { //非法的URL 返回一个自定义的状态码 return new ResponsePackNew() { Code = "-100" }; } var client = new RestSharp.RestClient(strUrl); var request = new RestSharp.RestRequest(RestSharp.Method.GET); HDL_ON/UI/BindingResidence/BindingResidencePage.cs
@@ -124,11 +124,21 @@ if (result.Code == DAL.Server.StateCode.SUCCESS) { //调用On原来的方法,刷新住宅列表及其缓存 pm.GetHomePager(); //跳转页面---- MainPage.GoUserPage(); //显示欢迎回家的弹窗界面 var form = new WellcomToHomeForm(); form.ShowForm(); MainPage.GoUserPage(false, () => { //显示欢迎回家的弹窗界面 var form = new WellcomToHomeForm(); form.ShowForm(); }); } //其他情况全部提示失效 else { //显示二维码已经过期的弹窗 this.ShowQrCodeTimeOutView(); } } @@ -139,6 +149,7 @@ { //整个界面的灰色背景 var frameBack = new Dialog(); frameBack.Show(); //中间白色区域 var frameWite = new FrameLayout(); @@ -156,7 +167,7 @@ picIcon.Height = Application.GetRealWidth(160); picIcon.Width = Application.GetRealWidth(160); picIcon.Gravity = Gravity.CenterHorizontal; picIcon.UnSelectedImagePath = "oRobot.png"; picIcon.UnSelectedImagePath = "ErrorIcon.png"; frameBack.AddChidren(picIcon); //二维码失效,请重试 HDL_ON/UI/BindingResidence/WellcomToHomeForm.cs
@@ -18,6 +18,7 @@ { //整个界面的灰色背景 var frameBack = new Dialog(); frameBack.Show(); //中间白色区域 var frameWite = new FrameLayout(); HDL_ON/UI/MainPage.cs
@@ -147,42 +147,30 @@ /// 进入主页 /// </summary> /// <param name="isFirstOpen">如果是第一次启动 检测校验密码</param> public static void GoUserPage(bool isFirstOpen = false) /// <param name="pageShowEvent">主页显示之后触发的事件(没有住宅的话,则不会触发)</param> public static void GoUserPage(bool isFirstOpen = false, Action pageShowEvent = null) { //加载Loading效果 var waitPage = new Loading(); BaseView.AddChidren(waitPage); waitPage.Start(Language.StringByID(StringId.PleaseWait)); //当没有住宅时,不能让它往下走 if (UserInfo.Current.regionList.Count == 0) { waitPage.Hide(); var addResidencePage = new BindingResidencePage(); BaseView.AddChidren(addResidencePage); addResidencePage.LoadView(); return; } new System.Threading.Thread(() => { try { if (UserInfo.Current.regionList.Count == 0) { bool loadPage = true; var pm = new DAL.Server.HttpServerRequest(); while (UserInfo.Current.regionList.Count == 0) { pm.GetHomePager();//刷新住宅信息 System.Threading.Thread.Sleep(2000); if (loadPage) { loadPage = false; Application.RunOnMainThread(() => { waitPage.Hide(); var addResidencePage = new BindingResidencePage(); BaseView.AddChidren(addResidencePage); addResidencePage.LoadView(); }); } } } else { Entity.FunctionList.List.Clear(); Entity.SpatialInfo.CurrentSpatial.Clear(); } Entity.FunctionList.List.Clear(); Entity.SpatialInfo.CurrentSpatial.Clear(); ///等待获取住宅信息 Application.RunOnMainThread(() => { @@ -224,6 +212,9 @@ //启动密码验证 new AppUnlockPage().LoadPage(isFirstOpen); } //主页加载完成,回调事件 pageShowEvent?.Invoke(); pageShowEvent = null; }); } catch (Exception ex) HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs
@@ -148,10 +148,12 @@ Application.RunOnMainThread(() => { //跳转页面---- MainPage.GoUserPage(); //显示欢迎回家的弹窗界面 var form = new WellcomToHomeForm(); form.ShowForm(); MainPage.GoUserPage(false, () => { //显示欢迎回家的弹窗界面 var form = new WellcomToHomeForm(); form.ShowForm(); }); }); break; }