合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs

old mode 100755
new mode 100644
@@ -11,14 +11,23 @@
        public const int AppRealWidth = 1080;

        /// <summary>
        /// 14
        /// </summary>
        public const int TextSize = 14;
        /// <summary>
        /// 16
        /// </summary>
        public const int TextSize_Selected = 16;

        /// <summary>
        /// 字体12
        /// </summary>
        public const int loginTextSize = 12;
        /// <summary>
        /// 占位字体大小
        /// 12
        /// 14
        /// </summary>
        public const int PlaceHolderTextSize = 12;
        public const int PlaceHolderTextSize = 14;

        /// <summary>
        /// Row_Height
@@ -45,13 +54,13 @@
        /// </summary>
        public const int TopFrameLayout_Height = 184;
        /// <summary>
        /// topview 状态栏高度 60
        /// topview 状态栏高度 74
        /// </summary>
        public const int TopStatuFrameLayout_Height = 60;
        public const int TopStatuFrameLayout_Height = 74;
        /// <summary>
        /// topview 状态栏高度 124
        /// topview 状态栏高度 110
        /// </summary>
        public const int Topview_Height = 124;
        public const int Topview_Height = 110;

        /// <summary>
        /// 标题大小 17
@@ -67,11 +76,11 @@
        /// </summary>
        /// <param name="loginSendVerCodeObj"></param>
        /// <returns></returns>
        public static async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> LoginSendVerCode(SendDataToServer.LoginSendVerCodeObj loginSendVerCodeObj)
        public static Shared.Common.ResponseEntity.ResponsePack LoginSendVerCode(SendDataToServer.LoginSendVerCodeObj loginSendVerCodeObj)
        {
            try
            {
                var requestRevertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/LoginSendVerCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(loginSendVerCodeObj)));
                var requestRevertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/LoginSendVerCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(loginSendVerCodeObj)));
                return requestRevertObj;
            }
            catch
@@ -85,11 +94,11 @@
        /// </summary>
        /// <param name="loginValidCodeOBJ"></param>
        /// <returns></returns>
        public static async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> LoginByCode(SendDataToServer.LoginValidCodeOBJ loginValidCodeOBJ)
        public static Shared.Common.ResponseEntity.ResponsePack LoginByCode(SendDataToServer.LoginValidCodeOBJ loginValidCodeOBJ)
        {
            try
            {
                var requestRevertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/LoginValidCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(loginValidCodeOBJ)));
                var requestRevertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/LoginValidCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(loginValidCodeOBJ)));
                return requestRevertObj;
            }
            catch
@@ -103,11 +112,11 @@
        /// </summary>
        /// <param name="registerAccountObj"></param>
        /// <returns></returns>
        public static async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> RegisterSendVerCode(SendDataToServer.RegisterSendVerCodeObj registerAccountObj)
        public static Shared.Common.ResponseEntity.ResponsePack RegisterSendVerCode(SendDataToServer.RegisterSendVerCodeObj registerAccountObj)
        {
            try
            {
                var requestRevertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/RegisterSendVerCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(registerAccountObj)));
                var requestRevertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/RegisterSendVerCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(registerAccountObj)));
                return requestRevertObj;
            }
            catch
@@ -121,11 +130,11 @@
        /// </summary>
        /// <param name="registerAccountObj"></param>
        /// <returns></returns>
        public static async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> Register(SendDataToServer.RegisterAccountObj registerAccountObj)
        public static Shared.Common.ResponseEntity.ResponsePack Register(SendDataToServer.RegisterAccountObj registerAccountObj)
        {
            try
            {
                var requestRevertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/ValidataCodeAndRegisterAccount", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(registerAccountObj)));
                var requestRevertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/ValidataCodeAndRegisterAccount", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(registerAccountObj)));
                return requestRevertObj;
            }
            catch
@@ -139,11 +148,11 @@
        /// </summary>
        /// <param name="resetPasswordObj"></param>
        /// <returns></returns>
        public static async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> ResetPassword(SendDataToServer.ResetPasswordObj resetPasswordObj)
        public static Shared.Common.ResponseEntity.ResponsePack ResetPassword(SendDataToServer.ResetPasswordObj resetPasswordObj)
        {
            try
            {
                var requestRevertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/ResetPassword", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(resetPasswordObj)));
                var requestRevertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/ResetPassword", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(resetPasswordObj)));
                return requestRevertObj;
            }
            catch
@@ -157,11 +166,11 @@
        /// </summary>
        /// <param name="validatorCodeObj"></param>
        /// <returns></returns>
        public static async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> ValidatorCode(SendDataToServer.ValidatorCodeObj validatorCodeObj)
        public static Shared.Common.ResponseEntity.ResponsePack ValidatorCode(SendDataToServer.ValidatorCodeObj validatorCodeObj)
        {
            try
            {
                var requestRevertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/ValidatorCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(validatorCodeObj)));
                var requestRevertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/ValidatorCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(validatorCodeObj)));
                return requestRevertObj;
            }
            catch
@@ -196,21 +205,56 @@
        /// <returns></returns>
        public static string GetTimeString(int second)
        {
            string tStr;
            if (second / 3600 > 0)
            if (second == 0)
            {
                tStr = $"{second / 3600}{Language.StringByID(R.MyInternationalizationString.Hour)}";
                return null;
            }
            else if (second / 60 > 0)
            string timeStr = string.Empty;
            int hour = second / 3600;
            int minu = second % 3600 / 60;
            int sec = second % 60;
            if (hour > 0)
            {
                tStr = $"{second / 60}{Language.StringByID(R.MyInternationalizationString.Minute)}";
                timeStr += $"{hour}{Language.StringByID(R.MyInternationalizationString.Hour)}";
                if (minu > 0)
                {
                    timeStr += $"{minu}{Language.StringByID(R.MyInternationalizationString.Minute)}";
                }
                if (sec > 0)
                {
                    timeStr += $"{sec}{Language.StringByID(R.MyInternationalizationString.Second)}";
                }
                return timeStr;
            }
            else if (minu > 0)
            {
                timeStr += $"{minu}{Language.StringByID(R.MyInternationalizationString.Minute)}";
                if (sec > 0)
                {
                    timeStr += $"{sec}{Language.StringByID(R.MyInternationalizationString.Second)}";
                }
                return timeStr;
            }
            else
            {
                tStr = $"{second}{Language.StringByID(R.MyInternationalizationString.Second)}";
                return $"{sec}{Language.StringByID(R.MyInternationalizationString.Second)}";
            }
            return tStr;
        }

        /// <summary>
        /// 显示提示
        /// </summary>
        /// <param name="r">The red component.</param>
        public static void ShowTip(string msg)
        {
            Application.RunOnMainThread(() =>
            {
                var myTip = new Tip();
                myTip.Direction = AMPopTipDirection.None;
                myTip.CloseTime = 2;
                myTip.Text = msg;
                myTip.Show(Common.CommonPage.Instance);
            });
        }
    }

}