From d63011d7ab1114289078fd3b67bfc9445e300a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Fri, 24 May 2024 17:21:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |  5 +--
 .idea/misc.xml                                |  2 +-
 .../common/utils/UpdateAppUtils.java          |  2 +-
 app/src/main/res/layout/fragment_my.xml       |  2 +-
 .../res/layout/item/layout/item_caidan.xml    | 39 ++++++++++++-------
 5 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 6e5389ed..0897082f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,16 +4,15 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Android Studio default JDK" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index cba3440e..c3df9b04 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="corretto-11" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/com/bonait/bnframework/common/utils/UpdateAppUtils.java b/app/src/main/java/com/bonait/bnframework/common/utils/UpdateAppUtils.java
index 06fc0c5c..052414e2 100644
--- a/app/src/main/java/com/bonait/bnframework/common/utils/UpdateAppUtils.java
+++ b/app/src/main/java/com/bonait/bnframework/common/utils/UpdateAppUtils.java
@@ -45,7 +45,7 @@ public class UpdateAppUtils {
     /**
      * 当前版本号
      */
-    private static String myVersionCode = "1.12";
+    private static String myVersionCode = "1.13";
     /**
      * 服务器的版本号
      */
diff --git a/app/src/main/res/layout/fragment_my.xml b/app/src/main/res/layout/fragment_my.xml
index 5ce18818..51e94ce2 100644
--- a/app/src/main/res/layout/fragment_my.xml
+++ b/app/src/main/res/layout/fragment_my.xml
@@ -70,7 +70,7 @@
 
                 <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="240dp"
+                    android:layout_height="280dp"
                     android:background="@mipmap/listbj">
 
                     <LinearLayout
diff --git a/app/src/main/res/layout/item/layout/item_caidan.xml b/app/src/main/res/layout/item/layout/item_caidan.xml
index 4bd6a523..b08df54b 100644
--- a/app/src/main/res/layout/item/layout/item_caidan.xml
+++ b/app/src/main/res/layout/item/layout/item_caidan.xml
@@ -8,24 +8,33 @@
         android:id="@+id/rea_main"
         android:layout_marginTop="10dp"
         android:layout_width="match_parent"
-        android:layout_height="120dp"
+        android:layout_height="150dp"
         android:background="@mipmap/listbj">
-        <ImageView
-            android:id="@+id/caidan_image"
-            android:layout_marginTop="14dp"
-            android:layout_width="70dp"
-            android:layout_height="70dp"
-            android:layout_centerHorizontal="true"
-            android:src="@mipmap/wlgl"/>
-        <TextView
-            android:id="@+id/caidan_text"
+
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="@dimen/dp_10"
-            android:text="基础数据管理"
-            android:textSize="@dimen/text_size_16"
-            android:textColor="@color/text_color"/>
+            android:layout_centerVertical="true"
+            android:orientation="vertical">
+            <ImageView
+                android:id="@+id/caidan_image"
+                android:layout_marginTop="14dp"
+                android:layout_width="70dp"
+                android:layout_height="70dp"
+                android:layout_gravity="center"
+                android:src="@mipmap/wlgl"/>
+            <TextView
+                android:id="@+id/caidan_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="10dp"
+                android:text="基础数据管理"
+                android:textSize="@dimen/text_size_16"
+                android:textColor="@color/text_color"/>
+        </LinearLayout>
+
+
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file