.DS_StoreBinary files differ
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,37 +1,39 @@ <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/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs"> <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget." /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/DriverLayer/Control.cs"> <Files> <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="1" Column="1" /> <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="21" Column="87" /> <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="735" Column="62" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs" Line="896" Column="84" /> <File FileName="../../Library/Containers/com.tencent.WeWorkMac/Data/Library/Application Support/WXWork/Data/1688852687634638/Cache/File/2021-03/DeviceTemperatureHistoryForm(1).cs" Line="1015" Column="25" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_Pie.cs" Line="39" Column="19" /> <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="740" Column="49" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs" Line="84" Column="56" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs" Line="146" Column="97" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="153" Column="28" /> <File FileName="HDL-ON_iOS/Info.plist" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" /> <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" /> <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" /> <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="404" Column="11" /> <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" /> <File FileName="HDL_ON/Entity/FunctionList.cs" /> <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="HDL_APP_Project" expanded="True"> <Node name="HDL_ON" expanded="True"> <Node name="Common" expanded="True" /> <Node name="DAL" expanded="True"> <Node name="DriverLayer" expanded="True"> <Node name="Control.cs" selected="True" /> </Node> <Node name="Mqtt" expanded="True" /> </Node> <Node name="UI" expanded="True"> <Node name="UI1-Login" expanded="True" /> <Node name="UI2" expanded="True"> <Node name="4-PersonalCenter" expanded="True"> <Node name="PirDevice" expanded="True" /> </Node> <Node name="FuntionControlView" expanded="True"> <Node name="1ContorlPage" expanded="True"> <Node name="AcControlPage_AddIrButton.cs" selected="True" /> </Node> </Node> <Node name="1-HomePage" expanded="True" /> </Node> </Node> </Node> <Node name="HDL-ON_iOS" expanded="True" /> </Node> </State> </Pad> @@ -43,12 +45,10 @@ <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String> <String>Shared.IOS/Shared.IOS.csproj</String> </DisabledProjects> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="2202" column="1" /> </BreakpointStore> <BreakpointStore /> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> </Properties> DLL/.DS_StoreBinary files differ
HDL-ON_Android/.DS_StoreBinary files differ
HDL-ON_Android/HDL-ON_Android.csproj
@@ -129,22 +129,22 @@ <HintPath>..\DLL\Android\AndriodBluetoothLibrary.dll</HintPath> </Reference> <Reference Include="cloudp2p"> <HintPath>..\..\..\未命名文件夹\cloudp2p.dll</HintPath> <HintPath>..\DLL\FL\Android\cloudp2p.dll</HintPath> </Reference> <Reference Include="corelooper"> <HintPath>..\..\..\未命名文件夹\corelooper.dll</HintPath> <HintPath>..\DLL\FL\Android\corelooper.dll</HintPath> </Reference> <Reference Include="crypt"> <HintPath>..\..\..\未命名文件夹\crypt.dll</HintPath> <HintPath>..\DLL\FL\Android\crypt.dll</HintPath> </Reference> <Reference Include="http"> <HintPath>..\..\..\未命名文件夹\http.dll</HintPath> <HintPath>..\DLL\FL\Android\http.dll</HintPath> </Reference> <Reference Include="VideoLibs"> <HintPath>..\..\..\未命名文件夹\VideoLibs.dll</HintPath> <HintPath>..\DLL\FL\Android\VideoLibs.dll</HintPath> </Reference> <Reference Include="videophone"> <HintPath>..\..\..\未命名文件夹\videophone.dll</HintPath> <HintPath>..\DLL\FL\Android\videophone.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> 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="202103251" android:versionName="1.1.202103251" package="com.hdl.onpro"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202103262" android:versionName="1.1.202103262" package="com.hdl.onpro"> <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="26" /> <!-- 定位权限--> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> HDL-ON_Android/Resources/Resource.designer.cs
Diff too large HDL-ON_iOS/.DS_StoreBinary files differ
HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -54,7 +54,7 @@ <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs> <MtouchEnableSGenConc>false</MtouchEnableSGenConc> <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> <CodesignProvision>ComHdlOnProDevelopment20210225-1</CodesignProvision> <CodesignProvision>ComHdlOnProDevelopment20210305-1</CodesignProvision> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' "> <DebugType>none</DebugType> HDL-ON_iOS/Info.plist
@@ -104,9 +104,9 @@ <key>UIStatusBarStyle</key> <string>UIStatusBarStyleLightContent</string> <key>CFBundleShortVersionString</key> <string>1.1.202103261</string> <string>1.1.202103262</string> <key>CFBundleVersion</key> <string>202103261</string> <string>202103262</string> <key>NSLocationWhenInUseUsageDescription</key> <string>Use geographic location to provide services such as weather</string> <key>NSAppleMusicUsageDescription</key> HDL_ON/DAL/Server/NewAPI.cs
@@ -531,16 +531,6 @@ /// </summary> public const string API_POST_EZ_GetChildToken = "/home-wisdom/platform/childToken"; /// <summary> /// 红外宝/遥控器删除 /// </summary> public const string API_POST_Ir_DeviceDel= "/home-wisdom/app/device/remove"; /// <summary> /// 修改红外宝名称 /// </summary> public const string API_POST_Ir_DeviceRename = "/home-wisdom/app/device/rename"; #endregion
@@ -78,7 +78,7 @@ intent.PutExtra("cmtID", mESVideoInfo.cmtID); intent.PutExtra("roomno", mESVideoInfo.roomno); intent.PutExtra("unitno", mESVideoInfo.unitno); intent.PutExtra("HomeID", mESVideoInfo.HomeID); //intent.PutExtra("HomeID", mESVideoInfo.HomeID); intent.PutExtra("callId", mESVideoInfo.callId); intent.PutExtra("Type", 0); Shared.Application.Activity.StartActivity(intent); @@ -114,7 +114,7 @@ intent.PutExtra("cmtID", mESVideoInfo.cmtID); intent.PutExtra("roomno", mESVideoInfo.roomno); intent.PutExtra("unitno", mESVideoInfo.unitno); intent.PutExtra("HomeID", mESVideoInfo.HomeID); //intent.PutExtra("HomeID", mESVideoInfo.HomeID); intent.PutExtra("callId", mESVideoInfo.callId); intent.PutExtra("Type", 1); Shared.Application.Activity.StartActivity(intent); HDL_ON/FengLinVideo/ESOnVideo.cs
File was deleted HDL_ON/HDL_ON.projitems
@@ -389,7 +389,6 @@ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\SetPir.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\1ContorlPage\AcControlPage_AddIrButton.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Video\Send.cs" /> <Compile Include="$(MSBuildThisFileDirectory)FengLinVideo\ESOnVideo.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Energy\EnergyMainPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)DAL\ThirdPartySdk\ESOnVideo.cs" /> </ItemGroup> HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -467,12 +467,18 @@ try { int index = 0; foreach (var function in FunctionList.List.GetDeviceFunctionList()) var list = FunctionList.List.GetDeviceFunctionList(); foreach (var function in list) { //音乐模块有主从关系，需要特殊处理 if (function.Spk_Prefix == FunctionCategory.Music) { var music = function as Music.A31MusicModel; //var music = function as Music.A31MusicModel; var music = Music.A31MusicModel.A31MusicModelList.Find((obj) => obj.sid == function.sid); if (music == null) { continue; } if (music.ServerClientType == -1) { continue; HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -264,17 +264,17 @@ MainPage.BasePageView.AddChidren(page); page.LoadPage(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; //获取列表 HDL_ON.UI.UI2.PersonalCenter.PirDevice.Method.GetPirDeviceList(this, () => { Application.RunOnMainThread(() => { var page = new UI2.PersonalCenter.PirDevice.PirMain(); MainPage.BasePageView.AddChidren(page); page.Show(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }); }); ////获取列表 //HDL_ON.UI.UI2.PersonalCenter.PirDevice.Method.GetPirDeviceList(this, () => //{ // Application.RunOnMainThread(() => // { // var page = new UI2.PersonalCenter.PirDevice.PirMain(); // MainPage.BasePageView.AddChidren(page); // page.Show(); // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; // }); //}); }; btnResidenceAddFunctionIcon.MouseUpEventHandler = eventHandler; btnResidenceAddFunctionText.MouseUpEventHandler = eventHandler; HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -485,8 +485,8 @@ var bodyView = new FrameLayout() { Y = Application.GetRealHeight(463), Height = Application.GetRealHeight(375), Y = Application.GetRealHeight(423), Height = Application.GetRealHeight(296), BackgroundColor = CSS_Color.MainBackgroundColor, }; div.AddChidren(bodyView); @@ -495,24 +495,26 @@ { Y = Application.GetRealHeight(16), Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth(296), Width = Application.GetRealWidth(296+200), }; bodyView.AddChidren(contentView); var row = new FrameLayout() { Height = Application.GetRealHeight(60), }; contentView.AddChidren(row); var row = new FrameLayout() { Height = Application.GetRealHeight(60), Width = Application.GetRealWidth(296), Gravity = Gravity.CenterHorizontal, }; contentView.AddChidren(row); int index = 0; int index = 0; List<FunctionAttributes> attrList = new List<FunctionAttributes>(); attrList.AddRange(device.attributes); attrList.Add(new FunctionAttributes() { key = "+", }); foreach (var attr in attrList) { @@ -532,6 +534,8 @@ row = new FrameLayout() { Height = Application.GetRealHeight(56), Width = Application.GetRealWidth(296), Gravity = Gravity.CenterHorizontal, }; contentView.AddChidren(row); } @@ -570,7 +574,10 @@ btnAdd.MouseUpEventHandler = (sender, e) => { dialog.Close(); var addButton = new AcControlPage_AddIrButton(); Action action = () => { LoadDialog_IrMoreView(); }; var addButton = new AcControlPage_AddIrButton(action); MainPage.BasePageView.AddChidren(addButton); addButton.Show(device); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; @@ -630,11 +637,6 @@ index++; } dialog.Show(); } HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs
@@ -9,8 +9,11 @@ { public class AcControlPage_AddIrButton : FrameLayout { public AcControlPage_AddIrButton() Action action; public AcControlPage_AddIrButton(Action act) { action = act; } public void Show(Function control) { @@ -139,6 +142,8 @@ { control.attributes.Add(new FunctionAttributes() { key = buttonObj.key, value = new System.Collections.Generic.List<string>() { buttonObj.value } }); this.RemoveFromParent(); action?.Invoke(); //new TipPopView().FlashingBox(Language.StringByID(StringId.tianjiachenggong)); } else { HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_Pie.cs
@@ -77,8 +77,8 @@ return @"{ series : [ { right: '54%', bottom:'54%', //right: '54%', //bottom:'54%', labelLine: false, type: 'pie', data:[
