2021-01-11 1.更新MQTT连接和本地搜索网关方法。2.子账号相关接口完善

JLChen

2021-01-11 5a5a2b696866f947b6025d26c3302e8ffef46435

 Crabtree/SmartHome/HDL/Operation/Control.cs

@@ -8,6 +8,7 @@
{
    public class Control
    {
        public static bool IsEnterBackground = false;
        public bool IsCanShowTip;
        public System.DateTime LatestDateTime = System.DateTime.Now;

@@ -62,7 +63,7 @@
                AddData = gatewayBytes,
            }, sendCount, false);
            CommonPage.FindGateway = false;
            System.Console.WriteLine (command.ToString () + "::" + CommonPage.EndPoint.ToString ());
            Utlis.WriteLine (command.ToString () + "::" + CommonPage.EndPoint.ToString ());
        }

        /// <summary>
@@ -153,6 +154,20 @@
                case Command.UpdataLightDimmingTheLargestLevelACK:
                case Command.UpdataLightDimmingMaximumOrMinimumACK:
                case Command.WriteManageWirelessNetACK:
                //**********新增mqtt上位机协议**********
                case Command.ReadGateWayURLACK:
                case Command.SetGateWayURLACK:
                case Command.ReadGateWayClientIDUsernamePasswordACK:
                case Command.SetGateWayClientIDUsernamePasswordACK:
                case Command.ReadGateWayAESEncryptionACK:
                case Command.SetGateWayAESEncryptionACK:
                case Command.ReadGateWayTopicACK:
                case Command.SetGateWayTopicACK:
                case Command.ReadGateWayAdminInfoACK:
                case Command.SetGateWayAdminInfoACK:
                case Command.ReadGateWayLocalEncryptionACK:
                case Command.SetReadGateWayLocalEncryptionACK:
                //************************************
                case Command.ReadGateWayModelInfoACK:
                case Command.ReadGatewayServerIPACK:
                case Command.SetGateWayModelInfoACK:
@@ -204,6 +219,7 @@
                case Command.READ_JOG_OPEN_TIME_ACK:
                case Command.SET_JOG_CLOSE_TIME_ACK:
                case Command.READ_JOG_CLOSE_TIME_ACK:
                case Command.ReadRemarkACK:
                    receiveFlag += "";
                    break;
                case Command.ControlMusicModel1ACK:
@@ -271,7 +287,7 @@
                default:
                    break;
                }
                //System.Console.WriteLine ("接收到数据：" + receiveFlag);
                //Utlis.WriteLine ("接收到数据：" + receiveFlag);

                for (int i = 0; i < controlList.Count; i++) {
                    try {
@@ -286,7 +302,7 @@
                    }
                }
            } catch (Exception ex) {
                Console.WriteLine ("ManagerReceive抛出异常：" + ex.ToString ());
                Utlis.WriteLine ("ManagerReceive抛出异常：" + ex.ToString ());
            }
        }

@@ -309,7 +325,7 @@
                    }

                }
                //System.Console.WriteLine ("++++++++"+controlList.Count.ToString ());
                //Utlis.WriteLine ("++++++++"+controlList.Count.ToString ());
            }
            controlList.Add (this);
        }
@@ -371,30 +387,66 @@
        void managerSendCount (object o)
        {
            add ();
            try {
                System.Console.WriteLine ("发送数据:" + SendFlag);
                BusSocket.AsyncBeginSend (Packet);
            if (CommonPage.IsRemote && !isLocal) {
                //if (!SmartHome.MqttCommon.IsGatewayOnline) {
                //    System.Threading.Thread.Sleep (500);
                //    Utlis.WriteLine ($"网关不在线 取消发送:" + SendFlag);
                //    Packet.HaveSendCount = 3;
                //    allDone.Set ();
                //    return;
                //}
                if (IsEnterBackground) {
                    System.Threading.Thread.Sleep (500);
                    Utlis.WriteLine ("已进入后台 取消发送");
                    Packet.HaveSendCount = 3;
                    allDone.Set ();
                    return;
                }
                Utlis.WriteLine ("远程发送数据:" + SendFlag);
                SmartHome.MqttCommon.MqttRemoteSend (Packet.Bytes);
                Packet.FlagDateTime = DateTime.Now;
                Packet.HaveSendCount--;

                //这里是重发两次
                while (Packet.HaveSendCount < 3) {
                    if (Packet.FlagDateTime.AddMilliseconds (1000).Ticks <= System.DateTime.Now.Ticks) {
                        //System.Console.WriteLine ("重发数据:" + SendFlag);
                        BusSocket.AsyncBeginSend (Packet);
                    if (Packet.HaveSendCount < 2) {
                        if (Packet.FlagDateTime.AddMilliseconds (2000).Ticks <= System.DateTime.Now.Ticks) {
                            SmartHome.MqttCommon.MqttRemoteSend (Packet.Bytes);
                            Utlis.WriteLine ("重发远程发送数据:" + SendFlag);
                            Packet.FlagDateTime = DateTime.Now;
                            Packet.HaveSendCount++;
                        }
                    } else {
                        if (Packet.FlagDateTime.AddMilliseconds (5000).Ticks <= System.DateTime.Now.Ticks) {
                            Utlis.WriteLine ("远程发送数据: 等待5s超时");
                            Packet.FlagDateTime = DateTime.Now;
                            Packet.HaveSendCount++;
                        }
                    }
                    System.Threading.Thread.Sleep (100);
                }
                }
                allDone.Set ();
            } else {
                try {
                    Utlis.WriteLine ("发送数据:" + SendFlag);
                    BusSocket.AsyncBeginSend (Packet);

            } catch (Exception ex) {
                Console.WriteLine ("managerSendCount:" + ex.ToString ());
            } finally {
                allDone.Set ();
                if (Packet.HaveSendCount == 3 && IsCanShowTip) {
                    //MainPage.AddTip (Language.StringByID (SimpleControl.R.MyInternationalizationString.OperationFailed));
                    Packet.FlagDateTime = DateTime.Now;
                    Packet.HaveSendCount--;

                    //这里是重发两次
                    while (Packet.HaveSendCount < 3 && BusSocket.IsRunning) {
                        if (Packet.FlagDateTime.AddMilliseconds (1000).Ticks <= System.DateTime.Now.Ticks) {
                            Utlis.WriteLine ("重发数据:" + SendFlag);
                            BusSocket.AsyncBeginSend (Packet);
                        }
                        System.Threading.Thread.Sleep (100);
                    }

                } catch (Exception ex) {
                    Utlis.WriteLine ("managerSendCount:" + ex.ToString ());
                } finally {
                    allDone.Set ();
                }
            }
        }

        /// <summary>
        /// 当前数据包
        /// </summary>
@@ -458,6 +510,20 @@
            case Command.WriteManageWirelessNet:
            case Command.UpdataLightDimmingTheLargestLevel:
            case Command.UpdataLightDimmingMaximumOrMinimum:
            //**********新增mqtt上位机协议**********
            case Command.ReadGateWayURL:
            case Command.SetGateWayURL:
            case Command.ReadGateWayClientIDUsernamePassword:
            case Command.SetGateWayClientIDUsernamePassword:
            case Command.ReadGateWayAESEncryption:
            case Command.SetGateWayAESEncryption:
            case Command.ReadGateWayTopic:
            case Command.SetGateWayTopic:
            case Command.ReadGateWayAdminInfo:
            case Command.SetGateWayAdminInfo:
            case Command.SetGateWayLocalEncryption:
            case Command.ReadGateWayLocalEncryption:
            //************************************
            case Command.ReadGateWayModelInfo:
            case Command.ReadGatewayServerIP:
            case Command.SetGateWayModelInfo:
@@ -510,6 +576,7 @@
            case Command.READ_JOG_OPEN_TIME_CMD:
            case Command.SET_JOG_CLOSE_TIME_CMD:
            case Command.READ_JOG_CLOSE_TIME_CMD:
            case Command.ReadRemark:
                this.SendFlag += "";
                break;
            case Command.ControlMusicModel2:
@@ -586,8 +653,9 @@
        /// </summary>
        /// <param name="target">发送对象</param>
        /// <param name="sendCount">重发次数</param>
        public void Send (Target target, SendCount sendCount, bool isWait)
        public void Send (Target target, SendCount sendCount, bool isWait, bool needLocal = false)
        {
            isLocal = needLocal;
            Packet = new Packet (target.SendBytes, target.IPEndPoint);
            Packet.HaveSendCount = 3 - (int)sendCount;

@@ -597,5 +665,6 @@
                this.wait ();
            }
        }
        bool isLocal = false;
    }
}