Skip to content

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

修改新人专享，推广有礼的样式

parent d2ec3b65
Hide whitespace changes
Inline Side-by-side
Showing with 184 additions and 56 deletions
RvClient/build.gradle
View file @ aa36b631
......@@ -8,8 +8,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
flavorDimensions "default"
versionCode 135
versionName "1.3.5"
versionCode 137
versionName "1.3.7"
multiDexEnabled true
//新版Gradle 是 implementation 为了兼容compile,写上这句话
......
RvClient/src/main/java/com/xxfc/rv/RvClientApplication.java
View file @ aa36b631
......@@ -56,9 +56,9 @@ public class RvClientApplication extends FrameApp {
ShareInstall.getInstance().init(this);
ShareInstall.getInstance().reportRegister();
}
LogUtil.setLogEnable(false, getApplicationContext());
// CrashHandler.getInstance().init(getApplicationContext());
LogUtil.setLogEnable(BuildConfig.DEBUG, getApplicationContext());
if (BuildConfig.DEBUG)
CrashHandler.getInstance().init(getApplicationContext());
// 在使用 SDK 各组间之前初始化 context 信息，传入 ApplicationContext
SDKInitializer.initialize(this);
//自4.3.0起，百度地图SDK所有接口均支持百度坐标和国测局坐标，用此方法设置您使用的坐标类型.
......
component_utils/src/main/java/com/rv/component/utils/Cookie.java
View file @ aa36b631
......@@ -75,4 +75,8 @@ public class Cookie {
public static boolean getBooleanValue(Context context, String key, boolean def) {
return getPreference(context).getBoolean(key, def);
}
public static void clear(Context context) {
getPreference(context).edit().clear().commit();
}
}
component_utils/src/main/java/com/rv/component/utils/RvCache.java
View file @ aa36b631
......@@ -104,6 +104,13 @@ public class RvCache<T extends Serializable> {
return o;
}
public void clear() {
clear(CacheEnum.USER);
clear(CacheEnum.MEMBER);
clear(CacheEnum.VISTOR_LIST);
clear(CacheEnum.CONSUMER_RECORD);
}
public void clear(CacheEnum cacheEnum) {
File f = new File(getSavePath(cacheEnum));
if (f.exists()) {
......
module_mine/src/main/java/com/rv/rvmine/traveler/SettingActivity.java
View file @ aa36b631
......@@ -14,6 +14,7 @@ import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.util.UtilsManager;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.utils.Cookie;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.login.RegisteredActivity;
......@@ -129,7 +130,8 @@ public class SettingActivity extends BaseStatusActivity<CommonPresenter> {
//退出登录
UtilsManager.getInstance(mActivity).clearShareData("city_json");
UtilsManager.getInstance(mActivity).setShNull();
RvCache.getInstance(getApplicationContext()).clear(CacheEnum.USER);
RvCache.getInstance(getApplicationContext()).clear();
Cookie.clear(getApplicationContext());
OkGoUtil.clearToken();
setResult(201);
showToast("退出成功！");
......
plugin_share/src/main/java/com/rv/share/BillActivity.java
View file @ aa36b631
......@@ -19,6 +19,7 @@ import android.widget.Toast;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.statusbar.StatusBarUtil;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.share.presenter.BillPresenter;
import com.rv.share.view.RvWebView;
......@@ -49,6 +50,11 @@ public class BillActivity extends BaseStatusActivity<BillPresenter> {
return intent;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
}
@Override
protected int setLayout() {
......
plugin_share/src/main/java/com/rv/share/WebViewActivity.java
View file @ aa36b631
......@@ -4,9 +4,15 @@ import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.base.utils.tools.android.NetworkUtil;
......@@ -22,10 +28,19 @@ import butterknife.BindView;
public class WebViewActivity extends BaseStatusActivity<WebViewPresenter> {
@BindView(R2.id.ll_content)
LinearLayout llContent;
@BindView(R2.id.img_left)
ImageView ivTitleLeft;
@BindView(R2.id.tv_left)
TextView tvTitleLeft;
@BindView(R2.id.tv_center)
TextView tvTitleCenter;
@BindView(R2.id.tv_right)
TextView tvTitleRight;
@BindView(R2.id.img_right)
ImageView ivTitleRight;
private String url;
private String title;
private RvWebView rvWebView;
private TitleView titleView;
public static Intent getIntent(Context context, String url, String name) {
Intent intent = new Intent(context, WebViewActivity.class);
......@@ -41,19 +56,23 @@ public class WebViewActivity extends BaseStatusActivity<WebViewPresenter> {
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
// 获取唤醒参数
titleView.setVisibility(View.GONE);
url = intent.getStringExtra("url");
title = intent.getStringExtra("title");
if (!TextUtils.isEmpty(title)) {
titleView.setTitle(title);
} else {
titleView.setVisibility(View.GONE);
tvTitleCenter.setVisibility(View.VISIBLE);
tvTitleCenter.setText(title);
}
ivTitleLeft.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
}
});
rvWebView = new RvWebView(getApplicationContext(), listener);
if (NetworkUtil.isNetworkAvailable(this)) {
llContent.addView(rvWebView);
if (!TextUtils.isEmpty(url)) {
// url = "https://xxtest.upyuns.com/h5/appHtml/view/invitationCourtesy.html" ;
rvWebView.loadUrl(url);
}
} else {
......@@ -88,44 +107,52 @@ public class WebViewActivity extends BaseStatusActivity<WebViewPresenter> {
}
rvWebView.destroy();// 生命周期销毁
}
super.onDestroy();
}
private RvWebView.WebViewListener listener = new RvWebView.WebViewListener() {
@Override
public void share(String url, String imgUrl, String title, String circleTitle, String desc) {
String billUrl = RvFrameConfig.HOST + "/h5/appHtml/view/poster.html";
mPresenter.showShareDialog(url, imgUrl, title, circleTitle, desc, billUrl);
public void share(final String url, final String imgUrl, final String title, final String circleTitle, final String desc) {
runOnUiThread(new Runnable() {
@Override
public void run() {
String billUrl = RvFrameConfig.HOST + "/h5/appHtml/view/poster.html";
mPresenter.showShareDialog(url, imgUrl, title, circleTitle, desc, billUrl);
}
});
}
@Override
public void share(String url, String title, String desc) {
mPresenter.showShareDialog(url, null, title, null, desc, null);
public void share(final String url, final String title, final String desc) {
runOnUiThread(new Runnable() {
@Override
public void run() {
mPresenter.showShareDialog(url, null, title, null, desc, null);
}
});
}
@Override
public void finish() {
finish();
}
@Override
public void showShareIcon(final String url, final String imgUrl, final String title, final String circleTitle, final String desc) {
// runOnUiThread(new Runnable() {
// @Override
// public void run() {
// titleView.setVisible(R.id.iv_title_right, true);
// titleView.setImageResource(R.id.iv_title_right, R.drawable.tourism_rv_rentingcar_icon_share);
// titleView.setChildClickListener(R.id.iv_title_right, new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// String billUrl = RvFrameConfig.HOST + "/h5/appHtml/view/newPeoplePoster.html";
// mPresenter.showShareDialog(url, imgUrl, title, circleTitle, desc, billUrl);
// }
// });
// }
// });
runOnUiThread(new Runnable() {
@Override
public void run() {
ivTitleRight.setVisibility(View.VISIBLE);
ivTitleRight.setImageResource(R.drawable.tourism_rv_rentingcar_icon_share);
}
});
final String billUrl = RvFrameConfig.HOST + "/h5/appHtml/view/newPeoplePoster.html";
ivTitleRight.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mPresenter.showShareDialog(url, imgUrl, title, circleTitle, desc, billUrl);
}
});
}
};
}
plugin_share/src/main/java/com/rv/share/view/RvWebView.java
View file @ aa36b631
......@@ -159,7 +159,7 @@ public class RvWebView extends WebView {
@JavascriptInterface
public void share(String url, String title, String desc) {
if (listener != null) {
listener.share(url, title, desc);
listener.share(url, title, TextUtils.isEmpty(desc) ? " " : desc);
}
}
......@@ -178,14 +178,14 @@ public class RvWebView extends WebView {
@JavascriptInterface
public void share(String url, String imgUrl, String title, String titleCircle, String desc) {
if (listener != null) {
listener.share(url, imgUrl, title, titleCircle, desc);
listener.share(url, imgUrl, title, titleCircle, TextUtils.isEmpty(desc) ? " " : desc);
}
}
@JavascriptInterface
public void showShareIcon(String url, String imgUrl, String title, String titleCircle, String desc) {
if (listener != null) {
listener.showShareIcon(url, imgUrl, title, titleCircle, desc);
listener.showShareIcon(url, imgUrl, title, titleCircle, TextUtils.isEmpty(desc) ? " " : desc);
}
}
......
plugin_share/src/main/res/layout/activity_bill.xml
View file @ aa36b631
......@@ -7,19 +7,27 @@
android:background="#FE6E2F"
tools:context=".BillActivity">
<TextView
android:id="@+id/tv_back_title"
android:layout_width="wrap_content"
android:layout_height="@dimen/size_40"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginLeft="@dimen/dp_10"
android:drawableLeft="@drawable/rv_common_icon_back_white"
android:drawablePadding="@dimen/size_5"
android:gravity="center_vertical"
android:text="生成海报"
android:textColor="@color/white"
android:textSize="@dimen/text_18" />
<com.ruiwenliu.wrapper.statusbar.StatusBarHeightView
android:id="@+id/ll_item_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:use_type="use_padding_top">
<TextView
android:id="@+id/tv_back_title"
android:layout_width="wrap_content"
android:layout_height="@dimen/size_40"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginLeft="@dimen/dp_10"
android:drawableLeft="@drawable/rv_common_icon_back_white"
android:drawablePadding="@dimen/size_5"
android:gravity="center_vertical"
android:text="生成海报"
android:textColor="@color/white"
android:textSize="@dimen/text_18" />
</com.ruiwenliu.wrapper.statusbar.StatusBarHeightView>
<LinearLayout
android:id="@+id/ll_bottom"
......@@ -57,9 +65,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/ll_bottom"
android:layout_below="@id/tv_back_title"
android:layout_marginTop="@dimen/size_50"
android:layout_below="@id/ll_item_title"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/size_30"
android:layout_marginRight="@dimen/dp_10"
android:layout_marginBottom="@dimen/size_20"
android:background="@drawable/shape_rv_bg_bill"
......
plugin_share/src/main/res/layout/activity_reative_bill.xml
View file @ aa36b631
......@@ -6,7 +6,6 @@
android:layout_height="match_parent"
android:background="#ffffff"
android:orientation="vertical"
android:weightSum="19"
tools:context=".ReativeBillActivity">
<TextView
......@@ -41,7 +40,7 @@
android:id="@+id/ll_bill_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_gravity="top"
android:background="@color/white"
app:cardCornerRadius="5dp">
......
plugin_share/src/main/res/layout/activity_web_view.xml
View file @ aa36b631
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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:id="@+id/ll_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".WebViewActivity">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_55"
android:background="@color/colorWrite">
<ImageView
android:id="@+id/img_left"
android:layout_width="@dimen/size_32"
android:layout_height="@dimen/size_32"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/size_5"
android:padding="@dimen/size_8"
android:src="@drawable/rv_common_icon_back_dark" />
<TextView
android:id="@+id/tv_left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/iv_title_left"
android:gravity="center"
android:padding="@dimen/size_10"
android:textColor="@color/textMain"
android:textSize="@dimen/text_16"
android:visibility="gone" />
<TextView
android:id="@+id/tv_center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:ellipsize="end"
android:gravity="center"
android:maxWidth="320dp"
android:maxLines="1"
android:textColor="@color/textMain"
android:textSize="@dimen/text_18" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:paddingLeft="@dimen/size_8"
android:paddingTop="@dimen/size_5"
android:paddingRight="@dimen/size_8"
android:paddingBottom="@dimen/size_5"
android:textColor="@color/textMain"
android:textSize="@dimen/text_16"
android:visibility="gone" />
<ImageView
android:id="@+id/img_right"
android:layout_width="@dimen/size_32"
android:layout_height="@dimen/size_32"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/size_5"
android:padding="@dimen/size_8"
android:visibility="gone" />
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" />
</LinearLayout>
\ No newline at end of file
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