From 3e286ae4d9a23674674f9ad12573e7e7911f2dfb Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 17 三月 2021 18:00:48 +0800
Subject: [PATCH] 备份代码
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs | 56 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
index 077b5f8..908d600 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
@@ -11,14 +11,23 @@
{
Tag = "PirView";
}
- public void Show(List<Library> libraryList,string spk)
+
+ public void Show(List<Brand> brandList,List<Library> libraryList,string spk)
{
+
+
#region 鐣岄潰甯冨眬
this.BackgroundColor = CSS.CSS_Color.viewMiddle;
PirDevice.View.TopView topView = new View.TopView();
topView.topNameBtn.TextID = StringId.pipeiyaokongqi;
this.AddChidren(topView.FLayoutView());
- topView.clickBackBtn.MouseUpEventHandler += (sender, e) => { this.RemoveFromParent(); };
+ topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ BrandList brandObj = new BrandList();
+ brandObj.Show(brandList, spk);
+ this.RemoveFromParent();
+
+ };
FrameLayout fLayout = new FrameLayout
{
@@ -140,10 +149,12 @@
fLayout.AddChidren(succeedBtn);
#endregion
#region 鐐瑰嚮浜嬩欢
- //琛ㄧず搴撳垪琛ㄧ储寮曞��
- int index= 1;
- //琛ㄧず娴嬭瘯鐮佺储寮曞��
+ //琛ㄧず搴撳垪琛ㄧ储寮曞��(鐩墠鍙�20涓簱)
+ int index = 1;
+ //琛ㄧず娴嬭瘯鐮佺储寮曞��(鐩墠鍙祴璇�3涓爜)
int code = 1;
+ //琛ㄧず娴嬭瘯鏈�鍚庝竴涓爜锛�
+ bool if_bool = false;
//宸�
leftIconBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -165,22 +176,31 @@
code = 1;
GetBtnText(testBtn, code, spk);
};
+
//娴嬭瘯Text
testBtn.MouseUpEventHandler += (sender, e) =>
{
var library = libraryList[index];
var control = GetControl(spk, testBtn.TextID, library);
+ //鍙戦�佹祴璇曠爜鍛戒护
CodeTest(control);
+ if (code == 3) {
+ //鏍囪鏈�鍚庨偅涓爜
+ if_bool = true;
+ }
};
//鎺у埗澶辫触
failedBtn.MouseUpEventHandler += (sender, e) =>
{
if (index < 20)
{
+ //鍏堝姞
index++;
+ //鏇存柊鏂囨湰
sumBtn.Text = "(" + index.ToString() + "/20)";
}
code = 1;
+ //鏇存柊鐘舵��
GetBtnText(testBtn, code, spk);
};
//鎺у埗鎴愬姛
@@ -190,17 +210,20 @@
{
code++;
}
+ //鏇存柊鐘舵��
GetBtnText(testBtn, code, spk);
- if (code == 3)
+ if (if_bool)
{
var library = libraryList[index];
var control = GetControl(spk, testBtn.TextID, library);
Method method = new Method();
- method.ThreadAddControl(control, this,(control1) => {
+ //鍙戦�佸簱娣诲姞閬ユ帶鍣ㄥ懡浠�
+ method.ThreadAddControl(control, this, (cont) =>
+ {
MainPage.BasePageView.RemoveViewByTag("PirView");
AddControlComplete addControlComplete = new AddControlComplete();
MainPage.BasePageView.AddChidren(addControlComplete);
- addControlComplete.Show(control1,true);
+ addControlComplete.Show(cont, true);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
});
@@ -247,11 +270,11 @@
}
}
break;
- case SPK.ElectricTV:
+ case SPK.TvIr:
{
switch (textInt)
{
- case StringId.dianshi:
+ case StringId.dianyuan:
{
key = "on_off";
value = "on";
@@ -259,8 +282,8 @@
break;
case StringId.yinliangjia:
{
- key = "on_off";
- value = "on";
+ key = "volume+";
+ value = "50";
}
break;
case StringId.jingyin:
@@ -284,12 +307,11 @@
control.type = "library";
control.status.Add(buttonObj);
control.deviceId = Pir.currPir.deviceId;
+ control.sid = "";
string[] strings = library.irCode.Split(',');
for (int arrayStr = 0; arrayStr < strings.Length; arrayStr++)
{
//var intValue = Convert.ToInt32(strings[arrayStr],16);
- //intValue
- //control.library1.Add((uint)intValue);
control.library.Add(strings[arrayStr].Replace("0x",""));
}
@@ -326,8 +348,8 @@
}
else
{
- Method method = new Method();
- method.ErrorShow(responsePackNew);
+ //Method method = new Method();
+ //method.ErrorShow(responsePackNew);
}
});
@@ -370,7 +392,7 @@
}
}
break;
- case SPK.ElectricTV:
+ case SPK.TvIr:
{
switch (code)
{
--
Gitblit v1.8.0