From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Common/CommonPage.cs | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
old mode 100755
new mode 100644
index 6ea9f15..6211aa3
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -45,7 +45,8 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string CodeIDString = "1.1.0121011401";
+ //public static string CodeIDString = "1.1.0121070801";
+ public static string CodeIDString = "1.2.1";
/// <summary>
/// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
/// </summary>
@@ -308,6 +309,17 @@
}
}
}
+ }
+
+ //娓呴櫎瑙掓爣鏁板��
+ public void clearBadgeNum()
+ {
+ try
+ {
+ //this.RequestHttpsZigbeeResultAsync("ZigbeeUsers/CornerClear", null, 10);
+ this.RequestHttpsZigbeeBytesResultAsync("ZigbeeUsers/CornerClear", null, "GET", 10);
+ }
+ catch { }
}
/// <summary>
@@ -318,8 +330,12 @@
try
{
Application.RunOnMainThread(() =>
- {
- //璁惧畾涓�涓椂闂�
+ {
+#if iOS
+ //鍏ㄨ閫氶��鍑虹櫥褰�
+ Shared.IOS.HDLFVSDK.Video.Logout();
+#endif
+ //璁惧畾涓�涓椂闂�
Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
Config.Instance.Save();
CommonPage.Instance.RemoveAll();
@@ -358,10 +374,10 @@
/// <returns>杩斿洖鐘舵�佺爜</returns>
public string PushRegID()
{
-#if DEBUG
- //璋冭瘯涓嶉渶瑕佸彂閫佽繖涓笢瑗�
- return null;
-#endif
+//#if DEBUG
+// //璋冭瘯涓嶉渶瑕佸彂閫佽繖涓笢瑗�
+// return null;
+//#endif
try
{
string deviceAlias;
@@ -381,6 +397,7 @@
DeviceType = deviceType
};
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(RegIDObj);
+ Console.WriteLine(requestJson);
var reverObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/SignZigbeeNeedPushRegID", System.Text.Encoding.UTF8.GetBytes(requestJson), 4);
if (reverObj == null)
{
--
Gitblit v1.8.0