From c9d58a3d346b52339203ac63d551f03812bac401 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 15 七月 2024 14:50:51 +0800
Subject: [PATCH] 兼容Android OS 33 edittext 文本对齐
---
HDL-ON_Android/HDL-ON_Android.csproj | 6 +++---
/dev/null | 0
HDL-ON_Android/Properties/AndroidManifest.xml | 2 +-
DLL/Android/Shared.Droid.TouchID.dll | 0
DLL/Android/Shared.Droid.Smartrefresh.dll | 0
DLL/Android/Shared.Droid.HDLWidget.dll | 0
DLL/Android/Shared.Droid.dll | 0
HDL_ON/Common/AliyunLog/AliyunLogClient.cs | 1 +
8 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/DLL/Android/Shared.Droid.HDLWidget.dll b/DLL/Android/Shared.Droid.HDLWidget.dll
new file mode 100644
index 0000000..aebc950
--- /dev/null
+++ b/DLL/Android/Shared.Droid.HDLWidget.dll
Binary files differ
diff --git a/DLL/Android/Shared.Droid.Smartrefresh.dll b/DLL/Android/Shared.Droid.Smartrefresh.dll
index 1e6b3da..d9079ef 100644
--- a/DLL/Android/Shared.Droid.Smartrefresh.dll
+++ b/DLL/Android/Shared.Droid.Smartrefresh.dll
Binary files differ
diff --git a/DLL/Android/Shared.Droid.TouchID.dll b/DLL/Android/Shared.Droid.TouchID.dll
index 2befefc..4b6d4e8 100644
--- a/DLL/Android/Shared.Droid.TouchID.dll
+++ b/DLL/Android/Shared.Droid.TouchID.dll
Binary files differ
diff --git a/DLL/Android/Shared.Droid.dll b/DLL/Android/Shared.Droid.dll
index f8c6937..56c69d9 100644
--- a/DLL/Android/Shared.Droid.dll
+++ b/DLL/Android/Shared.Droid.dll
Binary files differ
diff --git a/DLL/Shared.Droid.HDLWidget.dll b/DLL/Shared.Droid.HDLWidget.dll
deleted file mode 100644
index 91c55f5..0000000
--- a/DLL/Shared.Droid.HDLWidget.dll
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 4a27923..e2e3330 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -78,9 +78,6 @@
<Reference Include="System.Numerics.Vectors" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Net" />
- <Reference Include="Shared.Droid.HDLWidget">
- <HintPath>..\DLL\Shared.Droid.HDLWidget.dll</HintPath>
- </Reference>
<Reference Include="Shared.Droid.Smartrefresh">
<HintPath>..\DLL\Android\Shared.Droid.Smartrefresh.dll</HintPath>
</Reference>
@@ -187,6 +184,9 @@
<Reference Include="Shared.Droid">
<HintPath>..\DLL\Android\Shared.Droid.dll</HintPath>
</Reference>
+ <Reference Include="Shared.Droid.HDLWidget">
+ <HintPath>..\DLL\Android\Shared.Droid.HDLWidget.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Other\JPush\JPushFirmBroadcast.cs" />
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 703a751..8a1a30f 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="2.4.5" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202405201">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.4.8" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202407121">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="33" />
<uses-permission android:name="android.permission.USE_CREDENTIALS" />
<uses-permission android:name="android.permission.FLASHLIGHT" />
diff --git a/HDL_ON/Common/AliyunLog/AliyunLogClient.cs b/HDL_ON/Common/AliyunLog/AliyunLogClient.cs
index 02c0336..7cce42e 100644
--- a/HDL_ON/Common/AliyunLog/AliyunLogClient.cs
+++ b/HDL_ON/Common/AliyunLog/AliyunLogClient.cs
@@ -130,6 +130,7 @@
{"id", DateTime.Now.Ticks.ToString()},
{"homeid", Entity.DB_ResidenceData.Instance.CurrentRegion.id},
{"userid", UserInfo.Current.ID},
+ {"userAccount", UserInfo.Current.AccountString},
{"userName", UserInfo.Current.userName},
{"server", DAL.Server.HttpUtil.GlobalRequestHttpsHost},
{"message", msg},
--
Gitblit v1.8.0