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

JLChen

2021-01-11 5a5a2b696866f947b6025d26c3302e8ffef46435

 Crabtree/SmartHome/UI/SimpleControl/Phone/Curtain/UserDeviceToCurtains.cs

@@ -534,6 +534,96 @@
        }

        /// <summary>
        /// 控制所有窗帘
        /// </summary>
        /// <param name="status">1：开，2：关.</param>
        void controlAllCurtainNew (byte status)
        {
            if (CommonPage.IsRemote) {
                if (!SmartHome.MqttCommon.IsGatewayOnline) {
                    new Alert ("", "Gateway offline" + ErrorCode.ControlFailure, "Close").Show ();
                    return;
                }
            }
            showTip = true;
            MainPage.Loading.Start ("Sending...");
            System.Threading.Tasks.Task.Run (() => {

                int mSendCount = 0;
                foreach (var room in Room.Lists) {
                    if (room == null)
                        continue;
                    if (string.IsNullOrEmpty (room.Name)) {
                        continue;
                    }
                    foreach (var common in room.DeviceList) {
                        //2020-02-10
                        byte [] returnBytes = null;
                        if (common.Type == DeviceType.CurtainModel || common.Type == DeviceType.CurtainRoller || common.Type == DeviceType.CurtainTrietex) {
                            System.Threading.Tasks.Task.Run (() => {
                                mSendCount++;

                                if (common.Type == DeviceType.CurtainModel) {
                                    var curtainmodel = common as CurtainModel;
                                    returnBytes = Control.ControlBytesSendHasReturn (Command.UpdataCurtainModelStutas, curtainmodel.SubnetID, curtainmodel.DeviceID, new byte [] { curtainmodel.LoopID, status });
                                } else if (common.Type == DeviceType.CurtainRoller) {
                                    var curtainroller = common as CurtainRoller;
                                    returnBytes = Control.ControlBytesSendHasReturn (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { curtainroller.LoopID, status });
                                } else if (common.Type == DeviceType.CurtainTrietex) {
                                    var curtaintrietex = common as CurtainTrietex;
                                    returnBytes = Control.ControlBytesSendHasReturn (Command.UpdataCurtainModelStutas, curtaintrietex.SubnetID, curtaintrietex.DeviceID, new byte [] { curtaintrietex.LoopID, status });
                                } 

                                if (showTip) {
                                    if (returnBytes == null) {
                                        Application.RunOnMainThread (() => {

                                            string tipString = ErrorCode.ControlFailure;
                                            var btnTip = new Button () {
                                                Height = Application.GetRealHeight (140),
                                                Text = common.Name + tipString,// + "..." + controlDeviceIndex.ToString () + @"/" + sceneDeviceCount.ToString (),
                                                BackgroundColor = 0xFFD7D7D7,
                                            };
                                            MainPage.MainFrameLayout.AddChidren (btnTip);
                                            btnTip.MouseUpEventHandler += (sender, e) => {
                                                btnTip.RemoveFromParent ();
                                                showTip = false;
                                            };

                                            System.Threading.Tasks.Task.Run (() => {
                                                System.Threading.Thread.Sleep (3000);
                                                Application.RunOnMainThread (() => {
                                                    btnTip.RemoveFromParent ();
                                                });
                                            });

                                        });
                                    }
                                }

                                mSendCount--;
                            });

                            //等待100ms再发送第二个设备数据
                            System.Threading.Thread.Sleep (100);

                        }


                    }
                }

                while (mSendCount > 0) {
                    System.Threading.Thread.Sleep (100);
                }

                Application.RunOnMainThread (() => {
                    MainPage.Loading.Hide ();
                });
            });
        }

        /// <summary>
        /// //2020-02-10 带返回结果的修改窗帘状态
        /// </summary>
        /// <param name="mLightCommon"></param>