From 98d002e55304e5c8ff13b7cd195920975bef69f5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 23 二月 2021 17:16:57 +0800
Subject: [PATCH] Merge branch 'CJL' into temp-wxr
---
HDL-ON_Android/Application.cs | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index 0cd6b6d..cf6dae2 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -61,7 +61,6 @@
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