From 94bed925cf453e148bc5a7556a8a86e0bcb9ad6c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 24 三月 2021 14:11:16 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs | 208 +++++++++++++++++++++++----------------------------
1 files changed, 95 insertions(+), 113 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs
index e62c484..9236d52 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs
@@ -8,6 +8,39 @@
{
public class Method
{
+
+ /// <summary>
+ /// 绾㈠瀹濈▼搴忎富鍏ュ彛
+ /// </summary>
+ /// <param name="frame"></param>
+ /// <param name="function"></param>
+ public void MainView(FrameLayout frame, Entity.Function function,Action action)
+ {
+ Pir pirDevice = new Pir();
+ if (function != null)
+ {//鏁版嵁杞崲
+ pirDevice.name = function.name;
+ pirDevice.deviceId = function.deviceId;
+ pirDevice.sid = function.sid;
+ pirDevice.online = function.online;
+ pirDevice.versions = function.versions;
+ }
+ Pir.currPir = pirDevice;
+ GetControlList(frame, () =>
+ {
+ Application.RunOnMainThread(() =>
+ {
+ var page = new PirMain();
+ MainPage.BasePageView.AddChidren(page);
+ page.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ PirMain.BackAction += () =>
+ {
+ action?.Invoke();
+ };
+ });
+ }, Pir.currPir);
+ }
/// <summary>
/// 绠＄悊浣嶇疆
@@ -181,25 +214,10 @@
var pirJosn = Newtonsoft.Json.JsonConvert.DeserializeObject<Pir>(str);
if (pirJosn != null)
{
-
-/* 椤圭洰鈥淗DL-ON_iOS鈥濈殑鏈悎骞剁殑鏇存敼
-鍦ㄦ涔嬪墠:
- if (null == Pir.pirDeviceList.Find((c) => c.deviceId == pirJosn.deviceId))
-鍦ㄦ涔嬪悗:
- if (null == list.pirDeviceList.Find((c) => c.deviceId == pirJosn.deviceId))
-*/
+
if (null == PirDevice.Pir.pirDeviceList.Find((c) => c.deviceId == pirJosn.deviceId))
- {
-
-
-/* 椤圭洰鈥淗DL-ON_iOS鈥濈殑鏈悎骞剁殑鏇存敼
-鍦ㄦ涔嬪墠:
- Pir.pirDeviceList.Add(pirJosn);
-鍦ㄦ涔嬪悗:
- list.pirDeviceList.Add(pirJosn);
-*/
+ {
PirDevice.Pir.pirDeviceList.Add(pirJosn);
-
}
}
}
@@ -241,7 +259,7 @@
}
/// <summary>
- /// 鑾峰彇閬ユ帶鍣ㄥ垪琛�
+ /// 鑾峰彇鎵�鏈夌孩澶栧疂閬ユ帶鍣ㄥ垪琛�
/// </summary>
/// <param name="action">鍥炶皟鍑芥暟</param>
public static void GetControlList(Action action)
@@ -256,7 +274,7 @@
var pirDevice = Pir.pirDeviceList[i];
try
{
- var responsePackNew = PirSend.ControlList(pirDevice);
+ var responsePackNew = PirSend.ControlList(pirDevice.deviceId);
if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
{
var jArray = JArray.Parse(responsePackNew.Data.ToString());
@@ -296,6 +314,34 @@
{ IsBackground = true }.Start();
}
+
+ /// <summary>
+ /// 鑾峰彇鍗曚釜绾㈠瀹濋仴鎺у櫒鍒楄〃
+ /// </summary>
+ /// <param name="action">鍥炶皟鍑芥暟</param>
+ public static void GetControlList(FrameLayout frame, Action action, Pir pirDevice)
+ {
+ ThreadSend(new Control { deviceId = pirDevice.deviceId }, (responsePackNew) =>
+ {
+ var jArray = JArray.Parse(responsePackNew.Data.ToString());
+ for (int a = 0; a < jArray.Count; a++)
+ {
+ var jay = jArray[a];
+ //鏁版嵁杩斿簭鍒楀寲涓篖ogic瀵硅薄
+ var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay);
+ var pirJosn = Newtonsoft.Json.JsonConvert.DeserializeObject<Entity.Function>(str);
+ if (pirJosn != null)
+ {
+ if (null == pirDevice.FunctioList.Find((c) => c.deviceId == pirJosn.deviceId))
+ {
+ pirDevice.FunctioList.Add(pirJosn);
+ }
+ }
+ }
+ action();
+ }, "鑾峰彇閬ユ帶鍣ㄥ垪琛�", "frame", frame, null);
+
+ }
/// <summary>
/// 鑾峰彇璁惧璇︽儏閫氳繃(spk,sid)
/// </summary>
@@ -304,113 +350,40 @@
/// <param name="action">鍥炶皟鍑芥暟</param>
public void GetControl(FrameLayout frame, Control control, Action<Entity.Function> action)
{
- Entity.Function function = null;
- //鍔犺浇log
- Loading loading = new Loading();
- frame.AddChidren(loading);
- loading.Start();
- new System.Threading.Thread(() =>
+ ThreadSend(control, (responsePackNew) =>
{
- try
- {
- // 鑾峰彇璁惧璇︽儏閫氳繃(spk,sid)
- var responsePackNew = PirSend.GetinfoBySid(control);
- if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
- {
- //var str = Newtonsoft.Json.JsonConvert.SerializeObject(responsePackNew.Data.ToString());
- function = Newtonsoft.Json.JsonConvert.DeserializeObject<Entity.Function>(responsePackNew.Data.ToString());
- }
- }
- catch { }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- loading.Hide();
- action(function);
- });
- }
-
- })
- { IsBackground = true }.Start();
+ var function = Newtonsoft.Json.JsonConvert.DeserializeObject<Entity.Function>(responsePackNew.Data.ToString());
+ action(function);
+ }, "鑾峰彇璁惧璇︽儏", "frame", frame, null);
}
-
/// <summary>
/// 鍙戦�佸懡浠ょ嚎绋�
/// </summary>
/// <param name="control">鍙戦�佹暟鎹璞�</param>
/// <param name="action">鍥炶皟鍑芥暟</param>
/// <param name="str">鍒ゆ柇瀛楃</param>
+ /// <param name="view">鍒ゆ柇log鐖舵帶浠�</param>
/// <param name="frame">log鐖舵帶浠�</param>
- public void ThreadSend(Control control, Action<ResponsePackNew> action, string str, FrameLayout frame)
+ /// <param name="dialog">log鐖舵帶浠�</param>
+ public static void ThreadSend(Control control, Action<ResponsePackNew> action, string str,string view, FrameLayout frame, Dialog dialog)
{
//鍔犺浇log
Loading loading = new Loading();
- frame.AddChidren(loading);
+ if (view == "dialog")
+ {
+ dialog.AddChidren(loading);
+ }
+ else
+ {
+ frame.AddChidren(loading);
+ }
loading.Start();
ResponsePackNew responsePackNew = null;
new System.Threading.Thread(() =>
{
try
{
- if (str == "鍒犻櫎")
- {
- responsePackNew = PirSend.DeleteDevice(control.deviceId);
- }
- else if (str == "淇敼鍚嶇О")
- {
-
- responsePackNew = PirSend.DeviceRename(control.deviceId, control.name);
- }
- else if (str == "鍒犻櫎鎸夐敭") {
- // responsePackNew = PirSend.CodeRemove(control.deviceId, control.name);
- }
- }
- catch { }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- loading.Hide();
- if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
- {
- action(responsePackNew);
- }
- else
- {
- Method method = new Method();
- method.ErrorShow(responsePackNew, "");
- }
-
- });
- }
-
- })
- { IsBackground = true }.Start();
-
-
- }
- /// <summary>
- /// 鍙戦�佸懡浠ょ嚎绋�
- /// </summary>
- /// <param name="control">鍙戦�佹暟鎹璞�</param>
- /// <param name="action">鍥炶皟鍑芥暟</param>
- /// <param name="str">鍒ゆ柇瀛楃</param>
- /// <param name="dialog">log鐖舵帶浠�</param>
- public void ThreadSend(Control control, Action<ResponsePackNew> action, string str,Dialog dialog)
- {
- //鍔犺浇log
- Loading loading = new Loading();
- dialog.AddChidren(loading);
- ResponsePackNew responsePackNew = null;
- loading.Start();
- new System.Threading.Thread(() =>
- {
- try
- {
-
-
if (str == "鍒犻櫎")
{
responsePackNew = PirSend.DeleteDevice(control.deviceId);
@@ -422,7 +395,16 @@
}
else if (str == "鍒犻櫎鎸夐敭")
{
- // responsePackNew = PirSend.CodeRemove(control.deviceId, control.name);
+ // responsePackNew = PirSend.CodeRemove(control.deviceId, control.name);
+ }
+ else if (str == "鑾峰彇璁惧璇︽儏")
+ {
+ // 鑾峰彇璁惧璇︽儏閫氳繃(spk,sid)
+ responsePackNew = PirSend.GetinfoBySid(control);
+ }
+ else if (str == "鑾峰彇閬ユ帶鍣ㄥ垪琛�")
+ {
+ responsePackNew = PirSend.ControlList(control.deviceId);
}
}
catch { }
@@ -480,7 +462,7 @@
str = buttondata;
}
- if (!string.IsNullOrEmpty(controldata))
+ if (!string.IsNullOrEmpty(str))
{
try
{
@@ -520,7 +502,7 @@
}
else if (text == "璇诲彇绾㈠瀹濆垪琛ㄥけ璐�")
{
- str = "璇诲彇绾㈠瀹濆垪琛ㄥけ璐�"; //Language.StringByID(StringId.delFail);
+ str = Language.StringByID(StringId.huoqushujushibao);
}
else
{
@@ -538,19 +520,19 @@
break;
case "10807":
{
- str = "绾㈠瀹濅笅閬ユ帶鍣ㄨ秴杩囨渶澶�(10涓�)鏁伴噺闄愬埗";// Language.StringByID(StringId.gatewayNotOnline);
+ str = Language.StringByID(StringId.bunengchaoguo10);
}
break;
case "2":
{
- str = "绯荤粺缁存姢涓瓇璇风◢鍚庡啀璇晘";
+ str = Language.StringByID(StringId.xitongweihuzhong);
}
break;
default:
{
- str ="鑾峰彇鏁版嵁澶辫触" ;// Language.StringByID(StringId.saveFail);
+ str = Language.StringByID(StringId.huoqushujushibao);
}
break;
--
Gitblit v1.8.0