From 2029e64ec0491f7e511dc15bffaf821bfbabe2de Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期一, 20 七月 2020 14:10:22 +0800 Subject: [PATCH] 上传一个很特别的新版本 --- ZigbeeApp/Shared/Common/CommonPage.cs | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs index 6acd388..5e1036d 100755 --- a/ZigbeeApp/Shared/Common/CommonPage.cs +++ b/ZigbeeApp/Shared/Common/CommonPage.cs @@ -42,7 +42,7 @@ /// <summary> /// 鐗堟湰鍙� /// </summary> - public static string CodeIDString = "1.1.0120071301"; + public static string CodeIDString = "1.1.0120071701"; /// <summary> /// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee) /// </summary> @@ -355,6 +355,10 @@ /// <returns>杩斿洖鐘舵�佺爜</returns> public string PushRegID() { +#if DEBUG + //璋冭瘯涓嶉渶瑕佸彂閫佽繖涓笢瑗� + return null; +#endif try { string deviceAlias; @@ -364,8 +368,9 @@ deviceType = "iphone"; #elif Android deviceAlias = Android.OS.Build.Manufacturer; - deviceType = "android"; -#endif + deviceType = "android"; +#endif + var RegIDObj = new SendDataToServer.SignZigbeeNeedPushRegIDObj() { RegID = Shared.Common.Config.Instance.RegistrationID, @@ -375,9 +380,14 @@ var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(RegIDObj); var reverObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/SignZigbeeNeedPushRegID", System.Text.Encoding.UTF8.GetBytes(requestJson)); if (reverObj == null) - { + { + //璋冭瘯:璁板綍鏋佸厜ID + Phone.UserCenter.HdlLogLogic.Current.WriteOtherText(Shared.Phone.UserCenter.DirNameResourse.JiguangFile, "send:" + RegIDObj.RegID + " fail,receive obj is null", false, true); return null; - } + } + //璋冭瘯:璁板綍鏋佸厜ID + Phone.UserCenter.HdlLogLogic.Current.WriteOtherText(Shared.Phone.UserCenter.DirNameResourse.JiguangFile, "send:" + RegIDObj.RegID + " result:" + reverObj.StateCode, false, true); + return reverObj.StateCode; } catch -- Gitblit v1.8.0