From 454ac814944cf956ff02b84b70ba2ec68e5e5ea1 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 15 一月 2020 19:38:47 +0800
Subject: [PATCH] 2020-01-15 1.优化MQTT连接。 2.增加本地通信加密。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
index 626e0ad..47d179f 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using System.Collections.Generic;
using System.IO;
namespace Shared.SimpleControl.Phone
@@ -118,8 +119,8 @@
#region ---杩涘叆鍚庡彴---DeviceManagementView---
- //if (true) {//璋冭瘯璐﹀彿
- if (MainPage.LoginUser.AccountType == 0) {//璋冭瘯璐﹀彿
+ if (true) {//璋冭瘯璐﹀彿
+ //if (MainPage.LoginUser.AccountType == 0) {//璋冭瘯璐﹀彿
FrameLayout DeviceManagementView = new FrameLayout () {
Width = Application.GetRealWidth (640),
Height = Application.GetRealHeight (100),
@@ -371,7 +372,7 @@
#endregion
#region subaccount
- if (MainPage.LoginUser.AccountType == 0) {
+ //if (MainPage.LoginUser.AccountType == 0) {
FrameLayout subaccountView = new FrameLayout () {
Width = Application.GetRealWidth (640),
Height = Application.GetRealHeight (100),
@@ -401,6 +402,12 @@
UserMiddle.SettingView.AddChidren (btnNullSubaccount);
EventHandler<MouseEventArgs> SubaccountEventHandler = (sender, e) => {
+ if (UserConfig.Instance.CurrentRegion.IsOthreShare) {
+ //鎻愮ず娌℃湁鍒嗕韩浣忓畢鐨勬潈闄�
+ new Alert ("", ErrorCode.InsufficientAuthority, "Close").Show ();
+ return;
+ }
+
if (UserConfig.Instance.internetStatus == 0) {
new Alert ("", "Unable to save data, please check the network.", "Close").Show ();
return;
@@ -408,12 +415,15 @@
MainPage.Loading.Start ("Please wait...");
System.Threading.Tasks.Task.Run (() => {
try {
- var requestObj = new GetSubAccountListObj ();
+ var requestObj = new GetSubAccountByDistributedMarkObj () {
+ DistributedMark = UserConfig.Instance.CurrentRegion.Id,
+ };
+ //var requestObj = new GetSubAccountListObj ();
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj);
- var revertObj = MainPage.RequestHttps ("GetSubAccountList", requestJson);
- if (revertObj.StateCode == "SUCCESS") {
+ var revertObj = MainPage.RequestHttps (API.GetSubAccountByDistributedMark, requestJson);
+ if (revertObj.StateCode.ToUpper() == "SUCCESS") {
Application.RunOnMainThread (() => {
- var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<System.Collections.Generic.List<SubAccountRes>> (revertObj.ResponseData.ToString ());
+ var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SubAccountRes>> (revertObj.ResponseData.ToString ());
SubaccountListView subView = new SubaccountListView (responseDataObj);
UserMiddle.SettingPageView.AddChidren (subView);
subView.ShowSubaccountListView ();
@@ -433,7 +443,7 @@
subaccountView.MouseUpEventHandler += SubaccountEventHandler;
btnSubaccountIcon.MouseUpEventHandler += SubaccountEventHandler;
btnSubaccountTitle.MouseUpEventHandler += SubaccountEventHandler;
- }
+ //}
#endregion
@@ -465,6 +475,7 @@
btnhelpTitle.MouseLongEventHandler += (sd, ds) => {
//var uc = UserConfig.Instance.RometoUserInfoKeys.Find ((obj) => obj.Contains ("HiddenJson"));
//new Alert ("", uc, "close").Show ();
+
};
EventHandler<MouseEventArgs> helpEventHandler = (sender, e) => {
--
Gitblit v1.8.0