2019-12-30-1

WJC

2019-12-30 f1c3921b08bb22ac6f5db22d620e01d7e8e5c49f

 ZigbeeApp/Shared/Common/CommonPage.cs

old mode 100755
new mode 100644
@@ -7,7 +7,7 @@
using Shared.Phone.UserCenter.Abount;
namespace Shared.Common
{
    public class CommonPage : FrameLayout
    public class CommonPage : UIDrawerLayout
    {
        static CommonPage commonPage;
        public static CommonPage Instance
@@ -43,6 +43,11 @@
            Application.MainPage.AddChidren(Loading);
            //}
            Phone.UserView.HomePage.Instance.InitPage();

            var roomList = new Shared.Phone.Device.Room.RoomManagement();
           
            Instance.AddLeftView(roomList);
            roomList.Show();
        }

        public static string SoftTitle = "ZigBee";
@@ -57,7 +62,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string CodeIDString = "1.0.19103101";
        public static string CodeIDString = "1.0.19112901";
        /// <summary>
        /// 注册来源(0:HDL On 1:Zigbee)
        /// </summary>
@@ -268,7 +273,7 @@
        /// <param name="token">token</param>
        /// <param name="requestMethod">POST 或者 GET 等等</param>
        /// <returns>得到响应的数据</returns>
        private async System.Threading.Tasks.Task<byte[]> DoRequestZigbeeHttpsInterface(string requestFullUrl, byte[] byteData, string token, string requestMethod = "POST")
        public async System.Threading.Tasks.Task<byte[]> DoRequestZigbeeHttpsInterface(string requestFullUrl, byte[] byteData, string token, string requestMethod = "POST")
        {

            try
            {
@@ -279,7 +284,11 @@
                //2． 初始化HttpWebRequest对象
                webRequest.Method = requestMethod;
                webRequest.Timeout = 10 * 1000;
                webRequest.Headers.Add(HttpRequestHeader.Authorization, token);
                if (token != null)

                {

                    //对应微信网址

                    webRequest.Headers.Add(HttpRequestHeader.Authorization, token);

                }
                if (requestMethod == "GET")
                {
                    //webRequest.ContentType = "text/html";
@@ -317,8 +326,10 @@
                }
            }
            catch (Exception e)
            {
                System.Console.WriteLine(e.Message);
            {

#if DEBUG
                System.Console.WriteLine(e.Message);

#endif
                return null;
            }
        }