parent: 1fe7427f | 补丁 | 提交 | ignore whitespace
wxr
2023-07-20 dc8767129b2960b087494768b9fe77e764169988 
首页群控界面异常修复
6个文件已修改
21 ■■■■■ 已修改文件
HDL-ON_Android/Properties/AndroidManifest.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Resources/Resource.designer.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Info.plist 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Common/ApiUtlis.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/MainPage.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/1-HomePage/HomePage.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 HDL-ON_Android/Properties/AndroidManifest.xml


@@ -1,5 +1,5 @@


<?xml version="1.0" encoding="utf-8"?>


<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.8.1" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202307061">


<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.9.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202307201">


    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />


    <uses-permission android:name="android.permission.RECEIVE_SMS" />


    <!--友盟-->




 HDL-ON_Android/Resources/Resource.designer.cs


@@ -14,7 +14,7 @@


{


    


    


    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]


    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.8.165")]


    public partial class Resource


    {


        




 HDL-ON_iOS/Info.plist


@@ -11,7 +11,7 @@


    <key>CFBundleName</key>


    <string>On Pro</string>


    <key>CFBundleShortVersionString</key>


    <string>1.8.1</string>


    <string>1.9.0</string>


    <key>CFBundleURLTypes</key>


    <array>


        <dict>


@@ -36,7 +36,7 @@


        </dict>


    </array>


    <key>CFBundleVersion</key>


    <string>1.8.1</string>


    <string>1.9.0</string>


    <key>LSApplicationQueriesSchemes</key>


    <array>


        <string>weixinULAPI</string>




 HDL_ON/Common/ApiUtlis.cs


@@ -178,7 +178,7 @@


                                FunctionList.List.ClearDatas();


                                //MainPage.Log($"============设备============开始" + FunctionList.List.Functions.Count);


                                //MainPage.Log($"读取设备信息成功");


                                //MainPage.Log($"sid列表获取====" + deviceResult.Data.ToString());


                                MainPage.Log($"sid列表获取====" + deviceResult.Data.ToString());


                                var deviceList = JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());


                                if (deviceList == null)


                                {




 HDL_ON/UI/MainPage.cs


@@ -26,7 +26,7 @@


        /// <summary>


        /// 版本号


        /// </summary>


        public static string VersionString = "1.8.1";


        public static string VersionString = "1.9.0";


        ///// <summary>


        ///// 客户端类型


        ///// </summary>


@@ -618,10 +618,9 @@


        public static void Log(string msg)


        {


#if DEBUG


            if (msg.Contains("收到数据")


                || msg.Contains("发送")




                )


            //if (msg.Contains("收到数据")


            //    || msg.Contains("发送")


            //    )


                Console.WriteLine(msg);


#endif


        }




 HDL_ON/UI/UI2/1-HomePage/HomePage.cs


@@ -964,7 +964,7 @@


                if (index == 0)


                {


                    var view = new FrameLayout();


                    deviceFunctionView.AddChidren(view);


                    gcFunctionView.AddChidren(view);




                    var btnNoCollectionBg = new Button()


                    {