Commit a06203d5 authored by jianglx's avatar jianglx

引导页添加跳过按钮

parent 7bf082c7
...@@ -57,7 +57,7 @@ android { ...@@ -57,7 +57,7 @@ android {
variant.outputs.all { variant.outputs.all {
if (variant.buildType.name == 'release') { if (variant.buildType.name == 'release') {
def productVersion = "Rv" + releaseTime() + "V" + defaultConfig.versionName + "_Release_"+productFlavors[0].name + ".apk"; def productVersion = "Rv" + releaseTime() + "V" + defaultConfig.versionName + "_Release_" + productFlavors[0].name + ".apk";
outputFileName = productVersion outputFileName = productVersion
} }
} }
......
...@@ -8,6 +8,7 @@ import android.support.v4.view.ViewPager; ...@@ -8,6 +8,7 @@ import android.support.v4.view.ViewPager;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView; import android.widget.ImageView;
import com.ruiwenliu.wrapper.adapter.TabAdapter; import com.ruiwenliu.wrapper.adapter.TabAdapter;
...@@ -34,6 +35,7 @@ public class GuideActivity extends BaseActivity<CommonPresenter> { ...@@ -34,6 +35,7 @@ public class GuideActivity extends BaseActivity<CommonPresenter> {
private ViewPager viewPager; private ViewPager viewPager;
private ImageView imgSelect; private ImageView imgSelect;
private Button btnSkip;
private int[] poits = { private int[] poits = {
R.drawable.icon_guide_circle1, R.drawable.icon_guide_circle1,
R.drawable.icon_guide_circle2, R.drawable.icon_guide_circle2,
...@@ -55,6 +57,7 @@ public class GuideActivity extends BaseActivity<CommonPresenter> { ...@@ -55,6 +57,7 @@ public class GuideActivity extends BaseActivity<CommonPresenter> {
titleView.setVisibility(View.GONE); titleView.setVisibility(View.GONE);
viewPager = findViewById(R.id.viewpager); viewPager = findViewById(R.id.viewpager);
imgSelect = findViewById(R.id.img_select); imgSelect = findViewById(R.id.img_select);
btnSkip = findViewById(R.id.btn_skip);
TabAdapter mAdapter = new TabAdapter(getSupportFragmentManager(), getListFragment()); TabAdapter mAdapter = new TabAdapter(getSupportFragmentManager(), getListFragment());
viewPager.setOffscreenPageLimit(4); viewPager.setOffscreenPageLimit(4);
viewPager.setAdapter(mAdapter); viewPager.setAdapter(mAdapter);
...@@ -76,6 +79,11 @@ public class GuideActivity extends BaseActivity<CommonPresenter> { ...@@ -76,6 +79,11 @@ public class GuideActivity extends BaseActivity<CommonPresenter> {
} }
}); });
btnSkip.setOnClickListener(v -> {
mPresenter.getView().onShowLoading();
startActivity(MainActivity.getIntent(GuideActivity.this));
finish();
});
} }
@Override @Override
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke
android:width="1px"
android:color="#666666" />
<corners android:radius="@dimen/size_20" />
</shape>
\ No newline at end of file
...@@ -11,6 +11,16 @@ ...@@ -11,6 +11,16 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
<Button
android:id="@+id/btn_skip"
android:layout_width="@dimen/size_70"
android:layout_height="@dimen/size_28"
android:layout_gravity="top|right"
android:layout_marginTop="@dimen/size_20"
android:layout_marginRight="20dp"
android:background="@drawable/ic_guide_skip"
android:text="跳过"
android:textColor="#666666" />
<ImageView <ImageView
android:id="@+id/img_select" android:id="@+id/img_select"
......
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