From fe2b566c8d9c097d2568ad211088fa5bc6f8c229 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 23 三月 2021 13:48:25 +0800
Subject: [PATCH] 2.增加住宅绑定网关判断，没有绑定网关的住宅，ON+不再显示

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

diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index 0cd6b6d..4f9f009 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -28,12 +28,11 @@
             application.StartActivity(intent);
             Android.OS.Process.KillProcess(Android.OS.Process.MyPid());
         }
-
+        
         public Application(IntPtr handle, Android.Runtime.JniHandleOwnership ownerShip) : base(handle, ownerShip) { }
         public override void OnCreate()
         {
             //娉ㄥ唽鏈鐞嗗紓甯镐簨浠�
-
             Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "cb89f20750");
             if (Shared.Application.Activity != null)
             {
@@ -47,6 +46,7 @@
             initAll();
 
         }
+
         /// <summary>
         /// 鎵�鏈夊垵濮嬪寲鍏ㄩ儴鍦ㄨ繖涓柟娉曞疄鐜�
         /// </summary>
@@ -57,11 +57,11 @@
             Manifest.Permission.Camera, Manifest.Permission.ProcessOutgoingCalls, Manifest.Permission.GetAccounts};
             //绂佹灞忓箷闀夸寒
             BaseActivity.KeepScreenON = false;
-            //闅愯棌杩嫓铏氭嫙鎸夐敭
+            //闅愯棌铏氭嫙鎸夐敭
             BaseActivity.IsHideVirualButtons = true;
             //瀹炵幇瀹夊崜杩斿洖鎸夐敭
-            BaseActivity.BackKeyAction = () => {
-                MainPage.Log($"android鍚庨��");
+            BaseActivity.BackKeyAction = () =>
+            {
                 try
                 {
                     var result = MainPage.LoadEvent_BackAction();
@@ -78,9 +78,9 @@
                             break;
                     }
                 }
-                catch (System.Exception ezx)
+                catch (Exception ex)
                 {
-                    Console.WriteLine(ezx.Message);
+                    Console.WriteLine(ex.Message);
                 }
             };
 
@@ -94,7 +94,11 @@
                 {
                     Language.CurrentLanguage = "Chinese";
                 }
-        
+                else
+                {
+                    Language.CurrentLanguage = "English";
+                }
+
                 //鑾峰彇鏋佸厜鎺ㄩ�両D
                 GetJPushRegistrationID(activity);
 
@@ -130,7 +134,7 @@
             BaseActivity.OnResumeAction += (activity) =>
             {
                 checkSomeInfo();
-                
+
             };
             BaseActivity.OnDestroyAction += (activity) =>
             {
@@ -139,7 +143,7 @@
                 //UserInfo.Current.unlockTime = DateTime.Now;
             };
 
-       
+
 
             HDLUtils.SetAuthoritiesName("com.hdl.onpro.fileProvider");
 
@@ -154,14 +158,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>
@@ -170,6 +174,7 @@
         /// <param name="activity"></param>
         void GetJPushRegistrationID(BaseActivity activity)
         {
+          
             try
             {
                 //淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠�
@@ -374,7 +379,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