Skip to content

A
android_freeworld
Commit 81f26613 authored by 张释方's avatar 张释方
Browse files
Options

优化引导页UI

parent 4f3fa81f
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 59 deletions
app/src/main/AndroidManifest.xml
View file @ 81f26613
......@@ -63,11 +63,7 @@
<activity
android:name=".splash.SplashActivity"
android:theme="@style/NormalSplash">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".login.LoginActivity" />
<activity
......@@ -81,7 +77,13 @@
<activity android:name=".main.my.OpenvipActivity" />
<activity android:name=".main.home.HistoricalimageActivity" />
<activity android:name=".main.my.BindMobileActivity" />
<activity android:name=".splash.GuideActivity" />
<activity android:name=".splash.GuideActivity" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".main.home.SearchMapActivity" /> <!-- ShareSDK start -->
<activity
android:name="com.mob.tools.MobUIShell"
......
app/src/main/java/com/mints/street/splash/GuideActivity.kt
View file @ 81f26613
......@@ -9,15 +9,19 @@ import com.mints.street.R
import com.mints.street.databinding.ActivityGuideBinding
import com.mints.street.main.MainActivity
import kotlinx.android.synthetic.main.activity_guide.*
import me.goldze.mvvmhabit.utils.systembar.StatusBarUtil
class GuideActivity : BaseActivity<ActivityGuideBinding,GuideBindingViewModel>(), View.OnClickListener {
override fun initContentView(savedInstanceState: Bundle?)=R.layout.activity_guide
override fun initVariableId()= BR.viewModel
override fun getStatusBarHeightView(): View? {
return null
}
override fun initData() {
super.initData()
StatusBarUtil.setHeightAndPadding(this, binding.lyLinear)
initView()
initListener()
}
......@@ -27,7 +31,7 @@ class GuideActivity : BaseActivity<ActivityGuideBinding,GuideBindingViewModel>()
}
private fun initView() {
Glide.with(this).asGif().load(R.mipmap.earth).into(iv_earth);
// Glide.with(this).asGif().load(R.mipmap.earth).into(iv_earth);
}
override fun onClick(v: View?) {
......
app/src/main/res/drawable/shape_bg_guide_btn.xml 0 → 100644
View file @ 81f26613
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#ffff9837" />
<corners android:radius="25dp" />
<gradient
android:angle="90"
android:endColor="#4587FF"
android:startColor="#646BFF"
android:type="linear"
android:useLevel="true" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_bg_guide_tv.xml
View file @ 81f26613
......@@ -2,10 +2,10 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners
android:topLeftRadius="20dp"
android:bottomLeftRadius="20dp"/>
android:topLeftRadius="50dp"
android:bottomLeftRadius="50dp"/>
<gradient
android:startColor="#73FFFFFF"
android:startColor="#C2FFFFFF"
android:endColor="#00FFFFFF"
android:angle="0"/>
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_guide.xml
View file @ 81f26613
......@@ -9,64 +9,113 @@
type="com.mints.street.splash.GuideBindingViewModel" />
</data>
<LinearLayout
android:gravity="center"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black"
android:orientation="vertical">
android:layout_height="match_parent">
<ImageView
android:id="@+id/iv_earth"
<View
android:id="@+id/ly_linear"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_height="20dp"
android:background="@color/ksad_translucent"/>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:layout_marginTop="20dp"
android:id="@+id/tv1"
android:textSize="20sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/ic_bg_guide"
android:gravity="center|bottom">
<LinearLayout
android:id="@+id/ly_1"
android:layout_width="267dp"
android:layout_height="30dp"
android:layout_marginLeft="5dp"
android:background="@drawable/shape_bg_guide_tv"
android:text="国内外全覆盖街景"
android:drawableLeft="@mipmap/satellite"
android:paddingLeft="10dp"/>
<TextView
android:layout_marginTop="20dp"
android:id="@+id/tv2"
android:layout_below="@+id/tv1"
android:textSize="20sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginLeft="12dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:src="@mipmap/icon_guide1" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="3dp"
android:text="国内外全覆盖街景"
android:textSize="18sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ly_2"
android:layout_width="267dp"
android:layout_height="30dp"
android:layout_below="@+id/ly_1"
android:layout_marginLeft="5dp"
android:layout_marginTop="17dp"
android:background="@drawable/shape_bg_guide_tv"
android:text="VR沉浸式景点体验"
android:drawableLeft="@mipmap/satellite"
android:paddingLeft="10dp"/>
<TextView
android:layout_marginTop="20dp"
android:id="@+id/tv3"
android:layout_below="@+id/tv2"
android:textSize="20sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginLeft="12dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:src="@mipmap/icon_guide2" />
<TextView
android:gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="3dp"
android:layout_gravity="center"
android:text="VR沉浸式景点体验"
android:textSize="18sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ly_3"
android:layout_width="267dp"
android:layout_height="30dp"
android:layout_below="@+id/ly_2"
android:layout_marginLeft="5dp"
android:layout_marginTop="17dp"
android:background="@drawable/shape_bg_guide_tv"
android:text="高清卫星地图/历史影像"
android:drawableLeft="@mipmap/satellite"
android:paddingLeft="10dp"/>
android:orientation="horizontal">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginLeft="12dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:src="@mipmap/icon_guide3" />
<TextView
android:gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="3dp"
android:layout_gravity="center"
android:text="高清卫星地图/历史影像"
android:textSize="18sp" />
</LinearLayout>
<Button
android:id="@+id/bt_enter"
android:layout_marginTop="70dp"
android:layout_below="@+id/tv3"
android:layout_width="250dp"
android:layout_height="40dp"
android:textSize="18sp"
android:layout_width="292dp"
android:layout_height="47dp"
android:layout_below="@+id/ly_3"
android:layout_marginTop="97dp"
android:layout_marginBottom="87dp"
android:background="@drawable/shape_bg_guide_btn"
android:text="立即体验"
android:gravity="center"
android:background="@drawable/shape_login_bg"/>
android:textSize="18sp" />
</RelativeLayout>
</FrameLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/mipmap-xhdpi/ic_bg_guide.png 0 → 100644
View file @ 81f26613
This diff is collapsed.
mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/Utils.java
View file @ 81f26613
......@@ -28,7 +28,7 @@ public final class Utils {
* @param context 上下文
*/
public static void init(@NonNull final Context context) {
Utils.context = context.getApplicationContext();
Utils.context = context.getApplicationContext();
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment