Skip to content

R
RvApp
Commit 88186d5d authored by jianglx's avatar jianglx
Browse files
Options

适配推广有奖界面，添加推荐规则界面。

parent fefc2e52
Expand all Show whitespace changes
Inline Side-by-side
Showing with 588 additions and 252 deletions
plugin_share/src/main/AndroidManifest.xml
View file @ 88186d5d
......@@ -6,16 +6,18 @@
<activity android:name=".ShareActivity" />
<activity android:name=".BillActivity" />
<activity android:name=".WebViewActivity">
<!--<intent-filter>-->
<!--<data android:scheme="rv" android:host="xxfc" android:path="/activity" />-->
<!--&lt;!&ndash;下面这几行也必须得设置&ndash;&gt;-->
<!--<category android:name="android.intent.category.DEFAULT"/>-->
<!--<action android:name="android.intent.action.VIEW"/>-->
<!--<category android:name="android.intent.category.BROWSABLE"/>-->
<!--</intent-filter>-->
<!-- <intent-filter> -->
<!-- <data android:scheme="rv" android:host="xxfc" android:path="/activity" /> -->
<!-- &lt;!&ndash;下面这几行也必须得设置&ndash;&gt; -->
<!-- <category android:name="android.intent.category.DEFAULT"/> -->
<!-- <action android:name="android.intent.action.VIEW"/> -->
<!-- <category android:name="android.intent.category.BROWSABLE"/> -->
<!-- </intent-filter> -->
</activity>
<activity android:name=".ReativeBillActivity" />
<activity android:name=".PopularizeActivity"></activity>
<activity android:name=".PopularizeActivity" />
<activity android:name=".ShareRulerActivity"></activity>
</application>
</manifest>
\ No newline at end of file
plugin_share/src/main/java/com/rv/share/ReativeBillActivity.java
View file @ 88186d5d
......@@ -87,11 +87,12 @@ public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter
}
@OnClick({R2.id.btn_save_bill, R2.id.btn_share})
@OnClick({R2.id.btn_save_bill, R2.id.btn_share,R2.id.tv_back_title})
public void onViewClicked(View view) {
int id = view.getId();
if (id == R.id.btn_save_bill) {
if (id == R.id.tv_back_title) {
finish();
} else if (id == R.id.btn_save_bill) {
mPresenter.saveBill(llContent);
} else if (id == R.id.btn_share) {
mPresenter.saveShare(llContent);
......
plugin_share/src/main/java/com/rv/share/ShareActivity.java
View file @ 88186d5d
......@@ -115,13 +115,13 @@ public class ShareActivity extends BaseStatusActivity<SharePresenter> {
shareUrl = RvFrameConfig.HOST + "/h5/appHtml/view/invitationCourtesyShare.html?code=" + code + "_P0101";
}
if (id == R.id.tv_weixin) {
mPresenter.shareWx(shareUrl, "【滴房车】", "新人专享大礼包，快去领！");
mPresenter.shareWx(shareUrl, "新人专享大礼包，快去领！", " ");
} else if (id == R.id.tv_weixin_circle) {
mPresenter.shareWxC(shareUrl, "【滴房车】", "新人专享大礼包，快去领！");
mPresenter.shareWxC(shareUrl, "新人专享大礼包，快去领！", " ");
} else if (id == R.id.tv_bill) {
startActivity(ReativeBillActivity.getIntent(this, shareUrl));
} else if (id == R.id.tv_more) {
mPresenter.shareMore(shareUrl, "【滴房车】", "新人专享大礼包，快去领！");
mPresenter.shareMore(shareUrl, "新人专享大礼包，快去领！", " ");
} else if (id == R.id.tv_more_detail) {
startActivity(PopularizeActivity.getIntent(getApplicationContext(), 0));
} else if (id == R.id.ll_activation) {
......@@ -130,6 +130,8 @@ public class ShareActivity extends BaseStatusActivity<SharePresenter> {
startActivity(PopularizeActivity.getIntent(getApplicationContext(), 1));
} else if (id == R.id.ll_comein) {
startActivity(PopularizeActivity.getIntent(getApplicationContext(), 0));
} else if (id == R.id.tv_ruler) {
startActivity(new Intent(getApplicationContext(), ShareRulerActivity.class));
}
}
......
plugin_share/src/main/java/com/rv/share/ShareRulerActivity.java 0 → 100644
View file @ 88186d5d
package com.rv.share;
import android.content.Intent;
import android.os.Bundle;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.home.rv.module.basic.BaseStatusActivity;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
public class ShareRulerActivity extends BaseStatusActivity<CommonPresenter> {
@Override
protected int setLayout() {
return R.layout.activity_share_ruler;
}
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle("推广有奖规则");
}
@Override
public void onShowResult(int requestType, BaseBean result) {
}
}
plugin_share/src/main/java/com/rv/share/view/RvWebView.java
View file @ 88186d5d
......@@ -98,7 +98,6 @@ public class RvWebView extends WebView {
WebResourceResponse response = super.shouldInterceptRequest(view, request);
return response;
}
};
public WebChromeClient webChromeClient = new WebChromeClient() {
......
plugin_share/src/main/res/drawable-xhdpi/bg_share_ruler_tab.xml 0 → 100644
View file @ 88186d5d
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#ffff9e74" />
<corners
android:bottomLeftRadius="80dp"
android:bottomRightRadius="80dp"
android:topLeftRadius="0dp"
android:topRightRadius="80dp" />
</shape>
plugin_share/src/main/res/drawable-xhdpi/icon_line_share_ruler.xml 0 → 100644
View file @ 88186d5d
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke
android:width="2dp"
android:color="#fffe6e2f" />
</shape>
\ No newline at end of file
plugin_share/src/main/res/drawable/icon_triangle_share_ruler.xml 0 → 100644
View file @ 88186d5d
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#ffffffff" />
<stroke
android:width="2dp"
android:color="#fffe6e2f" />
</shape>
\ No newline at end of file
plugin_share/src/main/res/layout/activity_reative_bill.xml
View file @ 88186d5d
......@@ -10,8 +10,9 @@
tools:context=".ReativeBillActivity">
<TextView
android:id="@+id/tv_back_title"
android:layout_width="wrap_content"
android:layout_height="@dimen/size_48"
android:layout_height="@dimen/size_55"
android:drawableLeft="@drawable/rv_common_icon_back_dark"
android:drawablePadding="5dp"
android:gravity="center"
......@@ -24,9 +25,9 @@
<include layout="@layout/common_line" />
<FrameLayout
android:background="#55eeeeee"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="#55eeeeee">
<LinearLayout
android:id="@+id/ll_content"
......
plugin_share/src/main/res/layout/activity_share.xml
View file @ 88186d5d
......@@ -4,28 +4,29 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#FEE4A9"
android:background="#FCE2A8"
android:gravity="center_horizontal"
android:orientation="vertical"
tools:context=".ShareActivity">
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:weightSum="19">
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="7">
android:layout_height="wrap_content">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
android:src="@drawable/bg_share_new1" />
android:layout_height="wrap_content"
android:src="@drawable/bg_share_top" />
<TextView
android:id="@+id/tv_ruler"
......@@ -43,15 +44,17 @@
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="@dimen/dp_10"
android:layout_weight="5"
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_marginBottom="@dimen/size_10"
android:background="@color/white"
app:cardCornerRadius="5dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
......@@ -66,9 +69,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/size_10"
android:layout_marginBottom="10dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_20"
android:layout_marginBottom="@dimen/size_15"
android:gravity="center"
android:orientation="horizontal">
......@@ -79,6 +82,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@drawable/icon_share_weixin"
android:drawablePadding="@dimen/size_10"
android:gravity="center"
android:text="微信" />
......@@ -88,6 +92,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawablePadding="@dimen/size_10"
android:drawableTop="@drawable/icon_share_wx_circle"
android:gravity="center"
android:text="朋友圈" />
......@@ -99,6 +104,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@drawable/icon_share_code"
android:drawablePadding="@dimen/size_10"
android:gravity="center"
android:text="邀请码" />
......@@ -107,7 +113,7 @@
android:id="@+id/tv_more"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:drawablePadding="@dimen/size_10"
android:layout_weight="1"
android:drawableTop="@drawable/icon_share_more"
android:gravity="center"
......@@ -122,17 +128,16 @@
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_10"
android:layout_weight="5"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:layout_marginBottom="@dimen/size_10"
android:background="@color/white"
app:cardCornerRadius="5dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout
......@@ -159,13 +164,15 @@
android:layout_centerVertical="true"
android:drawableRight="@drawable/common_icon_rig_gray"
android:drawablePadding="3dp"
android:text="查看详情" />
android:text="查看详情"
android:textSize="@dimen/sp_12" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_20"
android:layout_marginBottom="@dimen/size_15"
android:gravity="center"
android:orientation="horizontal"
android:weightSum="3">
......@@ -173,7 +180,7 @@
<LinearLayout
android:id="@+id/ll_comein"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
......@@ -201,7 +208,7 @@
<LinearLayout
android:id="@+id/ll_invite"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
......@@ -229,7 +236,7 @@
<LinearLayout
android:id="@+id/ll_activation"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
......@@ -258,11 +265,10 @@
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_10"
android:layout_weight="2"
android:layout_height="48dp"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:layout_marginBottom="@dimen/size_10"
android:background="@color/white"
app:cardCornerRadius="5dp">
......@@ -309,4 +315,6 @@
</LinearLayout>
</ScrollView>
</LinearLayout>
\ No newline at end of file
plugin_share/src/main/res/layout/activity_share_ruler.xml 0 → 100644
View file @ 88186d5d
This diff is collapsed.
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