diff --git a/app/build.gradle b/app/build.gradle index eb11d8d..d135d1b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ android { applicationId "com.cheng.BoLe" minSdk 26 targetSdk 34 - versionCode 240 - versionName "2.4.0" + versionCode 200 + versionName "2.0.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { @@ -93,7 +93,7 @@ android { applicationVariants.configureEach { variant -> if (variant.buildType.name == "release") { variant.outputs.forEach { - it.outputFileName = "material_v${defaultConfig.versionName}_${variant.productFlavors[0].name}.apk" + it.outputFileName = "bole_v${defaultConfig.versionName}_${variant.productFlavors[0].name}.apk" } variant.assembleProvider.get().doLast { diff --git a/app/src/main/java/com/cheng/blzb/ui/activity/LauncherActivity.kt b/app/src/main/java/com/cheng/blzb/ui/activity/LauncherActivity.kt index 8cc40d5..a708cfb 100644 --- a/app/src/main/java/com/cheng/blzb/ui/activity/LauncherActivity.kt +++ b/app/src/main/java/com/cheng/blzb/ui/activity/LauncherActivity.kt @@ -94,7 +94,8 @@ class LauncherActivity : BaseActivity() { if (UserConfigManager.isFirstUseApp()) { UserConfigManager.saveFirstUseApp(false) if (UserConfigManager.getGuideEnable()) { - startActivity() +// startActivity() + LoginActivity.start(this@LauncherActivity) } else { if (!LoginManager.isLogin()) { if (TextUtils.isEmpty(LoginManager.getLastLoginType())) { @@ -115,8 +116,8 @@ class LauncherActivity : BaseActivity() { LoginActivity.start(this@LauncherActivity) } } else { -// startActivity() - startActivity() + startActivity() +// startActivity() } finish() } diff --git a/app/src/main/java/com/cheng/blzb/ui/dialog/LoginTipDialog.kt b/app/src/main/java/com/cheng/blzb/ui/dialog/LoginTipDialog.kt index 6d45514..9517803 100644 --- a/app/src/main/java/com/cheng/blzb/ui/dialog/LoginTipDialog.kt +++ b/app/src/main/java/com/cheng/blzb/ui/dialog/LoginTipDialog.kt @@ -88,7 +88,7 @@ class LoginTipDialog :DialogFragment(){ .append("登录之前须先查看并同意") .append("《${preLoginResult.privacyName}》") .setClickSpan(getColor(R.color.color_125ffe), false) { - BrowserActivity.start(requireContext(), preLoginResult.privacyName, preLoginResult.privacyUrl, false) + BrowserActivity.start(requireContext(), preLoginResult.privacyName, preLoginResult.privacyUrl) } .append("、") .append("《用户协议》") diff --git a/app/src/main/java/com/cheng/blzb/ui/fragment/bid/detail/BidDetailFragment.kt b/app/src/main/java/com/cheng/blzb/ui/fragment/bid/detail/BidDetailFragment.kt index a86e0c2..e88160a 100644 --- a/app/src/main/java/com/cheng/blzb/ui/fragment/bid/detail/BidDetailFragment.kt +++ b/app/src/main/java/com/cheng/blzb/ui/fragment/bid/detail/BidDetailFragment.kt @@ -110,7 +110,7 @@ class BidDetailFragment: BaseFragment