HDL-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="1.5.6" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202206082"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.5.8" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202206261"> <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" /> <!--友盟--> <!--<uses-sdk android:minSdkVersion="8"></uses-sdk>--> @@ -88,7 +88,7 @@ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <uses-permission android:name="android.permission.READ_LOGS" /> <!-- 极光推送结束 --> <application android:allowBackup="true" android:debuggable="false" android:icon="@drawable/Icon" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="On Pro"> <application android:allowBackup="true" android:debuggable="false" android:icon="@drawable/Icon" android:requestLegacyExternalStorage="true" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="On Pro"> <!--/扫描二维码activity--> <!--<activity android:name="com.journeyapps.barcodescanner.CaptureActivity" HDL-ON_Android/SplashActivity.cs
@@ -1,4 +1,4 @@ using System; using System; using Android.App; using Android.Content; using Android.Content.PM; @@ -45,6 +45,8 @@ protected override void OnCreate(Bundle savedInstanceState) { base.OnCreate(savedInstanceState); //Intent i = new Intent(this, typeof(BaseActivity));//Intent intent=new Intent( 起始组件对象 , 目标 Service.class); //StartActivityForResult(i, 1); @@ -107,6 +109,9 @@ BaseActivity.KeepScreenON = false; //隐藏虚拟按键 BaseActivity.IsHideVirualButtons = true; //实现安卓返回按键 BaseActivity.BackKeyAction = () => { @@ -138,9 +143,18 @@ Language.CurrentLanguage = "Chinese"; Locale locale1 = Locale.Default; var localeList = Resources.Configuration.Locale; Console.WriteLine("999999999999999999999999999999999999999999999"+ localeList.Language); if (localeList.Language == "zh") { Language.CurrentLanguage = "Chinese"; } else if(localeList.Language == "es") { Language.CurrentLanguage = "Spanish"; } else if (localeList.Language == "ru") { Language.CurrentLanguage = "russian"; } else { @@ -171,6 +185,26 @@ }; BaseActivity.RefreshUIAction += (activity) => { Language.CurrentLanguage = "Chinese"; Locale locale1 = Locale.Default; var localeList = Resources.Configuration.Locale; Console.WriteLine("999999999999999999999999999999999999999999999" + localeList.Language); if (localeList.Language == "zh") { Language.CurrentLanguage = "Chinese"; } else if (localeList.Language == "es") { Language.CurrentLanguage = "Spanish"; } else if (localeList.Language == "ru") { Language.CurrentLanguage = "russian"; } else { Language.CurrentLanguage = "English"; } MainPage.Show(); checkSomeInfo(); }; HDL-ON_iOS/Info.plist
@@ -100,9 +100,9 @@ <key>UIStatusBarStyle</key> <string>UIStatusBarStyleLightContent</string> <key>CFBundleShortVersionString</key> <string>1.5.502205241</string> <string>1.5.502206241</string> <key>CFBundleVersion</key> <string>1.5.505241</string> <string>1.5.506241</string> <key>NSLocationWhenInUseUsageDescription</key> <string>Use geographic location to provide services such as weather</string> <key>NSAppleMusicUsageDescription</key> HDL_ON/DAL/Server/HttpUtil.cs
@@ -17,8 +17,8 @@ /// 固定域名,正式环境 /// 公共域名就近解析 /// </summary> //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm /// <summary> /// RegionMark /// </summary> HDL_ON/Entity/Function/Function.cs
@@ -1196,14 +1196,19 @@ public string loopId; } /// <summary> /// Tag 功能SPK /// </summary> public static class SPK { /// <summary> /// 门锁 /// </summary> public const string DoorLock = "security.door"; /// <summary> /// 门锁spk列表 /// </summary> /// <returns></returns> public static List<string> GetDoorLockSPKList() { var list = new List<string>(); @@ -1267,6 +1272,10 @@ /// （卷帘） /// </summary> public const string CurtainRoller = "curtain.roller"; /// <summary> /// 梦幻帘 /// </summary> public const string CurtainDream = "curtain.dream"; /// <summary> /// 窗帘spk列表 @@ -1279,6 +1288,7 @@ spkList.Add(CurtainSwitch); spkList.Add(CurtainShades); spkList.Add(CurtainTrietex); spkList.Add(CurtainDream); return spkList; } #endregion HDL_ON/Entity/Function/Scene.cs
@@ -540,6 +540,10 @@ public int min = 0; /// <summary> /// 属性的值列表 /// </summary> public List<string> valueList = new List<string>(); /// <summary> /// 属性名称显示文本 /// 中英文显示 /// </summary> HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@ /// <summary> /// 版本号 /// </summary> public static string VersionString = "1.5.5"; public static string VersionString = "1.5.81"; ///// <summary> ///// 客户端类型 ///// </summary> HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -482,6 +482,13 @@ scene.functions.Remove(scenefunction); continue; } //将spk实体里面的min max值放入场景功能实体里，要不然数据会丢失 2022-06-21 16:06:45 foreach (var tt in scenefunction.status) { tt.min = scenefunction.localFunction.GetAttribute(tt.key).min; tt.max = scenefunction.localFunction.GetAttribute(tt.key).max; tt.valueList = scenefunction.localFunction.GetAttribute(tt.key).value; } i++; var row = new RowLayout() { HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs
@@ -165,22 +165,28 @@ else { var selectedRoom = Room.CurrentSpatial.RoomList.Find((obj) => obj.uid == DB_ResidenceData.Instance.sceneChooseRoomId); var listAllFun = new List<Function>(); var listFun = new List<Function>(); listAllFun.AddRange(unallocatedList); listAllFun.AddRange(allocatedList); btnFloor.Text = selectedRoom.floorRoomName; foreach(var funtion in listAllFun) if (selectedRoom == null) { if (funtion.roomIds.Contains(selectedRoom.roomId)) { listFun.Add(funtion); } LoadFunctionListRow(null); } LoadFunctionListRow(listFun); else { var listAllFun = new List<Function>(); var listFun = new List<Function>(); listAllFun.AddRange(unallocatedList); listAllFun.AddRange(allocatedList); btnFloor.Text = selectedRoom.floorRoomName; foreach (var funtion in listAllFun) { if (funtion.roomIds.Contains(selectedRoom.roomId)) { listFun.Add(funtion); } } LoadFunctionListRow(listFun); } }
@@ -568,7 +568,9 @@ }) { IsBackground = true }.Start(); } catch { } catch (Exception ex) { MainPage.Log(ex.Message); } }
@@ -84,6 +84,15 @@ public FloorHeatingPage(Function func) { bodyView = this; var tempAttr = func.GetAttribute(FunctionAttributeKey.SetTemp); if (tempAttr != null) { if(tempAttr.min == 0 && tempAttr.max == 0) { tempAttr.min = 16; tempAttr.max = 30; } } function = func; }
@@ -349,6 +349,28 @@ { DriverLayer.Control.Ins.SendReadCommand(function); }) { IsBackground = true }.Start(); new System.Threading.Thread(() => { while (true) { System.Threading.Thread.Sleep(500); System.Threading.Thread.Sleep(500); if (curDimmerStatus) { continue; } if (onDimmerBar) { onDimmerBar = false; continue; } else { DriverLayer.Control.Ins.SendReadCommand(function); } } }) { IsBackground = true }.Start(); }
@@ -27,8 +27,11 @@ { bodyView.dimmerBar.Progress = Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness)); } bodyView.btnBrightnessText.Text = updataTemp.GetAttrState(FunctionAttributeKey.Brightness) + "%"; bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80); if (updataTemp.GetAttrState(FunctionAttributeKey.Brightness) != "0") { bodyView.btnBrightnessText.Text = updataTemp.GetAttrState(FunctionAttributeKey.Brightness) + "%"; bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80); } } else { @@ -134,6 +137,7 @@ }; } bool curDimmerStatus = false; /// <summary> /// 灯光调光事件 /// </summary> @@ -141,17 +145,18 @@ { dimmerBar.OnStopTrackingTouchEvent = (sender, e) => { if (!function.online) { new Tip() { CloseTime = 1, Text = Language.StringByID(StringId.DeviceOfflineCannotOption), Direction = AMPopTipDirection.None, }.Show(MainPage.BaseView); return; } onDimmerBar = false; //if (!function.online) //{ // new Tip() // { // CloseTime = 1, // Text = Language.StringByID(StringId.DeviceOfflineCannotOption), // Direction = AMPopTipDirection.None, // }.Show(MainPage.BaseView); // return; //} //onDimmerBar = false; curDimmerStatus = false; function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress); System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString()); HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
@@ -262,9 +262,35 @@ DriverLayer.Control.Ins.SendReadCommand(function); }) { IsBackground = true }.Start(); new System.Threading.Thread(() => { while (true) { System.Threading.Thread.Sleep(500); if (curDimmerStatus) { continue; } if ( onDimmerBar) { onDimmerBar = false; continue; } else { DriverLayer.Control.Ins.SendReadCommand(function); } } }) { IsBackground = true }.Start(); } } } HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -21,13 +21,13 @@ if (updataTemp.spk == bodyView.function.spk && updataTemp.sid == bodyView.function.sid) { bodyView.btnBrightnessText.Text = updataTemp.GetAttrState(FunctionAttributeKey.Brightness) + "%"; bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32( updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40); if (updataTemp.trait_on_off.curValue.ToString() == "on") { bodyView.dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1); if (!bodyView.onDimmerBar) { bodyView.dimmerBar.Progress = Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness)); bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40); } } else @@ -83,6 +83,8 @@ }; } bool curDimmerStatus = false; /// <summary> /// 灯光调光事件 /// </summary> @@ -92,12 +94,13 @@ { dimmerBar.OnStartTrackingTouchEvent = (sender, e) => { onDimmerBar = true; curDimmerStatus = onDimmerBar = true; dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1); }; dimmerBar.OnStopTrackingTouchEvent = (sender, e) => { onDimmerBar = false; curDimmerStatus = false; function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress); System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString()); @@ -133,9 +136,9 @@ function.refreshTime = DateTime.Now; new System.Threading.Thread(() => { System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); d.Add(FunctionAttributeKey.Brightness, e.ToString()); Control.Ins.SendWriteCommand(function, d); System.Collections.Generic.Dictionary<string, string> dic = new System.Collections.Generic.Dictionary<string, string>(); dic.Add(FunctionAttributeKey.Brightness, e.ToString()); Control.Ins.SendWriteCommand(function, dic); }) { IsBackground = true }.Start(); } 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";//mmmm public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm /// <summary> /// RegionMark /// </summary>
