Skip to content

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

合并林峰分支代码

parents 18e6e79e b079251e
Show whitespace changes
Inline Side-by-side
Showing with 135 additions and 49 deletions
module_discovery/src/main/res/layout/rv_item_discovery_ask.xml
View file @ 9a38f571
......@@ -10,18 +10,18 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/size_8"
android:orientation="vertical"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"
android:orientation="vertical">
android:paddingTop="@dimen/size_8"
android:paddingRight="@dimen/size_15">
<TextView
android:id="@+id/tv_ask_content"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:lines="2"
android:ellipsize="end"
android:lines="2"
android:text=""
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
......@@ -30,9 +30,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingBottom="@dimen/size_8"
android:orientation="horizontal"
android:paddingTop="@dimen/size_5"
android:orientation="horizontal">
android:paddingBottom="@dimen/size_8">
<com.base.utils.ui.image.round.RoundImageView
android:id="@+id/iv_ask_icon"
......@@ -43,13 +43,14 @@
<TextView
android:id="@+id/tv_ask_name"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_5"
android:text="房车旅行家Rose"
android:layout_weight="1"
android:ellipsize="end"
android:maxLines="1"
android:maxEms="6"
android:maxLines="1"
android:singleLine="true"
android:text=""
android:textColor="@color/textGray"
android:textSize="@dimen/text_10" />
......@@ -58,9 +59,9 @@
android:id="@+id/ll_item_like"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/size_15"
android:gravity="center_vertical"
android:orientation="horizontal">
android:orientation="horizontal"
android:paddingLeft="@dimen/size_15">
<ImageView
android:id="@+id/iv_like"
......@@ -72,8 +73,8 @@
android:id="@+id/tv_like_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1509"
android:layout_marginLeft="@dimen/size_5"
android:text=""
android:textColor="@color/textGray"
android:textSize="@dimen/text_10" />
</LinearLayout>
......@@ -82,8 +83,8 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_marginLeft="@dimen/size_15"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
......@@ -95,8 +96,8 @@
android:id="@+id/tv_comment_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1509"
android:layout_marginLeft="@dimen/size_5"
android:text=""
android:textColor="@color/textGray"
android:textSize="@dimen/text_10" />
</LinearLayout>
......
module_discovery/src/main/res/layout/rv_item_discovery_recommend.xml
View file @ 9a38f571
......@@ -25,7 +25,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:src="@drawable/icon_fragment_video_hint"/>
android:src="@drawable/icon_fragment_video_hint" />
</RelativeLayout>
......@@ -35,24 +35,27 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:ellipsize="end"
android:maxLines="2"
android:paddingLeft="@dimen/size_5"
android:paddingRight="@dimen/size_5"
android:maxLines="2"
android:ellipsize="end"
android:text="行摄川西邂逅生命中未知的精彩"
android:text=""
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:layout_marginBottom="@dimen/size_10"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="@dimen/size_5">
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -67,7 +70,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_3"
android:text="房车旅行家Rose"
android:ellipsize="end"
android:singleLine="true"
android:text=""
android:textSize="@dimen/text_8" />
</LinearLayout>
......@@ -75,13 +80,14 @@
android:id="@+id/ll_item_islike"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginLeft="@dimen/size_20"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="@dimen/size_15"
android:paddingTop="@dimen/size_5"
android:paddingBottom="@dimen/size_5"
android:paddingRight="@dimen/size_15"
android:layout_alignParentRight="true"
android:gravity="center_vertical"
android:orientation="horizontal">
android:paddingBottom="@dimen/size_5">
<ImageView
android:id="@+id/iv_like"
......@@ -95,10 +101,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_3"
android:text="10589"
android:text=""
android:textColor="@color/textGray"
android:textSize="@dimen/text_8" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
module_mine/src/main/java/com/rv/rvmine/MineFragment.java
View file @ 9a38f571
......@@ -261,7 +261,6 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
int id = view.getId();
if (id == R.id.iv_item_setting) {
//设置
if (isLogin()) return;
startActivityForResult(SettingActivity.getIntent(_mActivity), 101);
} else if (id == R.id.iv_item_message) {
//消息通知
......
module_mine/src/main/java/com/rv/rvmine/traveler/SettingActivity.java
View file @ 9a38f571
......@@ -12,24 +12,29 @@ import android.widget.Toast;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
import com.ruiwenliu.wrapper.other.TagAliasOperatorHelper;
import com.ruiwenliu.wrapper.util.AppUtils;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.home.rv.module.ApiConfig;
import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.login.LoginRvActivity;
import com.rv.home.rv.module.ui.login.RegisteredActivity;
import com.rv.rvmine.R;
import com.rv.rvmine.R2;
import com.rv.version.DownListenerManager;
import com.rv.version.bean.VersionCheckBean;
import com.rv.version.util.UpdateAppUtils;
import com.yuyife.okgo.OkGoUtil;
import java.io.File;
import java.util.LinkedHashMap;
import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
import static com.ruiwenliu.wrapper.other.TagAliasOperatorHelper.ACTION_DELETE;
import static com.ruiwenliu.wrapper.other.TagAliasOperatorHelper.sequence;
......@@ -42,6 +47,8 @@ public class SettingActivity extends BaseStatusActivity<CommonPresenter> impleme
@BindView(R2.id.tv_version)
TextView tvVersion;
@BindView(R2.id.tv_out_sign)
TextView tvOutSign;
private UpdateAppUtils updateAppUtils;
private VersionCheckBean versionCheckBean = null;
......@@ -61,6 +68,28 @@ public class SettingActivity extends BaseStatusActivity<CommonPresenter> impleme
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle(getString(R.string.setting_title));
isShowLoadingError = false;
initRxBus();
if (TextUtils.isEmpty(OkGoUtil.getToken())) {
tvOutSign.setText("立即登录");
tvOutSign.setBackgroundResource(R.drawable.shape_rv_bg_shallow_dark_yellow_circle);
} else {
tvOutSign.setText("退出登录");
tvOutSign.setBackgroundResource(R.drawable.shape_rv_button_light_gray);
}
}
private void initRxBus() {
RxBus.tObservable(LoginSuccessfulEvent.class)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<LoginSuccessfulEvent>(disposable) {
@Override
public void onNext(LoginSuccessfulEvent event) {
tvOutSign.setText("退出登录");
tvOutSign.setBackgroundResource(R.drawable.shape_rv_button_light_gray);
}
});
}
DownListenerManager.getInstance().addDownListener(this);
......@@ -88,6 +117,7 @@ public class SettingActivity extends BaseStatusActivity<CommonPresenter> impleme
tvVersion.setText("已是最新版本V" + UpdateAppUtils.getAppVersionName(this));
}
}
break;
default:
break;
......@@ -115,6 +145,11 @@ public class SettingActivity extends BaseStatusActivity<CommonPresenter> impleme
int id = view.getId();
if (id == R.id.rl_item_change_password) {
//修改密码
if (TextUtils.isEmpty(OkGoUtil.getToken())) {
startActivity(LoginRvActivity.getIntent(mActivity, 0));
return;
}
startActivity(RegisteredActivity.getIntent(mActivity, 1, 0));
} else if (id == R.id.ll_item_app_push) {
......@@ -122,7 +157,10 @@ public class SettingActivity extends BaseStatusActivity<CommonPresenter> impleme
showToast("亲，该功能还在开发中。。。");
} else if (id == R.id.rl_item_clear_cache) {
//清除缓存
showToast("亲，该功能还在开发中。。。");
deleteDir(Environment.getExternalStorageDirectory() + "/photo/camera");
deleteDir(Environment.getExternalStorageDirectory() + "/photo/crop");
showToast("清理成功！");
} else if (id == R.id.rl_item_check_for_updates) {
if (!DownListenerManager.getInstance().isDown())
......@@ -150,6 +188,12 @@ public class SettingActivity extends BaseStatusActivity<CommonPresenter> impleme
} else if (id == R.id.tv_out_sign) {
//退出登录
//登录
if (TextUtils.isEmpty(OkGoUtil.getToken())) {
startActivity(LoginRvActivity.getIntent(mActivity, 0));
return;
}
boolean isAliasAction = true;
TagAliasOperatorHelper.TagAliasBean tagAliasBean = new TagAliasOperatorHelper.TagAliasBean();
tagAliasBean.action = ACTION_DELETE;
......@@ -194,6 +238,27 @@ public class SettingActivity extends BaseStatusActivity<CommonPresenter> impleme
}
}
public static boolean deleteDir(String path) {
File file = new File(path);
if (!file.exists()) {//判断是否待删除目录是否存在
return false;
}
String[] content = file.list();//取得当前目录下所有文件和文件夹
for (String name : content) {
File temp = new File(path, name);
if (temp.isDirectory()) {//判断是否是目录
deleteDir(temp.getAbsolutePath());//递归调用，删除目录里的内容
temp.delete();//删除空目录
} else {
if (!temp.delete()) {//直接删除文件
}
}
}
return true;
}
@Override
public void pending() {
tvVersion.setText("下载准备中...");
......
plugin_wallet/src/main/java/com/xxrv/wallet/adapter/ConsumeListAdapter.java
View file @ 9a38f571
......@@ -15,9 +15,10 @@ public class ConsumeListAdapter extends BaseQuickAdapter<ConsumeListBean.Consume
super(R.layout.item_consume, data);
}
@Override
protected void convert(BaseViewHolder helper, ConsumeListBean.ConsumeItem item) {
switch (item.getSource()) {
/* switch (item.getSource()) {
case 0:
helper.setText(R.id.tv_consume_name, "活动奖励金");
break;
......@@ -36,9 +37,14 @@ public class ConsumeListAdapter extends BaseQuickAdapter<ConsumeListBean.Consume
case 12:
helper.setText(R.id.tv_consume_name, "购买");
break;
case 13:
helper.setText(R.id.tv_consume_name, "手续费");
break;
default:
break;
}
}*/
helper.setText(R.id.tv_consume_name, item.getDesc());
helper.setText(R.id.tv_income_time, DateUtils.timestampToString1(item.getCrtTime()));
StringBuilder builder = new StringBuilder();
......
plugin_wallet/src/main/java/com/xxrv/wallet/bean/ConsumeListBean.java
View file @ 9a38f571
......@@ -30,7 +30,7 @@ public class ConsumeListBean extends BaseBean {
this.data = data;
}
public static class ConsumeList{
public static class ConsumeList {
private int totalCount;
private int totalPage;
private int pageNum;
......@@ -85,6 +85,7 @@ public class ConsumeListBean extends BaseBean {
private int id;
private int itype;
private int source;
private String desc;
public BigDecimal getAmount() {
return amount;
......@@ -125,5 +126,13 @@ public class ConsumeListBean extends BaseBean {
public void setSource(int source) {
this.source = source;
}
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
}
}
plugin_wallet/src/main/res/layout/item_consume.xml
View file @ 9a38f571
......@@ -24,14 +24,14 @@
android:id="@+id/tv_consume_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="11"
android:text=""
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_income_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="11"
android:text=""
android:textColor="@color/colorGray"
android:textSize="@dimen/text_10" />
......@@ -44,7 +44,7 @@
android:layout_gravity="right"
android:layout_marginRight="@dimen/text_10"
android:gravity="right|center_vertical"
android:text="11"
android:text=""
android:textColor="@color/gray_707070"
android:textSize="@dimen/sp_14" />
</LinearLayout>
......
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