From df8d4ab0ef17a7fab5dea9c47bbd9f4d4a2a40b0 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 15 三月 2021 14:55:49 +0800
Subject: [PATCH] 合并前上传一个版本
---
HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs | 88 ++++++++++++++++++++++++++++++++++---------
1 files changed, 69 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs
index 490f4a8..de75ae9 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs
@@ -61,12 +61,9 @@
//杩欎釜鐣岄潰鐨勮儗鏅渶瑕佺櫧鑹�
bodyFrameLayout.BackgroundColor = UI.CSS.CSS_Color.MainBackgroundColor;
-#if __IOS__
-#endif
-#if __Android__
//娣诲姞鎺ユ敹钃濈墮鍙嶉鐨勪簨浠�
- HdlAndroidBluetoothLogic.Current.AddReceiveEvent(this.BluetoothReceiveEvent);
-#endif
+ HdlBluetoothLogic.Current.AddReceiveEvent(this.BluetoothReceiveEvent);
+
//娣诲姞浜戠鍙嶉浜嬩欢
HdlCloudReceiveLogic.Current.AddCloudReceiveEvent("AddMiniRemoteControlDirection4Page", this.CloudReceiveEvent);
@@ -255,7 +252,9 @@
btnReDo.ButtonClickEvent += (sender, e) =>
{
//閲嶆柊鍒濆鍖栦腑閮ㄤ俊鎭�
- this.InitMiddleFrame();
+ this.CloseForm();
+ var form = new AddMiniRemoteControlDirection2Page();
+ form.AddForm(this.wifiName, this.wifiPsw);
};
}
@@ -268,14 +267,63 @@
/// </summary>
private void SendAccountAndPswToBluetooth()
{
-#if __IOS__
-#endif
-#if __Android__
//鑾峰彇鍙戦�佸埌钃濈墮鐨勬暟鎹�
var sendData = this.GetSendToBluetoothData();
//涓嶇瓑寰�
- HdlAndroidBluetoothLogic.Current.SendData(sendData);
-#endif
+ HdlBluetoothLogic.Current.SendData(sendData);
+ }
+
+ #endregion
+
+ #region 鈻� 绾㈠瀹濈浉鍏虫柟娉昣____________________
+
+ /// <summary>
+ /// 妫�娴嬫槸鍚︽槸鏂扮殑绾㈠瀹�
+ /// </summary>
+ /// <param name="pushEnum">鎺ㄩ�佹灇涓�</param>
+ /// <param name="i_data">鎺ㄩ�佺殑鏁版嵁</param>
+ /// <returns></returns>
+ private bool CheckIsNewMiniRemoteControl(CloudPushEnum pushEnum, string i_data)
+ {
+ if (pushEnum != CloudPushEnum.A鏂拌澶囦笂鎶�) { return false; }
+
+ try
+ {
+ var strSpk = string.Empty;
+ //杞负json
+ var json = Newtonsoft.Json.Linq.JObject.Parse(i_data);
+ var linqArry = json["objects"] as Newtonsoft.Json.Linq.JArray;
+ if (linqArry != null)
+ {
+ //鏁扮粍绫诲瀷
+ if (linqArry.Count == 0) { return false; }
+ strSpk = linqArry[0]["spk"].ToString();
+ }
+ else
+ {
+ //闈炴暟缁勭被鍨�
+ strSpk = json["objects"]["spk"].ToString();
+ }
+ if (strSpk != Entity.SPK.IrModule)
+ {
+ //濡傛灉涓嶆槸绾㈠瀹濈殑璇�
+ return false;
+ }
+ return true;
+ }
+ catch { return false; }
+ }
+
+ /// <summary>
+ /// 鍒锋柊绾㈠瀹濅俊鎭�
+ /// </summary>
+ private void RefreshMiniRemoteControlInfo()
+ {
+ var pra = new Dictionary<string, object>();
+ pra.Add("homeId", Entity.DB_ResidenceData.Instance.CurrentRegion.RegionID);
+
+ var requestJson = DAL.Server.HttpUtil.GetSignRequestJson(pra);
+ DAL.Server.HttpUtil.RequestHttpsPostFroHome(DAL.Server.NewAPI.Api_Post_GetDevcieList, requestJson);
}
#endregion
@@ -289,7 +337,13 @@
/// <param name="i_data">鎺ㄩ�佺殑鍐呭</param>
private void CloudReceiveEvent(CloudPushEnum pushEnum, string i_data)
{
- if (pushEnum != CloudPushEnum.A鏂拌澶囦笂鎶�) { return; }
+ //妫�娴嬫槸鍚︽槸鏂扮殑绾㈠瀹�
+ if (this.CheckIsNewMiniRemoteControl(pushEnum, i_data) == false)
+ {
+ return;
+ }
+ //鍒锋柊绾㈠瀹濅俊鎭�
+ this.RefreshMiniRemoteControlInfo();
//鎺ユ敹鍒板氨绉婚櫎杩欎釜浜嬩欢
HdlCloudReceiveLogic.Current.RemoveCloudReceiveEvent("AddMiniRemoteControlDirection4Page");
@@ -367,8 +421,8 @@
{
HdlThreadLogic.Current.RunThread(() =>
{
- //300绉掕秴鏃�
- int timeout = 300;
+ //360绉掕秴鏃�
+ int timeout = 360;
while (this.timeoutThreadActivity == false && this.Parent != null)
{
System.Threading.Thread.Sleep(1000);
@@ -399,11 +453,7 @@
public override void CloseFormBefore()
{
//鎽ф瘉钃濈墮
-#if __IOS__
-#endif
-#if __Android__
- HdlAndroidBluetoothLogic.Current.Dispone();
-#endif
+ HdlBluetoothLogic.Current.Dispone();
HdlCloudReceiveLogic.Current.RemoveCloudReceiveEvent("AddMiniRemoteControlDirection4Page");
base.CloseFormBefore();
--
Gitblit v1.8.0