From dc14dbad8e3a55b57cadddba40c3f437e5e80fc5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 十一月 2022 09:08:03 +0800
Subject: [PATCH] 备份
---
Crabtree/ON/.DS_Store | 0
Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs | 11 ++++-
Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs | 18 +++++++++
Crabtree/SmartHome/HDL/Common/HttpUtil/NewAPI.cs | 5 ++
Crabtree/SmartHome/HDL/Common/HttpUtil/HttpUtil.cs | 2
Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserScenePage.cs | 20 +++++++---
Crabtree/SmartHome/UI/SimpleControl/MainPage.cs | 2
Crabtree/ON/Properties/AndroidManifest.xml | 2
.DS_Store | 0
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 34 ++++++++++++-----
Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs | 9 ++++
Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserDeviceToScene.cs | 16 +++++--
Crabtree/.DS_Store | 0
13 files changed, 92 insertions(+), 27 deletions(-)
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..e111c98
--- /dev/null
+++ b/.DS_Store
Binary files differ
diff --git a/Crabtree/.DS_Store b/Crabtree/.DS_Store
new file mode 100644
index 0000000..79ad52d
--- /dev/null
+++ b/Crabtree/.DS_Store
Binary files differ
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index c2845ef..fde46cb 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/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 />
diff --git a/Crabtree/ON/.DS_Store b/Crabtree/ON/.DS_Store
new file mode 100644
index 0000000..6a2a0ed
--- /dev/null
+++ b/Crabtree/ON/.DS_Store
Binary files differ
diff --git a/Crabtree/ON/Properties/AndroidManifest.xml b/Crabtree/ON/Properties/AndroidManifest.xml
index 070abb2..b0eeb93 100644
--- a/Crabtree/ON/Properties/AndroidManifest.xml
+++ b/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" />
<!-- 鍦ㄥ畨鍗揚鐗堟湰涔嬪悗锛屽繀椤昏鎺堜簣FOREGROUND_SERVICE鏉冮檺锛屾墠鑳藉浣跨敤鍓嶅彴鏈嶅姟 -->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
diff --git a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs b/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
index caebea3..0d8a1da 100644
--- a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs
+++ b/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;
+ }
}
}
\ No newline at end of file
diff --git a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpUtil.cs b/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpUtil.cs
index 489525a..3b3f764 100644
--- a/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpUtil.cs
+++ b/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";
diff --git a/Crabtree/SmartHome/HDL/Common/HttpUtil/NewAPI.cs b/Crabtree/SmartHome/HDL/Common/HttpUtil/NewAPI.cs
index c98dfdd..d14ea5d 100644
--- a/Crabtree/SmartHome/HDL/Common/HttpUtil/NewAPI.cs
+++ b/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>
diff --git a/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs b/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs
index f3f6eaf..d5b1db6 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/MainPage.cs
+++ b/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銆備负浠�涔堜細澹版槑杩欐牱鍙橀噺,鍥犱负鏈変簺鎺ュ彛蹇呴』浣跨敤鍘熸潵鐨凾oken)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs
index 570c048..352e964 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs
+++ b/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 ();
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs
index cf19b50..4ce9682 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs
+++ b/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 (() => {
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserDeviceToScene.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserDeviceToScene.cs
index 4975ee1..4f3d5e5 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserDeviceToScene.cs
+++ b/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 ();
};
};
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserScenePage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserScenePage.cs
index b39fb1e..9347331 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserScenePage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserScenePage.cs
@@ -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) {
--
Gitblit v1.8.0