wxr
2024-06-07 56da43f1e25a191cd83fb91c5756f19ef7431bb0
Crabtree/SmartHome/UI/SimpleControl/EquipmentPublicClass.cs
@@ -106,9 +106,8 @@
                                //MainPage.AddTip (Language.StringByID (R.MyInternationalizationString.SearchingGatewayLocally));
                                MainPage.LoadingStart (Language.StringByID (R.MyInternationalizationString.SearchingGatewayLocally));
                                var control = new Control ();
                                UserConfig.Instance.IsLocalEncrypt = false;
                                var control = new Control ();
                                control.Send (new Target () {
                                    IPEndPoint = new System.Net.IPEndPoint (System.Net.IPAddress.Parse (new Net.NetWiFi ().BroadcastIpAddress.ToString ()), 6000),
                                    Command = Command.ReadGateway,
@@ -118,6 +117,18 @@
                                }, SendCount.Three, true, true);
                                var result = control.UsefulBytes;
                                //优化一下,防止逻辑异常
                                if(result == null) {
                                    UserConfig.Instance.IsLocalEncrypt = true;
                                    control.Send (new Target () {
                                        IPEndPoint = new System.Net.IPEndPoint (System.Net.IPAddress.Parse (new Net.NetWiFi ().BroadcastIpAddress.ToString ()), 6000),
                                        Command = Command.ReadGateway,
                                        SubnetID = SmartHome.MqttCommon.GatewayCommon.SubnetID,
                                        DeviceID = SmartHome.MqttCommon.GatewayCommon.DeviceID,
                                        AddData = new byte [] { (byte)new Random ().Next (255), (byte)new Random ().Next (255) },
                                    }, SendCount.Three, true, true);
                                    result = control.UsefulBytes;
                                }
                                #endregion
                                if (result != null) {
@@ -250,6 +261,12 @@
                    //    });
                    //}
                    //在确定用户及住宅信息后,初始化基本信息,如:
                    var logBean = HDL_ON_Android.Aliyu.AliyuLogUtil.getLogBean;
                    logBean.setHomeId (UserConfig.Instance.CurrentRegion.Id);
                    logBean.setUserId (MainPage.LoginUser.ID);
                    logBean.setAppVersion (MainPage.RequestVersion);
#if DEBUG
                    Shared.Utlis.WriteLine ($"CheckLinkRemote: 结束");
#endif