.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,15 +1,24 @@ <Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" /> <MonoDevelop.Ide.Workbench> <Files> <File FileName="HDL-ON_Android/Assets/Language.ini" Line="1" Column="1" /> <File FileName="HDL_ON/UI/MainPage.cs" Line="28" Column="56" /> <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" /> <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs" /> <File FileName="HDL-ON_iOS/Info.plist" /> <File FileName="HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs" Line="758" Column="16" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="HDL_APP_Project" expanded="True"> <Node name="HDL-ON_iOS" expanded="True" selected="True" /> <Node name="HDL_ON" expanded="True"> <Node name="DAL" expanded="True"> <Node name="ThirdPartySdk" expanded="True" /> </Node> </Node> <Node name="HDL-ON_iOS" selected="True" /> </Node> </State> </Pad> @@ -21,8 +30,8 @@ <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String> <String>Shared.IOS/Shared.IOS.csproj</String> </DisabledProjects> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" line="42" column="1" /> @@ -39,6 +48,7 @@ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Scene.cs" relfile="HDL_ON/Entity/Function/Scene.cs" line="338" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="2144" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs" line="244" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs" line="148" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dllBinary files differ
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="202109071" android:versionName="1.2.202109071" package="com.hdl.onpro"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202109151" android:versionName="1.2.202109151" package="com.hdl.onpro"> <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" /> <!-- 乐橙可视对讲需要的权限 --> <!--<uses-permission android:name="android.permission.INTERNET" />--> HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -54,7 +54,7 @@ <MtouchLink>SdkOnly</MtouchLink> <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs> <MtouchEnableSGenConc>false</MtouchEnableSGenConc> <CodesignProvision>On+Dev-20210616-1</CodesignProvision> <CodesignProvision>On+Dev-20210913-1</CodesignProvision> <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' "> HDL-ON_iOS/Info.plist
@@ -100,9 +100,9 @@ <key>UIStatusBarStyle</key> <string>UIStatusBarStyleLightContent</string> <key>CFBundleShortVersionString</key> <string>1.2.202109071</string> <string>1.2.202109161</string> <key>CFBundleVersion</key> <string>1.2.09071</string> <string>1.2.09161</string> <key>NSLocationWhenInUseUsageDescription</key> <string>Use geographic location to provide services such as weather</string> <key>NSAppleMusicUsageDescription</key> HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -747,15 +747,15 @@ /// 截图成功 /// </summary> /// <param name="image"></param> public override void OnScreenshotSuccessfulAction(UIImage image) { //public override void OnScreenshotSuccessfulAction(UIImage image) //{ ////NSData imageData = UIImagePNGRepresentation(image); UIImage //NSData imageData = image.AsPNG(); //byte[] dataBytes = new byte[imageData.Length]; //System.Runtime.InteropServices.Marshal.Copy(imageData.Bytes, dataBytes, 0, Convert.ToInt32(imageData.Length)); ////image.g ////hdlLinphone.ScreenshotSuccessfulAction(dataBytes); } //} /// <summary> /// 开锁成功 HDL_ON/Entity/Function/Function.cs
@@ -1232,7 +1232,7 @@ //spkList.Add(SensorShanLan); //spkList.Add(SensorDuiShe); //spkList.Add(SensoruUtrasonic); //spkList.Add(SensorDryContact); spkList.Add(SensorDryContact); spkList.Add(SenesorMegahealth); return spkList; } HDL_ON/UI/MainPage.cs
@@ -25,7 +25,7 @@ /// <summary> /// 版本号 /// </summary> public static string VersionString = "1.2.0907"; public static string VersionString = "1.2.0916"; ///// <summary> ///// 客户端类型 ///// </summary> HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -212,7 +212,7 @@ //etAccount.Text = "18316672920"; //etAccount.Text = "18316120654";//tujie etAccount.Text = "15626203746"; //etAccount.Text = "13450425807";//黄竹溪 knx项目 etAccount.Text = "13450425807";//黄竹溪 knx项目 } else { @@ -520,13 +520,13 @@ IsBold = true, TextColor = CSS_Color.MainColor, TextAlignment = TextAlignment.Center, Text = "Demo模式" Text = "游客体验" }; bodyView.AddChidren(btnDomeLogin); if(Language.CurrentLanguage!= "Chinese") { btnDomeLogin.Text = "Experience model"; btnDomeLogin.Text = "Tourist experience"; } btnDomeLogin.MouseUpEventHandler = (sender, e) => { HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -549,6 +549,16 @@ FunctionList.List.Functions.Add(new Function() { spk = SPK.SensorDryContact, name = "干接点", attributes = new List<FunctionAttributes>() { new FunctionAttributes(){ key = "status",curValue= "on",state = "on" }, }, }); FunctionList.List.Functions.Add(new Function() { spk = SPK.AirSwitch, name = "智能空开", attributes = new List<FunctionAttributes>() HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -140,7 +140,10 @@ functionListView.RemoveAll(); foreach (var function in showList) { if(function.spk == SPK.SensorDryContact) { continue; } if (function.spk == SPK.LightRGB || function.spk == SPK.LightDimming) { var functionDiv = new FunctionControlZone(function) HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -250,11 +250,11 @@ }; if(Language.CurrentLanguage =="Chinese") { btnExit.Text = "退出体验模式"; btnExit.Text = "退出"; } else { btnExit.Text = "Exit dome"; btnExit.Text = "Exit"; } btnExit.MouseUpEventHandler = (sender, e) => { HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -935,12 +935,16 @@ { btnTemp.Text = Convert.ToDouble( device.GetAttrState(FunctionAttributeKey.SetTemp)).ToString(); btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.RoomTemp))) + "°C"; btnMode.UnSelectedImagePath = acFunction.GetModeIconPath(device.GetAttrState(FunctionAttributeKey.Mode)); btnSwing.UnSelectedImagePath = acFunction.GetSwingIconPath(device.GetAttrState(FunctionAttributeKey.Swing)); btnWindSpeed.UnSelectedImagePath = acFunction.GetFanIconPath(device.GetAttrState(FunctionAttributeKey.FanSpeed)); btnMode.SelectedImagePath = acFunction.GetModeIconPath(device.GetAttrState(FunctionAttributeKey.Mode)); btnSwing.SelectedImagePath = acFunction.GetSwingIconPath(device.GetAttrState(FunctionAttributeKey.Swing)); btnWindSpeed.SelectedImagePath = acFunction.GetFanIconPath(device.GetAttrState(FunctionAttributeKey.FanSpeed)); btnMode.UnSelectedImagePath = acFunction.GetModeIconPath(device.GetAttrState(FunctionAttributeKey.Mode),false); btnSwing.UnSelectedImagePath = acFunction.GetSwingIconPath(device.GetAttrState(FunctionAttributeKey.Swing),false); btnWindSpeed.UnSelectedImagePath = acFunction.GetFanIconPath(device.GetAttrState(FunctionAttributeKey.FanSpeed),false); arcBar.Progress = Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.SetTemp))); if (device.trait_on_off.curValue.ToString() == "on") { btnMode.IsSelected = btnSwing.IsSelected = btnWindSpeed.IsSelected = true; arcBar.IsOffline = false; btnSwitch.IsSelected = true; arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIconOn.png"; @@ -955,6 +959,7 @@ } else { btnMode.IsSelected = btnSwing.IsSelected = btnWindSpeed.IsSelected = false; arcBar.IsOffline = true; btnSwitch.IsSelected = false; arcBar.IsClickable = false; HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
@@ -22,7 +22,8 @@ var outinTemp = Convert.ToInt32(Convert.ToDouble(updateTemp.GetAttrState(FunctionAttributeKey.SetTemp))); bodyView.btnTemp.Text = outinTemp.ToString(); bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(updateTemp.GetAttrState(FunctionAttributeKey.RoomTemp))) + "°C"; bodyView.btnMode.UnSelectedImagePath = bodyView.fhTemp.GetModeIconPath(updateTemp.GetAttrState(FunctionAttributeKey.Mode)); bodyView.btnMode.SelectedImagePath = bodyView.fhTemp.GetModeIconPath(updateTemp.GetAttrState(FunctionAttributeKey.Mode)); bodyView.btnMode.UnSelectedImagePath = bodyView.fhTemp.GetModeIconPath(updateTemp.GetAttrState(FunctionAttributeKey.Mode),false); bodyView.arcBar.Progress = outinTemp; //if (updateTemp.trait_on_off.curValue.ToString() == "on") //{ @@ -39,6 +40,7 @@ if (updateTemp.trait_on_off.curValue.ToString() == "on") { bodyView.btnMode.IsSelected = true; bodyView.arcBar.IsOffline = false; bodyView.btnSwitch.IsSelected = true; bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIconOn.png"; @@ -53,6 +55,7 @@ } else { bodyView.btnMode.IsSelected = false; bodyView.arcBar.IsOffline = true; bodyView.btnSwitch.IsSelected = false; bodyView.arcBar.IsClickable = false;
