代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

 ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs

@@ -105,14 +105,14 @@
        /// </summary>
        /// <param name="lat"></param>
        /// <param name="lon"></param>
        public async void ReceiveAppLatAndLon(string lat, string lon)
        public async void ReceiveAppLatAndLon(string lon, string lat)
        {
            try
            {
                var requestObj = new SendDataToServer.ReceiveAppLatAndLonObj
                {
                    Latitude = lat,
                    Longitude = lon
                    Longitude = lon,
                    Latitude = lat
                };
                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
                var revertObj = await RequestHttpsZigbeeAsync("ProcessRange/ReceiveAppLatAndLon", System.Text.Encoding.UTF8.GetBytes(requestJson));
@@ -177,8 +177,9 @@
        public async System.Threading.Tasks.Task<byte[]> RequestHttpsZigbeeBytesResultAsync(string requestUrl, byte[] byteData, string requestMethod = "POST")
        {
            //请求Url的完成路径
            var fullUrl = $"{CommonPage.RequestHttpsHost}/{requestUrl}";
            return await CommonPage.Instance.DoRequestZigbeeHttpsInterface(fullUrl, byteData, Config.Instance.LoginToken, requestMethod);
            var requestHost = "https://global.hdlcontrol.com/GeofenceService";
            var fullUrl = $"{requestHost}/{requestUrl}";
            return await CommonPage.Instance.DoRequestZigbeeHttpsInterface(fullUrl, byteData, Config.Instance.Token, requestMethod);
        }

        #endregion