From f440f09ca4309ac9228ee474f693e14534fafe0f Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Wed, 26 Oct 2022 10:00:41 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=86=E6=AE=B5=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90-M9Tag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++-- .../com/navinfo/outdoor/activity/LoginActivity.java | 4 +++- .../com/navinfo/outdoor/activity/MainActivity.java | 2 ++ .../main/java/com/navinfo/outdoor/api/Constant.java | 1 - app/src/main/res/layout/activity_main.xml | 11 ++++++++++- xrecyclerview/build.gradle | 2 +- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b6da6aa..7b0106e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { applicationId "com.navinfo.outdoor" minSdkVersion 23 targetSdkVersion 30 - versionCode 27 - versionName "8.220907" + versionCode 28 + versionName "8.221021" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { diff --git a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java index 65ce073..720aa14 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java @@ -20,6 +20,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.github.lazylibrary.util.AppUtils; import com.github.lazylibrary.util.FileUtils; import com.lzy.okgo.model.HttpParams; import com.lzy.okgo.model.Progress; @@ -32,6 +33,7 @@ import com.navinfo.outdoor.http.Callback; import com.navinfo.outdoor.http.HttpInterface; import com.navinfo.outdoor.http.OkGoBuilder; import com.navinfo.outdoor.http.UploadCallBack; +import com.navinfo.outdoor.util.APKVersionCodeUtils; import com.navinfo.outdoor.util.Base64; import com.navinfo.outdoor.util.Md5Util; import com.navinfo.outdoor.util.TimestampUtil; @@ -125,7 +127,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener navInfoEditor = navInfo.edit(); TextView tvRegister = findViewById(R.id.tv_register); TextView tvView = findViewById(R.id.tv_view); - tvView.setText(Constant.NAVIN_FO); + tvView.setText("版本号:"+AppUtils.getVerName(this)); etLoginName = findViewById(R.id.et_login_name); etLoginPaw = findViewById(R.id.et_login_paw); TextView tvForgetPaw = findViewById(R.id.tv_forget_paw); diff --git a/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java index ec9a030..186fbe4 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java @@ -20,6 +20,7 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import androidx.core.content.FileProvider; +import com.github.lazylibrary.util.AppUtils; import com.hjq.permissions.OnPermissionCallback; import com.hjq.permissions.Permission; import com.hjq.permissions.XXPermissions; @@ -493,5 +494,6 @@ public class MainActivity extends BaseActivity { Constant.REFRESH_TOKEN = navInfo.getString("refresh_token", null); Constant.ACCESS_TOKEN = navInfo.getString("access_token", null); initPermission(); + ((TextView)findViewById(R.id.tv_view)).setText("版本号:"+ AppUtils.getVerName(this)); } } \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/outdoor/api/Constant.java b/app/src/main/java/com/navinfo/outdoor/api/Constant.java index ed0619a..c0312a9 100644 --- a/app/src/main/java/com/navinfo/outdoor/api/Constant.java +++ b/app/src/main/java/com/navinfo/outdoor/api/Constant.java @@ -175,7 +175,6 @@ public class Constant { public static final String INTENT_DETAIL = "Detail";//poiEntity 的detail public static SlidingUpPanelLayout SLIDING_LAYOUT = null;//設置 public static TencentMap.OnMarkerClickListener markerClickListener = null; - public static final String NAVIN_FO = "12.10";//版本日期 //marker public static final BitmapDescriptor MARKER_CHARGE_SHOW = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_show); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 06007b6..365a6df 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,5 +6,14 @@ android:layout_height="match_parent" android:background="@drawable/start_bg" tools:context="activity.MainActivity"> - + \ No newline at end of file diff --git a/xrecyclerview/build.gradle b/xrecyclerview/build.gradle index f986ae4..19e9a9c 100644 --- a/xrecyclerview/build.gradle +++ b/xrecyclerview/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 30 - buildToolsVersion '30.0.3' + buildToolsVersion '29.0.2' defaultConfig { minSdkVersion 16 targetSdkVersion 30