~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -45,7 +45,7 @@
			Phone.UserView.HomePage.Instance.InitPage();

			var roomList = new Shared.Phone.Device.Room.RoomManagement();


			Instance.AddLeftView(roomList);
			roomList.Show();
			}
			@@ -62,7 +62,7 @@
			/// <summary>
			/// 版本号
			/// </summary>
			public static string CodeIDString = "1.0.19120501";
			public static string CodeIDString = "1.0.20011001";
			/// <summary>
			/// 注册来源(0:HDL On 1:Zigbee)
			/// </summary>
			@@ -158,9 +158,8 @@

			/// <summary>
			/// 用于中国大陆验证手机号正则表达式
			/// 等同于--- "^[1]+\\d{10}"
			/// </summary>
			public static string PhoneRegexStr = "^[1]+[0,1,2,3,4,5,6,7,8,9]+\\d{9}";
			public static string PhoneRegexStr = "^[1][0-9]{10}$";
			/// <summary>
			/// 用于验证非中国大陆手机号正则表达式
			/// </summary>
			@@ -169,10 +168,7 @@
			/// 用于验证邮箱正则表达式
			/// </summary>
			public static string EmailRegexStr = "^\\s([A-Za-z0-9_-]+(\\.\\w+)@(\\w+\\.)+\\w{2,5})\\s*$";
			/// <summary>
			/// 下载安卓apk的byte长度
			/// </summary>
			public static long ApkBytesTotalLength = 0;


			//public static Encoding EncodingUTF8 = Encoding.UTF8;
			//public static Encoding EncodingGB2312 = Encoding.GetEncoding("gb2312");
			@@ -187,8 +183,8 @@
			/// 11
			/// </summary>
			public static int PlaceHolderTextSize = 11;
			/// <summary>
			/// 安卓的系统返回按键能否按下(比如在备份还原时,不能按下返回键)
			/// <summary>
			/// 安卓的系统返回按键能否按下(比如在备份还原时,不能按下返回键)
			/// </summary>
			public static bool BackKeyCanClick = true;

			@@ -227,9 +223,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;
			}
			@@ -252,18 +248,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，得到响应的数据
			@@ -279,7 +275,7 @@
			{
			//初始化新的webRequst
			//1．创建httpWebRequest对象
			HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(new Uri(requestFullUrl));
			HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(new Uri(requestFullUrl));

			//2．初始化HttpWebRequest对象
			webRequest.Method = requestMethod;
			@@ -310,7 +306,7 @@
			var response = (HttpWebResponse)webRequest.GetResponse();
			using (var stream = response.GetResponseStream())
			{
			if (stream == null)
			if (stream == null)
			{
			return null;
			}
			@@ -333,152 +329,7 @@
			return null;
			}
			}
			#if iOS
			/// <summary>
			/// 获取iOS-APP版本信息
			/// </summary>
			/// <returns>The https app version async.</returns>
			public async System.Threading.Tasks.Task<ResponseEntity.ResultPack> RequestHttpsiOSAppVersionAsync()
			{
			try
			{
			var webClient = new WebClient { };
			var result = await webClient.DownloadDataTaskAsync("https://itunes.apple.com/lookup?id=1461693569");
			if (result == null)
			{
			return null;
			}
			return Newtonsoft.Json.JsonConvert.DeserializeObject<ResponseEntity.ResultPack>(Encoding.UTF8.GetString(result));
			}
			catch
			{
			return null;
			}
			}
			/// <summary>
			/// 跳转到APP Store
			/// </summary>
			public void OpenUrl()
			{
			Uri url = new Uri("https://itunes.apple.com/cn/app/hdl-home/id1461693569?mt=8");
			UIKit.UIApplication.SharedApplication.OpenUrl(url);
			}
			#elif Android
			/// <summary>
			/// 获取 Android-APP 版本信息
			/// </summary>
			/// <returns>The https app version async.</returns>
			public async System.Threading.Tasks.Task<ResponseEntity.ApkInfoOBJ> RequestHttpsAndroidAppVersionAsync()
			{
			try
			{
			var requestOBJ = new SendDataToServer.GetAndroidApkInfoOBJ
			{
			Name = "ZigbeeApp",
			RequestVersion = CodeIDString
			};
			var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestOBJ);
			var result = await RequestHttpsZigbeeAsync("FirmwareMana/DetectionPlatformUploadFirmware", System.Text.Encoding.UTF8.GetBytes(requestJson));
			if (result == null)
			{
			return null;
			}
			if (result.StateCode.ToUpper() == "SUCCESS")
			{
			if (result.ResponseData == null)
			{
			return null;
			}

			var responeData = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponseEntity.ApkInfoRes>(result.ResponseData.ToString());
			if (responeData == null \|\| responeData.pageData == null \|\| responeData.pageData.Count==0)
			{
			return null;
			}
			int MaxIndex = 0;
			int NewVersion = 0;
			for (int i = 0; i < responeData.pageData.Count; i++)
			{
			var apkInfo = responeData.pageData[i];
			var version = int.Parse(apkInfo.FirmwareVersion.Replace(".", ""));
			if (version > NewVersion)
			{
			NewVersion = version;
			MaxIndex = i;
			}
			}
			return responeData.pageData[MaxIndex];
			}
			return null;
			}
			catch (Exception ex)
			{
			return null;
			}
			}

			/// <summary>
			/// 下载安装apk
			/// </summary>
			/// <returns>The load apk async.</returns>
			/// <param name="requestUrl">请求链接</param>
			/// <param name="byteData">请求参数</param>
			public System.Threading.Tasks.Task<byte[]> DownLoadApkAsync(string requestUrl, byte[] byteData)
			{
			try
			{
			AbountForm.instance.webClient.Headers.Add(HttpRequestHeader.ContentType, "application/json");
			AbountForm.instance.webClient.Headers.Add(HttpRequestHeader.Authorization, Config.Instance.Token);
			AbountForm.instance.webClient.UploadProgressChanged += Client_DownloadProgressChanged;
			AbountForm.instance.webClient.UploadDataCompleted += Client_UploadCompleted;
			var result = AbountForm.instance.webClient.UploadDataTaskAsync($"{RequestHttpsHost}/{requestUrl}", "POST", byteData);
			if (result == null)
			{
			return null;
			}
			return result;
			}
			catch (Exception ex)
			{
			return null;
			}
			finally
			{
			}
			}
			/// <summary>
			/// apk下载进度
			/// </summary>
			/// <param name="sender">Sender.</param>
			/// <param name="e">E.</param>
			void Client_DownloadProgressChanged(object sender, UploadProgressChangedEventArgs e)
			{
			System.Console.WriteLine($"当前进度--{(int)(e.BytesReceived / (float)ApkBytesTotalLength * 100)} % --BytesReceived--{e.BytesReceived}--totalByte{e.TotalBytesToReceive}");
			if (e.BytesReceived <= ApkBytesTotalLength)
			{
			Application.RunOnMainThread(() =>
			{
			//Loading.Start($"{(int)(e.BytesReceived / (float)ApkBytesTotalLength * 100)} %");
			AbountForm.instance.seekBar.Progress = (int)(e.BytesReceived / (float)ApkBytesTotalLength * 100);
			AbountForm.instance.seekBarTitle.Text = $"{(int)(e.BytesReceived / (float)ApkBytesTotalLength * 100)}%";
			});
			}
			}
			void Client_UploadCompleted(object sender, UploadDataCompletedEventArgs e)
			{
			System.Console.WriteLine("下载apk完成");
			//Application.RunOnMainThread(Loading.Hide);
			}
			/// <summary>
			/// 取消下载apk
			/// </summary>
			public static void CancelDownLoadApkAsync()
			{
			AbountForm.instance.webClient?.CancelAsync();
			System.Console.WriteLine("取消下载apk");
			}

			#endif
			/// <summary>
			/// 服务器获取数据失败提示
			/// </summary>
			@@ -538,7 +389,7 @@
			{
			try
			{
			Application.RunOnMainThread( () =>
			Application.RunOnMainThread(() =>
			{
			//设定一个时间
			Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);