diff --git a/app/build.gradle b/app/build.gradle
index 4e9323d..c579b5e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -132,6 +132,7 @@ dependencies {
implementation AndroidX.multidex
implementation AndroidX.material
implementation AndroidX.appcompat
+ implementation Libs.flycoTabLayout
testImplementation "junit:junit:4.13.2"
androidTestImplementation "androidx.test:runner:1.1.0"
@@ -139,9 +140,7 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
implementation 'com.google.android.gms:play-services-auth:20.7.0'
-
-
- implementation Libs.flycoTabLayout
-
+ implementation "androidx.core:core:1.13.1"
+ implementation "androidx.core:core-ktx:1.13.1"
}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index dbb1af4..acf8249 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,42 +47,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:exported="true"
+ android:theme="@style/MySplashStyle">
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
diff --git a/app/src/main/java/com/project/survey/activity/MainActivity.kt b/app/src/main/java/com/project/survey/activity/MainActivity.kt
index 5889e22..f30723e 100644
--- a/app/src/main/java/com/project/survey/activity/MainActivity.kt
+++ b/app/src/main/java/com/project/survey/activity/MainActivity.kt
@@ -3,12 +3,15 @@ package com.project.survey.activity
import com.project.survey.activity.base.BaseBindingActivity
import com.project.survey.databinding.ActivityMainBinding
+
class MainActivity : BaseBindingActivity() {
+
override fun getBinding(): ActivityMainBinding {
return ActivityMainBinding.inflate(layoutInflater)
}
override fun initView() {
+
}
override fun initData() {
diff --git a/app/src/main/java/com/project/survey/activity/SplashActivity.kt b/app/src/main/java/com/project/survey/activity/SplashActivity.kt
index 269ce33..1e4dd80 100644
--- a/app/src/main/java/com/project/survey/activity/SplashActivity.kt
+++ b/app/src/main/java/com/project/survey/activity/SplashActivity.kt
@@ -1,6 +1,23 @@
package com.project.survey.activity
+import android.content.Intent
import com.project.survey.activity.base.BaseBindingActivity
+import com.project.survey.databinding.ActivitySplashBinding
-class SplashActivity :BaseBindingActivity<> {
+/**
+ * 启动页
+ */
+class SplashActivity : BaseBindingActivity() {
+
+ override fun getBinding(): ActivitySplashBinding {
+ return ActivitySplashBinding.inflate(layoutInflater)
+ }
+
+ override fun initView() {
+ startActivity(Intent(this, MainActivity::class.java))
+ finish()
+ }
+
+ override fun initData() {
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/project/survey/activity/base/BaseBindingActivity.kt b/app/src/main/java/com/project/survey/activity/base/BaseBindingActivity.kt
index d011c41..5be5362 100644
--- a/app/src/main/java/com/project/survey/activity/base/BaseBindingActivity.kt
+++ b/app/src/main/java/com/project/survey/activity/base/BaseBindingActivity.kt
@@ -3,27 +3,22 @@ package com.project.survey.activity.base
import android.os.Bundle
import android.view.MenuItem
import android.view.View
-import android.view.ViewGroup
import android.view.WindowManager
-import android.widget.LinearLayout
import androidx.annotation.StringRes
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.app.AppCompatDelegate
import androidx.appcompat.widget.Toolbar
-import androidx.core.content.ContextCompat
import androidx.viewbinding.ViewBinding
import blankj.utilcode.util.Utils
import com.project.survey.App
import com.project.survey.R
-import com.project.survey.databinding.ActivityBaseBindingBinding
-
import org.polaric.colorful.Colorful
abstract class BaseBindingActivity : AppCompatActivity() {
protected val mBinding get() = _binding!!
private var _binding: VB? = null
- private lateinit var toolBar: Toolbar
+ private var toolBar: Toolbar? = null
abstract fun getBinding(): VB
@@ -31,8 +26,8 @@ abstract class BaseBindingActivity : AppCompatActivity() {
abstract fun initData()
override fun onCreate(savedInstanceState: Bundle?) {
- initTheme()
super.onCreate(savedInstanceState)
+ initTheme()
setContentView(getContentView())
initToolBar()
initView()
@@ -54,35 +49,34 @@ abstract class BaseBindingActivity : AppCompatActivity() {
}
private fun getContentView(): View {
- val baseBinding = ActivityBaseBindingBinding.inflate(layoutInflater)
- val layoutParams = LinearLayout.LayoutParams(
- ViewGroup.LayoutParams.MATCH_PARENT,
- ViewGroup.LayoutParams.MATCH_PARENT
- )
+// val baseBinding = ActivityBaseBindingBinding.inflate(layoutInflater)
+// val layoutParams = LinearLayout.LayoutParams(
+// ViewGroup.LayoutParams.MATCH_PARENT,
+// ViewGroup.LayoutParams.MATCH_PARENT
+// )
_binding = getBinding()
- baseBinding.llParent.addView(mBinding.root, layoutParams)
- baseBinding.llParent.setBackgroundColor(
- ContextCompat.getColor(
- this,
- R.color.bg_content_new
- )
- )
-
- toolBar = baseBinding.ilToolBar.toolbar
- return baseBinding.root
+// baseBinding.llParent.addView(mBinding.root, layoutParams)
+// baseBinding.llParent.setBackgroundColor(
+// ContextCompat.getColor(
+// this,
+// R.color.bg_content_new
+// )
+// )
+ return mBinding.root
}
protected open fun initToolBar() {
+ toolBar = findViewById(R.id.toolbar)
setSupportActionBar(toolBar)
if (supportActionBar != null) supportActionBar!!.setDisplayHomeAsUpEnabled(true)
}
protected fun setToolbarTitle(text: String?) {
- toolBar.setTitle(text)
+ toolBar?.setTitle(text)
}
protected fun setToolbarTitle(@StringRes text: Int) {
- toolBar.setTitle(text)
+ toolBar?.setTitle(text)
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
diff --git a/app/src/main/res/drawable/bg_splash.xml b/app/src/main/res/drawable/bg_splash.xml
new file mode 100644
index 0000000..8bdf6fc
--- /dev/null
+++ b/app/src/main/res/drawable/bg_splash.xml
@@ -0,0 +1,8 @@
+
+
+ -
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/splash_img.png b/app/src/main/res/drawable/splash_img.png
new file mode 100644
index 0000000..79c67ed
Binary files /dev/null and b/app/src/main/res/drawable/splash_img.png differ
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index d28ed5a..8bfe003 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -1,31 +1,8 @@
-
-
-
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c0246f1..b338b78 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -20,6 +20,14 @@
+
+