From 94968f63b181eee088dab157881daf50ec5cb56a Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 12 三月 2021 12:00:54 +0800
Subject: [PATCH] 2021-3-12-1
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
index e640385..8ef498e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
@@ -140,10 +140,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 +167,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 +201,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,(cont) => {
+ //鍙戦�佸簱娣诲姞閬ユ帶鍣ㄥ懡浠�
+ method.ThreadAddControl(control, this, (cont) =>
+ {
MainPage.BasePageView.RemoveViewByTag("PirView");
AddControlComplete addControlComplete = new AddControlComplete();
MainPage.BasePageView.AddChidren(addControlComplete);
- addControlComplete.Show(cont,true);
+ addControlComplete.Show(cont, true);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
});
@@ -325,8 +339,8 @@
}
else
{
- Method method = new Method();
- method.ErrorShow(responsePackNew);
+ //Method method = new Method();
+ //method.ErrorShow(responsePackNew);
}
});
--
Gitblit v1.8.0