Skip to content

R
RvApp
Commit b1650366 authored by linfeng's avatar linfeng
Browse files
Options

刷新动画

parent 23614c30
Show whitespace changes
Inline Side-by-side
Showing with 507 additions and 124 deletions
RvClient/build.gradle
View file @ b1650366
......@@ -8,8 +8,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 119
versionName "1.1.9"
versionCode 120
versionName "1.2.0"
multiDexEnabled true
//新版Gradle 是 implementation 为了兼容compile,写上这句话
......
RvWrapper/src/main/res/drawable/progress_freshing_frame.xml
View file @ b1650366
<?xml version="1.0" encoding="utf-8"?>
<animation-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/icon_freshing_1"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_2"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_3"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_4"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_5"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_6"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_7"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_8"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_9"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_10"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_11"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_12"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_13"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_14"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_15"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_16"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_17"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_18"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_19"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_20"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_21"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_22"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_23"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_24"
android:duration="40"/>
<item android:drawable="@mipmap/icon_freshing_25"
android:duration="40"/>
<item
android:drawable="@mipmap/icon_loading1"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading2"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading3"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading4"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading5"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading6"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading7"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading8"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading9"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading10"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading11"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading12"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading13"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading14"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading15"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading16"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading17"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading18"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading19"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading20"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading21"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading22"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading23"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading24"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading25"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading26"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading27"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading28"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading29"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading30"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading31"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading32"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading33"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading34"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading35"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading36"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading37"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading38"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading39"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading40"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading41"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading42"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading43"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading44"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading45"
android:duration="40" />
<item
android:drawable="@mipmap/icon_loading46"
android:duration="40" />
</animation-list>
\ No newline at end of file
RvWrapper/src/main/res/layout/view_refresh_header.xml
View file @ b1650366
......@@ -2,6 +2,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorWrite"
android:orientation="horizontal"
android:paddingBottom="10px">
......@@ -14,7 +15,7 @@
android:id="@+id/iv_refresh_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/progress_freshing_frame"/>
android:src="@drawable/progress_freshing_frame" />
</LinearLayout>
<TextView
......@@ -27,5 +28,6 @@
android:gravity="center"
android:text="正在刷新"
android:textColor="#000000"
android:textSize="38px"/>
android:textSize="38px"
android:visibility="gone" />
</FrameLayout>
\ No newline at end of file
module_discovery/src/main/java/com/xxfc/discovery/adapter/DiscoveryAskAdapter.java
View file @ b1650366
......@@ -26,7 +26,7 @@ public class DiscoveryAskAdapter extends BaseQuickAdapter<DiscoveryAskBean.DataB
return;
}
GlideManager.getInstance(mContext).loadImage(item.getPicUrl(), (ImageView)helper.getView(R.id.iv_ask_icon));
helper.setText(R.id.tv_ask_content,item.getContent());
helper.setText(R.id.tv_ask_content,item.getTitle());
helper.setText(R.id.tv_ask_name,item.getNickname());
helper.setText(R.id.tv_like_number,item.getPraiseCount());
helper.setText(R.id.tv_comment_number,item.getCommentCount());
......
module_discovery/src/main/java/com/xxfc/discovery/adapter/DiscoveryRecommendAdapter.java
View file @ b1650366
......@@ -33,15 +33,20 @@ public class DiscoveryRecommendAdapter extends BaseQuickAdapter<DiscoveryRecomme
helper.setText(R.id.tv_title, body.getText());
if ("4".equals(body.getType())) { //消息类型 基础属性 1=文字消息、2=图文消息、3=语音消息、4=视频消息、 5=文件消
helper.setGone(R.id.iv_isvideo, true);
}else {
} else {
helper.setGone(R.id.iv_isvideo, false);
}
}
helper.setText(R.id.tv_user_name,item.getNickname());
helper.setText(R.id.tv_user_name, item.getNickname());
GlideManager.getInstance(mContext).loadImage(item.getPicUrl(), (ImageView) helper.getView(R.id.iv_user_icon));
if (item.getCount() !=null) {
if (item.getCount() != null) {
helper.setText(R.id.iv_like_number, item.getCount().getPraise());
}
if ("1".equals(item.getIsPraise())) { //0：未点赞 1：已点赞
helper.setImageResource(R.id.iv_like, R.drawable.icon_discovery_ask_like);
} else {
helper.setImageResource(R.id.iv_like, R.drawable.icon_discovery_ask_unlike);
}
helper.addOnClickListener(R.id.ll_item_islike);
}
......
module_discovery/src/main/java/com/xxfc/discovery/api/DiscoveryApi.java
View file @ b1650366
......@@ -34,6 +34,9 @@ public interface DiscoveryApi extends RvFrameConfig {
//拍拍添加评论
String DISCOVERY_COMMENT_ADD = IMA_BASEUSRL + "/b/circle/msg/comment/add";
//点赞
String DISCOVERY_PRAISE_ADD = IMA_BASEUSRL + "/b/circle/msg/praise/add";
// 添加消息（拍拍、段视频）
String DISCOVERY_MSG_ADD = IMA_BASEUSRL +"/b/circle/msg/add";
......
module_discovery/src/main/java/com/xxfc/discovery/bean/DiscoveryRecommendBean.java
View file @ b1650366
......@@ -223,7 +223,7 @@ public class DiscoveryRecommendBean extends BaseBean {
private String time;
private String userId;
private String visible;
private String isPraise;
private String isPraise; //0：未点赞 1：已点赞
private String isCollect;
private String state;
private String isAllowComment;
......
module_discovery/src/main/java/com/xxfc/discovery/fragment/PatFragment.java
View file @ b1650366
......@@ -20,6 +20,7 @@ import com.xxfc.discovery.R;
import com.xxfc.discovery.R2;
import com.xxfc.discovery.adapter.DiscoveryRecommendAdapter;
import com.xxfc.discovery.api.DiscoveryApi;
import com.xxfc.discovery.bean.DiscoveryIMTokenBean;
import com.xxfc.discovery.bean.DiscoveryRecommendBean;
import com.xxfc.discovery.event.DiscoveryAddEvent;
import com.xxfc.discovery.event.PostPatEvent;
......@@ -46,6 +47,7 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Si
private DiscoveryRecommendAdapter mAdapter;
private int countPage;
private int mPage;
private DiscoveryRecommendBean.DataBeanX.DataBean itemDatabean;
public static PatFragment getInstance(int type) {
......@@ -103,6 +105,26 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Si
}, 200);
}
}, rvContent);
mAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
itemDatabean = (DiscoveryRecommendBean.DataBeanX.DataBean) adapter.getItem(position);
int id = view.getId();
if (id == R.id.ll_item_islike){
isLike();
}
}
});
}
private void isLike() {
if (OkGoUtil.getToken() != null) {
Map<String, Object> headMap = new LinkedHashMap<>();
headMap.put("Authorization",OkGoUtil.getToken());
mPresenter.postData(RvFrameConfig.HOST,2, DiscoveryApi.DISCOVERY_IM_LOGIN, DiscoveryIMTokenBean.class,headMap, headMap,true);
}
}
private void initRxbus() {
......@@ -144,7 +166,26 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Si
@Override
public void onShowResult(int requestType, BaseBean result) {
mSimpleRefreshLayout.onRefreshComplete();
switch (requestType){
case 0:
processData((DiscoveryRecommendBean) result);
break;
case 2:
DiscoveryIMTokenBean intokenBean = (DiscoveryIMTokenBean) result;
setIMData(intokenBean);
break;
case 3:
onFresh();
break;
}
}
private void setIMData(DiscoveryIMTokenBean bean) {
Map<String, Object> map = new LinkedHashMap<>();
map.put("access_token",bean.getData());
map.put("messageId",itemDatabean.getMsgId());
mPresenter.postData(3, DiscoveryApi.DISCOVERY_PRAISE_ADD, BaseBean.class, map,true);
}
private void processData(DiscoveryRecommendBean bean) {
......
module_discovery/src/main/res/layout/rv_item_discovery_ask.xml
View file @ b1650366
......@@ -22,7 +22,7 @@
android:layout_weight="1"
android:lines="2"
android:ellipsize="end"
android:text="房车充一次电可以用多久，空调、冰箱的耗电量大吗？有没有什么相关分享？"
android:text=""
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
......
module_home/src/main/java/com/rv/home/rv/module/ApiConfig.java
View file @ b1650366
......@@ -99,4 +99,14 @@ public class ApiConfig {
public static String HTTP_URL_USER_PROFIT = RvFrameConfig.HOST + "/api/admin/app/user/profit";
public static String HTTP_URL_SELECTED_ACTIVITIES = RvFrameConfig.HOST + "/api/activity/homeActivities/app/unauth/activity/findAll"; // 精选活动
/**
* 取消订单的退款价格计算
*/
public static String HTTP_URL_PRICE_CALCULATE = RvFrameConfig.HOST + "/api/order/orderRefund/price/calculate/";
/**
* 通用文本请求
*/
public static String HTTP_URL_UNAUTH_TYPES = RvFrameConfig.HOST + "/api/app/cofig/app/unauth/types/";
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/dialog/TipsDialog.java
View file @ b1650366
......@@ -15,7 +15,7 @@ public class TipsDialog extends BaseDialog {
public TipsDialog(@NonNull Context context) {
super(context);
setDialogParams(ViewGroup.LayoutParams.WRAP_CONTENT,ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER);
setDialogParams(ViewGroup.LayoutParams.MATCH_PARENT,ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER);
}
@Override
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/CancelTheTripActivity.java
View file @ b1650366
......@@ -5,11 +5,12 @@ import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.Html;
import android.text.TextUtils;
import android.view.View;
import android.widget.Toast;
import android.webkit.WebView;
import android.widget.TextView;
import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.base.bus.CancelOrderEvent;
import com.frame.base.bus.RxBus;
......@@ -25,6 +26,8 @@ import com.rv.home.rv.module.basic.presenter.PickerPresenter;
import com.rv.home.rv.module.ui.main.home.dialog.TipsDialog;
import com.rv.home.rv.module.ui.main.home.order.adapter.CancelTheTripAdapter;
import com.rv.home.rv.module.ui.main.home.order.bean.CancelTheTripBean;
import com.rv.home.rv.module.ui.main.home.order.bean.CancelTheTripDataBean;
import com.rv.home.rv.module.ui.main.home.order.bean.CancelTheTripTextDataBean;
import com.yuyife.okgo.OkGoUtil;
import java.util.ArrayList;
......@@ -32,6 +35,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
/**
......@@ -42,12 +46,20 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
@BindView(R2.id.recyclerView)
RecyclerView mRecyclerView;
@BindView(R2.id.tv_content)
TextView tvContent;
private CancelTheTripAdapter mAdapter;
private String no;
private String type;
private TipsDialog dialog;
public static Intent getIntent(Context context, String no) {
return new Intent(context, CancelTheTripActivity.class).putExtra("no", no);
private CancelTheTripDataBean.DataBean data;
public static Intent getIntent(Context context, String no,String type) {
return new Intent(context, CancelTheTripActivity.class)
.putExtra("no", no)
.putExtra("type",type);
}
@Override
......@@ -58,9 +70,45 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
RxBus.post(new CancelOrderEvent());
finish();
break;
case 2:
setData((CancelTheTripDataBean) result);
break;
case 3:
setTextData((CancelTheTripTextDataBean) result);
break;
}
}
private void setTextData(CancelTheTripTextDataBean bean) {
if (bean !=null && bean.getData() !=null && bean.getData().size() >0 ){
tvContent.setText(Html.fromHtml(bean.getData().get(0).getValue()));
}
}
private void setData(CancelTheTripDataBean bean) {
data = bean.getData();
}
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
super.loadData(savedInstanceState, intent);
getData();
getTextData();
}
private void getTextData() {
mPresenter.getData(RvFrameConfig.HOST, 3, ApiConfig.HTTP_URL_UNAUTH_TYPES + "?types=" + type, CancelTheTripTextDataBean.class, false);
}
private void getData() {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null) {
headMap.put("Authorization", OkGoUtil.getToken());
mPresenter.getDataHead(RvFrameConfig.HOST, 2, ApiConfig.HTTP_URL_PRICE_CALCULATE + no, CancelTheTripDataBean.class, headMap, false);
}
}
@Override
protected int setLayout() {
......@@ -72,6 +120,7 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
titleView.setTitle(mActivity.getString(R.string.cancel_the_trip));
no = intent.getStringExtra("no");
type = intent.getStringExtra("type");
mAdapter = new CancelTheTripAdapter();
mRecyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
......@@ -92,6 +141,10 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
@Override
public void helper(ViewHolder helper) {
super.helper(helper);
if (data != null) {
helper.setText(R.id.tv_content, data.getRefundDesc());
}
helper.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
......@@ -116,6 +169,14 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
private class cancelReasonBean {
private String cancelReason;
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderDetailActivity.java
View file @ b1650366
......@@ -279,7 +279,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
switch (status) {
case 3:
case 4:
startActivityForResult(CancelTheTripActivity.getIntent(mActivity, no), 1);
startActivityForResult(CancelTheTripActivity.getIntent(mActivity, no,"8"), 1);
break;
case 5:
showToast("该功能还在开发中...");
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/TravelOrderDetailsActivity.java
View file @ b1650366
......@@ -255,7 +255,7 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
switch (status) {
case 3:
case 4:
startActivityForResult(CancelTheTripActivity.getIntent(mActivity, no), 1);
startActivityForResult(CancelTheTripActivity.getIntent(mActivity, no,"16"), 1);
break;
case 5:
break;
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/bean/CancelTheTripDataBean.java 0 → 100644
View file @ b1650366
package com.rv.home.rv.module.ui.main.home.order.bean;
import com.ruiwenliu.wrapper.base.BaseBean;
import java.io.Serializable;
/**
* 个人中心获取余额等信息
*/
public class CancelTheTripDataBean extends BaseBean implements Serializable {
private DataBean data;
private int code;
public DataBean getData() {
return data;
}
public void setData(DataBean data) {
this.data = data;
}
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
public static class DataBean {
private String refundAmount;//退款金额
private String realAmount;//真实支付金额
private String cutAmount;//扣了的金额
private String refundDesc;//退款描述
public String getRefundAmount() {
return refundAmount;
}
public void setRefundAmount(String refundAmount) {
this.refundAmount = refundAmount;
}
public String getRealAmount() {
return realAmount;
}
public void setRealAmount(String realAmount) {
this.realAmount = realAmount;
}
public String getCutAmount() {
return cutAmount;
}
public void setCutAmount(String cutAmount) {
this.cutAmount = cutAmount;
}
public String getRefundDesc() {
return refundDesc;
}
public void setRefundDesc(String refundDesc) {
this.refundDesc = refundDesc;
}
}
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/bean/CancelTheTripTextDataBean.java 0 → 100644
View file @ b1650366
package com.rv.home.rv.module.ui.main.home.order.bean;
import com.ruiwenliu.wrapper.base.BaseBean;
import java.io.Serializable;
import java.util.List;
/**
* 个人中心获取余额等信息
*/
public class CancelTheTripTextDataBean extends BaseBean implements Serializable {
private List<DataBean> data;
private int code;
public List<DataBean> getData() {
return data;
}
public void setData(List<DataBean> data) {
this.data = data;
}
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
public static class DataBean {
private String id;
private String type;
private String value;
private String crtTime;
private String updTime;
private String title;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
public String getCrtTime() {
return crtTime;
}
public void setCrtTime(String crtTime) {
this.crtTime = crtTime;
}
public String getUpdTime() {
return updTime;
}
public void setUpdTime(String updTime) {
this.updTime = updTime;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
}
}
module_home/src/main/res/layout/activity_cancel_the_trip.xml
View file @ b1650366
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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/colorWrite"
......@@ -12,7 +13,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
......@@ -22,14 +23,16 @@
android:layout_marginTop="@dimen/size_15"
android:text="@string/rv_cancel_rule"
android:textColor="@color/colorMain"
android:layout_marginBottom="@dimen/size_10"
android:textSize="@dimen/text_16" />
<TextView
android:id="@+id/tv_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_10"
android:text="@string/rv_cancel_rule_content"
android:textColor="@color/textGray"
android:text=""
android:textSize="@dimen/text_16" />
<LinearLayout
......
module_home/src/main/res/layout/rv_dialog_tips.xml
View file @ b1650366
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:orientation="vertical"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_40"
android:layout_marginRight="@dimen/size_40"
android:background="@color/colorWrite"
android:layout_height="wrap_content">
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_60"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_18"
android:text="温馨提示"
android:textColor="@color/colorMain"
android:text="温馨提示"/>
android:textSize="@dimen/text_18" />
</LinearLayout>
<TextView
android:id="@+id/tv_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:textSize="@dimen/size_16"
android:layout_marginBottom="@dimen/size_26"
android:text="取消将从您的押金里扣除20元手续费，确认要取消吗？"
android:textColor="@color/textGray"
android:text="取消将从您的押金里扣除20元手续费，确认要取消吗？"/>
android:textSize="@dimen/size_16" />
<include layout="@layout/common_line"/>
<include layout="@layout/common_line" />
<LinearLayout
android:layout_width="match_parent"
......@@ -41,25 +49,25 @@
<TextView
android:id="@+id/tv_ok"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:layout_height="match_parent"
android:text="确认取消"/>
android:text="确认取消" />
<View
android:layout_width="@dimen/size_half"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/size_10"
android:layout_marginBottom="@dimen/size_10"
android:background="@color/colorLine"
android:layout_width="@dimen/size_half"
android:layout_height="match_parent"/>
android:background="@color/colorLine" />
<TextView
android:id="@+id/tv_cancel"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:layout_height="match_parent"
android:text="暂不取消"/>
android:text="暂不取消" />
</LinearLayout>
</LinearLayout>
</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