合并了新代码

黄学彪

2019-12-12 7e863a33397f317ffc3ffd9288496d0e4f16aa66

 ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs

@@ -60,6 +60,12 @@
        /// <value><c>true</c> if is remote; otherwise, <c>false</c>.</value>
        public static bool IsRemote;

        /// <summary>

        /// 是否拥有远程连接的权限

        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public static bool AllowRemoteCtrl = true;

        /// <summary>
        /// 网关保存路径
        /// </summary>
@@ -3229,6 +3235,11 @@
        /// <returns></returns>
        static async System.Threading.Tasks.Task initGateWayBaseInfomation()
        {

            if (AllowRemoteCtrl == false)

            {

                //没有远程连接的权限

                return;

            }

            string loginToken = Config.Instance.Token;

            if (Config.Instance.Home.IsOthreShare == true)

            {

@@ -3271,11 +3282,13 @@
                    var statuCode = jobject["StateCode"].ToString();

                    if (statuCode != "Success")

                    {

                        //Log出力

                        Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(-1, "接口访问失败★：App/GetSingleHomeGatewayPagger " + statuCode);

                        //序列化对象

                        var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(pra2);

                        Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(-1, "参数：\r\n" + requestJson);

                        //Log出力

                        string errorMsg = "接口访问失败★：App/GetSingleHomeGatewayPagger " + statuCode + "\r\n";

                        errorMsg += "参数：\r\n" + requestJson;

                        Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(-1, errorMsg);

                        return;

                    }



                    var responseData = jobject["ResponseData"];

@@ -3323,10 +3336,12 @@
        /// <param name="brokerName">Broker name.</param>
        public static async System.Threading.Tasks.Task StartRemoteMqtt()
        {

            if (remoteMqttIsConnecting

                       || !Shared.Common.Config.Instance.IsLogin

                       || Shared.Common.Config.Instance.HomeId == ""

                       || remoteIsConnected)

            //追加：没有远程连接的权限

            if (AllowRemoteCtrl == false

               || remoteMqttIsConnecting

               || !Shared.Common.Config.Instance.IsLogin

               || Shared.Common.Config.Instance.HomeId == ""

               || remoteIsConnected)

            {

                return;

            }
@@ -3444,6 +3459,12 @@
                        if (result != null)
                        {
                            var jobject = Newtonsoft.Json.Linq.JObject.Parse(Encoding.UTF8.GetString(result));
                            if (jobject["StateCode"].ToString() == "NotAllowRemoteCtrl")

                            {

                                //没有远程连接的权限

                                AllowRemoteCtrl = false;

                                return;

                            }
                            var responseData = jobject["ResponseData"];
                            if (responseData != null)
                            {