From dc8767129b2960b087494768b9fe77e764169988 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期四, 20 七月 2023 13:31:01 +0800 Subject: [PATCH] 首页群控界面异常修复 --- HDL-ON_Android/Properties/AndroidManifest.xml | 2 +- HDL-ON_iOS/Info.plist | 4 ++-- HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 2 +- HDL-ON_Android/Resources/Resource.designer.cs | 2 +- HDL_ON/Common/ApiUtlis.cs | 2 +- HDL_ON/UI/MainPage.cs | 9 ++++----- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml index dc840b6..7ff26a8 100644 --- a/HDL-ON_Android/Properties/AndroidManifest.xml +++ b/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" /> <!--鍙嬬洘--> diff --git a/HDL-ON_Android/Resources/Resource.designer.cs b/HDL-ON_Android/Resources/Resource.designer.cs index 24b9b9e..0bf2792 100644 --- a/HDL-ON_Android/Resources/Resource.designer.cs +++ b/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 { diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist index 3edb6dd..922dbd4 100644 --- a/HDL-ON_iOS/Info.plist +++ b/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> diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs index e0a8a6a..65288e4 100644 --- a/HDL_ON/Common/ApiUtlis.cs +++ b/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) { diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs index 9ba4beb..392b734 100644 --- a/HDL_ON/UI/MainPage.cs +++ b/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 } diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs index a7fd938..e958818 100644 --- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs +++ b/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() { -- Gitblit v1.8.0