From b8bdf52ccc38e3c6b0a95c2b60f59fc99dc546fd Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期四, 22 四月 2021 09:25:06 +0800
Subject: [PATCH] 2021-4-22 对接乐橙可视对讲
---
HDL-ON_Android/Application.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index 2ba0094..c68939a 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -57,7 +57,7 @@
Manifest.Permission.Camera, Manifest.Permission.ProcessOutgoingCalls, Manifest.Permission.GetAccounts};
//绂佹灞忓箷闀夸寒
BaseActivity.KeepScreenON = false;
- //闅愯棌杩嫓铏氭嫙鎸夐敭
+ //闅愯棌铏氭嫙鎸夐敭
BaseActivity.IsHideVirualButtons = true;
//瀹炵幇瀹夊崜杩斿洖鎸夐敭
BaseActivity.BackKeyAction = () => {
@@ -92,6 +92,10 @@
if (localeList.Language == "zh")
{
Language.CurrentLanguage = "Chinese";
+ }
+ else
+ {
+ Language.CurrentLanguage = "English";
}
//鑾峰彇鏋佸厜鎺ㄩ�両D
@@ -215,9 +219,9 @@
{
//鎵嬫満鍚嶇О Android.OS.Build.Manufacturer;
//OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
-#if DEBUG
- CN.Jpush.Android.Api.JPushInterface.SetDebugMode(true);
-#endif
+//#if DEBUG
+ //CN.Jpush.Android.Api.JPushInterface.SetDebugMode(true);
+//#endif
CN.Jpush.Android.Api.JPushInterface.Init(this);
}
@@ -373,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