222222222

黄学彪

2020-05-13 5095bb05ab8ef77e2edc3cad2b94f9d75b30f193

222222222

 ZigbeeApp/Home.Ios/MainViewController.cs

@@ -12,6 +12,12 @@
        {
            base.ViewDidLoad();

            //11.0版本以下自动偏移取消
            if (!UIDevice.CurrentDevice.CheckSystemVersion(11, 0))
            {
                this.AutomaticallyAdjustsScrollViewInsets = false;
            }

            if (NSLocale.PreferredLanguages[0].Contains("zh-"))
            {
                //if (NSLocale.PreferredLanguages [0].Contains (@"zh-") && NSLocale.PreferredLanguages [0].Contains (@"-CN")) {

 ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs

old mode 100755
new mode 100644
@@ -204,29 +204,29 @@
        {

#if iOS

            try

            {

                    var versionResult = await RequestHttpsiOSAppVersionAsync();

                    if (versionResult == null || versionResult.Results == null)

                    {

                        return false;

                    }

                    var results = Newtonsoft.Json.Linq.JArray.Parse(versionResult.Results.ToString());

                    if (results[0] == null)

                    {

                        return false;

                    }

                    var newVersion = results[0]["version"]?.ToString();

                    var updateContent = results[0]["releaseNotes"]?.ToString();

                    if (newVersion != CommonPage.CodeIDString)

                    {

                        return true;

                    }

                    return false;

                }

                catch

                {

                   return false;

                }

            {
                var versionResult = await RequestHttpsiOSAppVersionAsync();
                if (versionResult == null || versionResult.Results == null)
                {
                    return false;
                }
                var results = Newtonsoft.Json.Linq.JArray.Parse(versionResult.Results.ToString());
                if (results[0] == null)
                {
                    return false;
                }
                var newVersion = results[0]["version"]?.ToString();
                var updateContent = results[0]["releaseNotes"]?.ToString();
                if (newVersion.CompareTo(CommonPage.CodeIDString) > 0)
                {
                    return true;
                }
                return false;
            }
            catch
            {
                return false;
            }



#elif Android

            try


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs

old mode 100755
new mode 100644
@@ -41,7 +41,14 @@
        /// <param name="i_rowSpace">行之间的间距(这个值是与行控件绑定一起使用的)</param>

        public VerticalFrameControl(int i_rowSpace = 0)

        {

            rowSpace = Application.GetRealHeight(i_rowSpace);

            rowSpace = Application.GetRealHeight(i_rowSpace);
#if iOS

            //自动偏移取消
            if (UIKit.UIDevice.CurrentDevice.CheckSystemVersion(11, 0))
            {
                (this.uiView as UIKit.UIScrollView).ContentInsetAdjustmentBehavior = UIKit.UIScrollViewContentInsetAdjustmentBehavior.Never;
            }
#endif

        }



        /// <summary>


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs

old mode 100755
new mode 100644
@@ -42,7 +42,15 @@
        public VerticalFrameRefreshControl(int i_rowSpace = 0)

        {

            rowSpace = Application.GetRealHeight(i_rowSpace);

            this.VerticalScrollBarEnabled = false;

            this.VerticalScrollBarEnabled = false;

#if iOS

            //自动偏移取消
            if (UIKit.UIDevice.CurrentDevice.CheckSystemVersion(11, 0))
            {
                (this.uiView as UIKit.UIScrollView).ContentInsetAdjustmentBehavior = UIKit.UIScrollViewContentInsetAdjustmentBehavior.Never;
            }
#endif

        }



        /// <summary>


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs

old mode 100755
new mode 100644
@@ -49,7 +49,14 @@
        /// <param name="i_rowSpace">行之间的间距(这个值是与行控件绑定一起使用的)</param>

        public VerticalListControl(int i_rowSpace = 0)

        {

            this.rowSpace = Application.GetRealHeight(i_rowSpace);

            this.rowSpace = Application.GetRealHeight(i_rowSpace);
#if iOS

            //自动偏移取消
            if (UIKit.UIDevice.CurrentDevice.CheckSystemVersion(11, 0))
            {
                (this.uiView as UIKit.UIScrollView).ContentInsetAdjustmentBehavior = UIKit.UIScrollViewContentInsetAdjustmentBehavior.Never;
            }
#endif

        }



        #endregion


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListRefreshControl.cs

old mode 100755
new mode 100644
@@ -50,7 +50,14 @@
        public VerticalListRefreshControl(int i_rowSpace = 0)

        {

            this.rowSpace = Application.GetRealHeight(i_rowSpace);

            this.VerticalScrollBarEnabled = false;

            this.VerticalScrollBarEnabled = false;
#if iOS

            //自动偏移取消
            if (UIKit.UIDevice.CurrentDevice.CheckSystemVersion(11, 0))
            {
                (this.uiView as UIKit.UIScrollView).ContentInsetAdjustmentBehavior = UIKit.UIScrollViewContentInsetAdjustmentBehavior.Never;
            }
#endif

        }



        #endregion