.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,20 +1,15 @@ <Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.94B44E9C-E1BC-4BF7-812E-FC71E9B623B2" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Entity/Function/Function.cs"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpServerRequest.cs"> <Files> <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs" /> <File FileName="HDL_ON/UI/MainPage.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs" /> <File FileName="HDL_ON/UI/UI0-Public/PublicAssmebly.cs" /> <File FileName="HDL_ON/DAL/Server/IMessageCommon.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_Pie.cs" Line="26" Column="29" /> <File FileName="HDL_ON/Entity/Enumerative/MyEnum.cs" Line="47" Column="23" /> <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="633" Column="51" /> <File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" Line="641" Column="59" /> <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="197" Column="18" /> <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="382" Column="59" /> <File FileName="HDL_ON/Entity/Function/Function.cs" Line="1052" Column="47" /> <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="186" Column="1" /> <File FileName="HDL_ON/Entity/FunctionList.cs" Line="159" Column="38" /> <File FileName="HDL_ON/Entity/Function/Function.cs" Line="927" Column="30" /> <File FileName="HDL-ON_iOS/Info.plist" /> <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="15" Column="36" /> <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" Line="817" Column="47" /> <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="495" Column="30" /> <File FileName="HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs" Line="125" Column="22" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -23,52 +18,35 @@ <Node name="HDL_ON" expanded="True"> <Node name="Common" expanded="True" /> <Node name="DAL" expanded="True"> <Node name="DriverLayer" expanded="True" /> <Node name="Server" expanded="True" /> <Node name="Server" expanded="True"> <Node name="HttpServerRequest.cs" selected="True" /> </Node> </Node> <Node name="Entity" expanded="True"> <Node name="Device" expanded="True" /> <Node name="Enumerative" expanded="True" /> <Node name="Function" expanded="True"> <Node name="Function.cs" selected="True" /> </Node> <Node name="ResponseEntity" expanded="True" /> </Node> <Node name="UI" expanded="True"> <Node name="CSS" expanded="True" /> <Node name="UI1-Login" expanded="True" /> <Node name="UI2" expanded="True"> <Node name="1-HomePage" expanded="True" /> <Node name="2-Classification" expanded="True" /> <Node name="4-PersonalCenter" expanded="True"> <Node name="AddDevice" expanded="True" /> </Node> <Node name="FuntionControlView" expanded="True"> <Node name="1ContorlPage" expanded="True" /> <Node name="EnvironmentalScience" expanded="True" /> </Node> </Node> </Node> </Node> <Node name="HDL-ON_Android" expanded="True"> <Node name="Assets" expanded="True"> <Node name="Phone" expanded="True"> <Node name="FunctionIcon" expanded="True" /> </Node> </Node> </Node> <Node name="HDL-ON_iOS" expanded="True"> <Node name="Resources" expanded="True"> <Node name="Phone" expanded="True"> <Node name="FunctionIcon" expanded="True" /> <Node name="Public" expanded="True"> <Node name="MsgIcon" expanded="True" /> <Node name="FunctionIcon" expanded="True"> <Node name="Icon" expanded="True" /> </Node> </Node> </Node> </Node> <Node name="ys" expanded="True" /> </Node> </State> </Pad> <Pad Id="MonoDevelop.Debugger.WatchPad"> <State> <Value>tempFunction.name</Value> <Value>filePath</Value> <Value>newFunction.savePath</Value> </State> </Pad> </Pads> @@ -79,7 +57,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.Workspace ActiveConfiguration="Debug|iPhone" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore /> </MonoDevelop.Ide.DebuggingService.Breakpoints> 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="202103191" android:versionName="1.1.202103191" package="com.hdl.onpro"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202103232" android:versionName="1.1.202103232" 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/Info.plist
@@ -104,9 +104,9 @@ <key>UIStatusBarStyle</key> <string>UIStatusBarStyleLightContent</string> <key>CFBundleShortVersionString</key> <string>1.1.202103181</string> <string>1.1.202103232</string> <key>CFBundleVersion</key> <string>202103181</string> <string>202103232</string> <key>NSLocationWhenInUseUsageDescription</key> <string>Use geographic location to provide services such as weather</string> <key>NSAppleMusicUsageDescription</key> HDL_ON/Common/ApiUtlis.cs
@@ -185,6 +185,7 @@ //处理剩下的新增功能 foreach (var newFunction in deviceList.list) { MainPage.Log(newFunction.savePath); newFunction.SaveFunctionFile(); FunctionList.List.IniFunctionList(newFunction.savePath); } HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -480,6 +480,7 @@ IsOthreShare = mHome.IsOtherShare, accountType = mHome.accountType, isRemoteControl = mHome.isRemoteControl, isBindGateway = mHome.isBindGateway, longitude = mHome.longitude, latitude = mHome.latitude, deliverstatus = mHome.deliverstatus, @@ -491,7 +492,10 @@ Address = mHome.homeAddress, isAllowCreateScene = mHome.isAllowCreateScene, }; UserInfo.Current.regionList.Add(home); if (home.isBindGateway) { UserInfo.Current.regionList.Add(home); } } //-------如果账号是首次登录 if (DB_ResidenceData.Instance.CurrentRegion == null || string.IsNullOrEmpty(DB_ResidenceData.Instance.CurrentRegion.RegionID)) 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"; //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com"; /// <summary> /// RegionMark /// </summary> HDL_ON/Entity/Function/Function.cs
@@ -919,7 +919,13 @@ { get { return Convert.ToByte(loopId, 16); try { return Convert.ToByte(loopId, 16); }catch { return 0; } } }
@@ -137,6 +137,8 @@ var tempFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString); if (tempFunction == null) { MainPage.Log("null"); FileUtlis.Files.DeleteFile(filePath); return; } @@ -154,6 +156,7 @@ } } } MainPage.Log("add"); Functions.Add(tempFunction); } if (filePath.StartsWith("SceneData_")) HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs
@@ -122,10 +122,10 @@ /// 是否允许创建场景 /// </summary> public bool isAllowCreateScene; ///// <summary> ///// 是否绑定网关 ///// </summary> //public bool isBindGateway; /// <summary> /// 是否绑定网关 /// </summary> public bool isBindGateway; } /// <summary> HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@ /// <summary> /// 版本号 /// </summary> public static string VersionString = "1.1.0319"; public static string VersionString = "1.1.0323"; ///// <summary> ///// 客户端类型 ///// </summary> HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -192,12 +192,12 @@ //return; if (b) { etAccount.Text = "Sumant.Bhatia@havells.com";//"18316120654";//lcg "18316672920";//hzx;// "13415629083"//cf;//tujie"18316120654"; etAccount.Text = "15622703419";//"18316120654";//lcg "18316672920";//hzx;// "13415629083"//cf;//tujie"18316120654"; // "15622703419"lwn;// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568 } else { etAccount.Text = "15971583093";//凉霸"18666455392";//13375012446//13602944661//tzy 18778381374 etAccount.Text = "18316672920";//凉霸"18666455392";//13375012446//13602944661//tzy 18778381374 //15971583093 gs//tzy 274116637@qq.com//Sumant.Bhatia@havells.com 国外服务器测试 } b = !b; HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -637,9 +637,12 @@ } else { BindingResidencePage page = new BindingResidencePage(); MainPage.BaseView.AddChidren(page); page.LoadView(); //Application.RunOnMainThread(() => //{ // BindingResidencePage page = new BindingResidencePage(); // MainPage.BaseView.AddChidren(page); // page.LoadView(); //});
@@ -220,22 +220,22 @@ return; } var form = HdlFormLogic.Current.GetFormByName("AddMiniRemoteControlDirection1Page") as AddMiniRemoteControlDirection1Page; if (form.AddDeviceEvent != null) //if (form.AddDeviceEvent != null) { //代表这个是由温总那边调用的,直接回调函数 form.AddDeviceEvent.Invoke(newDevice); form.AddDeviceEvent?.Invoke(newDevice); //关闭掉这个界面 this.CloseForm(); //再把AddMiniRemoteControlDirection1Page界面关了 HdlFormLogic.Current.CloseFormByFormName("AddMiniRemoteControlDirection1Page"); } else { //代表这并不是由温总的界面调用的,则关闭掉全部的界面 HdlFormLogic.Current.CloseAllOpenForm(); //然后再把温总的界面new起来 new UI2.PersonalCenter.PirDevice.Method().MainView(this, newDevice,()=> { }); } //else //{ // //代表这并不是由温总的界面调用的,则关闭掉全部的界面 // HdlFormLogic.Current.CloseAllOpenForm(); // //然后再把温总的界面new起来 // new UI2.PersonalCenter.PirDevice.Method().MainView(this, newDevice,()=> { }); //} }; }
@@ -18,7 +18,7 @@ brand = integratedBrand; } public void LoadPage() public void LoadPage(VerticalRefreshLayout refreshView) { new TopViewDiv(bodyView, Language.StringByID(StringId.AddDevice)).LoadTopView(); bodyView.BackgroundColor = CSS_Color.BackgroundColor; @@ -33,16 +33,16 @@ Load3tyBrandDeviceList(); Load3tyBrandDeviceList(refreshView); contentView.BeginHeaderRefreshingAction = () => { contentView.EndHeaderRefreshing(); Load3tyBrandDeviceList(); Load3tyBrandDeviceList(refreshView); }; } void Load3tyBrandDeviceList() void Load3tyBrandDeviceList(VerticalRefreshLayout refreshView) { var waitPage = new Loading(); waitPage.Start(); @@ -57,7 +57,7 @@ var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<IntegratedBrandDevice>>(pack.Data.ToString()); Application.RunOnMainThread(() => { LoadRow(revData); LoadRow(revData, refreshView); }); } else @@ -77,7 +77,7 @@ { IsBackground = true }.Start(); } void LoadRow(List<IntegratedBrandDevice> deviceList) void LoadRow(List<IntegratedBrandDevice> deviceList, VerticalRefreshLayout refreshView) { contentView.RemoveAll(); bool isFrist = true; @@ -143,6 +143,9 @@ case SPK.IrModule: var form = new AddMiniRemoteControlDirection1Page(); form.AddForm(); form.AddDeviceEvent = (functionObj) => { refreshView.BeginHeaderRefreshing(); }; break; } }; HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -25,7 +25,7 @@ { var page = new AddDevciePage(brand); MainPage.BasePageView.AddChidren(page); page.LoadPage(); page.LoadPage(contentView); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }; new TopViewDiv(bodyView, Language.StringByID(StringId.Devices)).LoadTopView_AddIcon("3ty", action); @@ -46,6 +46,8 @@ contentView.EndHeaderRefreshing(); Load3tyBrandDeviceList(); }; //contentView.BeginHeaderRefreshing(); } void Load3tyBrandDeviceList()
