From fb1d2ee8a53c56dbb22f38fccb83335fd489456f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 十二月 2020 11:33:56 +0800
Subject: [PATCH] Merge branch 'CJL-NEW' into NewFilePath

---
 HDL-ON_iOS/AppDelegate.cs |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index a83a710..4ddbb7d 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -166,7 +166,7 @@
         {
             Console.WriteLine("OnResignActivation");
             OnAppConfig.Instance.unlockTime = DateTime.Now;
-            //BusSocket.Stop();
+            HDL_ON.DriverLayer.UdpSocket._BusSocket.Stop();
         }
 
         public override void DidEnterBackground(UIApplication application)
@@ -179,10 +179,11 @@
         public override void WillEnterForeground(UIApplication application)
         {
             SharedMethod.SharedMethod.IsBackground = false;
-            //BusSocket.Start();
+            HDL_ON.DriverLayer.UdpSocket._BusSocket.Start();
             new AppUnlockPage().LoadPage();
             Console.WriteLine("WillEnterForeground");
             UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0;
+            HDL_ON.DriverLayer.Control.Ins.SearchLoaclGateway();
         }
 
         public override void WillTerminate(UIApplication application)
@@ -210,7 +211,14 @@
         {
 
             //Shared.Application.FontSize = 12;
+
+            //鍙栨秷EditText榛樿瀵嗙爜杈撳叆鏂瑰紡
+            Shared.Application.IsEditTextContentTypePassword = false;
+            //榛樿浣跨敤鑻规柟瀛椾綋
             Shared.Application.IsUsePingFang = true;
+            ////榛樿绂佹闊充箰鏈嶅姟
+            //Shared.Application.IsMusicEnable = false;
+
             Window = new UIWindow(UIScreen.MainScreen.Bounds);
             rootViewController = new UINavigationController(new ViewController()) { NavigationBarHidden = true };
             Window.RootViewController = rootViewController;

--
Gitblit v1.8.0