Skip to content

R
RvApp
Commit ee369d41 authored by linfeng's avatar linfeng
Browse files
Options

Merge branch 'dev-member-john' of http://113.105.137.151:22280/lify/rvapp

parents 420f9e8f a06203d5
Hide whitespace changes
Inline Side-by-side
Showing with 518 additions and 53 deletions
RvClient/build.gradle
View file @ ee369d41
......@@ -57,7 +57,7 @@ android {
variant.outputs.all {
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
}
}
......
RvClient/src/main/AndroidManifest.xml
View file @ ee369d41
......@@ -178,7 +178,7 @@
<activity
android:name=".MainActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name="com.rv.home.rv.module.ui.login.LoginRvActivity"
android:screenOrientation="portrait" />
......@@ -361,12 +361,10 @@
android:name="com.rv.camp.camp.CampDetailActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<activity
android:name="com.rv.camp.camp.CampShopShowActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<activity android:name=".WakeUpActivity">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
......@@ -377,6 +375,7 @@
<data android:scheme="pdfd6612" />
</intent-filter>
</activity>
<activity android:name=".GuideActivity"></activity>
</application>
</manifest>
\ No newline at end of file
RvClient/src/main/java/com/xxfc/rv/GuideActivity.java 0 → 100644
View file @ ee369d41
package com.xxfc.rv;
import android.content.Context;
import android.content.Intent;
import android.support.annotation.NonNull;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import com.ruiwenliu.wrapper.adapter.TabAdapter;
import com.ruiwenliu.wrapper.base.BaseActivity;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseWrapperFragment;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.camp.CampFragment;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.main.home.HomeFragment;
import com.rv.rvmine.MineFragment;
import com.rv.tourism.TourismFragment;
import com.xxfc.discovery.DiscoveryFragment;
import com.xxfc.imcamera.photopicker.Image;
import com.xxfc.rv.fragment.GuideFirstFragment;
import com.xxfc.rv.fragment.GuideFourthFragment;
import com.xxfc.rv.fragment.GuideSecondFragment;
import com.xxfc.rv.fragment.GuideThirdFragment;
import java.util.ArrayList;
import java.util.List;
public class GuideActivity extends BaseActivity<CommonPresenter> {
private ViewPager viewPager;
private ImageView imgSelect;
private Button btnSkip;
private int[] poits = {
R.drawable.icon_guide_circle1,
R.drawable.icon_guide_circle2,
R.drawable.icon_guide_circle3,
R.drawable.icon_guide_circle4
};
public static Intent getIntent(Context context) {
return new Intent(context, GuideActivity.class);
}
@Override
protected int setLayout() {
return R.layout.activity_guide;
}
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setVisibility(View.GONE);
viewPager = findViewById(R.id.viewpager);
imgSelect = findViewById(R.id.img_select);
btnSkip = findViewById(R.id.btn_skip);
TabAdapter mAdapter = new TabAdapter(getSupportFragmentManager(), getListFragment());
viewPager.setOffscreenPageLimit(4);
viewPager.setAdapter(mAdapter);
viewPager.setCurrentItem(0);
imgSelect.setImageResource(poits[0]);
viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@Override
public void onPageScrolled(int i, float v, int i1) {
}
@Override
public void onPageSelected(int i) {
imgSelect.setImageResource(poits[i]);
}
@Override
public void onPageScrollStateChanged(int i) {
}
});
btnSkip.setOnClickListener(v -> {
mPresenter.getView().onShowLoading();
startActivity(MainActivity.getIntent(GuideActivity.this));
finish();
});
}
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
}
@Override
public void onShowResult(int requestType, BaseBean result) {
}
private List<BaseWrapperFragment> getListFragment() {
List<BaseWrapperFragment> list = new ArrayList<>();
list.add(new GuideFirstFragment());
list.add(new GuideSecondFragment());
list.add(new GuideThirdFragment());
list.add(new GuideFourthFragment());
return list;
}
}
RvClient/src/main/java/com/xxfc/rv/WelcomeActivity.java
View file @ ee369d41
......@@ -11,6 +11,7 @@ import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.statusbar.StatusBarUtil;
import com.ruiwenliu.wrapper.util.UtilsManager;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.utils.Cookie;
import com.rv.component.utils.LogUtil;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.yuyife.okgo.OkGoUtil;
......@@ -81,7 +82,12 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
e.printStackTrace();
}
startActivity(MainActivity.getIntent(mActivity));
if (Cookie.getBooleanValue(mActivity, "firstOpen", true)) {
Cookie.save(mActivity, "firstOpen", false);
startActivity(GuideActivity.getIntent(mActivity));
} else {
startActivity(MainActivity.getIntent(mActivity));
}
mDisposable.dispose();
finish();
}
......
RvClient/src/main/java/com/xxfc/rv/fragment/GuideFirstFragment.java 0 → 100644
View file @ ee369d41
package com.xxfc.rv.fragment;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.widget.ImageView;
import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseFragment;
import com.ruiwenliu.wrapper.util.glide.GlideOptions;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.share.utils.TransformationUtils;
import com.xxfc.imcamera.photopicker.Image;
import com.xxfc.rv.R;
public class GuideFirstFragment extends BaseFragment<CommonPresenter> {
public GuideFirstFragment() {
}
private ImageView imageView;
private TextView textView1;
private TextView textView2;
@Override
public int getViewLayout() {
return R.layout.fragment_guide;
}
@Override
protected void initView(Bundle savedInstanceState) {
imageView = getView().findViewById(R.id.image);
textView1 = getView().findViewById(R.id.textview1);
textView2 = getView().findViewById(R.id.textview2);
textView1.setText("滴房车 全面上线");
textView2.setText("开启你的房车新生活");
GlideOptions options = GlideOptions.placeholderOf(R.drawable.icon_guide1);
Glide.with(getActivity())
.asBitmap()
.load(R.drawable.icon_guide1)
.apply(options)
.into(new TransformationUtils(imageView));
}
@Override
protected void loadData(Bundle savedInstanceState) {
}
@Override
public void onShowResult(int requestType, BaseBean result) {
}
}
RvClient/src/main/java/com/xxfc/rv/fragment/GuideFourthFragment.java 0 → 100644
View file @ ee369d41
package com.xxfc.rv.fragment;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseFragment;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.share.utils.TransformationUtils;
import com.xxfc.rv.MainActivity;
import com.xxfc.rv.R;
public class GuideFourthFragment extends BaseFragment<CommonPresenter> {
private ImageView imageView;
private TextView textView1;
private TextView textView2;
private Button btnConfirm;
public GuideFourthFragment() {
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
@Override
public int getViewLayout() {
return R.layout.fragment_guide;
}
@Override
protected void initView(Bundle savedInstanceState) {
imageView = getView().findViewById(R.id.image);
textView1 = getView().findViewById(R.id.textview1);
textView2 = getView().findViewById(R.id.textview2);
btnConfirm = getView().findViewById(R.id.btn_confirm);
btnConfirm.setVisibility(View.VISIBLE);
btnConfirm.setOnClickListener(v -> {
mPresenter.getView().onShowLoading();
startActivity(MainActivity.getIntent(getContext()));
getActivity().finish();
});
textView1.setText("开启房车自驾新旅程");
String html = "出发即是家，开门即是景";
textView2.setText(html);
Glide.with(getActivity())
.asBitmap()
.load(R.drawable.icon_guide4)
.into(new TransformationUtils(imageView));
}
@Override
protected void loadData(Bundle savedInstanceState) {
}
@Override
public void onShowResult(int requestType, BaseBean result) {
}
@Override
public void onDestroyView() {
super.onDestroyView();
mPresenter.getView().onHideLoading();
}
}
RvClient/src/main/java/com/xxfc/rv/fragment/GuideSecondFragment.java 0 → 100644
View file @ ee369d41
package com.xxfc.rv.fragment;
import android.graphics.Color;
import android.os.Bundle;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.style.ForegroundColorSpan;
import android.widget.ImageView;
import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseFragment;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.share.utils.TransformationUtils;
import com.xxfc.rv.R;
public class GuideSecondFragment extends BaseFragment<CommonPresenter> {
private ImageView imageView;
private TextView textView1;
private TextView textView2;
public GuideSecondFragment(){
}
@Override
public int getViewLayout() {
return R.layout.fragment_guide;
}
@Override
protected void initView(Bundle savedInstanceState) {
imageView = getView().findViewById(R.id.image);
textView1 = getView().findViewById(R.id.textview1);
textView2 = getView().findViewById(R.id.textview2);
textView1.setText("全国租车 异地取还");
SpannableStringBuilder style=new SpannableStringBuilder("覆盖200多个城市\n600多家门店\n说走就走");
style.setSpan(new ForegroundColorSpan(Color.RED),2,5,Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
style.setSpan(new ForegroundColorSpan(Color.RED),10,13,Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
textView2.setText(style);
Glide.with(getActivity())
.asBitmap()
.load(R.drawable.icon_guide2)
.into(new TransformationUtils(imageView));
}
@Override
protected void loadData(Bundle savedInstanceState) {
}
@Override
public void onShowResult(int requestType, BaseBean result) {
}
}
RvClient/src/main/java/com/xxfc/rv/fragment/GuideThirdFragment.java 0 → 100644
View file @ ee369d41
package com.xxfc.rv.fragment;
import android.os.Bundle;
import android.widget.ImageView;
import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseFragment;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.share.utils.TransformationUtils;
import com.xxfc.rv.R;
public class GuideThirdFragment extends BaseFragment<CommonPresenter> {
private ImageView imageView;
private TextView textView1;
private TextView textView2;
public GuideThirdFragment() {
}
@Override
public int getViewLayout() {
return R.layout.fragment_guide;
}
@Override
protected void initView(Bundle savedInstanceState) {
imageView = getView().findViewById(R.id.image);
textView1 = getView().findViewById(R.id.textview1);
textView2 = getView().findViewById(R.id.textview2);
textView1.setText("超值周边游任你选");
String html = "海量房车旅游路线\n尽在掌握";
textView2.setText(html);
Glide.with(getActivity())
.asBitmap()
.load(R.drawable.icon_guide3)
.into(new TransformationUtils(imageView));
}
@Override
protected void loadData(Bundle savedInstanceState) {
}
@Override
public void onShowResult(int requestType, BaseBean result) {
}
}
RvClient/src/main/res/drawable/ic_guide_skip.xml 0 → 100644
View file @ ee369d41
<?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
RvClient/src/main/res/layout/activity_guide.xml 0 → 100644
View file @ ee369d41
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".GuideActivity">
<android.support.v4.view.ViewPager
android:id="@+id/viewpager"
android:layout_width="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
android:id="@+id/img_select"
android:layout_width="wrap_content"
android:layout_height="8dp"
android:layout_gravity="center_horizontal|bottom"
android:layout_marginBottom="@dimen/size_20" />
</FrameLayout>
\ No newline at end of file
RvClient/src/main/res/layout/fragment_guide.xml 0 → 100644
View file @ ee369d41
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginLeft="@dimen/size_40"
android:layout_marginRight="@dimen/size_40"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="300dp"
android:src="@drawable/icon_guide1" />
<TextView
android:id="@+id/textview1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_22"
android:text="xxxxxx"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_20"
android:textStyle="bold" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_100">
<TextView
android:id="@+id/textview2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|center_horizontal"
android:layout_marginTop="@dimen/size_10"
android:gravity="center"
android:lineSpacingExtra="@dimen/size_3"
android:text="xxxxxx"
android:textColor="#ff666666"
android:textSize="@dimen/text_14" />
<Button
android:id="@+id/btn_confirm"
android:layout_width="@dimen/size_180"
android:layout_height="@dimen/size_40"
android:layout_gravity="center_horizontal|bottom"
android:background="@drawable/shape_rv_bg_shallow_dark_yellow_circle"
android:gravity="center"
android:text="立即体验"
android:textColor="@color/white"
android:textSize="@dimen/text_16"
android:visibility="gone" />
</FrameLayout>
</LinearLayout>
</RelativeLayout>
plugin_share/src/main/java/com/rv/share/ShareActivity.java
View file @ ee369d41
package com.rv.share;
import android.content.Intent;
import android.graphics.Typeface;
import android.os.Bundle;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.style.TextAppearanceSpan;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
......@@ -14,6 +18,7 @@ import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.utils.Cookie;
import com.rv.component.utils.DisplayUtil;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.BaseStatusActivity;
import com.rv.share.bean.PersonShareBean;
......@@ -65,9 +70,18 @@ public class ShareActivity extends BaseStatusActivity<SharePresenter> {
}
private void setView(PersonShareBean.PersonShareInfo data) {
tvAmount.setText(data.getTotalIncome() + "元");
tvPersonInval.setText(data.getInviteNumber() + "人");
tvPersonUse.setText(data.getActivatedNumber() + "人");
SpannableStringBuilder spanBuilder = new SpannableStringBuilder(data.getTotalIncome() + "元");
spanBuilder.setSpan(new TextAppearanceSpan(null, Typeface.BOLD, DisplayUtil.sp2px(this, 18), null, null), 0, data.getTotalIncome().toString().length(), Spanned.SPAN_EXCLUSIVE_INCLUSIVE);
tvAmount.setText(spanBuilder);
SpannableStringBuilder spanBuilder1 = new SpannableStringBuilder(data.getInviteNumber() + "人");
spanBuilder1.setSpan(new TextAppearanceSpan(null, Typeface.BOLD, DisplayUtil.sp2px(this, 18), null, null), 0, String.valueOf(data.getInviteNumber()).length(), Spanned.SPAN_EXCLUSIVE_INCLUSIVE);
tvPersonInval.setText(spanBuilder1);
SpannableStringBuilder spanBuilder2 = new SpannableStringBuilder(data.getActivatedNumber() + "人");
spanBuilder2.setSpan(new TextAppearanceSpan(null, Typeface.BOLD, DisplayUtil.sp2px(this, 18), null, null), 0, String.valueOf(data.getActivatedNumber()).length(), Spanned.SPAN_EXCLUSIVE_INCLUSIVE);
tvPersonUse.setText(spanBuilder2);
if (TextUtils.isEmpty(data.getLeaderHeadUrl()) && TextUtil.isEmpty(data.getLeaderUsername())) {
((View) tvParentPhone.getParent().getParent()).setVisibility(View.INVISIBLE);
} else {
......@@ -112,8 +126,7 @@ public class ShareActivity extends BaseStatusActivity<SharePresenter> {
int id = view.getId();
if (TextUtils.isEmpty(shareUrl)) {
String code = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_CODE, "");
shareUrl = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/newPeopleH5.html?code=" + code + "&userName=" + Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_NAME)
+ "&headUrl=" + Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_HEADERURL, "");
shareUrl = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/newPeopleH5.html?code=" + code;
}
if (id == R.id.tv_weixin) {
mPresenter.shareWx(shareUrl, "新人专享大礼包，快去领！", " ");
......
plugin_share/src/main/java/com/rv/share/presenter/SharePresenter.java
View file @ ee369d41
......@@ -27,7 +27,7 @@ import com.umeng.socialize.media.UMWeb;
public class SharePresenter extends CommonPresenter {
private ShareAction shareAction = null;
private int drawableSize = 50;
private int drawableSize = 70;
private String mUrl = null;
private String mTitle = null;
private String mDescript = null;
......
plugin_share/src/main/res/layout/activity_reative_bill.xml
View file @ ee369d41
......@@ -27,27 +27,30 @@
android:layout_height="match_parent"
android:background="#F9D993">
<ScrollView
<android.support.v7.widget.CardView
android:id="@+id/ll_bill_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="13dp"
android:layout_gravity="top"
android:layout_marginLeft="10dp"
android:layout_marginTop="@dimen/size_15"
android:layout_marginRight="13dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="@dimen/size_70"
android:scrollbars="none">
android:background="@color/white"
app:cardCornerRadius="5dp">
<android.support.v7.widget.CardView
android:id="@+id/ll_bill_content"
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:background="@color/white"
app:cardCornerRadius="5dp">
android:layout_marginLeft="@dimen/size_10"
android:layout_marginTop="@dimen/size_10"
android:layout_marginRight="@dimen/size_10"
android:layout_marginBottom="@dimen/size_10"
android:scrollbars="none">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/size_10"
android:gravity="center_horizontal"
android:orientation="vertical">
......@@ -59,14 +62,10 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
android:layout_marginTop="@dimen/size_20"
android:layout_marginRight="@dimen/size_10"
android:layout_marginBottom="@dimen/size_15"
android:layout_marginTop="@dimen/dp_10"
android:gravity="center_vertical"
android:orientation="horizontal">
<com.base.utils.ui.image.round.RoundImageView
android:id="@+id/ring_header"
android:layout_width="@dimen/size_50"
......@@ -98,7 +97,7 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_marginLeft="@dimen/text_10"
android:gravity="center_vertical"
......@@ -112,19 +111,17 @@
<ImageView
android:id="@+id/img_qrcode"
android:layout_width="@dimen/size_60"
android:layout_height="@dimen/size_60"
android:layout_width="@dimen/size_70"
android:layout_height="@dimen/size_70"
android:layout_marginLeft="@dimen/size_20"
android:src="@drawable/icon_share_wx" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
</android.support.v7.widget.CardView>
<!--</LinearLayout>-->
</android.support.v7.widget.CardView>
<!--</LinearLayout>-->
</ScrollView>
<LinearLayout
android:layout_width="match_parent"
......
plugin_share/src/main/res/layout/activity_share.xml
View file @ ee369d41
......@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ffe5d0"
android:background="#ffb74b"
android:gravity="center_horizontal"
android:orientation="vertical"
......@@ -45,9 +45,9 @@
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_10"
android:layout_marginRight="@dimen/size_15"
android:layout_marginLeft="@dimen/size_10"
android:layout_marginRight="@dimen/size_10"
android:layout_marginBottom="@dimen/size_10"
android:background="@color/white"
app:cardCornerRadius="5dp">
......@@ -63,14 +63,15 @@
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_10"
android:text="分享方式"
android:textColor="@color/black"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_18"
android:textStyle="bold" />
android:textStyle="bold"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_20"
android:layout_marginTop="@dimen/size_15"
android:layout_marginBottom="@dimen/size_15"
android:gravity="center"
android:orientation="horizontal">
......@@ -82,7 +83,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@drawable/icon_share_weixin"
android:drawablePadding="@dimen/size_10"
android:drawablePadding="@dimen/size_5"
android:gravity="center"
android:text="微信" />
......@@ -92,7 +93,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawablePadding="@dimen/size_10"
android:drawablePadding="@dimen/size_5"
android:drawableTop="@drawable/icon_share_wx_circle"
android:gravity="center"
android:text="朋友圈" />
......@@ -104,7 +105,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@drawable/icon_share_code"
android:drawablePadding="@dimen/size_10"
android:drawablePadding="@dimen/size_5"
android:gravity="center"
android:text="邀请码" />
......@@ -113,7 +114,7 @@
android:id="@+id/tv_more"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:drawablePadding="@dimen/size_10"
android:drawablePadding="@dimen/size_5"
android:layout_weight="1"
android:drawableTop="@drawable/icon_share_more"
android:gravity="center"
......@@ -129,8 +130,8 @@
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:layout_marginLeft="@dimen/size_10"
android:layout_marginRight="@dimen/size_10"
android:layout_marginBottom="@dimen/size_10"
android:background="@color/white"
app:cardCornerRadius="5dp">
......@@ -153,8 +154,9 @@
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="我的推广"
android:textColor="#000000"
android:textSize="@dimen/text_15" />
android:textColor="@color/colorMain"
android:textSize="@dimen/text_18"
android:textStyle="bold"/>
<TextView
android:id="@+id/tv_more_detail"
......@@ -266,8 +268,8 @@
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:layout_marginLeft="@dimen/size_10"
android:layout_marginRight="@dimen/size_10"
android:layout_marginBottom="@dimen/size_10"
android:background="@color/white"
app:cardCornerRadius="5dp">
......@@ -283,9 +285,9 @@
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_10"
android:text="我的推广人"
android:textColor="#000000"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_15"
android:textStyle="bold" />
android:textStyle="bold"/>
<TextView
android:id="@+id/tv_parent_phone"
......
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