diff --git a/app/build.gradle b/app/build.gradle
index 71fe15a..7cd6732 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,8 +12,8 @@ android {
applicationId "com.tairui.gov_affairs_cloud"
minSdkVersion 21
targetSdkVersion 33
- versionCode 1
- versionName "1.0"
+ versionCode 3
+ versionName "1.1"
multiDexEnabled true
javaCompileOptions {
annotationProcessorOptions {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2adac90..f3e12f3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,9 @@
+
+
+
@@ -355,6 +358,18 @@
android:name="com.amap.api.location.APSService"
android:foregroundServiceType="location" />
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/tairui/gov_affairs_cloud/entity/Api.java b/app/src/main/java/com/tairui/gov_affairs_cloud/entity/Api.java
index 037e0a9..6675136 100644
--- a/app/src/main/java/com/tairui/gov_affairs_cloud/entity/Api.java
+++ b/app/src/main/java/com/tairui/gov_affairs_cloud/entity/Api.java
@@ -5,7 +5,7 @@ import com.tairui.gov_affairs_cloud.BuildConfig;
public class Api {
public static String BASE_HOST = BuildConfig.DOMAIN;
- public static String OSS_HOST = "http://gov-cloud.oss-cn-chengdu.aliyuncs.com/";
+ public static String OSS_HOST = "http://app.yingyijt.com/";
/**
* 请求成功
diff --git a/app/src/main/java/com/tairui/gov_affairs_cloud/ui/MainActivity.java b/app/src/main/java/com/tairui/gov_affairs_cloud/ui/MainActivity.java
index 61823b0..9e1f367 100644
--- a/app/src/main/java/com/tairui/gov_affairs_cloud/ui/MainActivity.java
+++ b/app/src/main/java/com/tairui/gov_affairs_cloud/ui/MainActivity.java
@@ -139,7 +139,7 @@ public class MainActivity extends BaseActivity {
@Override
protected void onApplyData() {
- // getAppVersionInfo();
+ getAppVersionInfo();
}
/**
diff --git a/app/src/main/java/com/tairui/gov_affairs_cloud/ui/SplashActivity.java b/app/src/main/java/com/tairui/gov_affairs_cloud/ui/SplashActivity.java
index b7b7f2d..f359656 100644
--- a/app/src/main/java/com/tairui/gov_affairs_cloud/ui/SplashActivity.java
+++ b/app/src/main/java/com/tairui/gov_affairs_cloud/ui/SplashActivity.java
@@ -9,16 +9,13 @@ import com.tairui.gov_affairs_cloud.databinding.ActivitySplashBinding;
import com.tairui.gov_affairs_cloud.ui.login.LoginActivity;
import com.tairui.gov_affairs_cloud.util.IntentUtil;
import com.tairui.gov_affairs_cloud.util.MyCountDownTimer;
-import com.tairui.gov_affairs_cloud.util.SingleClickListener;
import android.text.TextUtils;
-import android.view.View;
public class SplashActivity extends BaseActivity {
private CountTimer countTimer;
private static final int INTERVAL = 1000;
- private boolean isSkipAble = true;// 跳过按钮可以点击
@Override
protected Class getBindingClass() {
@@ -31,51 +28,16 @@ public class SplashActivity extends BaseActivity {
.statusBarDarkFont(true).init();
}
- @Override
- protected void onBindListener() {
- binding.txtTimerSplash.setOnClickListener(new SingleClickListener() {
- @Override
- protected void onSingleClick(View v) {
- skipTimeCountDown();
- }
- });
- }
-
@Override
protected void onApplyData() {
goMain();
}
private void goMain() {
- if (null != binding.txtTimerSplash) {
- setGone(binding.txtTimerSplash, true);
- countTimer = new CountTimer(1 * 1000, INTERVAL);
- WeakReference weakTimerCountDowner = new WeakReference<>(countTimer);
- if (null != weakTimerCountDowner.get()) {
- weakTimerCountDowner.get().start();
- }
- }
- }
-
- /**
- * 跳过倒计时
- */
- private void skipTimeCountDown() {
- if (isSkipAble) {
- isSkipAble = false;
- if (null != binding.txtTimerSplash) {
- binding.txtTimerSplash.setClickable(false);
- }
- if (null != countTimer) {
- countTimer.cancel();
- countTimer = null;
- }
- if (TextUtils.isEmpty(AppConfig.getInstance().getToken())) {
- IntentUtil.startActivity(mContext, LoginActivity.class, null);
- finish();
- } else {
- gotoMain();
- }
+ countTimer = new CountTimer(1 * 1000, INTERVAL);
+ WeakReference weakTimerCountDowner = new WeakReference<>(countTimer);
+ if (null != weakTimerCountDowner.get()) {
+ weakTimerCountDowner.get().start();
}
}
@@ -111,11 +73,6 @@ public class SplashActivity extends BaseActivity {
@Override
public void onTick(long millisUntilFinished) {
- int time = (int) (millisUntilFinished / INTERVAL) + 1;
- if (null != binding.txtTimerSplash) {
- String TIME_PASS = "跳过 ";
- binding.txtTimerSplash.setText(TIME_PASS + time);
- }
}
@Override
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index fa5d919..22c6bfa 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -12,21 +12,5 @@
android:layout_centerInParent="true"
android:src="@mipmap/ic_logo" />
-
-
\ No newline at end of file
diff --git a/app/src/main/res/xml/file_paths.xml b/app/src/main/res/xml/file_paths.xml
new file mode 100644
index 0000000..26d2f1f
--- /dev/null
+++ b/app/src/main/res/xml/file_paths.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file