From 7fa4b66cd58a51c9e7e512ee652282825d16e5dc Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 27 十月 2020 15:13:21 +0800
Subject: [PATCH] 2020-10-27 1.增加iOS越狱和Androidr Root检测，强制关闭APP
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs | 94 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 71 insertions(+), 23 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs
index 1917d47..6dd2f3a 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs
@@ -59,11 +59,13 @@
if (btn.Tag.ToString () == DeviceType.LightEnergySocket.ToString () + "_Voltage" || btn.Tag.ToString () == DeviceType.LightEnergySwitch.ToString () + "_Voltage") {
btn.Text = energy.ToString () + " W";
}
- } else if (updataType == 11) {
- if (btn.Tag.ToString () == DeviceType.LightEnergySocket.ToString () + "_Electric" || btn.Tag.ToString () == DeviceType.LightEnergySwitch.ToString () + "_Electric") {
- btn.Text = ((double)(Convert.ToDouble (energy) / 10)).ToString () + " kw.h";
- }
}
+ //2020-07-01 瀹㈡埛鎻愬嚭闅愯棌kwh
+ //else if (updataType == 11) {
+ // if (btn.Tag.ToString () == DeviceType.LightEnergySocket.ToString () + "_Electric" || btn.Tag.ToString () == DeviceType.LightEnergySwitch.ToString () + "_Electric") {
+ // btn.Text = ((double)(Convert.ToDouble (energy) / 10)).ToString () + " kw.h";
+ // }
+ //}
}
}
}
@@ -916,13 +918,16 @@
SelectedTextColor = SkinStyle.Current.TextColor1,
};
acRowView.AddChidren (tempDeviceName);
+ //2020-08-28 澧炲姞闀挎寜淇敼璁惧澶囨敞
+ ButtonNameAddMouseLongEventHandler (tempDeviceName, devcieCommon);
+
tempDeviceName.MouseUpEventHandler += openACControlPageEvent;
Button btnMode = new Button () {
X = Application.GetRealWidth (20),
Y = Application.GetRealHeight (40),
- Width = Application.GetRealWidth (100),
- Height = Application.GetRealHeight (100),
+ Width = Application.GetMinRealAverage (100),
+ Height = Application.GetMinRealAverage (100),
Tag = "Mode"
};
acRowView.AddChidren (btnMode);
@@ -932,8 +937,8 @@
Button btnWind = new Button () {
X = btnMode.Right + Application.GetRealWidth (0),
Y = Application.GetRealHeight (40),
- Width = Application.GetRealWidth (100),
- Height = Application.GetRealHeight (100),
+ Width = Application.GetMinRealAverage (100),
+ Height = Application.GetMinRealAverage (100),
Tag = "Wind"
};
acRowView.AddChidren (btnWind);
@@ -1029,6 +1034,10 @@
IsMoreLines = true
};
fhRowView.AddChidren (tempDeviceName);
+
+ //2020-08-28 澧炲姞闀挎寜淇敼璁惧澶囨敞
+ ButtonNameAddMouseLongEventHandler (tempDeviceName, devcieCommon);
+
tempDeviceName.MouseUpEventHandler += (sender2, e2) => {
UserFHPage fhView = new UserFHPage (fh, room);
if (roomFilePath == Room.FavoriteRoom) {
@@ -1146,6 +1155,13 @@
IsMoreLines = true
};
DeviceRowView.AddChidren (btnName);
+
+ //2020-08-28 澧炲姞闀挎寜淇敼璁惧澶囨敞
+ ButtonNameAddMouseLongEventHandler (btnName, devcieCommon);
+
+ //btnName.MouseLongEventHandler += (sender, e)=>{
+ // RemarkDeviceName (devcieCommon, SimpleControl.CommonPage.MyEncodingUTF8.GetBytes (Newtonsoft.Json.JsonConvert.SerializeObject (devcieCommon)), btnName);
+ //};
Button tempSwitch = new Button () {
Width = Application.GetMinRealAverage (90),
@@ -1851,19 +1867,19 @@
};
DeviceRowView.AddChidren (btnEnergy);
EnergtLightList.Add (devcieCommon);
-
- Button btnElectric = new Button () {
- Width = Application.GetRealWidth (200),
- Height = Application.GetRealHeight (35),
- X = Application.GetRealWidth (320),
- Y = tempSwitch.Bottom,
- TextColor = SkinStyle.Current.TextColor1,
- TextAlignment = TextAlignment.CenterRight,
- SelectedTextColor = SkinStyle.Current.TextColor1,
- Tag = devcieCommon.Type.ToString () + "_Electric",
- Text = "0 kw.h"
- };
- DeviceRowView.AddChidren (btnElectric);
+ //2020-07-01 瀹㈡埛鎻愬嚭闅愯棌kwh
+ //Button btnElectric = new Button () {
+ // Width = Application.GetRealWidth (200),
+ // Height = Application.GetRealHeight (35),
+ // X = Application.GetRealWidth (320),
+ // Y = tempSwitch.Bottom,
+ // TextColor = SkinStyle.Current.TextColor1,
+ // TextAlignment = TextAlignment.CenterRight,
+ // SelectedTextColor = SkinStyle.Current.TextColor1,
+ // Tag = devcieCommon.Type.ToString () + "_Electric",
+ // Text = "0 kw.h"
+ //};
+ //DeviceRowView.AddChidren (btnElectric);
}
tempSwitch.MouseUpEventHandler += (sender3, e3) => {
//tempSwitch.IsSelected = !tempSwitch.IsSelected;
@@ -1881,7 +1897,8 @@
if (devcieCommon.Type == DeviceType.LightEnergySocket || devcieCommon.Type == DeviceType.LightEnergySwitch) {
new System.Threading.Thread (() => {
Control.ControlBytesSend (Command.ReadAnalogValue, switchLight.SubnetID, switchLight.DeviceID, new byte [] { 10, switchLight.LoopID }, SendCount.Zero);
- Control.ControlBytesSend (Command.ReadAnalogValue, switchLight.SubnetID, switchLight.DeviceID, new byte [] { 11, switchLight.LoopID }, SendCount.Zero);
+ //2020-07-01 瀹㈡埛鎻愬嚭闅愯棌kwh
+ //Control.ControlBytesSend (Command.ReadAnalogValue, switchLight.SubnetID, switchLight.DeviceID, new byte [] { 11, switchLight.LoopID }, SendCount.Zero);
}) { IsBackground = true }.Start ();
}
};
@@ -2308,7 +2325,8 @@
var c = EnergtLightList [i];
Control.ControlBytesSend (Command.ReadAnalogValue, c.SubnetID, c.DeviceID, new byte [] { 10, c.LoopID }, SendCount.Zero);
- Control.ControlBytesSend (Command.ReadAnalogValue, c.SubnetID, c.DeviceID, new byte [] { 11, c.LoopID }, SendCount.Zero);
+ //2020-07-01 瀹㈡埛鎻愬嚭闅愯棌kwh
+ //Control.ControlBytesSend (Command.ReadAnalogValue, c.SubnetID, c.DeviceID, new byte [] { 11, c.LoopID }, SendCount.Zero);
#if DEBUG
Application.RunOnMainThread (() => {
Utlis.WriteLine ($"璇诲彇 { c.Name } 鐢佃兘");
@@ -2360,5 +2378,35 @@
});
});
}
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="btnName"></param>
+ /// <param name="devcieCommon"></param>
+ void ButtonNameAddMouseLongEventHandler (Button btnName,Common devcieCommon)
+ {
+ //2020-08-28 澧炲姞闀挎寜淇敼璁惧澶囨敞
+ btnName.MouseLongEventHandler += (sender, e) => {
+ RemarkDeviceName (devcieCommon, SimpleControl.CommonPage.MyEncodingUTF8.GetBytes (Newtonsoft.Json.JsonConvert.SerializeObject (devcieCommon)), btnName);
+ };
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="commonDevice"></param>
+ /// <param name="commonBytes"></param>
+ /// <param name="btnEquipment"></param>
+ void RemarkDeviceName (Common commonDevice, byte[] commonBytes, Button btnEquipment)
+ {
+ Action successAction = () => {
+ GenericDialog.Current.RefreshRemark (commonDevice);
+ //if (!roomDeviceFilePathList.Contains (filePath)) {
+ // roomDeviceFilePathList.Add (filePath);
+ //}
+ };
+ GenericDialog.Current.ShowModifyRemarksDialog (commonDevice, commonBytes, btnEquipment, successAction);
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0