合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Common/CommonPage.cs

old mode 100755
new mode 100644
@@ -45,7 +45,8 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string CodeIDString = "1.1.0120121401";
        //public static string CodeIDString = "1.1.0121070801";
        public static string CodeIDString = "1.2.1";
        /// <summary>
        /// 注册来源(0:HDL On 1:Zigbee)
        /// </summary>
@@ -308,6 +309,17 @@
                    }
                }
            }
        }

        //清除角标数值
        public void clearBadgeNum()

        {
            try

            {
                //this.RequestHttpsZigbeeResultAsync("ZigbeeUsers/CornerClear", null, 10);
                this.RequestHttpsZigbeeBytesResultAsync("ZigbeeUsers/CornerClear", null, "GET", 10);
            }
            catch { }

        }



        /// <summary>

@@ -318,8 +330,12 @@
            try

            {

                Application.RunOnMainThread(() =>

                {

                    //设定一个时间

                {
#if iOS

                    //全视通退出登录
                    Shared.IOS.HDLFVSDK.Video.Logout();
#endif
                    //设定一个时间
                    Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);

                    Config.Instance.Save();

                    CommonPage.Instance.RemoveAll();

@@ -358,10 +374,10 @@
        /// <returns>返回状态码</returns>
        public string PushRegID()
        {
#if DEBUG
            //调试不需要发送这个东西
            return null;
#endif
//#if DEBUG
//            //调试不需要发送这个东西
//            return null;
//#endif
            try
            {
                string deviceAlias;
@@ -381,6 +397,7 @@
                    DeviceType = deviceType
                };
                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(RegIDObj);
                Console.WriteLine(requestJson);
                var reverObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/SignZigbeeNeedPushRegID", System.Text.Encoding.UTF8.GetBytes(requestJson), 4);
                if (reverObj == null)
                {