From 0fa1534827bd21d763216550d11006fc1441c6cb Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期五, 14 五月 2021 17:08:45 +0800
Subject: [PATCH] 门锁初始上传

---
 HDL-ON_Android/Application.cs |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index 2ba0094..01e7d43 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -33,7 +33,6 @@
         public override void OnCreate()
         {
             //娉ㄥ唽鏈鐞嗗紓甯镐簨浠�
-
             Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "cb89f20750");
             if (Shared.Application.Activity != null)
             {
@@ -47,6 +46,9 @@
             initAll();
 
         }
+
+
+
         /// <summary>
         /// 鎵�鏈夊垵濮嬪寲鍏ㄩ儴鍦ㄨ繖涓柟娉曞疄鐜�
         /// </summary>
@@ -57,10 +59,11 @@
             Manifest.Permission.Camera, Manifest.Permission.ProcessOutgoingCalls, Manifest.Permission.GetAccounts};
             //绂佹灞忓箷闀夸寒
             BaseActivity.KeepScreenON = false;
-            //闅愯棌杩嫓铏氭嫙鎸夐敭
+            //闅愯棌铏氭嫙鎸夐敭
             BaseActivity.IsHideVirualButtons = true;
             //瀹炵幇瀹夊崜杩斿洖鎸夐敭
-            BaseActivity.BackKeyAction = () => {
+            BaseActivity.BackKeyAction = () =>
+            {
                 try
                 {
                     var result = MainPage.LoadEvent_BackAction();
@@ -93,7 +96,12 @@
                 {
                     Language.CurrentLanguage = "Chinese";
                 }
-        
+                else
+                {
+                    Language.CurrentLanguage = "English";
+                }
+                Language.CurrentLanguage = "English";
+
                 //鑾峰彇鏋佸厜鎺ㄩ�両D
                 GetJPushRegistrationID(activity);
 
@@ -129,7 +137,8 @@
             BaseActivity.OnResumeAction += (activity) =>
             {
                 checkSomeInfo();
-                
+
+
             };
             BaseActivity.OnDestroyAction += (activity) =>
             {
@@ -138,7 +147,7 @@
                 //UserInfo.Current.unlockTime = DateTime.Now;
             };
 
-       
+
 
             HDLUtils.SetAuthoritiesName("com.hdl.onpro.fileProvider");
 
@@ -153,14 +162,14 @@
                     //鍏抽棴瀹氫綅鏈嶅姟
                     Shared.Application.StopGPSLocationService();
                 }
-                  catch(Exception ex)
+                catch (Exception ex)
                 {
-                    Utlis.WriteLine("GetCityInfo catch"+ ex.Message);
+                    Utlis.WriteLine("GetCityInfo catch" + ex.Message);
                 }
                 MainPage.Log($"缁忕含搴�:::{lon}:{lat}");
             };
 
-           
+
         }
 
         /// <summary>
@@ -169,8 +178,10 @@
         /// <param name="activity"></param>
         void GetJPushRegistrationID(BaseActivity activity)
         {
+
             try
             {
+
                 //淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠�
                 var tokenID = JPushInterface.GetRegistrationID(activity);
                 Console.WriteLine("RegistrationID:  " + tokenID);
@@ -360,7 +371,7 @@
             //杩涘叆鍚庡彴mqtt姝ｅ湪杩炴帴閲嶇疆鐘舵��
             HDL_ON.DAL.Mqtt.MqttClient.RemoteMqttIsConnecting = false;
             HDL_ON.DriverLayer.UdpSocket._BusSocket.Stop();
-           
+
         }
 
         /// <summary>
@@ -373,7 +384,7 @@
             if (CloseTime.AddSeconds(10) < DateTime.Now)
             {
                 //鍚庡彴瓒呰繃10s灏辨柇寮�MQTT閲嶈繛
-                if (HDL_ON.DriverLayer.Control.Ins.IsRemote)
+                //if (HDL_ON.DriverLayer.Control.Ins.IsRemote)
                 {
                     HDL_ON.DAL.Mqtt.MqttClient.DisConnectRemote("closeTime", false);
                 }

--
Gitblit v1.8.0