HDL-ON_Android/Assets/Phone/FunctionIcon/Light/LightScene/gp_all_off.pngHDL-ON_Android/Assets/Phone/FunctionIcon/Light/LightScene/gp_all_on.pngHDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.4.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202401031"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.4.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202401051"> <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" /> <uses-permission android:name="android.permission.RECEIVE_SMS" /> <!--友盟--> HDL-ON_iOS/Resources/Phone/FunctionIcon/Light/LightScene/gp_all_off.pngHDL-ON_iOS/Resources/Phone/FunctionIcon/Light/LightScene/gp_all_on.pngHDL_ON/Common/ApiUtlis.cs
@@ -536,7 +536,7 @@ //======================安防==================== GetSecurityList(); //===================读取逻辑列表========================== //===================读取逻辑列表==================== Logic.LogicList.Clear();//主页下拉强制刷新自动化列表 MainView.GetLogicList();//读取自动化列表 }) HDL_ON/DAL/Server/HttpServerRequest.cs
HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -329,11 +329,11 @@ etAccount.Text = "13533335801"; etAccount.Text = "13682244600"; etAccount.Text = "marketing@australindo.co.id"; etAccount.Text = "support7@hdlautomation.com"; etAccount.Text = "13922115008";//刘总 etAccount.Text = "1272061968@qq.com"; etAccount.Text = "support7@hdlautomation.com"; etAccount.Text = "info@hdlegypt.com"; etAccount.Text = "support7@hdlautomation.com"; etAccount.Text = "18402017839"; } HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -759,14 +759,40 @@ ///设备延时iewv DelayView(fLayout, volView.frameLayout.Bottom); var delayView = DelayView(fLayout, volView.frameLayout.Bottom); if (edit ) { Output outputs = Logic.currlogic.output[index]; var dicList = outputs.status.Find((obj) => obj.ContainsValue(FunctionAttributeKey.OnOff)); if (dicList != null) { if (dicList.ContainsValue( "off") || dicList.ContainsValue("pause")) { funTypeView.frameLayout.Visible = false; volView.frameLayout.Visible = false; delayView.frameLayout.Y = switchVie.frameLayout.Bottom; } } } #endregion #region 点击事件 ///开关点击事件 switchVie.btnClick.MouseUpEventHandler += (sender, e) => { SwitchViewMethod(device, switchVie.btnState, 2); SwitchViewMethod(device, switchVie.btnState, 2, (v) => { if (v == "on") { funTypeView.frameLayout.Visible = true; volView.frameLayout.Visible = true; delayView.frameLayout.Y = volView.frameLayout.Bottom; } else { funTypeView.frameLayout.Visible = false; volView.frameLayout.Visible = false; delayView.frameLayout.Y = switchVie.frameLayout.Bottom; } }); }; ///提示语音点击事件 funTypeView.btnClick.MouseUpEventHandler += (sender, e) => @@ -1002,6 +1028,23 @@ dicList.AddRange(diclist);//再添加其它属性 dicSateteList = dicList;//重新赋值 } var onoffDic = dicSateteList.Find((obj) => obj.ContainsValue("on_off")); if (onoffDic != null) { if (onoffDic.ContainsValue("off")) { for(int i =0;i<dicSateteList.Count;) { var d = dicSateteList[i]; if(!d.ContainsValue("on_off") || d.ContainsValue("delay")) { dicSateteList.Remove(d); continue; } i++; } } } } break; case SPK.GroupControl: @@ -1052,7 +1095,7 @@ /// </summary> /// <param name="fLayout">父控件</param> /// <param name="bottomY">在哪个控件下面</param> private void DelayView(FrameLayout fLayout, int bottomY) private LogicView.FunTypeView DelayView(FrameLayout fLayout, int bottomY) { LogicView.FunTypeView delayView = new LogicView.FunTypeView(); delayView.frameLayout.Y = bottomY; @@ -1072,6 +1115,7 @@ selectedState = "delay_" + strdelay; }); }; return delayView; } @@ -1081,7 +1125,8 @@ /// <param name="device"></param> /// <param name="button"></param> /// <param name="len">显示选择View数量</param> private void SwitchViewMethod(Entity.Function device, Button button, int len) /// <param name="action">点击回调事件，用来给音乐刷新界面使用，wxr 2024-01-04 16:03:47</param> private void SwitchViewMethod(Entity.Function device, Button button, int len,Action<string> action = null) { #region 界面 FrameLayout frame = new FrameLayout { BackgroundColor = CSS.CSS_Color.viewTrans60lucence }; @@ -1142,11 +1187,11 @@ } break; } //数据封装 AddDictionary(key, value); action?.Invoke(value); }); #endregion } HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
@@ -248,6 +248,17 @@ if (sceneFunction.localFunction.spk == SPK.MusicStandard) { for (var i = 0; i < sceneFunction.status.Count;) { var ddd = sceneFunction.status[i]; if (string.IsNullOrEmpty(ddd.value)) { sceneFunction.status.Remove(ddd); continue; } i++; } if (sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.PlaylistName) == null) { if (isOnStatus) HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -225,7 +225,31 @@ var regionId = (string)btnHomeName.Tag; dialog.Close(); LoadEvent_ChangeCurHome(home); new System.Threading.Thread(() => { try { while (true) { if (Common.ApiUtlis.Ins.DownloadDataComplete) { System.Threading.Thread.Sleep(100); } else { Application.RunOnMainThread(() => { LoadContentView(); }); break; } } } catch { } { } }) { IsBackground = true }.Start(); HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.ChangeCurrHome(home); }; } @@ -409,7 +433,31 @@ var regionId = (string)btnHomeName.Tag; dialog.Close(); LoadEvent_ChangeCurHome(home); new System.Threading.Thread(() => { try { while (true) { if (Common.ApiUtlis.Ins.DownloadDataComplete) { System.Threading.Thread.Sleep(100); } else { Application.RunOnMainThread(() => { LoadContentView(); }); break; } } } catch { } { } }) { IsBackground = true }.Start(); HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.ChangeCurrHome(home); }; } HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -446,7 +446,7 @@ d.Add(FunctionAttributeKey.Mode, m); Control.Ins.SendWriteCommand(device, d); dialog.Close(); if (device.GetAttrState(FunctionAttributeKey.Mode) == "fan") if (device.GetAttrState(FunctionAttributeKey.Mode) == "fan" || device.GetAttrState(FunctionAttributeKey.Mode) == "dry") { setTempBar.IsClickable = false; HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage_V2.cs
@@ -97,9 +97,6 @@ // function.CollectFunction(); //}; //回退刷新信息事件 new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl)).LoadTopView_SettingIcon( () => { var page = new AddGroupControlPage(function, @@ -310,18 +307,26 @@ attrView.AddChidren(btnSwitchIcon); btnSwitchIcon.MouseUpEventHandler = (sender, e) => { btnSwitchIcon.IsSelected = !btnSwitchIcon.IsSelected; if (btnSwitchIcon.IsSelected) { var d = new Dictionary<string, string>(); d.Add(FunctionAttributeKey.OnOff, "off"); function.Control(d); } else { var d = new Dictionary<string, string>(); d.Add(FunctionAttributeKey.OnOff, "on"); function.Control(d); } else { var d = new Dictionary<string, string>(); d.Add(FunctionAttributeKey.OnOff, "off"); function.Control(d); } }; btnOn.MouseUpEventHandler += (sender, e) => { btnSwitchIcon.IsSelected = true; }; btnOff.MouseUpEventHandler += (sender, e) => { btnSwitchIcon.IsSelected = false; }; } @@ -835,8 +840,8 @@ dimmerBar.OnProgressChangedEvent = (sender, e) => { btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100); btnBrightnessText.Text = dimmerBar.Progress + "%"; //btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100); //btnBrightnessText.Text = dimmerBar.Progress + "%"; return; if (e == 0 && lastBrightness != 0) { @@ -1085,13 +1090,13 @@ btnOn.MouseUpEventHandler += (sender, e) => { dimmerBar.Progress = 100; btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100); btnBrightnessText.Text = dimmerBar.Progress + "%"; //btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100); //btnBrightnessText.Text = dimmerBar.Progress + "%"; }; btnOff.MouseUpEventHandler += (sender, e) => { dimmerBar.Progress = 0; btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100); btnBrightnessText.Text = dimmerBar.Progress + "%"; //btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100); //btnBrightnessText.Text = dimmerBar.Progress + "%"; };
