From 24b01f308b6da6f1f0a42eef5348a8b8062760b7 Mon Sep 17 00:00:00 2001
From: Lihongda <963140097@qq.com>
Date: Thu, 4 Jan 2024 05:12:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E7=89=88=E6=9C=AC=E5=8F=B7=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 iFish7/build.gradle                           |  4 +--
 .../com/ifish/activity/MySettingActivity.java |  4 +++
 .../main/res/layout/mysetting_activity.xml    | 28 +++++++++++++------
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/iFish7/build.gradle b/iFish7/build.gradle
index bf3f166e6..174a7274b 100644
--- a/iFish7/build.gradle
+++ b/iFish7/build.gradle
@@ -34,8 +34,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         applicationId "com.ifish.activity"
-        versionCode 40
-        versionName '4.10.0'
+        versionCode Integer.parseInt(System.properties['versionCode'])
+        versionName System.properties['versionName']
         multiDexEnabled true
         ndk {
             abiFilters 'armeabi','arm64-v8a'
diff --git a/iFish7/src/main/java/com/ifish/activity/MySettingActivity.java b/iFish7/src/main/java/com/ifish/activity/MySettingActivity.java
index a2d6ec0ed..3dd669557 100644
--- a/iFish7/src/main/java/com/ifish/activity/MySettingActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/MySettingActivity.java
@@ -74,6 +74,10 @@ public class MySettingActivity extends BaseActivity {
 
     private void init() {
         mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+        TextView tvVersion = findMyViewById(R.id.tv_current_version);
+
+        tvVersion.setText(String.format("当前版本: %s", HttpManager.getVersionName(MySettingActivity.this)));
+
     }
 
     private void initListener() {
diff --git a/iFish7/src/main/res/layout/mysetting_activity.xml b/iFish7/src/main/res/layout/mysetting_activity.xml
index 0a168d891..682d783c4 100644
--- a/iFish7/src/main/res/layout/mysetting_activity.xml
+++ b/iFish7/src/main/res/layout/mysetting_activity.xml
@@ -17,7 +17,7 @@
         android:background="@drawable/minefragment_bg_select">
 
         <ImageView
-            android:id="@+id/iv_iv"
+            android:id="@+id/iv_iv_phone"
             android:layout_width="@dimen/ic_mine_size"
             android:layout_height="@dimen/ic_mine_size"
             android:layout_centerVertical="true"
@@ -29,7 +29,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/iv_iv"
+            android:layout_toRightOf="@+id/iv_iv_phone"
             android:text="更换手机"
             android:textColor="@color/shoplist_text_item"
             android:textSize="17sp" />
@@ -56,7 +56,7 @@
         android:background="@drawable/minefragment_bg_select">
 
         <ImageView
-            android:id="@+id/iv_iv"
+            android:id="@+id/iv_iv_password"
             android:layout_width="@dimen/ic_mine_size"
             android:layout_height="@dimen/ic_mine_size"
             android:layout_centerVertical="true"
@@ -68,7 +68,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/iv_iv"
+            android:layout_toRightOf="@+id/iv_iv_password"
             android:text="修改密码"
             android:textColor="@color/shoplist_text_item"
             android:textSize="17sp" />
@@ -167,7 +167,7 @@
         android:background="@drawable/minefragment_bg_select">
 
         <ImageView
-            android:id="@+id/iv_iv"
+            android:id="@+id/iv_iv_check_update"
             android:layout_width="@dimen/ic_mine_size"
             android:layout_height="@dimen/ic_mine_size"
             android:layout_centerVertical="true"
@@ -176,14 +176,26 @@
             android:src="@drawable/ic_mine_update" />
 
         <TextView
+            android:id="@+id/tv_check_update"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/iv_iv"
+            android:layout_toRightOf="@+id/iv_iv_check_update"
             android:text="检查更新"
             android:textColor="@color/shoplist_text_item"
             android:textSize="17sp" />
 
+        <TextView
+            android:id="@+id/tv_current_version"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toRightOf="@+id/tv_check_update"
+            android:layout_marginLeft="10dp"
+            android:text="当前版本: V1.0.0"
+            android:textColor="@color/text_hint_login"
+            android:textSize="13sp"/>
+
         <ImageView
             android:layout_width="@dimen/mine_fragment_ic_size"
             android:layout_height="@dimen/mine_fragment_ic_size"
@@ -206,7 +218,7 @@
         android:background="@drawable/minefragment_bg_select">
 
         <ImageView
-            android:id="@+id/iv_iv"
+            android:id="@+id/iv_iv_change_account"
             android:layout_width="@dimen/ic_mine_size"
             android:layout_height="@dimen/ic_mine_size"
             android:layout_centerVertical="true"
@@ -218,7 +230,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/iv_iv"
+            android:layout_toRightOf="@+id/iv_iv_change_account"
             android:text="切换账号"
             android:textColor="@color/shoplist_text_item"
             android:textSize="17sp" />