From d41f1d4a478c1afcc43f3a5abb0ba76e376bc7c1 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 09 三月 2021 15:23:25 +0800
Subject: [PATCH] 2
---
HDL-ON_Android/Application.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index 0cd6b6d..bb26507 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -57,11 +57,10 @@
Manifest.Permission.Camera, Manifest.Permission.ProcessOutgoingCalls, Manifest.Permission.GetAccounts};
//绂佹灞忓箷闀夸寒
BaseActivity.KeepScreenON = false;
- //闅愯棌杩嫓铏氭嫙鎸夐敭
+ //闅愯棌铏氭嫙鎸夐敭
BaseActivity.IsHideVirualButtons = true;
//瀹炵幇瀹夊崜杩斿洖鎸夐敭
BaseActivity.BackKeyAction = () => {
- MainPage.Log($"android鍚庨��");
try
{
var result = MainPage.LoadEvent_BackAction();
@@ -78,9 +77,9 @@
break;
}
}
- catch (System.Exception ezx)
+ catch (Exception ex)
{
- Console.WriteLine(ezx.Message);
+ Console.WriteLine(ex.Message);
}
};
@@ -93,6 +92,10 @@
if (localeList.Language == "zh")
{
Language.CurrentLanguage = "Chinese";
+ }
+ else
+ {
+ Language.CurrentLanguage = "English";
}
//鑾峰彇鏋佸厜鎺ㄩ�両D
@@ -374,7 +377,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