HDL-ON_Android/Assets/Language.ini
@@ -2013,7 +2013,7 @@ 630=炫彩功能 631=起始颜色 632=结束颜色 633=炫彩周期 633=炫彩速率 634=推荐 635=当前颜色 636=色值号为6位（由纯数字/数字+字母组合） HDL-ON_Android/Assets/Phone/FunctionIcon/GroupControl/gp_all_off.png
@@ -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,15 +575,37 @@ <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\Phone\LogicIcon\ganjiedian.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" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_off_home_click.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_off_home.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_off.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_on_home_click.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_on_home.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\GroupControl\gp_all_on.png" /> </ItemGroup> <ItemGroup> <AndroidResource Include="Resources\values\colors.xml" /> @@ -1824,6 +1823,7 @@ <Folder Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\" /> <Folder Include="Assets\Phone\AksIcon\" /> <Folder Include="Assets\Phone\HisenseTv\" /> <Folder Include="Assets\Phone\FunctionIcon\GroupControl\" /> </ItemGroup> <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> HDL-ON_Android/Resources/Resource.designer.cs
@@ -15,7 +15,7 @@ { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.99")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.1.111")] public partial class Resource {
@@ -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
@@ -505,6 +505,7 @@ <Folder Include="Resources\Phone\FunctionIcon\Panel\" /> <Folder Include="Resources\Phone\FunctionIcon\Inverter\" /> <Folder Include="Resources\Phone\FunctionIcon\Electrical\MechanicalArm\" /> <Folder Include="Resources\Phone\FunctionIcon\GroupControl\" /> </ItemGroup> <ItemGroup> <InterfaceDefinition Include="LaunchScreen.storyboard" /> @@ -1584,35 +1585,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,7 +1727,41 @@ <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\Phone\LogicIcon\ganjiedian.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" /> <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_off_home_click.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_off_home.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_off.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_on_home_click.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_on_home.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_on.png" /> </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_iOS/Resources/Phone/FunctionIcon/GroupControl/gp_all_off.png
@@ -28,6 +28,7 @@ /// <param name="content">信息内容</param> public static void WriteLine(string tag, string url, string content) { return; #if DEBUG if (url == "") { HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -163,6 +163,7 @@ else if (interphoneType == InterphoneType.FREEVIEW.ToString()) { string sip_account = "sip:D" + mESVideoInfo.deviceCode + "@139.159.157.75:46000"; mESVideoInfo.deviceSipAccount = sip_account; HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo, InterphoneType.FREEVIEW.ToString()); } HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -133,7 +133,7 @@ HDLLinphoneKit.Instance.SetAccountAndLogin( mHDLSipInfo.sipAccount, mHDLSipInfo.sipPasswd, "139.159.157.75:47000",//mHDLSipInfo.realm, mHDLSipInfo.realm, //"sip:139.159.157.75:47000;transport=udp", HDLLinphoneKit.InterPhoneTypeFreeview ); HDL_ON/Entity/Enumerative/Command.cs
@@ -1688,7 +1688,7 @@ SetGateway = 0xE54C, SetGatewayACK = 0xE54C, /// <summary> /// 第一次搜索指令 /// 搜索模块指令 /// 操作码: 0xE548 /// </summary> ReadDeviceModul = 0xE548, HDL_ON/Entity/Function/Scene.cs
@@ -592,6 +592,11 @@ var modeState = status.Find((obj) => obj.key == FunctionAttributeKey.Mode); var tempState = status.Find((obj) => obj.key == FunctionAttributeKey.SetTemp); var fanState = status.Find((obj) => obj.key == FunctionAttributeKey.FanSpeed); ////海信电视状态 //var hisenseTvState = status.Find((obj) => obj.key == "wol"); //if(hisenseTvState != null) //{ //} if (modeState != null) { sceneFunctionInfo += modeState.GetValueText() + " "; 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
@@ -326,6 +326,10 @@ //etAccount.Text = "12345678904";//2.0 测试 萤石 etAccount.Text = "18316672920"; etAccount.Text = "18244942707"; etAccount.Text = "1272061968@qq.com";//万科城市之光E区8栋206 etAccount.Text = "18933160333"; etAccount.Text = "18402017839";//wjc } else { @@ -343,7 +347,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"; @@ -377,9 +380,9 @@ else if (etAccount.Text == "18100573477") { etPassword.Text = "huang12345"; }else if(etAccount.Text == "15006564444") }else if(etAccount.Text == "1272061968@qq.com") { etPassword.Text = "zht626800"; etPassword.Text = "a123456"; } //etPassword.Text = "Hdl85521566"; btnLogin.IsSelected = true; @@ -923,6 +926,23 @@ #if DEBUG var hesTv = new Function() { sid = "hisense000000000001", deviceId = "hisense000000000001", name = "海信电视", spk = SPK.ElectricalTvHisense, roomIds = new List<string>() { "1405771024583090178" }, attributes = new List<FunctionAttributes>() { new FunctionAttributes() { key = "on_off",value =new List<string>(){ "off" }, curValue="on",state = "on" }, new FunctionAttributes() { key = "wol",value =new List<string>(){ "on" }, curValue="on",state = "on" }, } }; hesTv.SaveFunctionFile(); var airSwitchP3 = new Function() { sid = "airSwitchP3000000000001", HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic; using HDL_ON.Entity; using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock; using Newtonsoft.Json; namespace HDL_ON.UI.UI2.Intelligence.Automation HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
@@ -193,6 +193,28 @@ } else { if (sceneFunction.localFunction.spk == SPK.ElectricalTvHisense) { for(int i = 0;i< sceneFunction.status.Count;i++) { var tvState = sceneFunction.status[i]; if (tvState.key == FunctionAttributeKey.OnOff) { tvState.key = "wol"; tvState.value = "on"; } else { if(string.IsNullOrEmpty( tvState.value)) { sceneFunction.status.RemoveAt(i); i--; } } } } else { var isHasColorful = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Colorful); if (isHasColorful != null) { @@ -200,6 +222,7 @@ } } } } else { if (sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.OnOff) != null) 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(); SiriIntents/Server/HttpUtil.cs
@@ -16,8 +16,8 @@ /// 固定域名,正式环境 /// 公共域名就近解析 /// </summary> public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com"; //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com"; const string APP_KEY = "HDL-HOME-APP-TEST"; const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss"; //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
