| HDL-ON_Android/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/HDL-ON_Android.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Scan.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/HDL-ON_iOS.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Resources/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/MainPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI0-Public/PublicAssmebly.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI1-Login/LoginPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HDL-ON_Android/Assets/Language.ini
@@ -2013,7 +2013,7 @@ 630=炫彩功能 631=起始颜色 632=结束颜色 633=炫彩周期 633=炫彩速率 634=推荐 635=当前颜色 636=色值号为6位（由纯数字/数字+字母组合） HDL-ON_Android/HDL-ON_Android.csproj
@@ -402,27 +402,6 @@ <AndroidAsset Include="Assets\Phone\LogicIcon\selectlocation.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorfulBar.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\groupControl_blue.png" /> <AndroidAsset Include="Assets\h5\index.html" /> <AndroidAsset Include="Assets\h5\static\index.63b34199.css" /> <AndroidAsset Include="Assets\h5\static\images\coal-save-ic.png" /> <AndroidAsset Include="Assets\h5\static\images\inverter-center.svg" /> <AndroidAsset Include="Assets\h5\static\images\equal-plant-ic.png" /> <AndroidAsset Include="Assets\h5\static\images\left-icon-unselect.png" /> <AndroidAsset Include="Assets\h5\static\images\eidt.png" /> <AndroidAsset Include="Assets\h5\static\images\switch-off.svg" /> <AndroidAsset Include="Assets\h5\static\images\circle-ic.png" /> <AndroidAsset Include="Assets\h5\static\images\inverter-center.png" /> <AndroidAsset Include="Assets\h5\static\images\pan_ic.png" /> <AndroidAsset Include="Assets\h5\static\images\right-icon-unselect.png" /> <AndroidAsset Include="Assets\h5\static\images\up-icon-unselect.png" /> <AndroidAsset Include="Assets\h5\static\images\switch-on.svg" /> <AndroidAsset Include="Assets\h5\static\images\inverter-center.webp" /> <AndroidAsset Include="Assets\h5\static\images\yinying.png" /> <AndroidAsset Include="Assets\h5\static\images\down-icon-unselect.png" /> <AndroidAsset Include="Assets\h5\static\images\co2-reduction-ic.png" /> <AndroidAsset Include="Assets\h5\static\images\left-icon.png" /> <AndroidAsset Include="Assets\h5\static\js\chunk-vendors.56c88730.js" /> <AndroidAsset Include="Assets\h5\static\js\pages-inverter-index.e5e9499f.js" /> <AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" /> <AndroidAsset Include="Assets\h5\static\img\inverter-center.18b181f4.png" /> <AndroidAsset Include="Assets\h5\static\img\co2-reduction-ic.9c75228c.png" /> @@ -588,8 +567,6 @@ <AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjian.png" /> <AndroidAsset Include="Assets\Phone\HisenseTv\electricaltvhisense.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricaltvhisense_blue.png" /> <AndroidAsset Include="Assets\h5\static\js\index.31e0ba7a.js" /> <AndroidAsset Include="Assets\h5\static\js\pages-index-index.25064587.js" /> <AndroidAsset Include="Assets\Phone\HisenseTv\guan.png" /> <AndroidAsset Include="Assets\Phone\HisenseTv\kai.png" /> <AndroidAsset Include="Assets\Phone\HisenseTv\kaiguanSelected.png" /> @@ -598,14 +575,31 @@ <AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjiaSelected.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\IlluminationBg.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" /> <AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" /> <AndroidAsset Include="Assets\h5\static\img\inverter-center.18b181f4.png" /> <AndroidAsset Include="Assets\h5\static\img\co2-reduction-ic.9c75228c.png" /> <AndroidAsset Include="Assets\h5\static\img\equal-plant-ic.7ef6befa.png" /> <AndroidAsset Include="Assets\h5\static\img\coal-save-ic.6c5fd125.png" /> <AndroidAsset Include="Assets\h5\static\font\SourceHanSansCN-Normal.otf" /> <AndroidAsset Include="Assets\Phone\Collection\GatewayOnlineTipIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\AksFunctionBg.png" /> <AndroidAsset Include="Assets\h5\index.html" /> <AndroidAsset Include="Assets\h5\static\index.63b34199.css" /> <AndroidAsset Include="Assets\h5\static\images\coal-save-ic.png" /> <AndroidAsset Include="Assets\h5\static\images\inverter-center.svg" /> <AndroidAsset Include="Assets\h5\static\images\equal-plant-ic.png" /> <AndroidAsset Include="Assets\h5\static\images\left-icon-unselect.png" /> <AndroidAsset Include="Assets\h5\static\images\eidt.png" /> <AndroidAsset Include="Assets\h5\static\images\switch-off.svg" /> <AndroidAsset Include="Assets\h5\static\images\circle-ic.png" /> <AndroidAsset Include="Assets\h5\static\images\inverter-center.png" /> <AndroidAsset Include="Assets\h5\static\images\pan_ic.png" /> <AndroidAsset Include="Assets\h5\static\images\right-icon-unselect.png" /> <AndroidAsset Include="Assets\h5\static\images\up-icon-unselect.png" /> <AndroidAsset Include="Assets\h5\static\images\switch-on.svg" /> <AndroidAsset Include="Assets\h5\static\images\inverter-center.webp" /> <AndroidAsset Include="Assets\h5\static\images\yinying.png" /> <AndroidAsset Include="Assets\h5\static\images\down-icon-unselect.png" /> <AndroidAsset Include="Assets\h5\static\images\co2-reduction-ic.png" /> <AndroidAsset Include="Assets\h5\static\images\left-icon.png" /> <AndroidAsset Include="Assets\h5\static\js\pages-index-index.a5a00a32.js" /> <AndroidAsset Include="Assets\h5\static\js\index.3517131b.js" /> <AndroidAsset Include="Assets\h5\static\js\chunk-vendors.56c88730.js" /> <AndroidAsset Include="Assets\h5\static\js\pages-inverter-index.e5e9499f.js" /> </ItemGroup> <ItemGroup> <AndroidResource Include="Resources\values\colors.xml" /> HDL-ON_Android/Scan.cs
@@ -49,37 +49,7 @@ HDL_ON_Android.ScanActivity.InitDdd(this); //MobileBarcodeScanner.Initialize(Shared.Application.Activity.Application); //var mZXingCustomScanView = new ZXingCustomScanView(Shared.Application.Activity.Application); //mZXingCustomScanView.cancelTextView.Text = cancel; //mZXingCustomScanView.flashTextView.Text = flashText; //mZXingCustomScanView.titleTextView.Text = titleText; //mZXingCustomScanView.SetMinimumWidth( 1800); //var bOn = false; //scanner = new ZXing.Mobile.MobileBarcodeScanner() //{ // UseCustomOverlay = true, // CustomOverlay = mZXingCustomScanView //}; ////scanner.CustomOverlay.width //mZXingCustomScanView.OnCancel += () => //{ // scanner?.Cancel(); //}; //mZXingCustomScanView.OnTorch += () => //{ // bOn = !bOn; // scanner?.Torch(bOn); //}; } //var result = await scanner.Scan(); //if (result != null) // action?.Invoke(result.Text); //else // action?.Invoke(null); } else { HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1584,35 +1584,6 @@ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HorseRaceLampIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorlockBatteryManagementBg.png" /> <BundleResource Include="Resources\Phone\Classification\Room\HomePagebg.png" /> <BundleResource Include="Resources\h5\index.html" /> <BundleResource Include="Resources\h5\static\index.63b34199.css" /> <BundleResource Include="Resources\h5\static\images\coal-save-ic.png" /> <BundleResource Include="Resources\h5\static\images\inverter-center.svg" /> <BundleResource Include="Resources\h5\static\images\equal-plant-ic.png" /> <BundleResource Include="Resources\h5\static\images\left-icon-unselect.png" /> <BundleResource Include="Resources\h5\static\images\eidt.png" /> <BundleResource Include="Resources\h5\static\images\switch-off.svg" /> <BundleResource Include="Resources\h5\static\images\circle-ic.png" /> <BundleResource Include="Resources\h5\static\images\inverter-center.png" /> <BundleResource Include="Resources\h5\static\images\pan_ic.png" /> <BundleResource Include="Resources\h5\static\images\right-icon-unselect.png" /> <BundleResource Include="Resources\h5\static\images\up-icon-unselect.png" /> <BundleResource Include="Resources\h5\static\images\switch-on.svg" /> <BundleResource Include="Resources\h5\static\images\inverter-center.webp" /> <BundleResource Include="Resources\h5\static\images\yinying.png" /> <BundleResource Include="Resources\h5\static\images\down-icon-unselect.png" /> <BundleResource Include="Resources\h5\static\images\co2-reduction-ic.png" /> <BundleResource Include="Resources\h5\static\images\left-icon.png" /> <BundleResource Include="Resources\h5\static\js\chunk-vendors.56c88730.js" /> <BundleResource Include="Resources\h5\static\js\pages-inverter-index.e5e9499f.js" /> <BundleResource Include="Resources\h5\static\js\index.31e0ba7a.js" /> <BundleResource Include="Resources\h5\static\js\pages-index-index.25064587.js" /> <BundleResource Include="Resources\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" /> <BundleResource Include="Resources\h5\static\img\inverter-center.18b181f4.png" /> <BundleResource Include="Resources\h5\static\img\co2-reduction-ic.9c75228c.png" /> <BundleResource Include="Resources\h5\static\img\equal-plant-ic.7ef6befa.png" /> <BundleResource Include="Resources\h5\static\img\coal-save-ic.6c5fd125.png" /> <BundleResource Include="Resources\h5\static\font\SourceHanSansCN-Normal.otf" /> <BundleResource Include="Resources\Phone\HisenseTv\yingliangjian.png" /> <BundleResource Include="Resources\Phone\HisenseTv\caidan.png" /> <BundleResource Include="Resources\Phone\HisenseTv\offtvbj.png" /> @@ -1755,6 +1726,35 @@ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" /> <BundleResource Include="Resources\Phone\Collection\GatewayOnlineTipIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\AksFunctionBg.png" /> <BundleResource Include="Resources\h5\index.html" /> <BundleResource Include="Resources\h5\static\index.63b34199.css" /> <BundleResource Include="Resources\h5\static\images\coal-save-ic.png" /> <BundleResource Include="Resources\h5\static\images\inverter-center.svg" /> <BundleResource Include="Resources\h5\static\images\equal-plant-ic.png" /> <BundleResource Include="Resources\h5\static\images\left-icon-unselect.png" /> <BundleResource Include="Resources\h5\static\images\eidt.png" /> <BundleResource Include="Resources\h5\static\images\switch-off.svg" /> <BundleResource Include="Resources\h5\static\images\circle-ic.png" /> <BundleResource Include="Resources\h5\static\images\inverter-center.png" /> <BundleResource Include="Resources\h5\static\images\pan_ic.png" /> <BundleResource Include="Resources\h5\static\images\right-icon-unselect.png" /> <BundleResource Include="Resources\h5\static\images\up-icon-unselect.png" /> <BundleResource Include="Resources\h5\static\images\switch-on.svg" /> <BundleResource Include="Resources\h5\static\images\inverter-center.webp" /> <BundleResource Include="Resources\h5\static\images\yinying.png" /> <BundleResource Include="Resources\h5\static\images\down-icon-unselect.png" /> <BundleResource Include="Resources\h5\static\images\co2-reduction-ic.png" /> <BundleResource Include="Resources\h5\static\images\left-icon.png" /> <BundleResource Include="Resources\h5\static\js\pages-index-index.a5a00a32.js" /> <BundleResource Include="Resources\h5\static\js\index.3517131b.js" /> <BundleResource Include="Resources\h5\static\js\chunk-vendors.56c88730.js" /> <BundleResource Include="Resources\h5\static\js\pages-inverter-index.e5e9499f.js" /> <BundleResource Include="Resources\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" /> <BundleResource Include="Resources\h5\static\img\inverter-center.18b181f4.png" /> <BundleResource Include="Resources\h5\static\img\co2-reduction-ic.9c75228c.png" /> <BundleResource Include="Resources\h5\static\img\equal-plant-ic.7ef6befa.png" /> <BundleResource Include="Resources\h5\static\img\coal-save-ic.6c5fd125.png" /> <BundleResource Include="Resources\h5\static\font\SourceHanSansCN-Normal.otf" /> </ItemGroup> <ItemGroup> <ITunesArtwork Include="iTunesArtwork" /> HDL-ON_iOS/Resources/Language.ini
@@ -2013,7 +2013,7 @@ 630=炫彩功能 631=起始颜色 632=结束颜色 633=炫彩周期 633=炫彩速率 634=推荐 635=当前颜色 636=色值号为6位（由纯数字/数字+字母组合） HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@ /// <summary> /// 版本号 /// </summary> public static string VersionString = "2.1.3"; public static string VersionString = "2.1.4"; ///// <summary> ///// 客户端类型 ///// </summary> HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -476,6 +476,7 @@ } static Dialog dialogTipMsgAutoClose; /// <summary> /// 信息提示窗口，自动关闭 @@ -484,14 +485,31 @@ /// <param name="isWhite"></param> public void TipMsgAutoClose(string msg, bool isWhite, int closeTime = 1500) { Dialog dialog = new Dialog(); if (dialogTipMsgAutoClose == null) { dialogTipMsgAutoClose = new Dialog(); } else { try { if (dialogTipMsgAutoClose != null) { dialogTipMsgAutoClose.Close(); } dialogTipMsgAutoClose = null; } catch { } dialogTipMsgAutoClose = new Dialog(); } FrameLayout dialogBody = new FrameLayout(); dialog.AddChidren(dialogBody); dialogTipMsgAutoClose.AddChidren(dialogBody); dialogBody.MouseUpEventHandler = (sender, e) => { dialog.Close(); dialog = null; dialogTipMsgAutoClose.Close(); dialogTipMsgAutoClose = null; }; FrameLayout frame = new FrameLayout() @@ -503,11 +521,11 @@ BackgroundColor = isWhite ? 0xE6FFFFFF : CSS_Color.DialogTransparentColor1, Radius = (uint)Application.GetRealWidth(12), }; dialog.AddChidren(frame); dialogTipMsgAutoClose.AddChidren(frame); frame.MouseUpEventHandler = (sender, e) => { dialog.Close(); dialog = null; dialogTipMsgAutoClose.Close(); dialogTipMsgAutoClose = null; }; Button btnTipIcon = new Button() @@ -532,17 +550,22 @@ }; frame.AddChidren(btnTipMsg); dialog.Show(); dialogTipMsgAutoClose.Show(); new Thread(() => { Thread.Sleep(closeTime); Application.RunOnMainThread(() => { if(dialog!=null) try { dialog.Close(); if (dialogTipMsgAutoClose != null) { dialogTipMsgAutoClose.Close(); } dialogTipMsgAutoClose = null; } catch { } }); }) { IsBackground = true }.Start(); HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -327,6 +327,7 @@ etAccount.Text = "18316672920"; etAccount.Text = "18244942707"; etAccount.Text = "1272061968@qq.com";//万科城市之光E区8栋206 etAccount.Text = "18933160333"; } else { @@ -344,7 +345,6 @@ //etAccount.Text = "tf@smarttech.com.ua"; //etAccount.Text = "18814122445";//董泽斌 天河办公室 //etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568 //etAccount.Text = "18402017839";//wjc //etAccount.Text = "13430286286";//cwc //etAccount.Text = "13709260805"; //etAccount.Text = "support5@hdlchina.com.cn"; HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs
@@ -274,8 +274,8 @@ var time = Convert.ToInt32( function.GetAttrState(FunctionAttributeKey.ColorfulTime)); btnWorkHours.Text = time/ 360 + Language.StringByID(StringId.h); btnWorkHours.Text += time / 60 + Language.StringByID(StringId.m); //btnWorkHours.Text = time/ 360 + Language.StringByID(StringId.h); btnWorkHours.Text = time / 60 + Language.StringByID(StringId.m); btnWorkHours.Text += time % 60 + Language.StringByID(StringId.s); var waitPage = new Loading(); @@ -297,8 +297,8 @@ new PublicAssmebly().TipMsg(StringId.Tip, StringId.TimeInvalid); return; } btnWorkHours.Text = hour + "时"; btnWorkHours.Text += minute + "分"; //btnWorkHours.Text = hour + "时"; btnWorkHours.Text = minute + "分"; btnWorkHours.Text += second + "秒"; new System.Threading.Thread(() => { var d = new Dictionary<string, string>(); @@ -402,13 +402,13 @@ { item1.Add(i+Language.StringByID(StringId.h)); } for (int i = 0; i <= 59; i += 1) for (int i = 1; i <= 119; i += 1) { item2.Add(i + Language.StringByID(StringId.m)); item3.Add(i + Language.StringByID(StringId.s)); } uIPickerView.setNPicker(item1, item2,item3); uIPickerView.setCurrentItems(hour, minute, second); uIPickerView.setNPicker( item3,null,null); uIPickerView.setCurrentItems(second-1,0,0); optionBaseView.AddChidren(uIPickerView); dialog.Show();
