2021-01-08 1.去掉无关文件

JLChen

2021-01-08 cc8749fe1d158ee21670bde77fad237be2f0c416

 Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs

@@ -100,6 +100,7 @@
            try {
                if (!isSubscribeTopicSuccess) {


                    var topicFilterCommon = new TopicFilter () {
                        Topic = $"/BusGateWayToClient/{CurRemoteMACInfo.macMark}/Common/#",
                        QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce
@@ -123,12 +124,30 @@
                        QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce
                    };

                    

                    var topicFilters = new TopicFilter [] { topicFilterCommon, topicFilterGateWayInfoChange, topicFilterNotifySqueeze, topicFilterNotifyGateWayOffline };
                    var result = await RemoteMqttClient.SubscribeAsync (topicFilters);
                    if (result.Items [0].ResultCode == MQTTnet.Client.Subscribing.MqttClientSubscribeResultCode.GrantedQoS2) {
                        isSubscribeTopicSuccess = true;
                    }

                    ////2020-06-22 通用主题
                    //var topicFilterMacMark = new TopicFilter () {
                    //    Topic = $"/BusGateWayToClient/{CurRemoteMACInfo.macMark}/#",
                    //    QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce
                    //};

                    ////挤下线主题
                    //var topicFilterNotifySqueeze = new TopicFilter () {
                    //    Topic = $"/BusGateWayToClient/{mMqttInfo.connEmqClientId}/Push/NotifySqueeze",
                    //    QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce
                    //};

                    //var topicFilters = new TopicFilter [] { topicFilterMacMark, topicFilterNotifySqueeze };
                    //var result = await RemoteMqttClient.SubscribeAsync (topicFilters);
                    //if (result.Items [0].ResultCode == MQTTnet.Client.Subscribing.MqttClientSubscribeResultCode.GrantedQoS2) {
                    //    isSubscribeTopicSuccess = true;
                    //}
                }
            } catch (Exception ex) {

@@ -192,6 +211,9 @@
                    //表示后面将进行连接

                    #region 初始化远程Mqtt
                    //2020-06-22 增加
                    RemoteMqttClient = new MqttFactory ().CreateMqttClient ();

                    //(3)当[连接云端的Mqtt成功后]或者[以及后面App通过云端Mqtt转发数据给网关成功后],处理接收到云端数据包响应时在mqttServerClient_ApplicationMessageReceived这个方法处理
                    if (RemoteMqttClient.ApplicationMessageReceivedHandler == null) {
                        RemoteMqttClient.UseApplicationMessageReceivedHandler (async (e) => {
@@ -375,7 +397,7 @@
                LoginAccessToken = mqttRequestParToken,
                PlatformStr = "L1",
                PublishPayloadJsonStr = PushSignStr,
                MainUserDistributedMark = UserConfig.Instance.CurrentRegion.MainUserDistributedMark,
                //MainUserDistributedMark = UserConfig.Instance.CurrentRegion.MainUserDistributedMark,
                HomeId = UserConfig.Instance.CurrentRegion.Id
            };
            var mqttInfoRequestResult = MainPage.RequestHttps (API.ShareMemberConnMqttInfo, Newtonsoft.Json.JsonConvert.SerializeObject (mqttInfoRequestPar));
@@ -565,7 +587,7 @@

            var requestJson3 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj3);
            var revertObj3 = MainPage.RequestHttps (API.GetSingleHomeGatewayPagger, requestJson3, urlHead);
            if (revertObj3.StateCode.ToUpper () == "SUCCESS") {
            if (revertObj3.StateCode.ToUpper () == StateCode.SUCCESS) {
                var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGatewayResult> (revertObj3.ResponseData.ToString ());
                if (bNeedConnect) {
                    //2020-01-11
@@ -574,7 +596,7 @@
                    //var gatewayListRequestResult_Obj = Newtonsoft.Json.JsonConvert.DeserializeObject<MqttRemoteInfo> (revertObj3.ResponseData.ToString ());
                    //--找出是否存在匹配当前住宅的mac，存在再进行远程。
                    if (UserConfig.Instance.CheckHomeGatewaysNotEmpty ()) {
                        var mGatewayRes = infoResult.PageData.Find ((obj) => obj.GatewayUniqueId == UserConfig.Instance.CurrentRegion.HomeGateways [0].GatewayUniqueId);
                        var mGatewayRes = infoResult.PageData.Find ((obj) => obj.GatewayUniqueId == UserConfig.Instance.HomeGateway.mac);
                        if (mGatewayRes != null) {
                            CurRemoteMACInfo = new RemoteMACInfo ();
                            CurRemoteMACInfo.aesKey = mGatewayRes.AesKey;
@@ -590,7 +612,7 @@
                        Utlis.WriteLine ("============>Mqtt 取消连接，当前住宅没绑定网关");
                    }
                } else {
                    var mGatewayRes = infoResult.PageData.Find ((obj) => obj.GatewayUniqueId == UserConfig.Instance.CurrentRegion.HomeGateways [0].GatewayUniqueId);
                    var mGatewayRes = infoResult.PageData.Find ((obj) => obj.GatewayUniqueId == UserConfig.Instance.HomeGateway.mac);
                    if (mGatewayRes != null) {
                        CurRemoteMACInfo.aesKey = mGatewayRes.AesKey;
                        mqttEncryptKey = CurRemoteMACInfo.aesKey;
@@ -1061,7 +1083,7 @@
                        var requestObj3 = new GatewayByRegionListObj () { RegionID = UserConfig.Instance.CurrentRegion.RegionID };
                        var requestJson3 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj3);
                        var revertObj3 = MainPage.RequestHttps ("GatewayByRegionList", requestJson3, true, false);
                        if (revertObj3.StateCode.ToUpper() == "SUCCESS") {
                        if (revertObj3.StateCode.ToUpper() == StateCode.SUCCESS) {
                            var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<GatewayRes>> (revertObj3.ResponseData.ToString ());
                            var gatewayList = responseDataObj;
                            if (gatewayList != null && gatewayList.Count > 0) {
@@ -1140,7 +1162,7 @@
                                        Shared.SimpleControl.Phone.UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.DelColor;
                                    });
                                    break;
                                case "Success":
                                case StateCode.SUCCESS:
                                    CommonPage.IsRemote = true;
                                    Application.RunOnMainThread (() => {
                                        MainPage.Loading.Hide ();