Skip to content

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

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

parents 559e8530 1f85bfed
Show whitespace changes
Inline Side-by-side
Showing with 207 additions and 47 deletions
RvWrapper/src/main/java/com/ruiwenliu/wrapper/browse/ActivityImageBrowseInt.java
View file @ fa666144
......@@ -36,6 +36,7 @@ import java.util.List;
public class ActivityImageBrowseInt extends BaseActivity {
final public static String KEY_IMAGE = "image";
final public static String KEY_BACKGROUND = "background";
final public static String KEY_SELECTPOSITION = "select";
FrameLayout root;
ViewPager viewPager;
......@@ -58,6 +59,9 @@ public class ActivityImageBrowseInt extends BaseActivity {
@Override
public void onData() {
fragmentImageBrowseList = new ArrayList<>();
int select = getIntent().getIntExtra(ActivityImageBrowseInt.KEY_SELECTPOSITION, 0);
int background = getIntent().getIntExtra(ActivityImageBrowseInt.KEY_BACKGROUND, 0);
if (background != 0) {
root.setBackgroundColor(ContextCompat.getColor(baseContext, background));
......@@ -87,7 +91,7 @@ public class ActivityImageBrowseInt extends BaseActivity {
}
});
viewPager.setCurrentItem(0);
if (fragmentImageBrowseList.size() >= 2) {
recyclerView.setVisibility(View.VISIBLE);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext);
......@@ -96,6 +100,8 @@ public class ActivityImageBrowseInt extends BaseActivity {
adapterRecyclerViewIndicator = new AdapterRecyclerViewIndicator();
recyclerView.setAdapter(adapterRecyclerViewIndicator);
}
viewPager.setCurrentItem(select);
}
@Override
......
RvWrapper/src/main/java/com/ruiwenliu/wrapper/browse/ActivityImageBrowseUrl.java
View file @ fa666144
......@@ -37,6 +37,7 @@ import java.util.List;
public class ActivityImageBrowseUrl extends BaseActivity {
final public static String KEY_IMAGE = "image";
final public static String KEY_BACKGROUND = "background";
final public static String KEY_SELECTPOSITION = "select";
FrameLayout root;
ViewPager viewPager;
......@@ -60,6 +61,8 @@ public class ActivityImageBrowseUrl extends BaseActivity {
public void onData() {
fragmentImageBrowseList = new ArrayList<>();
int select = getIntent().getIntExtra(ActivityImageBrowseInt.KEY_SELECTPOSITION, 0);
int background = getIntent().getIntExtra(ActivityImageBrowseInt.KEY_BACKGROUND, 0);
if (background != 0) {
root.setBackgroundColor(ContextCompat.getColor(baseContext, background));
......@@ -71,6 +74,7 @@ public class ActivityImageBrowseUrl extends BaseActivity {
}
}
viewPager.setAdapter(new AdapterViewPager(getSupportFragmentManager()));
viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@Override
......@@ -89,7 +93,7 @@ public class ActivityImageBrowseUrl extends BaseActivity {
}
});
viewPager.setCurrentItem(0);
if (fragmentImageBrowseList.size() >= 2) {
recyclerView.setVisibility(View.VISIBLE);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext);
......@@ -98,6 +102,8 @@ public class ActivityImageBrowseUrl extends BaseActivity {
adapterRecyclerViewIndicator = new AdapterRecyclerViewIndicator();
recyclerView.setAdapter(adapterRecyclerViewIndicator);
}
viewPager.setCurrentItem(select);
}
@Override
......
RvWrapper/src/main/java/com/ruiwenliu/wrapper/util/um/ShareManager.java
View file @ fa666144
......@@ -48,6 +48,23 @@ public class ShareManager extends ShareAction {
.setShareboardclickCallback(boardListener);
}
/**
*
* @param activity
* @param boardListener
* @param copy
*/
public ShareManager(Activity activity, ShareBoardlistener boardListener,String copy) {
super(activity);
mActivity=activity;
this.setDisplayList(
SHARE_MEDIA.WEIXIN, SHARE_MEDIA.WEIXIN_CIRCLE, SHARE_MEDIA.WEIXIN_FAVORITE,
SHARE_MEDIA.QQ, SHARE_MEDIA.QZONE)
.addButton("复制链接", copy, "rv_share_copy", "rv_share_copy")
.setShareboardclickCallback(boardListener);
}
/**
*
* 分享链接
......
RvWrapper/src/main/res/drawable/progress_freshing_frame.xml
View file @ fa666144
......@@ -2,53 +2,63 @@
<animation-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/icon_freshing_1"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_2"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_3"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_4"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_5"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_6"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_7"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_8"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_9"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_10"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_11"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_12"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_13"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_14"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_15"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_16"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_17"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_18"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_19"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_20"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_21"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_22"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_23"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_24"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_25"
android:duration="40"/>
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_26"
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_27"
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_28"
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_29"
android:duration="30"/>
<item android:drawable="@mipmap/icon_freshing_30"
android:duration="30"/>
</animation-list>
\ No newline at end of file
module_discovery/src/main/java/com/xxfc/discovery/fragment/PatFragment.java
View file @ fa666144
......@@ -101,7 +101,8 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Sim
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_DETAILPAT)
.withString("id", item.getMsgId())
.withString("isPraise",item.getIsPraise())
.withString("title",item.getBody().getText())
.withString("iconUrl",item.getBody().getImages().get(0).getOurl())
.navigation();
}
}
......
module_discovery/src/main/java/com/xxfc/discovery/fragment/RecommendFragment.java
View file @ fa666144
......@@ -96,6 +96,8 @@ public class RecommendFragment extends BaseFragment<DiscoveryPresenter> implemen
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_DETAILPAT)
.withString("id", item.getMsgId())
.withString("title",item.getBody().getText())
.withString("iconUrl",item.getBody().getImages().get(0).getOurl())
.navigation();
}else if ("4".equals(item.getBody().getType())){
showToast("亲，该功能还在开发中。。。");
......@@ -175,9 +177,13 @@ public class RecommendFragment extends BaseFragment<DiscoveryPresenter> implemen
* @param page
*/
private void geDataList(int page) {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null) {
headMap.put("Authorization", OkGoUtil.getToken());
}
Map<String, Object> map = new LinkedHashMap<>();
map.put("page", page);
mPresenter.postData( 0, DiscoveryApi.DISCOVERY_HOTMSG_LIST, DiscoveryRecommendBean.class, map, page == 1 ? false : false);
mPresenter.postData(RvFrameConfig.HOST, 0, DiscoveryApi.DISCOVERY_HOTMSG_LIST, DiscoveryRecommendBean.class, map, headMap, page == 1 ? false : false);
}
@Override
......
module_discovery/src/main/java/com/xxfc/discovery/other/DetailPatActivity.java
View file @ fa666144
package com.xxfc.discovery.other;
import android.annotation.TargetApi;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Intent;
import android.os.Build;
import android.support.v7.app.AppCompatActivity;
......@@ -31,8 +33,13 @@ import com.google.gson.reflect.TypeToken;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.browse.ActivityImageBrowseUrl;
import com.ruiwenliu.wrapper.util.um.CustomShareListener;
import com.ruiwenliu.wrapper.util.um.ShareManager;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.utils.DateUtils;
import com.umeng.socialize.bean.SHARE_MEDIA;
import com.umeng.socialize.shareboard.SnsPlatform;
import com.umeng.socialize.utils.ShareBoardlistener;
import com.xxfc.discovery.R;
import com.xxfc.discovery.R2;
import com.xxfc.discovery.api.DiscoveryApi;
......@@ -71,9 +78,15 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
String id;
@Autowired()
String isPraise;
String title;
private boolean praises;
@Autowired()
String iconUrl;
private String isPraise;
private ShareManager shareManager;
private ClipboardManager myClipboard;
@Override
protected int setLayout() {
......@@ -83,9 +96,25 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle("拍拍详情");
titleView.setImageResource(R.id.iv_title_right, R.drawable.common_icon_rv_rentingcar_icon_share);
titleView.setChildClickListener(R.id.iv_title_right, new View.OnClickListener() {
@Override
public void onClick(View v) {
if (shareManager != null) {
shareManager.open();
}
}
});
webUrl = DiscoveryApi.DISCOVERY_FINDDETAILS + "?id=" + id;
Log.i("CampDetailActivity", "initView: " + webUrl);
initWeb();
if (!TextUtils.isEmpty(title) && !TextUtils.isEmpty(iconUrl)) {
initShare(webUrl + "&shareType=app", title, "", iconUrl);
}
}
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
......@@ -202,7 +231,7 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
}
private void setIMData(DiscoveryIMTokenBean bean) {
if (praises) {//0：未点赞 1：已点赞
if ("0".equals(isPraise)) {//0：未点赞 1：已点赞
Map<String, Object> map = new LinkedHashMap<>();
map.put("access_token", bean.getData());
map.put("messageId", id);
......@@ -231,13 +260,14 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
}
@JavascriptInterface
public void showImage(String imageJson) {
public void showImage(int selectPosition,String imageJson) {
if (!TextUtil.isEmpty(imageJson)) {
List<String> imagesList = new Gson().fromJson(imageJson,
new TypeToken<List<String>>() {
}.getType());
Bundle bundle = new Bundle();
bundle.putInt(ActivityImageBrowseUrl.KEY_BACKGROUND, R.color.colorPrimary);
bundle.putInt(ActivityImageBrowseUrl.KEY_SELECTPOSITION,selectPosition);
bundle.putStringArrayList(ActivityImageBrowseUrl.KEY_IMAGE, (ArrayList<String>) imagesList);
IntentUtil.startActivity(mActivity, ActivityImageBrowseUrl.class, bundle);
}
......@@ -245,8 +275,8 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
@JavascriptInterface
public void isLike(boolean praise) {
praises = praise;
public void isLike(String praise) {
isPraise = praise;
if (OkGoUtil.getToken() != null) {
Map<String, Object> headMap = new LinkedHashMap<>();
......@@ -258,6 +288,66 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
}
}
/**
* 初始化分享
*/
private void initShare(final String webUrl, final String name, final String content, final String logo) {
shareManager = new ShareManager(this, new ShareBoardlistener() {
@Override
public void onclick(SnsPlatform snsPlatform, SHARE_MEDIA share_media) {
if (snsPlatform.mShowWord.equals("复制链接")) {
copyText();
}
shareManager.showShare(share_media, webUrl, name, content, logo
, new CustomShareListener(mActivity) {
@Override
public void onResult(SHARE_MEDIA platform) {
super.onResult(platform);
if (platform.name().equals("WEIXIN_FAVORITE")) {
showToast(" 收藏成功啦");
} else {
if (platform != SHARE_MEDIA.MORE && platform != SHARE_MEDIA.SMS
&& platform != SHARE_MEDIA.EMAIL
&& platform != SHARE_MEDIA.FLICKR
&& platform != SHARE_MEDIA.FOURSQUARE
&& platform != SHARE_MEDIA.TUMBLR
&& platform != SHARE_MEDIA.POCKET
&& platform != SHARE_MEDIA.PINTEREST
&& platform != SHARE_MEDIA.INSTAGRAM
&& platform != SHARE_MEDIA.GOOGLEPLUS
&& platform != SHARE_MEDIA.YNOTE
&& platform != SHARE_MEDIA.EVERNOTE) {
showToast("分享成功啦");
}
}
}
});
}
},"rv_um_share_copy");
}
/**
* 复制文本
*/
private void copyText() {
if (myClipboard == null) {
myClipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
}
ClipData myClip = ClipData.newPlainText("text", webUrl + "&shareType=app");
myClipboard.setPrimaryClip(myClip);
showToast("复制成功！");
}
@Override
protected void onStart() {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java
View file @ fa666144
......@@ -335,19 +335,20 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
});
recyclerViewRvEnthusiast.setLayoutManager(staggeredGridLayoutManager);
recyclerViewRvEnthusiast.addItemDecoration(new AbSpacesItemDecoration(20));// 分割线。
recyclerViewRvEnthusiast.addItemDecoration(new AbSpacesItemDecoration2(20,10));// 分割线。
recyclerViewRvEnthusiast.setNestedScrollingEnabled(false);
recyclerViewRvEnthusiast.setAdapter(mRvEnthusiast);
mRvEnthusiast.bindToRecyclerView(recyclerViewRvEnthusiast);
mRvEnthusiast.setEnableLoadMore(true);
mRvEnthusiast.disableLoadMoreIfNotFullPage();
// mRvEnthusiast.bindToRecyclerView(recyclerViewRvEnthusiast);
// mRvEnthusiast.setEnableLoadMore(true);
// mRvEnthusiast.disableLoadMoreIfNotFullPage();
recyclerViewRvEnthusiast.setLayoutManager(new GridLayoutManager(getContext(), 2));
recyclerViewRvEnthusiast.addItemDecoration(new AbSpacesItemDecoration(10));// 分割线。
recyclerViewRvEnthusiast.addItemDecoration(new flow(10));
recyclerViewRvEnthusiast.setNestedScrollingEnabled(false);
recyclerViewRvEnthusiast.setAdapter(mRvEnthusiast);
// recyclerViewRvEnthusiast.setLayoutManager(new GridLayoutManager(getContext(), 2));
// recyclerViewRvEnthusiast.addItemDecoration(new AbSpacesItemDecoration(10));// 分割线。
// recyclerViewRvEnthusiast.addItemDecoration(new flow(10));
// recyclerViewRvEnthusiast.setNestedScrollingEnabled(false);
// recyclerViewRvEnthusiast.setAdapter(mRvEnthusiast);
//房车游榜单
mRvTourAdapter = new RVTourListAdapter();
......@@ -420,6 +421,28 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
ARouter.getInstance().build(Constance.ACTIVITY_URL_POPULARTOURLIST).withString("name", beanHot.getName()).withString("id", beanHot.getId()).navigation();
}
});
//房车发烧友
mRvEnthusiast.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
HomeRecommendBean.DataBeanX.DataBean item = (HomeRecommendBean.DataBeanX.DataBean) adapter.getItem(position);
if (item !=null){
if ("2".equals(item.getBody().getType())){
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_DETAILPAT)
.withString("id", item.getMsgId())
.withString("title",item.getBody().getText())
.withString("iconUrl",item.getBody().getImages().get(0).getOurl())
.navigation();
}else if ("4".equals(item.getBody().getType())){
showToast("亲，该功能还在开发中。。。");
}
}
}
});
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/CompletedFragment.java
View file @ fa666144
......@@ -29,6 +29,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
import butterknife.BindView;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
/**
......@@ -101,7 +102,7 @@ public class CompletedFragment extends BaseFragment<CommonPresenter> implements
private void initRxbus() {
RxBus.tObservable(PaymentSuccessfulEvent.class)
.observeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<PaymentSuccessfulEvent>(disposable) {
@Override
public void onNext(PaymentSuccessfulEvent event) {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/ToTravelFragment.java
View file @ fa666144
......@@ -118,7 +118,7 @@ public class ToTravelFragment extends BaseFragment<CommonPresenter> implements B
RxBus.tObservable(PaymentSuccessfulEvent.class)
.observeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<PaymentSuccessfulEvent>(disposable) {
@Override
public void onNext(PaymentSuccessfulEvent event) {
......
module_tourism/src/main/res/layout/activity_travel_details.xml
View file @ fa666144
......@@ -55,7 +55,7 @@
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/size_5"
android:padding="@dimen/size_8"
android:src="@drawable/tourism_rv_rentingcar_icon_share" />
android:src="@drawable/common_icon_rv_rentingcar_icon_share" />
</LinearLayout>
</RelativeLayout>
......
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