From 37dc5f07121946aa03ce96030a9f400af032367d Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 16:00:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW' into NewFilePath

---
 HDL-ON_iOS/Info.plist                                                   |    4 ++++
 HDL-ON_iOS/Resources/Language.ini                                       |    2 +-
 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs |    1 +
 HDL-ON_Android/Assets/Language.ini                                      |    2 +-
 HDL-ON_iOS/AppDelegate.cs                                               |   38 +++++++++++++++++++++++++++++++++-----
 HDL-ON_Android/Application.cs                                           |    4 +++-
 6 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index 41c3685..06bf43d 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -49,7 +49,9 @@
 
             string[] permissions = new string[] { Manifest.Permission.WriteExternalStorage, Manifest.Permission.RecordAudio,
             Manifest.Permission.Camera, Manifest.Permission.ProcessOutgoingCalls, Manifest.Permission.GetAccounts};
-
+            //绂佹灞忓箷闀夸寒
+            BaseActivity.KeepScreenON = false;
+            //闅愯棌杩嫓铏氭嫙鎸夐敭
             BaseActivity.IsHideVirualButtons = true;
             init();
             BaseActivity.OnCreateActoin += (activity, application) =>
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 30fd22a..ccc45f1 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -549,7 +549,7 @@
 9040=鎶ヨ绫�
 9041=绯荤粺淇℃伅
 9042=淇℃伅涓績
-9043=璇ヨ处鍙峰凡鍦ㄥ叾瀹冭澶囩櫥褰�
+9043=鎮ㄧ殑璐﹀彿宸插湪鍒鐧诲綍锛屽鏋滀笉鏄偍鏈汉鎿嶄綔锛岃绔嬪嵆淇敼瀵嗙爜锛�
 9044=涓婁紶鎴愬姛
 9045=涓婁紶澶辫触
 9046=淇敼鎴愬姛!
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index 480e78e..860b509 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -165,7 +165,7 @@
         public override void OnResignActivation(UIApplication application)
         {
             Console.WriteLine("OnResignActivation");
-            UserInfo.Current.unlockTime = DateTime.Now;
+            OnAppConfig.Instance.unlockTime = DateTime.Now;
             HDL_ON.DriverLayer.UdpSocket._BusSocket.Stop();
         }
 
@@ -195,7 +195,7 @@
         {
             Console.WriteLine("OnActivated");
             base.OnActivated(application);
-            Console.WriteLine("oooo...");
+
             //if (haveToSignOut == true)
             //{
                 ////寮哄埗涓嬬嚎
@@ -211,8 +211,16 @@
         {
 
             //Shared.Application.FontSize = 12;
+
+            //鍙栨秷EditText榛樿瀵嗙爜杈撳叆鏂瑰紡
             Shared.Application.IsEditTextContentTypePassword = false;
+            //榛樿浣跨敤鑻规柟瀛椾綋
             Shared.Application.IsUsePingFang = true;
+            ////榛樿绂佹闊充箰鏈嶅姟
+            //Shared.Application.IsMusicEnable = false;
+            //淇濇寔灞忓箷甯镐寒鎴栬�呰嚜鍔ㄩ攣灞�
+            application.IdleTimerDisabled = false;
+
             Window = new UIWindow(UIScreen.MainScreen.Bounds);
             rootViewController = new UINavigationController(new ViewController()) { NavigationBarHidden = true };
             Window.RootViewController = rootViewController;
@@ -235,7 +243,7 @@
             //    OnAppConfig.Instance.SaveUserConfig();
             //}
 
-            application.IdleTimerDisabled = true;
+           
             application.RegisterForRemoteNotificationTypes(UIRemoteNotificationType.Alert | UIRemoteNotificationType.Badge | UIRemoteNotificationType.Sound);
 
             //window.AccessibilityNavigationStyle = UIAccessibilityNavigationStyle.Automatic;
@@ -287,8 +295,28 @@
                     var expandData = "";
                     if (userInfo.ContainsKey(new NSString("expandData")))
                     {
-                        var expandDataNSD = userInfo["expandData"] as NSDictionary;
-                        expandData = expandDataNSD["messageType"] as NSString;
+                        var expandDataStr = userInfo["expandData"] as NSString;
+                        if(expandDataStr == null)
+                        {
+                            var expandDataNSD = userInfo["expandData"] as NSDictionary;
+                            if (expandDataNSD != null)
+                            {
+                                expandData = expandDataNSD.ToString();
+                            }
+                        }
+                        else
+                        {
+                            expandData = expandDataStr;
+                        }
+
+                        //var expandDataNSD = userInfo["expandData"] as NSDictionary;
+                        //if (expandDataNSD != null && expandDataNSD is NSDictionary)
+                        //{
+                        //    if (expandDataNSD.ContainsKey(new NSString("messageType")))
+                        //    {
+                        //        expandData = expandDataNSD["messageType"] as NSString;
+                        //    }
+                        //}
                     }
                     var pushMes = new JPushMessageInfo()
                     {
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index c76ed24..ddbfaed 100755
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -115,5 +115,9 @@
 	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>zh_CN</string>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>remote-notification</string>
+	</array>
 </dict>
 </plist>
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 0536c30..8a8fe5c 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -557,7 +557,7 @@
 9040=鎶ヨ绫�
 9041=绯荤粺淇℃伅
 9042=淇℃伅涓績
-9043=璇ヨ处鍙峰凡鍦ㄥ叾瀹冭澶囩櫥褰�
+9043=鎮ㄧ殑璐﹀彿宸插湪鍒鐧诲綍锛屽鏋滀笉鏄偍鏈汉鎿嶄綔锛岃绔嬪嵆淇敼瀵嗙爜锛�
 9044=涓婁紶鎴愬姛
 9045=涓婁紶澶辫触
 9046=淇敼鎴愬姛!
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
index 7bddacf..bbb9828 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
@@ -102,6 +102,7 @@
                     BorderColor = 0x00000000,
                     BorderWidth = 0,
                     ScrollEnabled = false,
+                    VerticalScrollBarEnabled = false,//闅愯棌婊氬姩鏉�
                 };
                 contentView.AddChidren(sView);
                 #region 澶村儚淇℃伅

--
Gitblit v1.8.0