Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs

@@ -56,7 +56,12 @@
            get

            {

#if iOS

                return string.Empty;

                string ssiD = Shared.WiimuUPnP.SSID;

                if (string.IsNullOrEmpty(ssiD) == false && ssiD.StartsWith("\"") && ssiD.EndsWith("\""))

                {

                    ssiD = ssiD.Substring(1, ssiD.Length - 2);

                }

                return ssiD;

#endif

#if Android

                string ssiD = null;

@@ -274,14 +279,14 @@
        /// <param name="wifiPsw">wifi密码</param>

        /// <param name="p2">我也不知道这个是什么东西</param>

        /// <returns></returns>

        public bool StartSmartConnection(string wifiName, string wifiPsw, string p2 = "1")

        public bool StartSmartConnection(string wifiName, string wifiPsw, string p2 = "")

        {

            if (hdlWiFi == null)

            {

                Com.Mediatek.Elian.ElianNative.LoadLib();

                var result2 = Com.Mediatek.Elian.ElianNative.LoadLib();

                //初始化Wi-Fi配网

                this.hdlWiFi = new Com.Mediatek.Elian.ElianNative();

                hdlWiFi.InitSmartConnection(null, 1, 1);

                var value = hdlWiFi.InitSmartConnection(null, 1, 1);

            }

            //开始Wi-Fi配网

            var result = hdlWiFi.StartSmartConnection(wifiName, wifiPsw, p2);

@@ -296,7 +301,8 @@
            if (hdlWiFi != null)

            {

                //停止Wi-Fi配网

                hdlWiFi.StopSmartConnection();

                var result = hdlWiFi.StopSmartConnection();

                hdlWiFi = null;

            }

        }

#endif

@@ -308,10 +314,10 @@
        /// <param name="wifiPsw">wifi密码</param>

        /// <param name="p2">我也不知道这个是什么东西</param>

        /// <returns></returns>

        public bool StartSmartConnection(string wifiName, string wifiPsw, string p2 = "1")

        public bool StartSmartConnection(string wifiName, string wifiPsw, string p2 = "")

        {

            //初始化Wi-Fi连接

            Com.Mediatek.Elian.ElianNative.InitSmartConnection(null, 1, 1);

            Com.Mediatek.Elian.ElianNative.InitSmartConnection("1", 1, 1);

            //开始Wi-Fi连接

            var result = Com.Mediatek.Elian.ElianNative.StartSmartConnection(wifiName, wifiPsw, p2);

            return true;