HDL-ON_Android/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL-ON_iOS/Resources/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/Common/R.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/DAL/Server/HttpServerRequest.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/UI/MainPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HDL-ON_Android/Assets/Language.ini
@@ -411,6 +411,7 @@ 426=Air dry time 427=Disinfect time 428=Anion Time 429=H 430=Min 431=You are currently adding any platform devices to @@ -418,6 +419,8 @@ 433=Water valve 434=Time switch 435=Remote control 436=Added Devices 437=Device List 1000=Indoor Humidity 1001=V-chip @@ -1178,6 +1181,8 @@ 433=水阀 434=定时开关 435=遥控器 436=已添加功能 437=设备列表 1000=室内湿度 HDL-ON_iOS/Resources/Language.ini
@@ -419,6 +419,8 @@ 433=Water valve 434=Time switch 435=Remote control 436=Added Devices 437=Device List 1000=Indoor Humidity 1001=V-chip @@ -1179,6 +1181,8 @@ 433=水阀 434=定时开关 435=遥控器 436=已添加功能 437=设备列表 1000=室内湿度 HDL_ON/Common/R.cs
@@ -4,6 +4,8 @@ { public static class StringId { public const int DeviceList = 437; public const int AddedDevice = 436; public const int RemoteControl = 435; public const int TimeSwitch = 434; public const int WaterValve = 433; HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -1808,6 +1808,8 @@ d.Add("categoryType", 1); d.Add("productPlatform", productPlatform); d.Add("productBrand", productBrand); d.Add("networkConfig", true); var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Get3tyBrandDevcieList, requestJson); HDL_ON/UI/MainPage.cs
@@ -192,7 +192,7 @@ waitPage.RemoveFromParent(); BaseView.RemoveAll(); BasePageView = new PageLayout(); BasePageView.ScrollEnabled = false; BasePageView.ScrollEnabled = true; BasePageView.IsShowPoint = false; BasePageView.PageChange = (sender, e) => { HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
@@ -21,13 +21,7 @@ public void LoadPage() { Action<string,string> action = (s,a) => { var page = new AddThirdPartyBrandListpage(brandList); MainPage.BasePageView.AddChidren(page); page.LoadPage(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }; new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView_AddIcon("3ty",action); new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView();//.LoadTopView_AddIcon("3ty",action); bodyView.BackgroundColor = CSS_Color.BackgroundColor; @@ -193,32 +187,30 @@ }; contentView.AddChidren(btnTipText1); var btnAdd = new Button() { Y = Application.GetRealHeight(500), Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth(220), Height = Application.GetRealWidth(44), BackgroundColor = CSS_Color.MainColor, TextAlignment = TextAlignment.Center, TextColor = CSS_Color.MainBackgroundColor, TextSize = CSS_FontSize.SubheadingFontSize, IsBold = true, Radius = (uint)Application.GetRealWidth(22), BorderColor = 0x00000000, BorderWidth = 0, TextID = StringId.Add, }; contentView.AddChidren(btnAdd); btnAdd.MouseUpEventHandler = (sender, e) => { var page = new AddThirdPartyBrandListpage(brandList); MainPage.BasePageView.AddChidren(page); page.LoadPage(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; this.RemoveFromParent(); }; //var btnAdd = new Button() //{ // Y = Application.GetRealHeight(500), // Gravity = Gravity.CenterHorizontal, // Width = Application.GetRealWidth(220), // Height = Application.GetRealWidth(44), // BackgroundColor = CSS_Color.MainColor, // TextAlignment = TextAlignment.Center, // TextColor = CSS_Color.MainBackgroundColor, // TextSize = CSS_FontSize.SubheadingFontSize, // IsBold = true, // Radius = (uint)Application.GetRealWidth(22), // BorderColor = 0x00000000, // BorderWidth = 0, // TextID = StringId.Add, //}; //contentView.AddChidren(btnAdd); //btnAdd.MouseUpEventHandler = (sender, e) => { // var page = new AddThirdPartyBrandListpage(brandList); // MainPage.BasePageView.AddChidren(page); // page.LoadPage(); // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; // this.RemoveFromParent(); //}; HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -20,7 +20,13 @@ public void LoadPage() { new TopViewDiv(bodyView, Language.StringByID(StringId.AddDevice)).LoadTopView(); Action<string,string> action = (s,a) => { var page = new AddDevciePage(brand); MainPage.BasePageView.AddChidren(page); page.LoadPage(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }; new TopViewDiv(bodyView, Language.StringByID(StringId.Devices)).LoadTopView_AddIcon("3ty",action); bodyView.BackgroundColor = CSS_Color.BackgroundColor; contentView = new VerticalRefreshLayout() @@ -69,8 +75,6 @@ void LoadRow(List<Function> deviceList) { deviceList.Add(new Function() { name ="测试红外宝",spk = SPK.IrModule}); contentView.RemoveAll(); bool isFrist = true; foreach (var device in deviceList)