| HDL-ON_Android/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/HDL-ON_Android.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Properties/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Info.plist | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Resources/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/Server/HttpUtil.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddOutputPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| SiriIntents/Server/HttpUtil.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HDL-ON_Android/Assets/Language.ini
@@ -1042,9 +1042,9 @@ 9011=Enter new password again 9012=Agree 9013=Service Agreement 9014=User information protection regulations 9014=Privacy Agreement 9015=and 9016=Please read and agree on User Service Agreement and User information protection regulations. 9016=Please read and agree on User Service Agreement and Privacy Agreement. 9017=Are you sure to log out? 9018=Please select country/region. 9019=Update now HDL-ON_Android/HDL-ON_Android.csproj
@@ -46,6 +46,7 @@ <BundleAssemblies>false</BundleAssemblies> <AndroidEnableMultiDex>false</AndroidEnableMultiDex> <AndroidUseAapt2>true</AndroidUseAapt2> <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugSymbols>True</DebugSymbols> 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:versionCode="202201231" android:versionName="1.5.4" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202201243" android:versionName="1.5.4" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools"> <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="30" /> <!--友盟--> <!--<uses-sdk android:minSdkVersion="8"></uses-sdk>--> HDL-ON_iOS/Info.plist
@@ -100,9 +100,9 @@ <key>UIStatusBarStyle</key> <string>UIStatusBarStyleLightContent</string> <key>CFBundleShortVersionString</key> <string>1.5.402101231</string> <string>1.5.402101241</string> <key>CFBundleVersion</key> <string>1.5.401231</string> <string>1.5.401241</string> <key>NSLocationWhenInUseUsageDescription</key> <string>Use geographic location to provide services such as weather</string> <key>NSAppleMusicUsageDescription</key> HDL-ON_iOS/Resources/Language.ini
@@ -1042,9 +1042,9 @@ 9011=Enter new password again 9012=Agree 9013=Service Agreement 9014=User information protection regulations 9014=Privacy Agreement 9015=and 9016=Please read and agree on User Service Agreement and User information protection regulations. 9016=Please read and agree on User Service Agreement and Privacy Agreement. 9017=Are you sure to log out? 9018=Please select country/region. 9019=Update now 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/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -842,6 +842,12 @@ UploadImage(selectImagePath, addSceneImageView, scene, uploadSuccessAction); } public override void RemoveFromParent() { backAction(); base.RemoveFromParent(); } /// <summary> /// 完成按钮点击事件 /// </summary> @@ -871,7 +877,7 @@ } scene.EditScene(); FunctionList.List.scenes.Add(scene); backAction(); //backAction(); this.RemoveFromParent(); } if (btnComplete.TextID == StringId.Del) @@ -879,7 +885,7 @@ Action action = () => { FunctionList.List.DeleteScene(scene,true); backAction(); //backAction(); this.RemoveFromParent(); }; new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.DeleteSceneTip, action); HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
@@ -148,7 +148,15 @@ if (temp != null) { temp = sceneFunction; temp.delay = sceneFunction.delay; foreach(var attr in sceneFunction.status) { var keva = temp.status.Find((obj) => obj.key == attr.key); if (keva != null) { keva.value = attr.value; } } } else { HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs
@@ -657,7 +657,7 @@ securityAlarm.output.Remove(delTemp); } outputRow.RemoveFromParent(); outputTargetView.Height = Application.GetRealHeight(65 * securityAlarm.output.Count); outputTargetView.Height = Application.GetRealHeight(65 * securityAlarm.output.Count + 50 ); }; outputRow.SetDelClickeEvent(eventHandler); } HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddOutputPage.cs
@@ -204,20 +204,12 @@ functionListView.RemoveAll(); foreach (var function in allocatedList) { var output = alarm.output.Find((obj) => obj.sid == function.sid); if (output == null) { output = new SecurityOutput(); //{ // status = new List<SecurityOutputStatus> { new SecurityOutputStatus { // key = FunctionAttributeKey.OnOff, // value = "on" // } // } //}; output.sid = function.sid; } //var output = alarm.output.Find((obj) => obj.sid == function.sid); //if (output == null) //{ // output = new SecurityOutput(); // output.sid = function.sid; //} FrameLayout functionRow = new FrameLayout() { @@ -257,7 +249,7 @@ TextAlignment = TextAlignment.CenterRight, TextSize = CSS_FontSize.TextFontSize, TextColor = CSS_Color.PromptingColor1, Text = output.StateText() Text = function.StateText() }; functionRow.AddChidren(btnState); @@ -275,36 +267,43 @@ btnChooseIcon.MouseUpEventHandler = (sender, e) => { btnChooseIcon.IsSelected = !btnChooseIcon.IsSelected; var tempLocal = alarm.output.Find((obj) => obj.sid == output.sid obj.sid == function.sid ); if (tempLocal == null && !string.IsNullOrEmpty(output.spk)) { ShowStateDialog(output, btnState, btnChooseIcon); } //if (tempLocal == null && !string.IsNullOrEmpty(output.spk)) //{ // ShowStateDialog(output, btnState, btnChooseIcon); //} if (btnChooseIcon.IsSelected) { if (tempLocal == null) alarm.output.Add(output); alarm.output.Add(function); ShowStateDialog(function, btnState, btnChooseIcon); } else { if (tempLocal != null) { alarm.output.Remove(output); alarm.output.Remove(function); } } }; btnState.MouseUpEventHandler = (sender, e) => { ShowStateDialog(output, btnState, btnChooseIcon); btnChooseIcon.IsSelected = true; var tempLocal = alarm.output.Find((obj) => obj.sid == function.sid ); if (tempLocal == null) alarm.output.Add(function); ShowStateDialog(function, btnState, btnChooseIcon); }; var localOutput = alarm.output.Find((obj) => obj.sid == output.sid); var localOutput = alarm.output.Find((obj) => obj.sid == function.sid); if (localOutput != null) { btnChooseIcon.IsSelected = true; btnState.Text = output.StateText(); btnState.Text = function.StateText(); } @@ -394,6 +393,7 @@ TextID = StringId.Cancel, TextColor = CSS_Color.WarningColor, IsBold = true, TextSize = CSS_FontSize.SubheadingFontSize, }; contentView.AddChidren(btnCancel);
@@ -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>
