~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -42,7 +42,7 @@
			/// <summary>
			/// 版本号
			/// </summary>
			public static string CodeIDString = "1.1.0120070302";
			public static string CodeIDString = "1.1.0120091002";
			/// <summary>
			/// 注册来源(0:HDL On 1:Zigbee)
			/// </summary>
			@@ -95,10 +95,6 @@
			/// 用于验证邮箱正则表达式
			/// </summary>
			public static string EmailRegexStr = "^\\s([A-Za-z0-9_-]+(\\.\\w+)@(\\w+\\.)+\\w{2,5})\\s*$";
			/// <summary>
			/// 当前网络连接的模式 0:没有网络 1：远程连接，也叫3G,4G 2：WIFI
			/// </summary>
			public static int nowNetworkMode = 0;
			/// <summary>
			/// 安卓的系统返回按键能否按下(比如在备份还原时,不能按下返回键)
			/// </summary>
			@@ -359,6 +355,10 @@
			/// <returns>返回状态码</returns>
			public string PushRegID()
			{
			#if DEBUG
			//调试不需要发送这个东西
			return null;
			#endif
			try
			{
			string deviceAlias;
			@@ -368,8 +368,9 @@
			deviceType = "iphone";
			#elif Android
			deviceAlias = Android.OS.Build.Manufacturer;
			deviceType = "android";
			#endif
			deviceType = "android";
			#endif

			var RegIDObj = new SendDataToServer.SignZigbeeNeedPushRegIDObj()
			{
			RegID = Shared.Common.Config.Instance.RegistrationID,
			@@ -377,11 +378,16 @@
			DeviceType = deviceType
			};
			var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(RegIDObj);
			var reverObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/SignZigbeeNeedPushRegID", System.Text.Encoding.UTF8.GetBytes(requestJson));
			var reverObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/SignZigbeeNeedPushRegID", System.Text.Encoding.UTF8.GetBytes(requestJson), 4);
			if (reverObj == null)
			{
			{
			//调试:记录极光ID
			Phone.UserCenter.HdlLogLogic.Current.WriteOtherText(Shared.Phone.UserCenter.DirNameResourse.JiguangFile, "send:" + RegIDObj.RegID + " fail,receive obj is null", false, true);
			return null;
			}
			}
			//调试:记录极光ID
			Phone.UserCenter.HdlLogLogic.Current.WriteOtherText(Shared.Phone.UserCenter.DirNameResourse.JiguangFile, "send:" + RegIDObj.RegID + " result:" + reverObj.StateCode, false, true);

			return reverObj.StateCode;
			}
			catch