.DS_StoreBinary files differ
Crabtree/.DS_StoreBinary files differ
Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,27 +1,40 @@ <Properties StartupConfiguration="{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}|Default"> <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.364c4b3158493098" /> <MonoDevelop.Ide.Workbench> <Files> <File FileName="ON/Application.cs" Line="108" Column="24" /> <File FileName="SmartHome/UI/SimpleControl/EquipmentPublicClass.cs" /> <File FileName="ON/Application.cs" Line="117" Column="26" /> <File FileName="SmartHome/HDL/Operation/UserConfig.cs" /> <File FileName="SmartHome/UI/SimpleControl/Phone/User/MigrateBean.cs" /> <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs" /> <File FileName="SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs" /> <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs" /> <File FileName="SmartHome/UI/SimpleControl/Phone/Scene/UserDeviceToScene.cs" /> <File FileName="SmartHome/HDL/Operation/Device/Room.cs" /> <File FileName="SmartHome/UI/SimpleControl/Phone/Scene/UserScenePage.cs" /> <File FileName="SmartHome/UI/SimpleControl/Phone/AC/UserACPage.cs" /> <File FileName="SmartHome/HDL/Common/HttpUtil/HttpUtil.cs" /> <File FileName="SmartHome/HDL/Operation/MyEnum.cs" /> <File FileName="SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs" /> <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs" Line="424" Column="29" /> <File FileName="SmartHome/HDL/Operation/Control.cs" /> <File FileName="SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs" /> <File FileName="SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs" /> <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" Line="41" Column="55" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="SmartHome" expanded="True"> <Node name="ON.Droid" selected="True" /> <Node name="SmartHome" expanded="True" selected="True"> <Node name="Shared" expanded="True"> <Node name="UI" expanded="True"> <Node name="SimpleControl" expanded="True" /> </Node> </Node> </Node> </State> </Pad> <Pad Id="MonoDevelop.Debugger.WatchPad"> <State> <Value>revertObj.Data.ToString () == "true"</Value> <Value>revertObj.Data.ToString()</Value> <Value>MainPage.LoginUser.LoginTokenString</Value> </State> </Pad> </Pads> @@ -42,11 +55,12 @@ <Breakpoint file="/Users/kaede/Desktop/CrabtreeOn2/Crabtree/SmartHome/UI/SimpleControl/Phone/User/MigrateBean.cs" relfile="SmartHome/UI/SimpleControl/Phone/User/MigrateBean.cs" line="302" column="1" /> <Breakpoint file="/Users/kaede/Desktop/CrabtreeOn2/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs" relfile="SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs" line="361" column="1" /> <Breakpoint file="/Users/kaede/Desktop/CrabtreeOn2/Crabtree/SmartHome/UI/SimpleControl/Phone/User/MigrateBean.cs" relfile="SmartHome/UI/SimpleControl/Phone/User/MigrateBean.cs" line="486" column="1" /> <Breakpoint file="/Users/kaede/Desktop/CrabtreeOn2/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs" relfile="SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs" line="230" column="1" /> <Breakpoint file="/Users/kaede/Desktop/CrabtreeOn2/Crabtree/SmartHome/UI/SimpleControl/Phone/User/MigrateBean.cs" relfile="SmartHome/UI/SimpleControl/Phone/User/MigrateBean.cs" line="484" column="1" /> <Breakpoint file="/Users/kaede/Desktop/CrabtreeOn2/Crabtree/SmartHome/UI/SimpleControl/Phone/User/MigrateBean.cs" relfile="SmartHome/UI/SimpleControl/Phone/User/MigrateBean.cs" line="225" column="1" /> <Breakpoint file="/Users/kaede/Desktop/CrabtreeOn2/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs" relfile="SmartHome/UI/SimpleControl/Phone/Schedule/Send.cs" line="79" column="1" /> <Breakpoint file="/Users/kaede/Desktop/CrabtreeOn2/Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs" relfile="SmartHome/UI/SimpleControl/EquipmentPublicClass.cs" line="210" column="1" /> <Breakpoint file="/Users/kaede/Desktop/CrabtreeOn2/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs" relfile="SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs" line="32" column="1" /> <Breakpoint file="/Users/kaede/Desktop/CrabtreeOn2/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs" relfile="SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs" line="320" column="1" /> <Breakpoint file="/Users/kaede/Desktop/CrabtreeOn2/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs" relfile="SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs" line="368" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> Crabtree/ON/.DS_StoreBinary files differ
Crabtree/ON/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtreenew" android:versionName="2.706241" android:versionCode="202206241"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtreenew" android:versionName="2.709151" android:versionCode="202209151"> <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="30" /> <!-- 在安卓P版本之后，必须要授予FOREGROUND_SERVICE权限，才能够使用前台服务 --> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
@@ -1416,5 +1416,23 @@ //} //#endregion /// <summary> /// 修改设备备注 /// </summary> /// <param name="deviceId"></param> /// <param name="homeId"></param> /// <param name="name"></param> /// <returns></returns> public ResponsePackNew EditDeviceName (string deviceId,string homeId,string name) { var d = new Dictionary<string, object> (); d.Add ("deviceId", deviceId); d.Add ("homeId", homeId); d.Add ("name", name); var requestJson = HttpUtil.GetSignRequestJson (d); var pack = HttpUtil.RequestHttpsPostFroHome (NewAPI.Api_Post_EditDeviceName, requestJson); return pack; } } } Crabtree/SmartHome/HDL/Common/HttpUtil/HttpUtil.cs
@@ -56,7 +56,7 @@ /// 固定域名,正式环境 /// 公共域名就近解析 /// </summary> #if DEBUG #if DEBUG1 public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com"; #else public const string GlobalRequestHttpsHost = "https://bahrain-gateway.hdlcontrol.com"; Crabtree/SmartHome/HDL/Common/HttpUtil/NewAPI.cs
@@ -525,6 +525,11 @@ #endregion #endregion /// <summary> /// 修改设备名称 /// </summary> //public const string Api_Post_Edit_Deivce_Name = "/home-wisdom/app/device/rename"; } ///// <summary> Crabtree/SmartHome/UI/SimpleControl/MainPage.cs
@@ -38,7 +38,7 @@ //public static Button LogoButton = new Button (); public static string RequestVersion = "2.706181"; public static string RequestVersion = "2.709151"; public static UserInfo LoginUser; /// <summary> /// 是否是管理员权限(变更了,成员的时候,这个也为ture。为什么会声明这样变量,因为有些接口必须使用原来的Token) Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs
@@ -316,7 +316,7 @@ //} EventHandler<MouseEventArgs> eHandler = (sender, e) => { Dialog dialog = new Dialog (); Dialog dialog = new Dialog ();//修改设备备注 FrameLayout dialogBodyView = new FrameLayout () { BackgroundColor = SkinStyle.Current.DialogColor, Width = Application.GetRealWidth (494), @@ -415,10 +415,17 @@ //CommonPage.UpdateRemark (common.SubnetID, common.DeviceID, btnChangeName.Text.Trim ()); byte [] updateBytes = new byte [20]; byte [] remakeBytes = CommonPage.MyEncodingGB2312.GetBytes (btnChangeName.Text.Trim ()); string changeName = btnChangeName.Text.Trim (); byte [] remakeBytes = CommonPage.MyEncodingGB2312.GetBytes (changeName); Array.Copy (remakeBytes, 0, updateBytes, 0, remakeBytes.Length < 20 ? remakeBytes.Length : 20); Control.ControlBytesSend (Command.Write_DeviceRamarkCMD, common.SubnetID, common.DeviceID, updateBytes); //修改云端备注 new Thread (() => { var http = new HttpServerRequest (); http.EditDeviceName (common.DeviceID.ToString(), UserConfig.Instance.CurrentRegion.Id,changeName); }) { IsBackground = true }.Start (); btnDeviceName.Text = btnChangeName.Text; dialog.Close (); Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs
@@ -364,7 +364,7 @@ deviceRow.AddChidren (btnEdit); btnEdit.MouseUpEventHandler += (sd, ds) => { Dialog dialog = new Dialog (); //修改设备备注 var dialogView = new FrameLayout () { Gravity = Gravity.Center, Width = Application.GetRealWidth (500), @@ -442,6 +442,13 @@ return; } //修改云端备注 new System.Threading.Thread (() => { var http = new HttpServerRequest (); http.EditDeviceName (commonDevice.DeviceID.ToString (), UserConfig.Instance.CurrentRegion.Id, remakeStr); }) { IsBackground = true }.Start (); MainPage.Loading.Start (); //byte [] remakeBytes = CommonPage.MyEncodingGB2312.GetBytes (etDeviceName.Text.Trim ()); System.Threading.Tasks.Task.Run (() => { Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserDeviceToScene.cs
@@ -264,11 +264,17 @@ LongPressFrameLayout.AddChidren (btnDel); btnDel.MouseUpEventHandler += (senderDel, eDel) => { IO.FileUtils.DeleteFile (sceneFilePath); sceneFilePaths.Remove (sceneFilePath); sceneFilePaths.Remove (""); IO.FileUtils.WriteFileByBytes (Scene.GlobalSceneFilePath, System.Text.Encoding.UTF8.GetBytes (Newtonsoft.Json.JsonConvert.SerializeObject (sceneFilePaths))); InitView (isGolba); Alert alert = new Alert ("", $"Are you sure to delete the scenario: {scene.Name}?", Language.StringByID (R.MyInternationalizationString.Cancel), Language.StringByID (R.MyInternationalizationString.Confrim)); alert.ResultEventHandler += (sender2, e2) => { if (e2) { IO.FileUtils.DeleteFile (sceneFilePath); sceneFilePaths.Remove (sceneFilePath); sceneFilePaths.Remove (""); IO.FileUtils.WriteFileByBytes (Scene.GlobalSceneFilePath, System.Text.Encoding.UTF8.GetBytes (Newtonsoft.Json.JsonConvert.SerializeObject (sceneFilePaths))); InitView (isGolba); } }; alert.Show (); }; };
@@ -203,12 +203,20 @@ LongPressFrameLayout.AddChidren (btnDel); btnDel.MouseUpEventHandler += (senderDel, eDel) => { IO.FileUtils.DeleteFile (sceneFilePath); room.SceneFilePathList.Remove (sceneFilePath); room.SceneFilePathList.Remove (""); room.Save (room.RoomFilePath); ShowUserScene (Room.GetRoomByFilePath (room.RoomFilePath)); UserDeviceToScene.hasModify = true; Alert alert = new Alert ("", $"Are you sure to delete the scenario: {scene.Name}?", Language.StringByID (R.MyInternationalizationString.Cancel), Language.StringByID (R.MyInternationalizationString.Confrim)); alert.ResultEventHandler += (sender2, e2) => { if (e2) { IO.FileUtils.DeleteFile (sceneFilePath); room.SceneFilePathList.Remove (sceneFilePath); room.SceneFilePathList.Remove (""); room.Save (room.RoomFilePath); ShowUserScene (Room.GetRoomByFilePath (room.RoomFilePath)); UserDeviceToScene.hasModify = true; } }; alert.Show (); //if (CommonList.MonitorScenePathList.Count > 0) { // foreach (var monitorData in CommonList.MonitorScenePathList) {
