From d72ca686a3e262693f8a6e45e747e8e8da43335b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 06 七月 2021 09:39:03 +0800
Subject: [PATCH] 2021-07-06 1.更新
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs | 106 ++++++++++++++++++++++-------------------------------
1 files changed, 44 insertions(+), 62 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..1a97eef 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
{
@@ -96,10 +105,10 @@
Button sumBtn = new Button
{
Y = Application.GetRealHeight(267),
- X = Application.GetRealWidth(170),
- Width = Application.GetRealWidth(36),
+ X = Application.GetRealWidth(136),
+ Width = Application.GetRealWidth(104),
Height = Application.GetRealHeight(17),
- Text = "(1/20)",
+ Text = $"(1/{libraryList.Count})",
TextSize = TextSize.text12,
TextColor = CSS.CSS_Color.textCancelColor,
};
@@ -116,7 +125,7 @@
TextSize = TextSize.text16,
TextColor = CSS.CSS_Color.textConfirmColor,
TextAlignment = TextAlignment.Center,
- Radius = (uint)Application.GetRealHeight(44),
+ Radius = (uint)Application.GetRealHeight(22),
BorderWidth = 1,
BorderColor = CSS.CSS_Color.textConfirmColor,
};
@@ -132,7 +141,7 @@
TextSize = TextSize.text16,
TextColor = CSS.CSS_Color.textWhiteColor,
TextAlignment = TextAlignment.Center,
- Radius = (uint)Application.GetRealHeight(44),
+ Radius = (uint)Application.GetRealHeight(22),
//BorderWidth = 1,
//BorderColor = CSS.CSS_Color.textConfirmColor,
BackgroundColor = CSS.CSS_Color.textConfirmColor,
@@ -140,16 +149,18 @@
fLayout.AddChidren(succeedBtn);
#endregion
#region 鐐瑰嚮浜嬩欢
- //琛ㄧず搴撳垪琛ㄧ储寮曞��
- int index= 1;
- //琛ㄧず娴嬭瘯鐮佺储寮曞��
+ //琛ㄧず搴撳垪琛ㄧ储寮曞��(鐩墠鍙�20涓簱)
+ int index = 1;
+ //琛ㄧず娴嬭瘯鐮佺储寮曞��(鐩墠鍙祴璇�3涓爜)
int code = 1;
+ //琛ㄧず娴嬭瘯鏈�鍚庝竴涓爜锛�
+ bool if_bool = false;
//宸�
leftIconBtn.MouseUpEventHandler += (sender, e) =>
{
if (index>1) {
index--;
- sumBtn.Text = "(" + index.ToString() + "/20)";
+ sumBtn.Text = $"({index.ToString()}/{libraryList.Count})";
}
code = 1;
GetBtnText(testBtn, code, spk);
@@ -157,30 +168,39 @@
//鍙�
rightIconBtn.MouseUpEventHandler += (sender, e) =>
{
- if (index < 20)
+ if (index < libraryList.Count)
{
index++;
- sumBtn.Text = "(" + index.ToString() + "/20)";
+ sumBtn.Text = $"({index.ToString()}/{libraryList.Count})";
}
code = 1;
GetBtnText(testBtn, code, spk);
};
+
//娴嬭瘯Text
testBtn.MouseUpEventHandler += (sender, e) =>
{
- var library = libraryList[index];
+ var library = libraryList[index - 1];
var control = GetControl(spk, testBtn.TextID, library);
- CodeTest(control);
+ //鍙戦�佹祴璇曠爜鍛戒护
+ Method.ThreadSend(control, (responsePackNew) => { }, "搴撶爜娴嬭瘯", "frame", this, null);
+ if (code == 3) {
+ //鏍囪鏈�鍚庨偅涓爜
+ if_bool = true;
+ }
};
//鎺у埗澶辫触
failedBtn.MouseUpEventHandler += (sender, e) =>
{
- if (index < 20)
+ if (index < libraryList.Count)
{
+ //鍏堝姞
index++;
- sumBtn.Text = "(" + index.ToString() + "/20)";
+ //鏇存柊鏂囨湰
+ sumBtn.Text = $"({index.ToString()}/{libraryList.Count})";
}
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 library = libraryList[index-1];
var control = GetControl(spk, testBtn.TextID, library);
Method method = new Method();
- method.ThreadAddControl(control, this,(cont) => {
+ //鍙戦�佸簱娣诲姞閬ユ帶鍣ㄥ懡浠�
+ method.ThreadAddControl(control, this, (device) =>
+ {
MainPage.BasePageView.RemoveViewByTag("PirView");
AddControlComplete addControlComplete = new AddControlComplete();
MainPage.BasePageView.AddChidren(addControlComplete);
- addControlComplete.Show(cont,true);
+ addControlComplete.Show(device, true);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
});
@@ -293,47 +316,6 @@
}
return control;
- }
-
- /// <summary>
- /// 鍙戦�佸簱鐮佹祴璇曞懡浠�
- /// </summary>
- /// <param name="control"></param>
- private void CodeTest(Control control)
- {
-
- //鍔犺浇log
- Loading loading = new Loading();
- this.AddChidren(loading);
- HDL_ON.DAL.Server.ResponsePackNew responsePackNew = null;
- loading.Start();
- new System.Threading.Thread(() =>
- {
- try
- {
- responsePackNew = PirSend.CodeTest(control);
- }
- catch { }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- loading.Hide();
- if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
- {
-
- }
- else
- {
- Method method = new Method();
- method.ErrorShow(responsePackNew);
- }
-
- });
- }
-
- })
- { IsBackground = true }.Start();
}
/// <summary>
--
Gitblit v1.8.0