From 9c33e4ccb90fae87a614abd2ed1ab034d3b7a13d Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期五, 26 三月 2021 11:26:01 +0800 Subject: [PATCH] 2021-03-26 1.对接接口优化。 --- HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 603 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 527 insertions(+), 76 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs index 9da222a..b4a9f34 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs @@ -1,5 +1,7 @@ 锘縰sing System; using System.Collections.Generic; +using System.Text; +using HDL_ON.Entity; using HDL_ON.UI.UI2.Intelligence.Automation.LogicView; using Shared; namespace HDL_ON.UI.UI2.PersonalCenter.PirDevice @@ -8,8 +10,13 @@ { public PirMain() { - Tag = "PirView"; + Tag = "PirMain"; + } + /// <summary> + /// 涓存椂鍌ㄥ瓨璁惧绫诲瀷鍒楄〃 + /// </summary> + List<DeviceType> DeviceTypeList = new List<DeviceType>(); public void Show() { #region 鐣岄潰甯冨眬 @@ -43,9 +50,9 @@ TextColor = CSS.CSS_Color.textConfirmColor, TextAlignment = TextAlignment.CenterLeft, TextID = StringId.shebeigaunli, - IsBold=true, + IsBold = true, }; - pirDeviceFLayout.AddChidren(text1Btn); + pirDeviceFLayout.AddChidren(text1Btn); Button pirIcon = new Button @@ -129,7 +136,8 @@ ///绾㈠瀹濈偣鍑讳簨浠� FrameLayout clickFLayout = new FrameLayout(); pirDeviceFLayout.AddChidren(clickFLayout); - clickFLayout.MouseUpEventHandler += (sender,e) => { + clickFLayout.MouseUpEventHandler += (sender, e) => + { DeviceSet deviceSet = new DeviceSet(); MainPage.BasePageView.AddChidren(deviceSet); @@ -160,7 +168,7 @@ }; deviceListFLayout.AddChidren(text3Btn); ///绾㈠瀹濆悕绉� - Button deviceNameBtn= new Button + Button deviceNameBtn = new Button { Y = Application.GetRealHeight(13), X = Application.GetRealWidth(161), @@ -172,17 +180,108 @@ Text = "mini鏅鸿兘閬ユ帶鍣�", }; deviceListFLayout.AddChidren(deviceNameBtn); + if (Pir.pirDeviceList.Count != 0) + { + deviceNameBtn.Text = Pir.pirDeviceList[0].name; + Pir.currPir = Pir.pirDeviceList[0]; + } //涓嬫媺鍥炬爣 var dropdownIconBtn = new Button { Y = Application.GetRealHeight(13), - X = Application.GetRealWidth(343-8-16), + X = Application.GetRealWidth(343 - 8 - 16), Width = Application.GetRealWidth(16), Height = Application.GetRealWidth(16), UnSelectedImagePath = "PirIcon/dropdown.png", }; deviceListFLayout.AddChidren(dropdownIconBtn); + + deviceNameBtn.MouseUpEventHandler += (sender, e) => + { + + #region 鍖哄煙寮规鐣岄潰 + FrameLayout fLayout = new FrameLayout + { + BackgroundColor = CSS.CSS_Color.viewTrans60lucence, + }; + this.AddChidren(fLayout); + fLayout.MouseUpEventHandler += (sender1, e1) => + { + fLayout.RemoveFromParent(); + }; + + FrameLayout iconFLyout = new FrameLayout + { + X = Application.GetRealWidth(205), + Y = Application.GetRealHeight(314), + Width = Application.GetRealWidth(160), + Height = Application.GetRealHeight(21 + 44), + //BackgroundImagePath = "LogicIcon/bjicon.png", + }; + fLayout.AddChidren(iconFLyout); + + FrameLayout textFLyout = new FrameLayout + { + X = Application.GetRealWidth(8), + Y = Application.GetRealHeight(14), + Width = Application.GetRealWidth(144), + Height = Application.GetRealHeight(44), + }; + VerticalScrolViewLayout vv = new VerticalScrolViewLayout + { + X = Application.GetRealWidth(8), + Y = Application.GetRealHeight(14), + Width = Application.GetRealWidth(144), + Height = Application.GetRealHeight(44 * 4), + }; + + if (Pir.pirDeviceList.Count > 4) + { + iconFLyout.Height = Application.GetRealHeight(21 + 44 * 4); + iconFLyout.AddChidren(vv); + iconFLyout.BackgroundImagePath = "PirIcon/4.png"; + } + else + { + + iconFLyout.AddChidren(textFLyout); + iconFLyout.Height = Application.GetRealHeight(21 + 44 * Pir.pirDeviceList.Count); + textFLyout.Height = Application.GetRealHeight(44 * Pir.pirDeviceList.Count); + iconFLyout.BackgroundImagePath = $"PirIcon/{Pir.pirDeviceList.Count}.png"; + } + #endregion + + for (int i = 0; i < Pir.pirDeviceList.Count; i++) + { + var pirJson = Pir.pirDeviceList[i]; + View.PirNameView pirNameView = new View.PirNameView(); + if (Pir.pirDeviceList.Count > 4) + { + vv.AddChidren(pirNameView.FLayoutView()); + } + else + { + pirNameView.frameLayout.Y = Application.GetRealHeight(i * 44); + textFLyout.AddChidren(pirNameView.FLayoutView()); + } + pirNameView.btnName.Text = pirJson.name; + pirNameView.btnClick.Tag = pirJson; + pirNameView.btnClick.MouseUpEventHandler += (sender2, e2) => + { + fLayout.RemoveFromParent(); + deviceNameBtn.Text = pirJson.name; + Pir.currPir = pirJson; + + }; + if (Pir.pirDeviceList.Count - 1 == i) + { + ///鏀瑰彉鏈�鍚庨偅鏉′竴涓嚎鐨勯鑹�,鐣岄潰鏄剧ず鏁堟灉浣滅敤; + pirNameView.btnLine.BackgroundColor = CSS.CSS_Color.view; + } + } + + }; #endregion int line = 0; @@ -206,9 +305,9 @@ UnSelectedImagePath = "PirIcon/Infraredtreasure.png", }; currpirdeviceFLayout.AddChidren(deviceIconBtn); - var iconNameBtn = new Button + var iconNameBtn = new Button { - Y = deviceIconBtn.Bottom+Application.GetRealHeight(8), + Y = deviceIconBtn.Bottom + Application.GetRealHeight(8), Width = Application.GetRealWidth(80), Height = Application.GetRealHeight(17), TextSize = TextSize.text12, @@ -227,68 +326,335 @@ GetIconAndText(i, deviceIconBtn, iconNameBtn); clickBtn.MouseUpEventHandler += (sender, e) => { + //1=绌鸿皟;2=鐢佃;3=椋庢墖;4=鏈洪《鐩�;5=DVD/EVD/VCD;6=鎶曞奖浠�;7=鑷畾涔�; - int if_value =int.Parse(clickBtn.Tag.ToString()); - var list11 = new List<string> { - "鐖变綘", "鍝庡懄","鍩冨強","鍝堝紬鎹㈠3鍝堝紬", "鐖卞痉鍗庡v","淇哄嚑涓柉浜�", - "鎷滀簡", "宸村+", "鐧惧か", "鐧惧悎鍦扮悊璇句綘鎵撶畻", "涓嶅害鑰侀浼忔灔", "姣斿埌涔濈偣", - "杞︾珯","娴嬭瘯","姝ゅ湴", "鎵嶇湅瑙佸ソ寰楀揩","鍚冭蒋楗�","浠庣湅瑙佷簩鍗佸", - "绛夊緟鏈轰細鍚�","鐨勫鎴�", "澶氬枬鐐�", "鐧昏鍝︾劧鍚�", "鎵撶數璇�", - "鎭╄偆闇滅湅灏辩湅浜�", "楗挎os","鎭堕瓟鍩�","鍎跨鑱斿姩", "鎭╁叚棰楀瓙寮规媺鎷夎¥娲楁尽浜�","鍙戝ぇ瀛︾敓鍙戝彂", - "鐪熷帀瀹砳鍙戝灏�", "鐭ラ亾浣犱粯娆句簡鍙�", "灏厭鍥炲", "鏀硅繘鐨勮瘽", "澶╁ぉ閫熷害鍥炵瓟", "澶ソ浜嗗紑杞�", - "鍑忚偉鐨勭湅杩�","妗″嚭鍙e閭�","濡傛灉瑙夊緱", "寰堣垝鏈嶇殑","鍚冭蒋楗�","浠庣湅瑙佷簩鍗佸", - "榫欏嵎椋庝簭澶у彂","鍘诲ソ鐪�", "澶氬枬鐐�", "濂芥氮璐瑰ソ", "鎵撶數璇�"}; - System.Threading.Tasks.Task.Run(() => + int if_value = int.Parse(clickBtn.Tag.ToString()); + if (if_value == 7) { - Application.RunOnMainThread(() => + Method method = new Method(); + method.AddControl(this, (control) => { - switch (if_value) + AddButton addButton = new AddButton(); + MainPage.BasePageView.AddChidren(addButton); + addButton.Show(control); + MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + }); + } + else + { + var strings = GetTypeString(if_value).Split('-'); + var jobDeviceType = DeviceTypeList.Find((c) => c.deviceType == strings[0]); + if (jobDeviceType == null) + { + return; + } + GetBrandList(jobDeviceType.id, (brandList) => + { + var brandSupportStrList = GetBrandSupport(if_value); + var strList = new List<string>(); + for (int str = 0; str < brandList.Count; str++) { - case 1: - { - } - break; - case 2: - { - } - break; - case 3: - { - } - break; - case 4: - { - } - break; - case 5: - { - } - break; - case 6: - { - } - break; - case 7: - { - Method method = new Method(); - method.AddControl(); - - } - break; + string s = brandList[str].brandName; + //var bool_if = brandSupportStrList.Find((c) => s.Contains(c)); + //if (bool_if != null) + //{ + // strList.Add(s); + //} + strList.Add(s); } - + //Application.RunOnMainThread(() => + //{ + // BrandList brandObj = new BrandList(); + // MainPage.BasePageView.AddChidren(brandObj); + // brandObj.Show(brandList, strList, strings[1]); + // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; - //BrandList brandList = new BrandList(); - //MainPage.BasePageView.AddChidren(brandList); - //brandList.Show(list11, null); - //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + //}); + + GoToShowSortSelection(strList); + }); - }); + + } + + }; } + GetDeviceTypeList(); + } + + void GoToShowSortSelection(List<string> dataList) + { + Dictionary<string, List<string>> dict = new Dictionary<string, List<string>>(); + + foreach (var data in dataList) + { + //鎻愬彇瀛楃涓茬涓�浣� + //string s = data.Substring(0, 1); + var key = GetCharSpellCode(data); + + if (dict.ContainsKey(key)) + { + var value = dict[key]; + if (value == null) + { + value = new List<string>(); + } + value.Add(data); + + + } + else + { + var value = new List<string>(); + value.Add(data); + dict.Add(key, value); + } + + + } + + + Application.RunOnMainThread(() => + { + JLCountrycode.CountryCodeView.Current.ShowSortSelection("閫夋嫨绾㈠鍝佺墝", dict, (countryName) => + { + //Console.WriteLine("countryName: " + countryName); + Utlis.ShowTip("閫変腑浜�:" + countryName); + + + }); + }); + } + + /// <summary> + /// 鑾峰彇姹夊瓧棣栧瓧姣� + /// </summary> + /// <param name="textValue"></param> + /// <returns></returns> + private string GetCharSpellCode(string textValue) + { + long iCnChar; + + byte[] ZW = Encoding.GetEncoding("gb2312").GetBytes(textValue); + + //濡傛灉鏄瓧姣嶏紝鍒欑洿鎺ヨ繑鍥� + if (ZW.Length == 1) + { + return textValue.ToUpper(); + } + else + { + // get the array of byte from the single char + int i1 = (short)(ZW[0]); + int i2 = (short)(ZW[1]); + iCnChar = i1 * 256 + i2; + } + + + + // iCnChar match the constant + if ((iCnChar >= 45217) && (iCnChar <= 45252)) + { + return "A"; + } + else if ((iCnChar >= 45253) && (iCnChar <= 45760)) + { + return "B"; + } + else if ((iCnChar >= 45761) && (iCnChar <= 46317)) + { + return "C"; + } + else if ((iCnChar >= 46318) && (iCnChar <= 46825)) + { + return "D"; + } + else if ((iCnChar >= 46826) && (iCnChar <= 47009)) + { + return "E"; + } + else if ((iCnChar >= 47010) && (iCnChar <= 47296)) + { + return "F"; + } + else if ((iCnChar >= 47297) && (iCnChar <= 47613)) + { + return "G"; + } + else if ((iCnChar >= 47614) && (iCnChar <= 48118)) + { + return "H"; + } + else if ((iCnChar >= 48119) && (iCnChar <= 49061)) + { + return "J"; + } + else if ((iCnChar >= 49062) && (iCnChar <= 49323)) + { + return "K"; + } + else if ((iCnChar >= 49324) && (iCnChar <= 49895)) + { + return "L"; + } + else if ((iCnChar >= 49896) && (iCnChar <= 50370)) + { + return "M"; + } + + else if ((iCnChar >= 50371) && (iCnChar <= 50613)) + { + return "N"; + } + else if ((iCnChar >= 50614) && (iCnChar <= 50621)) + { + return "O"; + } + else if ((iCnChar >= 50622) && (iCnChar <= 50905)) + { + return "P"; + } + else if ((iCnChar >= 50906) && (iCnChar <= 51386)) + { + return "Q"; + } + else if ((iCnChar >= 51387) && (iCnChar <= 51445)) + { + return "R"; + } + else if ((iCnChar >= 51446) && (iCnChar <= 52217)) + { + return "S"; + } + else if ((iCnChar >= 52218) && (iCnChar <= 52697)) + { + return "T"; + } + else if ((iCnChar >= 52698) && (iCnChar <= 52979)) + { + return "W"; + } + else if ((iCnChar >= 52980) && (iCnChar <= 53640)) + { + return "X"; + } + else if ((iCnChar >= 53689) && (iCnChar <= 54480)) + { + return "Y"; + } + else if ((iCnChar >= 54481) && (iCnChar <= 55289)) + { + return "Z"; + } + else return (""); + } + + /// <summary> + /// 鑾峰彇鍝佺墝鏀寔 + /// </summary> + /// <param name="index">绱㈠紩鍊�</param> + private List<string> GetBrandSupport(int index) + { + List<string> strList = new List<string>(); + switch (index) + { + case 1: + { + strList.Add("鏍煎姏"); + strList.Add("缇庣殑"); + strList.Add("娴峰皵"); + strList.Add("鏉句笅"); + strList.Add("娴蜂俊"); + strList.Add("闀胯櫣"); + } + break; + case 2: + { + strList.Add("鍒涚淮"); + strList.Add("TCL"); + strList.Add("娴蜂俊"); + strList.Add("闀胯櫣"); + strList.Add("娴峰皵"); + strList.Add("涓夋槦"); + strList.Add("涔愯"); + strList.Add("绱㈠凹"); + strList.Add("LG涔愰噾"); + } + break; + case 3: + { + } + break; + case 4: + { + } + break; + case 5: + { + } + break; + case 6: + { + } + break; + + + } + return strList; + } + /// <summary> + /// 鑾峰彇璁惧绫诲瀷str + /// </summary> + /// <param name="index">绱㈠紩鍊�</param> + private string GetTypeString(int index) + { + string type = ""; + switch (index) + { + case 1: + { + //绌鸿皟 + type = "ac-" + SPK.AcIr; + } + break; + case 2: + { + //鐢佃 + type = "tv-" + SPK.ElectricTV; + } + break; + case 3: + { + //椋庢墖 + type = "fan-" + SPK.ElectricFan; + } + break; + case 4: + { + //鏈洪《鐩� + // type = "set_top_box-" + SPK.ElectricTV; + } + break; + case 5: + { + //褰辩鏈� + // type = "dvd-" + SPK.ElectricTV; + } + break; + case 6: + { + //鎶曞奖浠� + // type = "projector-" + SPK.ElectricTV; + } + break; + + + } + return type; } /// <summary> /// 璁剧疆鍥剧墖鍜屽娉� @@ -296,44 +662,129 @@ /// <param name="index">绱㈠紩鍊�</param> /// <param name="deviceIconBtn">鍥炬爣Btn</param> /// <param name="deviceNameBtn">璁惧澶囨敞Btn</param> - private void GetIconAndText(int index,Button deviceIconBtn, Button deviceNameBtn) { - string iconPath = ""; - int deviceNameIndex=0; + private void GetIconAndText(int index, Button deviceIconBtn, Button deviceNameBtn) + { + string iconPath = ""; + int deviceNameIndex = 0; switch (index) { - case 1: { + case 1: + { iconPath = "PirIcon/air.png"; deviceNameIndex = StringId.kongtiao; - } break; - case 2: { + } + break; + case 2: + { iconPath = "PirIcon/tv.png"; deviceNameIndex = StringId.dianshi; - } break; - case 3: { + } + break; + case 3: + { iconPath = "PirIcon/fan.png"; deviceNameIndex = StringId.fengshan; - } break; - case 4: { + } + break; + case 4: + { iconPath = "PirIcon/stb.png"; deviceNameIndex = StringId.jidinghe; - } break; - case 5: { + } + break; + case 5: + { iconPath = "PirIcon/dvd.png"; deviceNameIndex = StringId.dvd; - } break; - case 6: { + } + break; + case 6: + { iconPath = "PirIcon/projector.png"; deviceNameIndex = StringId.touyingyi; - } break; - case 7: { + } + break; + case 7: + { iconPath = "PirIcon/custom.png"; deviceNameIndex = StringId.zidingyi; - } break; + } + break; } deviceIconBtn.UnSelectedImagePath = iconPath; deviceNameBtn.TextID = deviceNameIndex; } - + /// <summary> + /// 璇诲彇绾㈠璁惧绫诲瀷鍒楄〃 + /// </summary> + private void GetDeviceTypeList() + { + PirSend.GetDeviceTypesList(this, (responsePackNew) => + { + + if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "") + { + //娓呯┖涔嬪墠鏁版嵁 + DeviceTypeList.Clear(); + var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString()); + for (int a = 0; a < jArray.Count; a++) + { + var jay = jArray[a]; + var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay); + var objDeviceType = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceType>(str); + if (objDeviceType != null) + { + if (null == DeviceTypeList.Find((c) => c.id == objDeviceType.id)) + { + DeviceTypeList.Add(objDeviceType); + } + } + } + } + else + { + Method method = new Method(); + method.ErrorShow(responsePackNew); + } + }, "", "璁惧绫诲瀷鍒楄〃"); + } + /// <summary> + /// 璇诲彇绾㈠璁惧绫诲瀷鐨勫搧鐗屽垪琛� + /// </summary> + private void GetBrandList(string id, Action<List<Brand>> actionBrand) + { + List<Brand> brandList = new List<Brand>(); + PirSend.GetDeviceTypesList(this, (responsePackNew) => + { + + if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "") + { + //娓呯┖涔嬪墠鏁版嵁 + brandList.Clear(); + var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString()); + for (int a = 0; a < jArray.Count; a++) + { + var jay = jArray[a]; + var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay); + var brand = Newtonsoft.Json.JsonConvert.DeserializeObject<Brand>(str); + if (brand != null) + { + if (null == brandList.Find((c) => c.id == brand.id)) + { + brandList.Add(brand); + } + } + } + actionBrand(brandList); + } + else + { + Method method = new Method(); + method.ErrorShow(responsePackNew); + } + }, id, "鍝佺墝鍒楄〃"); + } } + } -- Gitblit v1.8.0