From 551e82d33c9c23442e0ecd320bcfc752f300d9ef Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 22 三月 2021 09:20:03 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into WJC
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs | 282 ++++++++++++++++++++++++++++---------------------------
1 files changed, 144 insertions(+), 138 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs
index f73971c..febc19c 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs
@@ -1,153 +1,159 @@
-锘縰sing System;
-using System.Collections.Generic;
-using HDL_ON.Entity;
-using HDL_ON.UI.CSS;
-using Shared;
+锘�//using System;
+//using System.Collections.Generic;
+//using HDL_ON.Entity;
+//using HDL_ON.UI.CSS;
+//using Shared;
-namespace HDL_ON.UI
-{
- public class AddThirdPartyBrandListpage : FrameLayout
- {
- FrameLayout bodyView;
- VerticalRefreshLayout contentView;
- List<IntegratedBrand> brandList;
- public AddThirdPartyBrandListpage(List<IntegratedBrand> list)
- {
- bodyView = this;
- brandList = list;
- }
+//namespace HDL_ON.UI
+//{
+// public class AddThirdPartyBrandListpage : FrameLayout
+// {
+// FrameLayout bodyView;
+// VerticalRefreshLayout contentView;
+// List<IntegratedBrand> brandList;
+// public AddThirdPartyBrandListpage(List<IntegratedBrand> list)
+// {
+// bodyView = this;
+// brandList = list;
+// }
- public void LoadPage()
- {
- new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView();
+// public void LoadPage()
+// {
+// new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView();
- bodyView.BackgroundColor = CSS_Color.BackgroundColor;
+// bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- contentView = new VerticalRefreshLayout()
- {
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667 - 64),
- VerticalScrollBarEnabled = false,
- };
- bodyView.AddChidren(contentView);
+// contentView = new VerticalRefreshLayout()
+// {
+// Y = Application.GetRealHeight(64),
+// Height = Application.GetRealHeight(667 - 64),
+// VerticalScrollBarEnabled = false,
+// };
+// bodyView.AddChidren(contentView);
- contentView.BeginHeaderRefreshingAction = () =>
- {
- contentView.EndHeaderRefreshing();
- Load3tyBrandList();
- };
+// contentView.BeginHeaderRefreshingAction = () =>
+// {
+// contentView.EndHeaderRefreshing();
+// Load3tyBrandList();
+// };
- Load3tyBrandList();
- }
+// Load3tyBrandList();
- void LoadRow(List<IntegratedBrand> brandList)
- {
- contentView.RemoveAll();
- bool isFrist = true;
- foreach(var brand in brandList)
- {
- FrameLayout row = new FrameLayout() {
- Height = Application.GetRealHeight(50),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- contentView.AddChidren(row);
+// contentView.BeginHeaderRefreshingAction = () =>
+// {
+// contentView.EndHeaderRefreshing();
+// Load3tyBrandList();
+// };
+// }
- if(isFrist)
- {
- isFrist = false;
- }
- else
- {
- Button btnLine = new Button()
- {
- X = Application.GetRealWidth(56),
- Width = Application.GetRealWidth(303),
- Height = 1,
- BackgroundColor = CSS_Color.DividingLineColor,
- };
- row.AddChidren(btnLine);
- }
+// void LoadRow(List<IntegratedBrand> brandList)
+// {
+// contentView.RemoveAll();
+// bool isFrist = true;
+// foreach(var brand in brandList)
+// {
+// FrameLayout row = new FrameLayout() {
+// Height = Application.GetRealHeight(50),
+// BackgroundColor = CSS_Color.MainBackgroundColor,
+// };
+// contentView.AddChidren(row);
- ImageView btnIcon = new ImageView()
- {
- X = Application.GetRealWidth(12),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetRealWidth(32),
- Height = Application.GetRealWidth(32),
- Radius = (uint)Application.GetRealWidth(4),
- BackgroundColor = CSS_Color.PromptingColor1
- //ImagePath = "tuya_logo.png"
- };
- row.AddChidren(btnIcon);
- Button btnRight = new Button()
- {
- X = Application.GetRealWidth(339),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/Right.png",
- };
- row.AddChidren(btnRight);
+// if(isFrist)
+// {
+// isFrist = false;
+// }
+// else
+// {
+// Button btnLine = new Button()
+// {
+// X = Application.GetRealWidth(56),
+// Width = Application.GetRealWidth(303),
+// Height = 1,
+// BackgroundColor = CSS_Color.DividingLineColor,
+// };
+// row.AddChidren(btnLine);
+// }
- Button btnName = new Button()
- {
- X = Application.GetRealWidth(56),
- Width = Application.GetRealWidth(303),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.TextFontSize,
- Text = brand.brandName,
- };
- row.AddChidren(btnName);
- //涓嬭浇绗笁鏂瑰搧鐗宨con
- ImageUtlis.Current.Load3tyBrandIconImages(brand.brandName, brand.brandIcon, btnIcon);
+// ImageView btnIcon = new ImageView()
+// {
+// X = Application.GetRealWidth(12),
+// Gravity = Gravity.CenterVertical,
+// Width = Application.GetRealWidth(32),
+// Height = Application.GetRealWidth(32),
+// Radius = (uint)Application.GetRealWidth(4),
+// BackgroundColor = CSS_Color.PromptingColor1
+// //ImagePath = "tuya_logo.png"
+// };
+// row.AddChidren(btnIcon);
+// Button btnRight = new Button()
+// {
+// X = Application.GetRealWidth(339),
+// Gravity = Gravity.CenterVertical,
+// Width = Application.GetMinRealAverage(16),
+// Height = Application.GetMinRealAverage(16),
+// UnSelectedImagePath = "Public/Right.png",
+// };
+// row.AddChidren(btnRight);
- btnName.MouseUpEventHandler = (sender, e) => {
- var page = new AddDevciePage(brand);
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
- }
+// Button btnName = new Button()
+// {
+// X = Application.GetRealWidth(56),
+// Width = Application.GetRealWidth(303),
+// TextAlignment = TextAlignment.CenterLeft,
+// TextColor = CSS_Color.FirstLevelTitleColor,
+// TextSize = CSS_FontSize.TextFontSize,
+// Text = brand.brandName,
+// };
+// row.AddChidren(btnName);
+// //涓嬭浇绗笁鏂瑰搧鐗宨con
+// ImageUtlis.Current.Load3tyBrandIconImages(brand.brandName, brand.brandIcon, btnIcon);
- }
+// btnName.MouseUpEventHandler = (sender, e) => {
+// var page = new AddDevciePage(brand);
+// MainPage.BasePageView.AddChidren(page);
+// page.LoadPage();
+// MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+// };
+// }
- void Load3tyBrandList()
- {
- var waitPage = new Loading();
- waitPage.Start();
- new System.Threading.Thread(() => {
- try
- {
- var pm = new DAL.Server.HttpServerRequest();
- var pack = pm.Get3tyBrandList();
- if(pack.Code == DAL.Server.StateCode.SUCCESS)
- {
- var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<IntegratedBrand>>(pack.Data.ToString());
- Application.RunOnMainThread(() =>
- {
- LoadRow(revData);
- });
- }
- }
- catch (Exception ex)
- {
- MainPage.Log("1--::"+ex.Message);
- }
- finally
- {
- Application.RunOnMainThread(() => { waitPage.Hide(); });
- }
- }) { IsBackground = true }.Start();
- }
- /// <summary>
- /// 璺宠浆娣诲姞璁惧鐣岄潰
- /// </summary>
- /// <param name="bandType">鍝佺墝绫诲瀷</param>
- void SkipPage_AddDevice()
- {
+// }
+
+// void Load3tyBrandList()
+// {
+// var waitPage = new Loading();
+// waitPage.Start();
+// new System.Threading.Thread(() => {
+// try
+// {
+// var pm = new DAL.Server.HttpServerRequest();
+// var pack = pm.Get3tyBrandList();
+// if(pack.Code == DAL.Server.StateCode.SUCCESS)
+// {
+// var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<IntegratedBrand>>(pack.Data.ToString());
+// Application.RunOnMainThread(() =>
+// {
+// LoadRow(revData);
+// });
+// }
+// }
+// catch (Exception ex)
+// {
+// MainPage.Log("1--::"+ex.Message);
+// }
+// finally
+// {
+// Application.RunOnMainThread(() => { waitPage.Hide(); });
+// }
+// }) { IsBackground = true }.Start();
+// }
+// /// <summary>
+// /// 璺宠浆娣诲姞璁惧鐣岄潰
+// /// </summary>
+// /// <param name="bandType">鍝佺墝绫诲瀷</param>
+// void SkipPage_AddDevice()
+// {
- }
- }
-}
\ No newline at end of file
+// }
+// }
+//}
\ No newline at end of file
--
Gitblit v1.8.0