Skip to content

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

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

parents 4da4982c 59406bfb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 575 additions and 1827 deletions
OkGo/src/main/java/com/yuyife/okgo/OkGoUtil.java
View file @ 51a60406
......@@ -41,20 +41,22 @@ public class OkGoUtil {
public static String TOKEN_KEY = "Authorization";
//把Token保存到SP文件中的Key
final private static String SP_KEY_TOKEN = "sp_key_token";
final private static String SP_KEY_TOKEN_TIME = "sp_key_token_time";
final private static String SP_KEY_USERINFO ="userinfo";
final private static String SP_KEY_USERINFO = "userinfo";
public static String getYkId(){
String ykid = "uk_"+ (int)((Math.random()*9+1)*100000);
public static String getYkId() {
String ykid = "uk_" + (int) ((Math.random() * 9 + 1) * 100000);
return ykid;
}
//保存Token
public static void setToken(String token) {
public static void setToken(String token, String time) {
if (application == null) return;
SharedPreferences sp = application.getSharedPreferences(OkGoUtil.class.getSimpleName(), Context.MODE_PRIVATE);
SharedPreferences.Editor editor = sp.edit();
editor.putString(SP_KEY_TOKEN, token);
editor.putString(SP_KEY_TOKEN_TIME, time);
editor.apply();
editor.commit();
}
......@@ -68,11 +70,20 @@ public class OkGoUtil {
return null;
}
//获取Token登录时间
public static String getTime() {
if (application != null) {
SharedPreferences sp = application.getSharedPreferences(OkGoUtil.class.getSimpleName(), Context.MODE_PRIVATE);
return sp.getString(SP_KEY_TOKEN_TIME, null);
}
return null;
}
/**
* 清空Token
*/
public static void clearToken(){
if (application ==null)
public static void clearToken() {
if (application == null)
return;
SharedPreferences sp = application.getSharedPreferences(OkGoUtil.class.getSimpleName(), Context.MODE_PRIVATE);
sp.edit().clear().commit();
......@@ -269,7 +280,7 @@ public class OkGoUtil {
getUrl = getUrl(url, param);
} else {
getUrl = url;
Log.d(OkGoUtil.class.getSimpleName(), "getJson():\n url:" + url );
Log.d(OkGoUtil.class.getSimpleName(), "getJson():\n url:" + url);
}
GetRequest<String> request;
request = OkGo.<String>get(getUrl)
......@@ -327,7 +338,7 @@ public class OkGoUtil {
sb.append(key);
sb.append("=");
sb.append(value);
}catch (Exception e){
} catch (Exception e) {
//忽略
}
}
......
RvClient/build.gradle
View file @ 51a60406
......@@ -8,8 +8,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
flavorDimensions "default"
versionCode 143
versionName "1.4.3"
versionCode 144
versionName "1.4.4"
multiDexEnabled true
ndk {
......
RvClient/src/main/java/com/xxfc/rv/MainActivity.java
View file @ 51a60406
......@@ -25,11 +25,13 @@ import android.widget.Toast;
import com.alibaba.android.arouter.launcher.ARouter;
import com.frame.base.url.Constance;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.SPConstance;
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.bean.ActBean;
import com.ruiwenliu.wrapper.bean.UpdateTokenBean;
import com.ruiwenliu.wrapper.receiver.NetWorkReceiver;
import com.ruiwenliu.wrapper.statusbar.StatusBarUtil;
import com.ruiwenliu.wrapper.util.listener.SwitchFragment;
......@@ -37,6 +39,7 @@ import com.ruiwenliu.wrapper.weight.CustomScrollViewPager;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.camp.CampFragment;
import com.rv.component.utils.Cookie;
import com.rv.component.utils.DateUtils;
import com.rv.home.rv.module.ApiConfig;
import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.main.home.HomeFragment;
......@@ -49,7 +52,6 @@ import com.rv.tourism.TourismFragment;
import com.rv.version.bean.VersionCheckBean;
import com.rv.version.util.DownloadAppUtils;
import com.rv.version.util.UpdateAppUtils;
import com.squareup.haha.perflib.Main;
import com.xxfc.discovery.DiscoveryFragment;
import com.yuyife.okgo.OkGoUtil;
......@@ -231,25 +233,44 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
promotionDialog.show();
}
break;
case 3:
case 4:
UpdateTokenBean updateTokenBean = (UpdateTokenBean) result;
if (updateTokenBean != null && !TextUtils.isEmpty(updateTokenBean.getData())) {
OkGoUtil.setToken(updateTokenBean.getData(), DateUtils.getCurDate());
Cookie.save(getApplicationContext(), SPConstance.USER_JSON_TOKEN, updateTokenBean.getData());
Cookie.save(getApplicationContext(), SPConstance.USER_JSON_TOKE_TIME, DateUtils.getCurDate());
}
break;
default:
break;
}
}
/**
* 检查token是否过期
* 设置token时间检测
*/
private void checkToken() {
String time = OkGoUtil.getTime();
if (!TextUtils.isEmpty(time)) {
if (DateUtils.compareDateDay(DateUtils.getCurDate(), time) > 6) {
getToken();
}
} else {
getToken();
}
}
/**
* 获取新token
*/
private void getToken() {
Map<String, Object> heapmap = new HashMap<>();
Map<String, Object> map = new HashMap<>();
if (!TextUtils.isEmpty(OkGoUtil.getToken())) {
map.put("Authorization", OkGoUtil.getToken());
heapmap.put("Authorization", OkGoUtil.getToken());
map.put("token", OkGoUtil.getToken());
mPresenter.getData(RvFrameConfig.HOST, 3, ApiConfig.HTTP_URL_GET_TOKEN, BaseBean.class, map, heapmap, false);
mPresenter.getData(RvFrameConfig.HOST, 4, ApiConfig.HTTP_URL_GET_TOKEN, UpdateTokenBean.class, map, heapmap, false);
}
}
......@@ -284,6 +305,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
setCurrent(TYPE_FOUND);
} else if (id == R.id.rl_mine) {
setCurrent(TYPE_MINE);
checkToken();
}
}
......
RvClient/src/main/java/com/xxfc/rv/WelcomeActivity.java
View file @ 51a60406
......@@ -7,14 +7,20 @@ import android.os.Bundle;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.view.View;
import com.ruiwenliu.wrapper.SPConstance;
import com.ruiwenliu.wrapper.base.BaseActivity;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.util.UtilsManager;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.utils.Cookie;
import com.rv.component.utils.DateUtils;
import com.rv.component.utils.LogUtil;
import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
import com.yuyife.okgo.OkGoUtil;
import java.util.concurrent.TimeUnit;
import io.reactivex.Flowable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.annotations.NonNull;
......@@ -68,11 +74,10 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
@Override
public void accept(@NonNull Long aLong) {
try {
if (!TextUtils.isEmpty(UtilsManager.getInstance(mActivity).getSPInstance("city_json").getString("token", ""))) {
OkGoUtil.setToken(
UtilsManager.getInstance(mActivity)
.getSPInstance("city_json")
.getString("token", ""));
String token = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_TOKEN, "");
String tokenTime = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_TOKE_TIME, "");
if (!TextUtils.isEmpty(token)) {
OkGoUtil.setToken(token, tokenTime);
}
} catch (Exception e) {
e.printStackTrace();
......@@ -106,7 +111,7 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
super.onCreate(savedInstanceState);
// this.getWindow().getDecorView().setBackground(null);
if (Build.VERSION.SDK_INT >= 21) {
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |View.SYSTEM_UI_FLAG_FULLSCREEN);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN);
}
// if (Build.VERSION.SDK_INT >= 21) {
// View decorView = getWindow().getDecorView();
......
RvClient/src/main/java/com/xxfc/rv/other/MyReceiver.java
View file @ 51a60406
......@@ -62,25 +62,26 @@ public class MyReceiver extends BroadcastReceiver {
intent2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
switch (onclickType) {
case "1":
intent2.setClass(context, OrderListActivity.class);
context.startActivity(intent2);
break;
case "2":
intent2.setClass(context, CollectionActivity.class);
context.startActivity(intent2);
break;
case "3":
intent2.setClass(context, ShareActivity.class);
break;
case "4":
break;
case "5":
break;
default:
intent2.setClass(context, MainActivity.class);
context.startActivity(intent2);
break;
}
} else {
Intent intent3 = new Intent();
intent3.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
Intent intent4 = new Intent();
intent4.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
intent4.setClass(context, MainActivity.class);
switch (onclickType) {
case "1":
intent3.setClass(context, OrderListActivity.class);
......@@ -94,6 +95,14 @@ public class MyReceiver extends BroadcastReceiver {
intent3.setClass(context, ShareActivity.class);
context.startActivity(intent3);
break;
case "4":
break;
case "5":
break;
default:
intent3.setClass(context, MainActivity.class);
context.startActivity(intent3);
break;
}
}
......
RvFrame/src/main/java/com/frame/rv/config/RvFrameConstant.java
View file @ 51a60406
......@@ -15,6 +15,9 @@ public interface RvFrameConstant {
int HTTP_STATE_DATA_ALREADY_EXISTS = 1009;
int HTTP_STATE_NOT_CHECKTOKEN = 10003; //参数不能为空",
int HTTP_STATE_DATA_NOT_CHECKTOKEN =10009; //"token无效",
int HTTP_STATE_TOKEN_EXPIRED =40101; //用户token异常
int HTTP_STATE_TOKEN_EXPIRED_PASS =40001; //用户token异常
int HTTP_STATE_TOKEN_EXPIRED_PASS2 =40301; //用户token异常
/**
* 请求错误类型
*/
......
RvWrapper/src/main/java/com/ruiwenliu/wrapper/SPConstance.java
View file @ 51a60406
......@@ -11,4 +11,5 @@ public final class SPConstance {
public static final String USER_JSON_ISCERTIFICATIONSTATUS ="CertificationStatus";
public static final String USER_JSON_USERINFO ="userinfo";
public static final String USER_JSON_CODE = "userCode";
public static final String USER_JSON_TOKE_TIME = "tokentime";
}
RvWrapper/src/main/java/com/ruiwenliu/wrapper/base/BaseActivity.java
View file @ 51a60406
......@@ -10,6 +10,7 @@ import android.view.Window;
import com.alibaba.android.arouter.launcher.ARouter;
import com.base.utils.tools.android.NetworkUtil;
import com.frame.base.url.Constance;
import com.ruiwenliu.wrapper.R;
import com.ruiwenliu.wrapper.dialog.LoadingDialog;
import com.ruiwenliu.wrapper.presenter.MvpPresenter;
......@@ -97,6 +98,10 @@ public abstract class BaseActivity<P extends MvpPresenter> extends BaseWrapperAc
}
}
@Override
public void onErrorToken() {
ARouter.getInstance().build(Constance.ACTIVITY_URL_LOGINRV).navigation();
}
protected LoadingDialog createLoadingDialog() {
if (mLoadingDialog == null) {
......
RvWrapper/src/main/java/com/ruiwenliu/wrapper/base/BaseView.java
View file @ 51a60406
......@@ -36,4 +36,9 @@ public interface BaseView<T extends BaseBean> {
* @param errorMsg
*/
void onShowError(String errorMsg, int errorType);
/**
* token过期或者异常
*/
void onErrorToken();
}
RvWrapper/src/main/java/com/ruiwenliu/wrapper/base/BaseWrapperFragment.java
View file @ 51a60406
......@@ -12,6 +12,7 @@ import android.widget.Toast;
import com.alibaba.android.arouter.launcher.ARouter;
import com.base.utils.tools.android.NetworkUtil;
import com.frame.base.url.Constance;
import com.ruiwenliu.wrapper.R;
import com.ruiwenliu.wrapper.dialog.LoadingDialog;
import com.ruiwenliu.wrapper.presenter.MvpPresenter;
......@@ -140,6 +141,10 @@ public abstract class BaseWrapperFragment<P extends MvpPresenter> extends Suppor
}
}
@Override
public void onErrorToken() {
ARouter.getInstance().build(Constance.ACTIVITY_URL_LOGINRV).navigation();
}
/**
* @return 布局resourceId
......
RvWrapper/src/main/java/com/ruiwenliu/wrapper/bean/UpdateTokenBean.java 0 → 100644
View file @ 51a60406
package com.ruiwenliu.wrapper.bean;
import com.ruiwenliu.wrapper.base.BaseBean;
public class UpdateTokenBean extends BaseBean {
private String data;
private int code;
public String getData() {
return data;
}
public void setData(String data) {
this.data = data;
}
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
}
RvWrapper/src/main/java/com/ruiwenliu/wrapper/http/RxRequestResult.java
View file @ 51a60406
......@@ -63,6 +63,12 @@ public class RxRequestResult<T extends BaseBean, V extends BaseView<T>> extends
case RvFrameConstant.HTTP_STATE_DATA_NOT_CHECKTOKEN:
RxBus.post(new SignOutEvent());
break;
case RvFrameConstant.HTTP_STATE_TOKEN_EXPIRED:
case RvFrameConstant.HTTP_STATE_TOKEN_EXPIRED_PASS:
case RvFrameConstant.HTTP_STATE_TOKEN_EXPIRED_PASS2:
RxBus.post(new SignOutEvent());
baseView.onErrorToken();
break;
default:
baseView.onShowError(bean.message, bean.status);
break;
......@@ -92,36 +98,27 @@ public class RxRequestResult<T extends BaseBean, V extends BaseView<T>> extends
baseView.onHideLoading();
if (e instanceof SocketTimeoutException) {//请求超时
} else if (e instanceof ConnectException) {//网络连接超时
// ToastManager.showShortToast("网络连接超时");
baseView.onShowError("网络连接超时", position);
} else if (e instanceof SSLHandshakeException) {//安全证书异常
// ToastManager.showShortToast("安全证书异常");
baseView.onShowError("安全证书异常", position);
} else if (e instanceof HttpException) {//请求的地址不存在
int code = ((HttpException) e).code();
if (code == 504) {
// ToastManager.showShortToast("网络异常，请检查您的网络状态");
baseView.onShowError("网络异常，请检查您的网络状态", position);
} else if (code == 404) {
// ToastManager.showShortToast("请求的地址不存在");
baseView.onShowError("请求的地址不存在", position);
} else {
// ToastManager.showShortToast("请求失败");
baseView.onShowError("请求失败", position);
}
} else if (e instanceof UnknownHostException) {//域名解析失败
// ToastManager.showShortToast("域名解析失败");
baseView.onShowError("域名解析失败", position);
} else {
// ToastManager.showShortToast("error:" + e.getMessage());
baseView.onShowError("error:" + e.getMessage(), position);
}
} catch (Exception e2) {
e2.printStackTrace();
} finally {
Log.e("OnSuccessAndFaultSub", "error:" + e.getMessage());
// mOnSuccessAndFaultListener.onFault("error:" + e.getMessage());
// dismissProgressDialog();
}
}
......
component_utils/src/main/java/com/rv/component/utils/DateUtils.java
View file @ 51a60406
......@@ -532,6 +532,24 @@ public class DateUtils {
}
/**
* 将yyyy-MM-dd HH:mm:ss格式成yyyy-MM-dd
*
* @param dateStr yyyy-MM-dd HH:mm:ss
* @return yyyy-MM-dd
*/
public static String formatDate166(String dateStr) {
String day = "";
try {
Date date = sdf.parse(dateStr);
day = sdf4.format(date);
} catch (Exception e) {
e.printStackTrace();
}
return day;
}
/**
* 将yyyy-MM-dd HH:mm格式成HH:mm
*
......
module_camp/src/main/java/com/rv/camp/camp/CampDetailActivity.java
View file @ 51a60406
......@@ -63,6 +63,7 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
@BindView(R2.id.webView)
WebView mWebView;
private String webUrl;
@Autowired()
......
module_discovery/src/main/java/com/xxfc/discovery/adapter/DiscoveryShortVideoAdapter.java
View file @ 51a60406
......@@ -30,7 +30,6 @@ public class DiscoveryShortVideoAdapter extends BaseQuickAdapter<DiscoveryRecomm
return;
}
DiscoveryRecommendBean.DataBeanX.DataBean.Body body = item.getBody();
if (body != null) {
if (body.getVideos() != null && body.getVideos().size() > 0) {
......@@ -40,6 +39,11 @@ public class DiscoveryShortVideoAdapter extends BaseQuickAdapter<DiscoveryRecomm
error(com.ruiwenliu.wrapper.R.drawable.glide_icon_error);
TransformationUtil utils = new TransformationUtil(image);
Glide.with(mContext)
.setDefaultRequestOptions(
new RequestOptions()
.frame(1000000)
.centerCrop()
)
.asBitmap()
.load(body.getVideos().get(0).getOurl())
.apply(options)
......
module_discovery/src/main/java/com/xxfc/discovery/other/ShortVideoActivity.java
View file @ 51a60406
package com.xxfc.discovery.other;
import android.app.DownloadManager;
import android.app.ProgressDialog;
import android.content.BroadcastReceiver;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.provider.MediaStore;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
......@@ -27,22 +21,23 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.request.RequestOptions;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dueeeke.videoplayer.player.VideoView;
import com.frame.base.url.Constance;
import com.dueeeke.videoplayer.widget.RotateVideoView;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.SPConstance;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.statusbar.StatusBarUtil;
import com.ruiwenliu.wrapper.util.TransformationUtil;
import com.ruiwenliu.wrapper.util.glide.GlideApp;
import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.ruiwenliu.wrapper.util.glide.GlideOptions;
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.AlbumNotifyHelper;
import com.rv.component.utils.Cookie;
import com.rv.component.utils.IsAppInstall;
import com.rv.component.utils.StorageUtils;
import com.umeng.socialize.bean.SHARE_MEDIA;
......@@ -60,12 +55,6 @@ import com.xxfc.discovery.presenter.DiscoveryPresenter;
import com.xxfc.discovery.widget.TikTokController;
import com.yuyife.okgo.OkGoUtil;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
......@@ -113,6 +102,8 @@ public class ShortVideoActivity extends BaseStatusActivity<DiscoveryPresenter> i
TextView tvVideoAddressName;
@BindView(R2.id.tv_video_address)
TextView tvVideoAddress;
// @BindView(R2.id.video_play)
// RotateVideoView mVideoView;
private VideoView mVideoView;
......@@ -154,6 +145,7 @@ public class ShortVideoActivity extends BaseStatusActivity<DiscoveryPresenter> i
dataBeanList = new ArrayList();
mVideoView = new VideoView(this);
mVideoView.setLooping(true);
mTikTokController = new TikTokController(this);
mVideoView.setVideoController(mTikTokController);
......@@ -172,10 +164,22 @@ public class ShortVideoActivity extends BaseStatusActivity<DiscoveryPresenter> i
tvVideoCommentAll.setText("全部评论" + dataBean.getCount().getComment() + "条");
if (dataBean.getBody() != null && dataBean.getBody().getImages() != null && dataBean.getBody().getImages().size() > 0) {
GlideOptions options = GlideOptions.placeholderOf(com.ruiwenliu.wrapper.R.drawable.glide_icon_placeholder).
error(com.ruiwenliu.wrapper.R.drawable.glide_icon_error);
TransformationUtil utils = new TransformationUtil(thumb);
GlideApp.with(mActivity)
.setDefaultRequestOptions(
new RequestOptions()
.frame(1000000)
.centerCrop()
)
.asBitmap()
.load(dataBean.getBody().getImages().get(0).getOurl())
.apply(options)
.apply(RequestOptions.bitmapTransform(new RoundedCorners(12)).override(thumb.getWidth(), thumb.getHeight()))
.placeholder(android.R.color.white)
.into(thumb);
.into(utils);
}
GlideManager.getInstance(mActivity).loadCircleImage(dataBean.getPicUrl(), ivVideoAvatar);
......@@ -203,10 +207,22 @@ public class ShortVideoActivity extends BaseStatusActivity<DiscoveryPresenter> i
private void startPlay() {
if (dataBean != null && dataBean.getBody() != null) {
if (dataBean.getBody().getVideos() != null && dataBean.getBody().getVideos().size() > 0) {
GlideApp.with(this)
GlideOptions options = GlideOptions.placeholderOf(com.ruiwenliu.wrapper.R.drawable.glide_icon_placeholder).
error(com.ruiwenliu.wrapper.R.drawable.glide_icon_error);
TransformationUtil utils = new TransformationUtil(mTikTokController.getThumb());
GlideApp.with(mActivity)
.setDefaultRequestOptions(
new RequestOptions()
.frame(1000000)
.centerCrop()
)
.asBitmap()
.load(dataBean.getBody().getVideos().get(0).getOurl())
.apply(options)
.apply(RequestOptions.bitmapTransform(new RoundedCorners(12)).override(mTikTokController.getThumb().getWidth(), mTikTokController.getThumb().getHeight()))
.placeholder(android.R.color.white)
.into(mTikTokController.getThumb());
.into(utils);
}
ViewParent parent = mVideoView.getParent();
......@@ -216,7 +232,7 @@ public class ShortVideoActivity extends BaseStatusActivity<DiscoveryPresenter> i
container.addView(mVideoView);
if (dataBean.getBody().getVideos() != null && dataBean.getBody().getVideos().size() > 0) {
mVideoView.setUrl(dataBean.getBody().getVideos().get(0).getOurl());
mVideoView.setScreenScale(VideoView.SCREEN_SCALE_CENTER_CROP);
mVideoView.setScreenScale(VideoView.SCREEN_SCALE_DEFAULT);
mVideoView.start();
}
}
......@@ -327,12 +343,6 @@ public class ShortVideoActivity extends BaseStatusActivity<DiscoveryPresenter> i
mVideoView.pause();
}
@Override
public void onResume() {
super.onResume();
mVideoView.resume();
}
@Override
public void onDestroy() {
super.onDestroy();
......
module_discovery/src/main/res/layout/activity_short_video.xml
View file @ 51a60406
......@@ -18,10 +18,16 @@
<ImageView
android:id="@+id/thumb"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop" />
android:layout_height="wrap_content"
android:scaleType="centerCrop"
android:layout_gravity="center_vertical" />
</FrameLayout>
<!--<com.dueeeke.videoplayer.widget.RotateVideoView-->
<!--android:id="@+id/video_play"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="match_parent" />-->
<RelativeLayout
android:id="@+id/rl_item_video"
android:layout_width="match_parent"
......@@ -151,7 +157,6 @@
android:textSize="@dimen/text_14" />
<TextView
android:visibility="gone"
android:id="@+id/tv_video_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -161,7 +166,8 @@
android:drawablePadding="@dimen/size_5"
android:text=""
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_10" />
android:textSize="@dimen/text_10"
android:visibility="gone" />
</LinearLayout>
</RelativeLayout>
......
module_discovery/src/main/res/layout/layout_tiktok_controller.xml
View file @ 51a60406
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_thumb"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"/>
android:layout_height="wrap_content"
android:scaleType="centerCrop" />
</LinearLayout>
\ No newline at end of file
module_home/src/main/java/com/rv/home/rv/module/ApiConfig.java
View file @ 51a60406
......@@ -145,4 +145,9 @@ public class ApiConfig {
* 检查token是否有效
*/
public static String HTTP_URL_GET_TOKEN = RvFrameConfig.HOST + "/api/auth/jwt/checkToken";
/**
* 获取新的token
*/
public static String HTTP_URL_GET_TOKEN_REFRESH = RvFrameConfig.HOST + "/api/auth/jwt/refresh";
}
module_home/src/main/java/com/rv/home/rv/module/basic/BaseLoginActivity.java
View file @ 51a60406
......@@ -17,6 +17,7 @@ import com.ruiwenliu.wrapper.presenter.MvpPresenter;
import com.ruiwenliu.wrapper.util.UtilsManager;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.utils.Cookie;
import com.rv.component.utils.DateUtils;
import com.rv.component.utils.LogUtil;
import com.rv.home.R;
import com.rv.home.rv.module.ApiConfig;
......@@ -128,6 +129,8 @@ public abstract class BaseLoginActivity<P extends MvpPresenter> extends BaseStat
Cookie.save(getApplicationContext(), SPConstance.USER_JSON_NAME, registeredBean.getData().getUsername());
Cookie.save(getApplicationContext(), SPConstance.USER_JSON_HEADERURL, registeredBean.getData().getHeaderurl());
Cookie.save(getApplicationContext(), SPConstance.USER_JSON_TOKEN, registeredBean.getToken());
Cookie.save(getApplicationContext(), SPConstance.USER_JSON_TOKE_TIME, DateUtils.getCurDate());
UtilsManager.getInstance(OkGoUtil.application).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_CODE, registeredBean.getData().getCode()).commit();
UtilsManager.getInstance(OkGoUtil.application).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_NAME, registeredBean.getData().getUsername()).commit();
UtilsManager.getInstance(OkGoUtil.application).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_HEADERURL, registeredBean.getData().getHeaderurl()).commit();
......@@ -142,7 +145,7 @@ public abstract class BaseLoginActivity<P extends MvpPresenter> extends BaseStat
headMap.put("Authorization", registeredBean.getToken());
mPresenter.getDataHead(RvFrameConfig.ADMIN_POST, 10, ApiConfig.HTTP_URL_APP_USER_INFO, BeanUserInfo.class, headMap, false);
}
OkGoUtil.setToken(registeredBean.getToken());
OkGoUtil.setToken(registeredBean.getToken(), DateUtils.getCurDate());
// switch (RvFrameConfig.RvFrameInfo.TYPE_LOGIN) {
// case 1:
// if ("0".equals(bean.getData().getCertificationStatus())) { //实名认证状态:0-未认证，1-已认证
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarDetailActivity.java
View file @ 51a60406
......@@ -49,6 +49,7 @@ import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.login.LoginRvActivity;
import com.rv.home.rv.module.ui.main.home.bean.CarTypeListBean;
import com.rv.home.rv.module.ui.main.home.bean.OrderDataBean;
import com.rv.home.rv.module.ui.main.home.bean.OrderPriceBean;
import com.umeng.socialize.UMShareAPI;
import com.umeng.socialize.bean.SHARE_MEDIA;
import com.umeng.socialize.shareboard.SnsPlatform;
......@@ -128,7 +129,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
.subscribe(new Observer<IDCardCertificationEvent>(disposable) {
@Override
public void onNext(IDCardCertificationEvent event) {
startActivity(ConfirmOrderActivity.getIntent(mActivity, dataBean, mCarBean, getIntent().getStringExtra("startTime"), getIntent().getStringExtra("endTime")));
getOrderPrice();
}
});
......@@ -174,6 +175,10 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
case 0:
userInfoData((UserInfoBean) result);
break;
case 1:
OrderPriceBean priceBean = (OrderPriceBean) result;
startActivity(ConfirmOrderActivity.getIntent(mActivity, dataBean, mCarBean, getIntent().getStringExtra("startTime"), getIntent().getStringExtra("endTime"), priceBean));
break;
}
}
......@@ -224,7 +229,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
super.onNewIntent(intent);
int type = intent.getIntExtra("type", 0);
if (type == 1) {
startActivity(ConfirmOrderActivity.getIntent(mActivity, dataBean, mCarBean, getIntent().getStringExtra("startTime"), getIntent().getStringExtra("endTime")));
getOrderPrice();
finish();
}
}
......@@ -263,17 +268,35 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
startActivity(LoginRvActivity.getIntent(mActivity, 0));
return;
}
// BeanUserInfo.UserInfo userInfo = getUserInfo();
// if (userInfo != null) {
// if (userInfo.getCertificationStatus() == 0) {
// ARouter.getInstance().build(Constance.ACTIVITY_URL_IDCARDCERTIFICATION).navigation();
// return;
// }
// }
startActivity(ConfirmOrderActivity.getIntent(mActivity, dataBean, mCarBean, getIntent().getStringExtra("startTime"), getIntent().getStringExtra("endTime")));
BeanUserInfo.UserInfo userInfo = getUserInfo();
if (userInfo != null) {
if (userInfo.getCertificationStatus() == 0) {
ARouter.getInstance().build(Constance.ACTIVITY_URL_IDCARDCERTIFICATION).navigation();
return;
}
}
getOrderPrice();
}
}
/**
* 获得订单价格
*/
private void getOrderPrice() {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null)
headMap.put("Authorization", OkGoUtil.getToken());
Map<String, Object> map = new LinkedHashMap<>();
map.put("driverType", 1);
map.put("modelId", dataBean.getModelId());
map.put("startTime", dataBean.getStartTime());
map.put("endTime", dataBean.getEndTime());
map.put("dayNum", dataBean.getDayNum());
mPresenter.getData(RvFrameConfig.VEHICLE_ORDER, 1, ApiConfig.HTTP_URL_GET_ORDER_PRICE, OrderPriceBean.class, map, headMap, true);
}
//添加收藏
private void addCollection() {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java
View file @ 51a60406
......@@ -72,6 +72,7 @@ import com.xxrv.coupon.api.CouponApi;
import com.xxrv.coupon.bean.CarCouponBean;
import com.yuyife.okgo.OkGoUtil;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.LinkedHashMap;
......@@ -190,12 +191,13 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
private List<CarCouponBean.DataBean.CarCouponTypeDataBean.CarCouponDataBean> selectCouponList = null;
private OrderMemberBean.DataBean memberData;
public static Intent getIntent(Context context, OrderDataBean bean, CarTypeListBean.DataBeanX.DataBean carBean, String startTime, String endTime) {
public static Intent getIntent(Context context, OrderDataBean bean, CarTypeListBean.DataBeanX.DataBean carBean, String startTime, String endTime, OrderPriceBean beanPrice) {
return new Intent(context, ConfirmOrderActivity.class)
.putExtra("bean", bean)
.putExtra("carBean", carBean)
.putExtra("startTime", startTime)
.putExtra("endTime", endTime);
.putExtra("endTime", endTime)
.putExtra("priceBean", beanPrice);
}
@Override
......@@ -209,6 +211,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
api = WXAPIFactory.createWXAPI(this, RvFrameConfig.APP_ID);
dataBean = (OrderDataBean) intent.getSerializableExtra("bean");
mCarBean = (CarTypeListBean.DataBeanX.DataBean) intent.getSerializableExtra("carBean");
priceBean = (OrderPriceBean) intent.getSerializableExtra("priceBean");
intiView();
initRxBus();
......@@ -285,14 +288,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
public void onShowResult(int requestType, BaseBean result) {
switch (requestType) {
case 0:
priceBean = (OrderPriceBean) result;
if (priceBean.getData() != null) {
tvXinDrivingPrice.setText(String.format("(¥%1$s%2$s", priceBean.getData().getDriverPrice(), "/天)"));
tvCarNotHurtMoney.setText(String.format("¥%1$s%2$s", priceBean.getData().getDamageSafePrice(), "/天"));
tvDeposit.setText(String.format("¥%1$s%2$s", priceBean.getData().getDeposit(), mActivity.getString(R.string.rv_rb)));
// orderPriceDetailBean = new Gson().fromJson(priceBean.getData().getCostDetail(), OrderPriceDetailBean.class);
getPayMoney();
}
// priceBean = (OrderPriceBean) result;
break;
case 1:
ConfirmOrderBean orderBean = (ConfirmOrderBean) result;
......@@ -316,7 +312,8 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
mCarBean.getVehicleModel().setMember(orderMemberBean.getData());
}
intiView();
getOrderPrice();
getPayMoney();
// getOrderPrice();
break;
}
}
......@@ -667,6 +664,14 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
tvFreeCarDays.setText("（剩余" + memberData.getRentFreeDays() + "天）");
}
if (priceBean.getData() != null) {
tvXinDrivingPrice.setText(String.format("(¥%1$s%2$s", priceBean.getData().getDriverPrice(), "/天)"));
tvCarNotHurtMoney.setText(String.format("¥%1$s%2$s", priceBean.getData().getDamageSafePrice(), "/天"));
tvDeposit.setText(String.format("¥%1$s%2$s", priceBean.getData().getDeposit(), mActivity.getString(R.string.rv_rb)));
// orderPriceDetailBean = new Gson().fromJson(priceBean.getData().getCostDetail(), OrderPriceDetailBean.class);
}
swbtnMember.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/DrivingListActivity.java
View file @ 51a60406
......@@ -8,6 +8,9 @@ import android.support.v7.widget.RecyclerView;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.base.bus.LoginSuccessfulEvent;
import com.frame.base.bus.Observer;
import com.frame.base.bus.RxBus;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
......@@ -25,6 +28,8 @@ import java.util.LinkedHashMap;
import java.util.Map;
import butterknife.BindView;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
public class DrivingListActivity extends BaseStatusActivity<CommonPresenter> implements BaseQuickAdapter.RequestLoadMoreListener {
@BindView(R2.id.recyclerView)
......@@ -93,6 +98,20 @@ public class DrivingListActivity extends BaseStatusActivity<CommonPresenter> imp
}
}
});
initRxBus();
}
private void initRxBus() {
RxBus.tObservable(LoginSuccessfulEvent.class)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<LoginSuccessfulEvent>(disposable) {
@Override
public void onNext(LoginSuccessfulEvent event) {
onRefresh();
}
});
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/bean/OrderPriceBean.java
View file @ 51a60406
......@@ -2,13 +2,15 @@ package com.rv.home.rv.module.ui.main.home.bean;
import com.ruiwenliu.wrapper.base.BaseBean;
import java.io.Serializable;
/**
* Created :Auser
* Date: 2019/5/28.
* Desc:获取订单价格
*/
public class OrderPriceBean extends BaseBean{
public class OrderPriceBean extends BaseBean implements Serializable {
/**
* data : {"orderAmount":90000.02,"goodsAmount":70000.02,"vehicleAmount":70000.02,"driverAmount":0,"deposit":20000}
......@@ -34,7 +36,7 @@ public class OrderPriceBean extends BaseBean{
this.rel = rel;
}
public static class DataBean {
public static class DataBean implements Serializable {
/**
* orderAmount : 90000.02
* goodsAmount : 70000.02
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/AllOrderFragment.java
View file @ 51a60406
......@@ -14,6 +14,7 @@ import android.view.View;
import com.alipay.sdk.app.PayTask;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.frame.base.bus.Observer;
import com.frame.base.bus.PaymentSuccessfulEvent;
import com.frame.base.bus.RxBus;
import com.frame.rv.config.RvFrameConfig;
......@@ -42,6 +43,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
import butterknife.BindView;
import io.reactivex.android.schedulers.AndroidSchedulers;
/**
* Created :Auser
......@@ -136,6 +138,18 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
}
});
initRxbus();
}
private void initRxbus() {
RxBus.tObservable(PaymentSuccessfulEvent.class)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<PaymentSuccessfulEvent>(disposable) {
@Override
public void onNext(PaymentSuccessfulEvent event) {
onRefresh();
}
});
}
@Override
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/ForPaymentFragment.java
View file @ 51a60406
......@@ -16,6 +16,7 @@ import com.alipay.sdk.app.PayTask;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.frame.base.bus.CancelOrderEvent;
import com.frame.base.bus.LoginSuccessfulEvent;
import com.frame.base.bus.Observer;
import com.frame.base.bus.PaymentSuccessfulEvent;
import com.frame.base.bus.RxBus;
......@@ -48,6 +49,7 @@ import butterknife.BindView;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
/**
* Created :Auser
......@@ -172,6 +174,16 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
}
});
RxBus.tObservable(LoginSuccessfulEvent.class)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<LoginSuccessfulEvent>(disposable) {
@Override
public void onNext(LoginSuccessfulEvent event) {
onRefresh();
}
});
}
@Override
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/HaveToTravelFragment.java
View file @ 51a60406
......@@ -8,6 +8,9 @@ import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.frame.base.bus.LoginSuccessfulEvent;
import com.frame.base.bus.Observer;
import com.frame.base.bus.RxBus;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseFragment;
......@@ -26,6 +29,8 @@ import java.util.LinkedHashMap;
import java.util.Map;
import butterknife.BindView;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
/**
* Created :Auser
......@@ -86,8 +91,22 @@ public class HaveToTravelFragment extends BaseFragment<CommonPresenter>implement
}
}
});
initRxbus();
}
private void initRxbus() {
RxBus.tObservable(LoginSuccessfulEvent.class)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<LoginSuccessfulEvent>(disposable) {
@Override
public void onNext(LoginSuccessfulEvent event) {
onRefresh();
}
});
}
@Override
protected void loadData(Bundle savedInstanceState) {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/ToTravelFragment.java
View file @ 51a60406
......@@ -10,6 +10,7 @@ import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.frame.base.bus.CancelOrderEvent;
import com.frame.base.bus.LoginSuccessfulEvent;
import com.frame.base.bus.Observer;
import com.frame.base.bus.PaymentSuccessfulEvent;
import com.frame.base.bus.RxBus;
......@@ -32,6 +33,7 @@ import java.util.Map;
import butterknife.BindView;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
/**
* Created :Auser
......@@ -124,6 +126,14 @@ public class ToTravelFragment extends BaseFragment<CommonPresenter> implements B
}
});
RxBus.tObservable(LoginSuccessfulEvent.class)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<LoginSuccessfulEvent>(disposable) {
@Override
public void onNext(LoginSuccessfulEvent event) {
onRefresh();
}
});
}
......
module_home/src/main/res/layout/rv_act_car_rental.xml deleted 100644 → 0
View file @ 4da4982c
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorLine"
tools:context=".rv.module.ui.main.home.CarRentalActivity">
<include layout="@layout/common_rv" />
<ImageView
android:id="@+id/iv_top"
android:layout_width="@dimen/size_50"
android:layout_height="@dimen/size_50"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_marginBottom="@dimen/size_30"
android:layout_marginRight="@dimen/size_30"
android:gravity="center"
android:src="@drawable/rv_top"
android:textColor="@color/colorWrite" />
</RelativeLayout>
module_home/src/main/res/layout/rv_act_confim_order.xml
View file @ 51a60406
......@@ -47,7 +47,7 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:text="大通自行式C型房车（旅居版）"
android:text=""
android:textColor="@color/textMain"
android:textSize="@dimen/text_16" />
......@@ -58,7 +58,7 @@
android:layout_marginTop="@dimen/size_3"
android:ellipsize="end"
android:maxLines="1"
android:text="大通自行式C型房车（旅居版）"
android:text=""
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
......@@ -80,7 +80,7 @@
android:layout_marginTop="@dimen/size_3"
android:ellipsize="end"
android:maxLines="1"
android:text="￥3500天"
android:text="￥0天"
android:textColor="@color/colorAuxiliaryRed"
android:textSize="@dimen/text_16" />
</LinearLayout>
......@@ -112,7 +112,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="2019-06-12 10:00~2019-06-15 18:00"
android:text=""
android:textColor="@color/colorMain"
android:textSize="@dimen/text_12" />
......@@ -122,7 +122,7 @@
android:layout_height="wrap_content"
android:background="@drawable/shape_rv_bg_shallow_yellow_small_circle"
android:padding="@dimen/size_5"
android:text="3天"
android:text="0天"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_12" />
......@@ -441,7 +441,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
android:gravity="right"
android:text="¥20000元"
android:text="¥0元"
android:textColor="@color/colorAuxiliaryRed"
android:textSize="@dimen/text_16" />
</LinearLayout>
......@@ -637,7 +637,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_weight="1"
android:text="￥100/日"
android:text="￥0/日"
android:textColor="@color/colorBg"
android:textSize="@dimen/text_14" />
</RelativeLayout>
......@@ -876,7 +876,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="￥22555"
android:text="￥0"
android:textColor="@color/colorAuxiliaryRed"
android:textSize="@dimen/text_16" />
......
module_home/src/main/res/layout/rv_head_car_rental.xml deleted 100644 → 0
View file @ 4da4982c
This diff is collapsed.
module_mine/src/main/java/com/rv/rvmine/traveler/ChooseAVisitorActivity.java
View file @ 51a60406
......@@ -11,6 +11,9 @@ import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.base.bus.LoginSuccessfulEvent;
import com.frame.base.bus.Observer;
import com.frame.base.bus.RxBus;
import com.frame.base.url.Constance;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
......@@ -37,6 +40,8 @@ import java.util.Map;
import butterknife.BindView;
import butterknife.OnClick;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
/**
* 选择出游人 / 选择出游人
......@@ -76,6 +81,7 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
openType = intent.getIntExtra("openType", 0);
initRxBus();
if (openType != 0) {
adultNumber = intent.getIntExtra("adult_number", 0);
childBumber = intent.getIntExtra("child_number", 0);
......@@ -225,6 +231,18 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
super.finish();
}
private void initRxBus() {
RxBus.tObservable(LoginSuccessfulEvent.class)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<LoginSuccessfulEvent>(disposable) {
@Override
public void onNext(LoginSuccessfulEvent event) {
getDrivingList();
}
});
}
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
super.loadData(savedInstanceState, intent);
......
module_mine/src/main/java/com/rv/rvmine/traveler/CollectionActivity.java
View file @ 51a60406
......@@ -10,6 +10,9 @@ import android.view.View;
import com.alibaba.android.arouter.launcher.ARouter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.frame.base.bus.LoginSuccessfulEvent;
import com.frame.base.bus.Observer;
import com.frame.base.bus.RxBus;
import com.frame.base.url.Constance;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
......@@ -28,8 +31,10 @@ import java.util.LinkedHashMap;
import java.util.Map;
import butterknife.BindView;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
public class CollectionActivity extends BaseStatusActivity<CommonPresenter> implements BaseQuickAdapter.RequestLoadMoreListener {
public class CollectionActivity extends BaseStatusActivity<CommonPresenter> implements BaseQuickAdapter.RequestLoadMoreListener {
@BindView(R2.id.recyclerView)
RecyclerView recyclerView;
private int mPage;
......@@ -50,8 +55,8 @@ public class CollectionActivity extends BaseStatusActivity<CommonPresenter> impl
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle("收藏");
titleView.setTitle("收藏");
initRxBus();
recyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
collectionAdapter = new CollectionAdapter(new ArrayList<MultiItemEntity>());
collectionAdapter.setOnLoadMoreListener(this, recyclerView);
......@@ -61,22 +66,34 @@ public class CollectionActivity extends BaseStatusActivity<CommonPresenter> impl
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
CollectionListBean.DataBeanX.DataBean dataBean = (CollectionListBean.DataBeanX.DataBean) adapter.getItem(position);
if ( 2 == dataBean.getType()) {
if (2 == dataBean.getType()) {
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_TRAVELDETAILS)
.withString("id", dataBean.getTypeId())
.withString("name", dataBean.getName())
.withString("content", dataBean.getUnit())
.withString("url", dataBean.getCover())
.withDouble("price",dataBean.getPrice())
.withDouble("price", dataBean.getPrice())
.navigation();
}else if (1 == dataBean.getType()){
} else if (1 == dataBean.getType()) {
}
}
});
}
private void initRxBus() {
RxBus.tObservable(LoginSuccessfulEvent.class)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<LoginSuccessfulEvent>(disposable) {
@Override
public void onNext(LoginSuccessfulEvent event) {
onRefresh();
}
});
}
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
super.loadData(savedInstanceState, intent);
......@@ -118,7 +135,7 @@ public class CollectionActivity extends BaseStatusActivity<CommonPresenter> impl
headMap.put("Authorization", OkGoUtil.getToken());
Map<String, Object> map = new LinkedHashMap<>();
map.put("page", page);
mPresenter.getData(RvFrameConfig.ADMIN_POST, 0, ApiConfig.HTTP_URL_COLLECTONLIST, CollectionListBean.class, map,headMap, page == 1 ? true : false);
mPresenter.getData(RvFrameConfig.ADMIN_POST, 0, ApiConfig.HTTP_URL_COLLECTONLIST, CollectionListBean.class, map, headMap, page == 1 ? true : false);
}
......
module_mine/src/main/java/com/rv/rvmine/traveler/SettingActivity.java
View file @ 51a60406
......@@ -10,6 +10,9 @@ import android.view.View;
import android.widget.TextView;
import android.widget.Toast;
import com.frame.base.bus.LoginSuccessfulEvent;
import com.frame.base.bus.Observer;
import com.frame.base.bus.RxBus;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.other.TagAliasOperatorHelper;
......@@ -32,6 +35,7 @@ import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import io.reactivex.schedulers.Schedulers;
import static com.ruiwenliu.wrapper.other.TagAliasOperatorHelper.ACTION_DELETE;
import static com.ruiwenliu.wrapper.other.TagAliasOperatorHelper.ACTION_SET;
......@@ -64,6 +68,7 @@ public class SettingActivity extends BaseStatusActivity<CommonPresenter> {
isShowLoadingError = false;
}
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
super.loadData(savedInstanceState, intent);
......
module_tourism/src/main/java/com/rv/tourism/adapter/TravelBookingDeparturetimeAdapter.java
View file @ 51a60406
......@@ -22,7 +22,6 @@ public class TravelBookingDeparturetimeAdapter extends BaseQuickAdapter<BeanTour
protected void convert(BaseViewHolder helper, BeanTourDetailData.DataBeanX.TourDepartTimeVo item) {
String time = item.getStartTime() + getWeek(item.getStartWeek()) + "~" + item.getEndTime() + getWeek(item.getEndWeek());
helper.setText(R.id.tv_time, time);
if ("0".equals(item.getOverdue())) {
if (selectPosition == mData.indexOf(item)) {
......@@ -33,6 +32,7 @@ public class TravelBookingDeparturetimeAdapter extends BaseQuickAdapter<BeanTour
helper.setTextColor(R.id.tv_time, ContextCompat.getColor(mContext, R.color.colorMain));
} else {
helper.setTextColor(R.id.tv_time, ContextCompat.getColor(mContext, R.color.textGray));
helper.getView(R.id.iv_time_select).setSelected(false);
}
}
......
module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java
View file @ 51a60406
......@@ -506,7 +506,12 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
@JavascriptInterface
public void showDialog() {
travelBooking();
mWebView.post(new Runnable() {
@Override
public void run() {
travelBooking();
}
});
}
@JavascriptInterface
......
plugin_member/src/main/java/com/rv.member/MemberCenterActivity.java
View file @ 51a60406
......@@ -17,6 +17,8 @@ import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter;
import com.alipay.sdk.app.EnvUtils;
import com.base.utils.ui.image.round.RoundImageView;
import com.frame.base.bus.LoginSuccessfulEvent;
import com.frame.base.bus.Observer;
import com.frame.base.bus.PaymentFailedEvent;
import com.frame.base.bus.PaymentSuccessfulEvent;
import com.frame.base.bus.RxBus;
......@@ -50,6 +52,7 @@ import java.util.Map;
import butterknife.BindView;
import butterknife.OnClick;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
......@@ -157,6 +160,16 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
}
});
Log.e("xxxxxxxxxxxxxx", disposableSuc == disposableFail ? "true" : "false");
RxBus.tObservable(LoginSuccessfulEvent.class)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<LoginSuccessfulEvent>(disposable) {
@Override
public void onNext(LoginSuccessfulEvent event) {
getUserData();
getMemberData();
}
});
}
@Override
......@@ -238,7 +251,7 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
*/
private boolean isLogin() {
if (TextUtils.isEmpty(OkGoUtil.getToken())) {
startActivityForResult(LoginRvActivity.getIntent(MemberCenterActivity.this,0), REQUEST_LOGIN);
startActivityForResult(LoginRvActivity.getIntent(MemberCenterActivity.this, 0), REQUEST_LOGIN);
return false;
}
return true;
......
plugin_share/src/main/res/layout/activity_bill.xml
View file @ 51a60406
......@@ -51,7 +51,6 @@
android:id="@+id/ll_webview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/ll_item_title"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
......
plugin_video/src/main/java/com/dueeeke/videoplayer/widget/RotateVideoView.java 0 → 100644
View file @ 51a60406
package com.dueeeke.videoplayer.widget;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.AttributeSet;
import com.dueeeke.videoplayer.player.VideoView;
public class RotateVideoView extends VideoView {
public RotateVideoView(@NonNull Context context) {
super(context);
}
public RotateVideoView(@NonNull Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
}
public RotateVideoView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
@Override
public void startFullScreen() {
super.startFullScreen();
mOrientationEventListener.disable();
}
@Override
public void stopFullScreen() {
super.stopFullScreen();
mOrientationEventListener.disable();
}
}
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