From 0c1e29166e6b188939c092d16f87ce2a27662c5f Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期五, 26 三月 2021 10:11:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy
---
HDL-ON_iOS/AppDelegate.cs | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index 0f88d41..0efe330 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -202,7 +202,7 @@
{
Console.WriteLine("OnActivated");
base.OnActivated(application);
- HDL_ON.DriverLayer.Control.Ins.SearchLoaclGateway();
+ //HDL_ON.DriverLayer.Control.Ins.SearchLoaclGateway();
//if (haveToSignOut == true)
//{
@@ -218,10 +218,10 @@
public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
{
//Shared.Application.FontSize = 12;
- Bugly.Bugly.StartWithAppId("b58fb35436");
+ //Bugly.Bugly.StartWithAppId("b58fb35436");
//鍙栨秷EditText榛樿瀵嗙爜杈撳叆鏂瑰紡
- Shared.Application.IsEditTextContentTypePassword = false;
+ //Shared.Application.IsEditTextContentTypePassword = false;
//榛樿浣跨敤鑻规柟瀛椾綋
Shared.Application.IsUsePingFang = true;
//淇濇寔灞忓箷甯镐寒鎴栬�呰嚜鍔ㄩ攣灞�
@@ -232,7 +232,8 @@
Window.RootViewController = rootViewController;
Window.MakeKeyAndVisible();
- //AppCenter.Start("e1add75a-82c6-4a5c-a902-4705b195748e",typeof(Analytics), typeof(Crashes));
+ AppCenter.Start("e1add75a-82c6-4a5c-a902-4705b195748e", typeof(Analytics), typeof(Crashes));
+
base.FinishedLaunching(application, launchOptions);
SharedMethod.SharedMethod.sharedApp = application;
@@ -281,6 +282,11 @@
//Harpy.Harpy.SharedInstance.AlertType = Harpy.HarpyAlertType.Skip;
//Harpy.Harpy.SharedInstance.DebugEnabled = false;
//Harpy.Harpy.SharedInstance.ForceLanguageLocalization = Harpy.Constants.HarpyLanguageChineseSimplified;
+
+ //涓枃鍥藉唴key銆佽嫳鏂囨捣澶杒ey
+ EZSDK.IOS.EZSDK.InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
+
+
Console.WriteLine("FinishedLaunching");
return true;
}
@@ -329,9 +335,9 @@
Extras = expandData,
messageType = messageType
};
- System.Console.WriteLine("PushMes title : " + pushMes.Title);
- System.Console.WriteLine("PushMes message : " + pushMes.Content);
- System.Console.WriteLine("PushMes extras : " + pushMes.Extras);
+ Utlis.WriteLine("PushMes title : " + pushMes.Title);
+ Utlis.WriteLine("PushMes message : " + pushMes.Content);
+ Utlis.WriteLine("PushMes extras : " + pushMes.Extras);
if (bFinishedLaunching)
{
@@ -414,7 +420,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