2019.11.26

gxc

2019-11-26 b800fbdf874cdc75ddc137ea2c22ac2c25d8b45c

 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";
@@ -182,8 +187,8 @@
        /// 11
        /// </summary>
        public static int PlaceHolderTextSize = 11;
        /// <summary>

        /// 安卓的系统返回按键能否按下(比如在备份还原时,不能按下返回键)

        /// <summary>
        /// 安卓的系统返回按键能否按下(比如在备份还原时,不能按下返回键)
        /// </summary>
        public static bool BackKeyCanClick = true;

@@ -222,9 +227,9 @@
        public async System.Threading.Tasks.Task<string> RequestHttpsZigbeeResultAsync(string requestUrl, byte[] byteData)
        {
            var result = await RequestHttpsZigbeeBytesResultAsync(requestUrl, byteData);
            if (result != null)

            {

                return Encoding.UTF8.GetString(result);

            if (result != null)
            {
                return Encoding.UTF8.GetString(result);
            }
            return null;
        }
@@ -247,18 +252,18 @@
        /// <summary>
        /// <pra>请求服务器方法,指定一个Url,和请求方法，数据，Cookie，得到响应的数据</pra>
        /// <pra>注意!!此方法仅限【拥有管理员权限的成员】调用</pra>
        /// </summary>

        /// </summary>
        /// <param name="requestUrl">请求Url</param>
        /// <param name="byteData">请求的的数据</param>
        /// <param name="requestMethod">POST 或者 GET 等等</param>
        /// <returns>得到响应的数据</returns>
        public async System.Threading.Tasks.Task<byte[]> RequestZigbeeHttpsByAdmin(string requestUrl, byte[] byteData, string requestMethod = "POST")
        {

        {
            //请求Url的完成路径
            var fullUrl = $"{Config.Instance.AdminRequestBaseUrl}/{requestUrl}";

            var fullUrl = $"{Config.Instance.AdminRequestBaseUrl}/{requestUrl}";
            return await this.DoRequestZigbeeHttpsInterface(fullUrl, byteData, Config.Instance.AdminRequestToken, requestMethod);
        }



        /// <summary>
        /// 请求服务器方法
        /// 指定一个Url,和请求方法，数据，Cookie，得到响应的数据
@@ -269,12 +274,12 @@
        /// <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")
        {

        {
            try
            {
                //初始化新的webRequst
                //1． 创建httpWebRequest对象
                HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(new Uri(requestFullUrl));

                HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(new Uri(requestFullUrl));

                //2． 初始化HttpWebRequest对象
                webRequest.Method = requestMethod;
@@ -301,7 +306,7 @@
                var response = (HttpWebResponse)webRequest.GetResponse();
                using (var stream = response.GetResponseStream())
                {
                    if (stream == null)

                    if (stream == null)
                    {
                        return null;
                    }
@@ -380,7 +385,7 @@
                    }

                    var responeData = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponseEntity.ApkInfoRes>(result.ResponseData.ToString());
                    if (responeData == null || responeData.pageData == null || responeData.pageData.Count==0)
                    if (responeData == null || responeData.pageData == null || responeData.pageData.Count == 0)
                    {
                        return null;
                    }
@@ -527,7 +532,7 @@
        {
            try
            {
                Application.RunOnMainThread( () =>
                Application.RunOnMainThread(() =>
                {
                    //设定一个时间
                    Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
@@ -598,4 +603,4 @@
            }
        }
    }
}
}