.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,11 +1,15 @@ <Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" /> <MonoDevelop.Ide.Workbench> <Files> <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="27" Column="22" /> <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="14" Column="1" /> <File FileName="HDL-ON_iOS/Info.plist" /> <File FileName="HDL_ON/UI/MainPage.cs" Line="115" Column="62" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs" Line="167" Column="29" /> <File FileName="HDL_ON/UI/MainPage.cs" Line="28" Column="55" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs" Line="177" Column="75" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs" Line="158" Column="69" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorEnvironment/SensorEnvironmentManagerPage.cs" Line="13" Column="18" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorEnvironment/AddSensorEnvironmentPage.cs" Line="116" Column="149" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -15,16 +19,12 @@ <Node name="DAL" expanded="True"> <Node name="Server" expanded="True" /> </Node> <Node name="UI" expanded="True"> <Node name="UI2" expanded="True"> <Node name="4-PersonalCenter" expanded="True"> <Node name="RoomListManage" expanded="True"> <Node name="RoomEditFunctionPage.cs" selected="True" /> </Node> </Node> <Node name="FuntionControlView" expanded="True" /> </Node> </Node> <Node name="UI" expanded="True" /> </Node> <Node name="HDL-ON_Android" selected="True" /> <Node name="HDL-ON_iOS" expanded="True"> <Node name="References" expanded="True" /> <Node name="Resources" expanded="True" /> </Node> </Node> </State> DLL/IOS/EZSDK.IOS.dllBinary files differ
HDL-ON_Android/Assets/Language.ini
@@ -328,7 +328,7 @@ 324=Scene delay 325=Delay setting 326=Delay 327=Catch Scene 327=Capture the scene 328=Film scene 329=General 330=Automatic mode @@ -439,7 +439,6 @@ 453=Alarm mute 454=Deployment information 455=The name can not be blank. 456=Canvas 457=Energy consumption 458=Date @@ -466,6 +465,7 @@ 477=Swing 478=Pattern 479=Speed 480=Environmental sensor @@ -1405,7 +1405,7 @@ 324=场景延时 325=延时设置 326=延时 327=捕获场景 327=捕捉场景 328=电影场景 329=普通 330=自动模式 @@ -1541,6 +1541,7 @@ 477=摆动 478=模式 479=风速 480=环境传感器 1000=室内湿度 @@ -1804,7 +1805,7 @@ 6016=离线 6017=版本号 6018=请输入遥控器名称 6019=提示：遥控器创建后可在功能-电器分类{\r\n}查找使用 6019=提示：遥控器创建后可在功能-电器分类，查找使用 6020=推荐按键 6021=请输入按键名称 6022=下一步 @@ -1879,6 +1880,7 @@ 6093=设备不在线 6094=网关设备不存在 6095=添加按钮超出30个 7000=新建自动化 @@ -2026,7 +2028,6 @@ 7142=严重 7143=偏高 7144=优秀 9000=请使用新的手机账号登录APP 9001=请使用新的邮箱账号登录APP 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="202107161" android:versionName="1.2.202107161" package="com.hdl.onpro"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202107192" android:versionName="1.2.202107192" package="com.hdl.onpro"> <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" /> <!-- 乐橙可视对讲需要的权限 --> <!--<uses-permission android:name="android.permission.INTERNET" />--> HDL-ON_iOS/Info.plist
@@ -100,9 +100,9 @@ <key>UIStatusBarStyle</key> <string>UIStatusBarStyleLightContent</string> <key>CFBundleShortVersionString</key> <string>1.2.202107161</string> <string>1.2.202107192</string> <key>CFBundleVersion</key> <string>1.2.07161</string> <string>1.2.07192</string> <key>NSLocationWhenInUseUsageDescription</key> <string>Use geographic location to provide services such as weather</string> <key>NSAppleMusicUsageDescription</key> HDL-ON_iOS/Resources/Language.ini
@@ -465,6 +465,7 @@ 477=Swing 478=Pattern 479=Speed 480=Environmental sensor @@ -1540,6 +1541,7 @@ 477=摆动 478=模式 479=风速 480=环境传感器 1000=室内湿度 HDL_ON/Common/R.cs
@@ -5,6 +5,10 @@ public static class StringId { /// <summary> /// 环境传感器 /// </summary> public const int SensorEnvironment = 480; /// <summary> /// 风量 /// </summary> public const int AirVolume = 479; HDL_ON/HDL_ON.projitems
@@ -465,6 +465,8 @@ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\View\FrameLayout50.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\View\SaveView.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\View\Buttons.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddDevice\SenesorEnvironment\SensorEnvironmentManagerPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddDevice\SenesorEnvironment\AddSensorEnvironmentPage.cs" /> </ItemGroup> <ItemGroup> <Folder Include="$(MSBuildThisFileDirectory)Entity\Device\" /> @@ -488,5 +490,6 @@ <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\SmartSpeaker\" /> <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddDevice\SenesorMegahealth\" /> <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddDevice\MiniRemoteControl\" /> <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddDevice\SenesorEnvironment\" /> </ItemGroup> </Project> HDL_ON/UI/MainPage.cs
@@ -25,7 +25,7 @@ /// <summary> /// 版本号 /// </summary> public static string VersionString = "1.2.0716"; public static string VersionString = "1.2.0719"; ///// <summary> ///// 客户端类型 ///// </summary> HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorEnvironment/AddSensorEnvironmentPage.cs
New file @@ -0,0 +1,186 @@ using HDL_ON.DAL.Server; using HDL_ON.Entity; using HDL_ON.Stan; using Shared; using System; namespace HDL_ON.UI { /// <summary> /// 添加毫米波步骤1界面 /// </summary> public class AddSensorEnvironmentPage : EditorCommonForm { #region ■ 变量声明___________________________ /// <summary> /// 添加设备完成之后的回调事件 /// </summary> public Action<Function> AddDeviceEvent = null; #endregion #region ■ 初始化_____________________________ /// <summary> /// 画面显示(底层会固定调用此方法，借以完成画面创建) /// </summary> public void ShowForm(IntegratedBrandDevice device) { if (Language.CurrentLanguage == "Chinese") { //设置头部信息 base.SetTitleText(Language.StringByID(StringId.Add) + device.productName); } else { base.SetTitleText(Language.StringByID(StringId.Add) + " " + device.productName); } //这个界面的背景需要白色 bodyFrameLayout.BackgroundColor = UI.CSS.CSS_Color.MainBackgroundColor; //初始化中部信息 this.InitMiddleFrame(); } /// <summary> /// 初始化中部信息 /// </summary> private void InitMiddleFrame() { //图片 var btnPic = new PicViewControl(132, 132); btnPic.Y = Application.GetRealHeight(69); btnPic.Gravity = Gravity.CenterHorizontal; btnPic.UnSelectedImagePath = "PersonalCenter/AddDevice/SenesorMegahealthBg.png"; bodyFrameLayout.AddChidren(btnPic); //请输入设备机上的sn码 var textView = new FrameLayout() { Y = Application.GetRealHeight(309 - 64), Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth(319), Height = Application.GetRealHeight(44), }; bodyFrameLayout.AddChidren(textView); textView.AddChidren(new Button() { Y = Application.GetRealHeight(43), Height = 1, BackgroundColor = CSS.CSS_Color.DividingLineColor }); EditText editText = new EditText() { TextAlignment = TextAlignment.Center, TextColor = CSS.CSS_Color.FirstLevelTitleColor, PlaceholderText = Language.StringByID(StringId.PlsEntrySNCode), PlaceholderTextColor = CSS.CSS_Color.PromptingColor1, TextSize = CSS.CSS_FontSize.TextFontSize, }; textView.AddChidren(editText); Button btnScan = new Button() { Width = Application.GetRealWidth(32), Height = Application.GetRealWidth(32), Gravity = Gravity.CenterVertical, X = Application.GetRealWidth(275), UnSelectedImagePath = "Public/Scan.png" }; textView.AddChidren(btnScan); btnScan.MouseUpEventHandler = (sender, e) => { Scan.OpenScan((scanString) => { editText.Text = scanString; }); }; //下一步 var btnNext = this.AddBottomClickButton(Language.StringByID(StringId.Next)); btnNext.ButtonClickEvent += (sender, e) => { var snCode = editText.Text.Trim(); if (string.IsNullOrEmpty(snCode)) { editText.PlaceholderTextColor = CSS.CSS_Color.WarningColor; } else { var waitPage = new Loading(); waitPage.Start(); new System.Threading.Thread(() => { try { var pm = new HttpServerRequest(); var pack = pm.IndependentRegister3TyDevcie(SPK.SensorEnvironment, snCode, Language.StringByID(StringId.SensorEnvironment)); if (pack.Code == StateCode.SUCCESS) { //var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<IntegratedBrandDevice>>(pack.Data.ToString()); Application.RunOnMainThread(() => { waitPage.Hide(); var tipDialog = new OperationResultDisPalyPage(); tipDialog.LoadPage(true, Language.StringByID(StringId.AddSuccess), "", Language.StringByID(StringId.CanStartUsingZhaoguanMillimeterWave), Language.StringByID(StringId.Next)); tipDialog.Show(); AddDeviceEvent?.Invoke(new Function()); this.CloseForm(); }); } else if (pack.Code == "10801" || pack.Code == "9") { var mes = ""; if (Language.CurrentLanguage == "Chinese") { mes = "该设备已经被添加。"; } else { mes = "This device has been added."; } Application.RunOnMainThread(() => { var tip = new Tip() { Text = mes, CloseTime = 2, Direction = AMPopTipDirection.None }; tip.Show(MainPage.BaseView); }); } else { IMessageCommon.Current.ShowErrorInfoAlter(pack.Code); } } catch (Exception ex) { MainPage.Log("2--::" + ex.Message); } finally { Application.RunOnMainThread(() => { waitPage.Hide(); }); } }) { IsBackground = true }.Start(); } }; } #endregion #region ■ 关闭界面___________________________ /// <summary> /// 关闭界面 /// </summary> public override void CloseFormBefore() { this.AddDeviceEvent = null; base.CloseFormBefore(); } #endregion } } HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorEnvironment/SensorEnvironmentManagerPage.cs
New file @@ -0,0 +1,133 @@ using HDL_ON.DAL.Server; using HDL_ON.Entity; using HDL_ON.Stan; using HDL_ON.UI.UI2.PersonalCenter.PirDevice; using Shared; using System; namespace HDL_ON.UI { /// <summary> /// 添加毫米波步骤1界面 /// </summary> public class SensorEnvironmentManagerPage : EditorCommonForm { #region ■ 变量声明___________________________ /// <summary> /// 添加设备完成之后的回调事件 /// </summary> public Action DelDeviceEvent = null; Function function = null; #endregion #region ■ 初始化_____________________________ /// <summary> /// 画面显示(底层会固定调用此方法，借以完成画面创建) /// </summary> public void ShowForm(Function device) { function = device; //设置头部信息 base.SetTitleText(Language.StringByID(StringId.Add) + device.name); //这个界面的背景需要白色 bodyFrameLayout.BackgroundColor = CSS.CSS_Color.BackgroundColor; //初始化中部信息 this.InitMiddleFrame(); } /// <summary> /// 初始化中部信息 /// </summary> private void InitMiddleFrame() { //图片 var btnPic = new PicViewControl(132, 132); btnPic.Y = Application.GetRealHeight(69); btnPic.Gravity = Gravity.CenterHorizontal; btnPic.UnSelectedImagePath = "PersonalCenter/AddDevice/SenesorMegahealthBg.png"; bodyFrameLayout.AddChidren(btnPic); var btnTip = new Button() { Y = Application.GetRealHeight(309 - 44), Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth(319), Height = Application.GetRealHeight(84), IsMoreLines = true, TextAlignment = TextAlignment.Center, TextColor = CSS.CSS_Color.FirstLevelTitleColor, TextSize = CSS.CSS_FontSize.SubheadingFontSize, }; bodyFrameLayout.AddChidren(btnTip); if (Language.CurrentLanguage == "Chinese") { btnTip.Text = "该设备已添加到安防传感器类别，可到对应功能板块查看"; } else { btnTip.Text = "The device has been added to the security sensor category, which can be viewed in the corresponding function block."; } var btnDel = new Button() { Y = Application.GetRealHeight(617 - 64), Height = Application.GetRealHeight(50), TextAlignment = TextAlignment.Center, TextColor = CSS.CSS_Color.WarningColor, TextSize = CSS.CSS_FontSize.SubheadingFontSize, TextID = StringId.DeleteDevice, BackgroundColor = CSS.CSS_Color.MainBackgroundColor, }; bodyFrameLayout.AddChidren(btnDel); btnDel.MouseUpEventHandler = (sender, e) => { var pack = PirSend.DeleteDevice(function.deviceId); if (pack.Code == StateCode.SUCCESS) { DelDeviceEvent?.Invoke(); this.CloseForm(); var mes = ""; if (Language.CurrentLanguage == "Chinese") { mes = "设备删除成功。"; } else { mes = "Device deleted successfully."; } var tip = new Tip() { Text = mes, CloseTime = 2, Direction = AMPopTipDirection.None }; tip.Show(MainPage.BaseView); } else { IMessageCommon.Current.ShowErrorInfoAlter(pack.Code); } }; } #endregion #region ■ 关闭界面___________________________ /// <summary> /// 关闭界面 /// </summary> public override void CloseFormBefore() { this.DelDeviceEvent = null; base.CloseFormBefore(); } #endregion } } HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs
@@ -3,8 +3,6 @@ using HDL_ON.Stan; using Shared; using System; using System.Collections.Generic; using System.Text; namespace HDL_ON.UI { HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/SenesorMegahealthManagerPage.cs
@@ -4,8 +4,6 @@ using HDL_ON.UI.UI2.PersonalCenter.PirDevice; using Shared; using System; using System.Collections.Generic; using System.Text; namespace HDL_ON.UI { HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
@@ -154,6 +154,14 @@ this.RemoveFromParent(); }; break; case SPK.SensorEnvironment: var form2 = new AddSensorEnvironmentPage(); form2.AddForm(device); form2.AddDeviceEvent = (functionObj) => { refreshView.BeginHeaderRefreshing(); this.RemoveFromParent(); }; break; } }; } HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -173,6 +173,14 @@ contentView.BeginHeaderRefreshing(); }; break; case SPK.SensorEnvironment: var smPage1 = new SensorEnvironmentManagerPage(); smPage1.AddForm(device); smPage1.DelDeviceEvent = () => { contentView.BeginHeaderRefreshing(); }; break; } }; }
