diff --git a/app/build.gradle b/app/build.gradle index 44a07a8..a84ccd9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,8 +26,8 @@ android { applicationId "com.lukouguoji.aerologic" minSdkVersion 24 targetSdkVersion 30 - versionCode 79 - versionName "1.7.9" + versionCode 84 + versionName "1.8.4" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/module_base/src/main/java/com/lukouguoji/module_base/LoginActivity.kt b/module_base/src/main/java/com/lukouguoji/module_base/LoginActivity.kt index 08ea865..02e7fc5 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/LoginActivity.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/LoginActivity.kt @@ -131,12 +131,6 @@ class LoginActivity : BaseActivity(), super.onCreate(savedInstanceState) setContentView(R.layout.activity_login) - // TODO: 临时跳过登录,直接进入移库列表页 - ARouter.getInstance().build(ARouterConstants.ACTIVITY_URL_GNJ_YIKU_EDIT) - .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) - .navigation() - return - checkAppUpdate() diff --git a/module_base/src/main/res/values/strings.xml b/module_base/src/main/res/values/strings.xml index 4ec4c1e..4a2d2d5 100644 --- a/module_base/src/main/res/values/strings.xml +++ b/module_base/src/main/res/values/strings.xml @@ -3,11 +3,9 @@ https://60.173.195.7:42280/app/ - http://192.168.18.4:8093/ - - + - + http://192.168.1.250:8093/ http://192.168.18.4:8092/ws/weight/