From 412e0af11df2b1d7986adf002e7997d82344ab3e Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 13 七月 2020 09:47:40 +0800
Subject: [PATCH] 请合并最新版代码

---
 ZigbeeApp/Home.Ios/AppDelegate.cs |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ZigbeeApp/Home.Ios/AppDelegate.cs b/ZigbeeApp/Home.Ios/AppDelegate.cs
index fc43236..0498c00 100644
--- a/ZigbeeApp/Home.Ios/AppDelegate.cs
+++ b/ZigbeeApp/Home.Ios/AppDelegate.cs
@@ -25,7 +25,9 @@
 
         public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
         {
-            //base.FinishedLaunching(application, launchOptions);
+            Shared.Application.IsGpsEnable = false;
+            Shared.Application.IsMusicEnable = false;
+            base.FinishedLaunching(application, launchOptions);
             Shared.Application.FontSize = 12;
             Shared.Application.IsUsePingFang = true;
             Window = new UIWindow(UIScreen.MainScreen.Bounds);
@@ -116,7 +118,7 @@
                         {
                             //寮哄埗涓嬬嚎
                             CommonPage.Instance.SingOut();
-                            CommonPage.Instance.ShowErrorInfoAlert(Shared.R.MyInternationalizationString.YouHaveBeenSignOut);
+                            CommonPage.Instance.ShowErrorInfoAlert(Shared.R.MyInternationalizationString.uHadBeenLoginAndOffLine);
                         }
                     }
                 }
@@ -206,7 +208,7 @@
             {
                 //寮哄埗涓嬬嚎
                 CommonPage.Instance.SingOut();
-                CommonPage.Instance.ShowErrorInfoAlert(Shared.R.MyInternationalizationString.YouHaveBeenSignOut);
+                CommonPage.Instance.ShowErrorInfoAlert(Shared.R.MyInternationalizationString.uHadBeenLoginAndOffLine);
             }
             //妫�鏌ヨ繛鎺ヨ繙绋�
             //浠g爜

--
Gitblit v1.8.0