From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/GateWay.Droid/Application.cs | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Application.cs b/ZigbeeApp/GateWay.Droid/Application.cs
index 71da5ff..163796e 100755
--- a/ZigbeeApp/GateWay.Droid/Application.cs
+++ b/ZigbeeApp/GateWay.Droid/Application.cs
@@ -104,7 +104,7 @@
catch (Exception ex)
{
//璋冭瘯:璁板綍绯荤粺寮傚父
- Shared.Phone.HdlLogLogic.Current.WriteOtherText(Shared.Phone.HdlFileNameResourse.LogDirectory, ex.Message + "\r\n" + ex.StackTrace, true, false);
+ Shared.Phone.UserCenter.HdlLogLogic.Current.WriteOtherText(Shared.Phone.UserCenter.DirNameResourse.SystemLogFile, ex.Message + "\r\n" + ex.StackTrace, true, false);
}
base.OnCreate();
// 閫氳繃WXAPIFactory宸ュ巶锛岃幏鍙朓WXAPI鐨勫疄渚�
@@ -175,7 +175,7 @@
{
try
{
- if (Shared.Common.Config.Instance.BackKeyCanClick == false)
+ if (Shared.Common.CommonPage.BackKeyCanClick == false)
{
//涓嶅厑璁告寜杩斿洖閿�
return;
@@ -225,21 +225,17 @@
{
Shared.Application.FontSize = 12;
AppCenter.Start("4802834a-e7e9-4dd8-93f1-c2f88f0bd464", typeof(Analytics), typeof(Crashes));
-#if DEBUG
- //娴嬭瘯ID,鐬庡啓鐨�
- Shared.Common.Config.Instance.RegistrationID = "93f1c2f88f0bd464";
-#endif
-#if Release
- //淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠�
- var registrationId = JPushInterface.GetRegistrationID(activity);
+#if Release
+ //淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠�
+ var registrationId = JPushInterface.GetRegistrationID(activity);
System.Console.WriteLine("registrationId-鏋佸厜id=" + registrationId);
- if (!string.IsNullOrEmpty(registrationId))
- {
- Shared.Common.Config.Instance.RegistrationID = registrationId;
- Shared.Common.Config.Instance.Save();
- }
- //璋冭瘯:璁板綍鏋佸厜ID
- Shared.Phone.UserCenter.HdlLogLogic.Current.WriteOtherText(Shared.Phone.UserCenter.DirNameResourse.JiguangFile, "receive1:" + registrationId, true, true);
+ if (!string.IsNullOrEmpty(registrationId))
+ {
+ Shared.Common.Config.Instance.RegistrationID = registrationId;
+ Shared.Common.Config.Instance.Save();
+ }
+ //璋冭瘯:璁板綍鏋佸厜ID
+ Shared.Phone.UserCenter.HdlLogLogic.Current.WriteOtherText(Shared.Phone.UserCenter.DirNameResourse.JiguangFile, "receive1:" + registrationId, true, true);
#endif
};
BaseActivity.RefreshUIAction += (activity) =>
@@ -379,6 +375,7 @@
if (!string.IsNullOrEmpty(regId))
{
Shared.Common.Config.Instance.RegistrationID = regId;
+ Shared.Common.Config.Instance.Save();
}
#if Release
//璋冭瘯:璁板綍鏋佸厜ID
@@ -427,7 +424,7 @@
System.Console.WriteLine(TAG, "extras : " + extras);
//澶勭悊鏋佸厜娑堟伅鎺ㄩ�佺殑閫昏緫鍑芥暟
- Shared.Phone.HdlJiguangMsgPushLogic.Current.AdjustJiguangMsgPush(title, message, extras);
+ Shared.Phone.UserCenter.HdlJiguangMsgPushLogic.Current.AdjustJiguangMsgPush(title, message, extras);
}
/// <summary>
/// 鎵撳紑娑堟伅鏄剧ず鐣岄潰
--
Gitblit v1.8.0