Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/Shared/Common/CommonPage.cs

old mode 100755
new mode 100644
@@ -53,11 +53,11 @@
        public static string LogoString = @"Logo/Logo.png";
        public static string RegisterLogoString = @"Logo/Register_logo.png";
        public static string RequestHttpsHost = "https://global.hdlcontrol.com/HangZhouHdlCloudApi";
        //public static string RequestHttpsHost = "http://172.16.2.225:13061";
        //public static string RequestHttpsHost = "http://172.16.2.192:13061";
        /// <summary>
        /// 版本号
        /// </summary>
        public static string CodeIDString = "1.0.19071501";
        public static string CodeIDString = "1.0.19110701";
        /// <summary>
        /// 注册来源(0:HDL On 1:Zigbee)
        /// </summary>
@@ -74,11 +74,11 @@
        /// <summary>
        /// 请求版本号
        /// </summary>
        public static string RequestVersion = "1.0";
        public static string RequestVersion = "2.0";
        /// <summary>
        /// 左边距离屏幕的宽度--50
        /// 左边距离屏幕的宽度--58
        /// </summary>
        public static int XLeft = 50;
        public static int XLeft = 58;
        /// <summary>
        /// button高度--110
        /// </summary>
@@ -130,9 +130,9 @@
        /// </summary>
        public static int Navigation_Height = 220;
        /// <summary>
        /// 底边栏高度 160
        /// 底边栏高度
        /// </summary>
        public static int TabbarHeight = 160;
        public const int TabbarHeight = 141;
        /// <summary>
        /// 线条的高度--实际像素3
        /// </summary>
@@ -177,8 +177,15 @@
        /// 当前网络连接的模式  0:没有网络  1：远程连接，也叫3G,4G  2：WIFI
        /// </summary>
        public static int nowNetworkMode = 0;


        /// <summary>
        /// 占位字体大小
        /// 11
        /// </summary>
        public static int PlaceHolderTextSize = 11;
        /// <summary>
        /// 安卓的系统返回按键能否按下(比如在备份还原时,不能按下返回键)
        /// </summary>
        public static bool BackKeyCanClick = true;

        /// <summary>
        /// 请求服务器方法
@@ -215,9 +222,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;
        }
@@ -240,18 +247,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，得到响应的数据
@@ -262,12 +269,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;
@@ -294,7 +301,7 @@
                var response = (HttpWebResponse)webRequest.GetResponse();
                using (var stream = response.GetResponseStream())
                {
                    if (stream == null)

                    if (stream == null)
                    {
                        return null;
                    }
@@ -373,18 +380,19 @@
                    }

                    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;
                    }
                    int MaxIndex = 0;
                    int NewID = 0;
                    int NewVersion = 0;
                    for (int i = 0; i < responeData.pageData.Count; i++)
                    {
                        var apkInfo = responeData.pageData[i];
                        if (int.Parse(apkInfo.Id) > NewID)
                        var version = int.Parse(apkInfo.FirmwareVersion.Replace(".", ""));
                        if (version > NewVersion)
                        {
                            NewID = int.Parse(apkInfo.Id);
                            NewVersion = version;
                            MaxIndex = i;
                        }
                    }
@@ -519,7 +527,7 @@
        {
            try
            {
                Application.RunOnMainThread( () =>
                Application.RunOnMainThread(() =>
                {
                    //设定一个时间
                    Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
@@ -590,4 +598,4 @@
            }
        }
    }
}
}