Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
RvApp
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lify
RvApp
Commits
8e5af147
Commit
8e5af147
authored
Nov 13, 2019
by
linfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
租车费用明细dialog
parent
dc4fecd7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
63 additions
and
31 deletions
+63
-31
rv_pw_order_price_detail.xml
...t_dialog/src/main/res/layout/rv_pw_order_price_detail.xml
+22
-15
ConfirmOrderActivity.java
.../rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java
+11
-7
OrderCarPriceDetailAdapter.java
...dule/ui/main/home/adapter/OrderCarPriceDetailAdapter.java
+5
-1
OrderCarPriceDetailPw.java
.../rv/module/ui/main/home/dialog/OrderCarPriceDetailPw.java
+22
-5
rv_item_order_car_price_detail.xml
...me/src/main/res/layout/rv_item_order_car_price_detail.xml
+3
-3
No files found.
component_dialog/src/main/res/layout/rv_pw_order_price_detail.xml
View file @
8e5af147
<?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:gravity=
"bottom"
android:
maxHeight=
"@dimen/size_580"
android:layout_height=
"wrap_content"
>
android:
orientation=
"vertical"
>
<LinearLayout
android:orientation=
"vertical"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/colorWrite"
android:layout_height=
"wrap_content"
>
android:orientation=
"vertical"
>
<View
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:visibility=
"gone"
android:layout_weight=
"1"
android:background=
"@color/bgAlpha"
/>
android:visibility=
"gone"
/>
<TextView
android:id=
"@+id/tv_title"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:padding=
"@dimen/size_15"
android:id=
"@+id/tv_title"
android:gravity=
"center"
android:padding=
"@dimen/size_15"
android:textColor=
"@color/textMain"
android:textSize=
"@dimen/text_16"
/>
<include
layout=
"@layout/common_line"
/>
<android.support.v7.widget.RecyclerView
android:textSize=
"@dimen/text_16"
/>
<include
layout=
"@layout/common_line"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:
id=
"@+id/recyclerView
"
android:
layout_height=
"wrap_content"
/
>
android:
layout_height=
"wrap_content
"
android:
maxHeight=
"@dimen/size_200"
>
<android.support.v7.widget.RecyclerView
android:id=
"@+id/recyclerView"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java
View file @
8e5af147
...
...
@@ -944,8 +944,12 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
detailPw
=
new
OrderCarPriceDetailPw
(
mActivity
)
{
};
}
detailPw
.
setNewData
(
orderPriceDetailBean
);
View
contentView
=
detailPw
.
getContentView
();
if
(
detailPw
!=
null
)
{
detailPw
.
setNewData
(
orderPriceDetailBean
);
detailPw
.
show
();
}
/* View contentView = detailPw.getContentView();
//需要先测量,PopupWindow还未弹出时,宽高为0
contentView.measure(makeDropDownMeasureSpec(detailPw.getWidth()), makeDropDownMeasureSpec(detailPw.getHeight()));
detailPw.setHeight(detailPw.getContentView().getMeasuredHeight());
...
...
@@ -953,18 +957,18 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
int offsetX = Math.abs(detailPw.getContentView().getMeasuredWidth() - view.getWidth()) / 2;
int offsetY = -(detailPw.getContentView().getMeasuredHeight() + view.getHeight());
PopupWindowCompat
.
showAsDropDown
(
detailPw
,
view
,
offsetX
,
offsetY
,
Gravity
.
START
);
PopupWindowCompat.showAsDropDown(detailPw, view, offsetX, offsetY, Gravity.START);
*/
/**
* 点击popupWindow让背景变暗
*/
final
WindowManager
.
LayoutParams
lp
=
getWindow
().
getAttributes
();
/*
final WindowManager.LayoutParams lp = getWindow().getAttributes();
lp.alpha = 0.5f;//代表透明程度,范围为0 - 1.0f
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
getWindow().setAttributes(lp);
/**
*/
/**
* 退出popupWindow时取消暗背景
*/
*/
/*
detailPw.setOnDismissListener(new PopupWindow.OnDismissListener() {
@Override
public void onDismiss() {
...
...
@@ -972,7 +976,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
getWindow().setAttributes(lp);
}
});
});
*/
}
}
...
...
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/OrderCarPriceDetailAdapter.java
View file @
8e5af147
...
...
@@ -2,13 +2,17 @@ package com.rv.home.rv.module.ui.main.home.adapter;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.view.Display
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.view.WindowManager
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseViewHolder
;
import
com.rv.home.R
;
import
com.rv.home.rv.module.ui.main.home.bean.OrderCarPriceBean
;
import
com.rv.home.rv.module.ui.main.home.bean.OrderCarPriceDetailBean
;
import
com.rv.home.rv.module.ui.main.home.dialog.OrderCarPriceDetailPw
;
import
java.util.List
;
...
...
@@ -68,7 +72,7 @@ public class OrderCarPriceDetailAdapter extends BaseQuickAdapter<OrderCarPriceDe
helper
.
setText
(
R
.
id
.
tv_attr
,
item
.
getDetail
());
}
if
(!
type
){
if
(!
type
)
{
rvDayPrice
.
setVisibility
(
View
.
GONE
);
}
...
...
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/dialog/OrderCarPriceDetailPw.java
View file @
8e5af147
...
...
@@ -4,9 +4,11 @@ import android.app.Activity;
import
android.support.annotation.NonNull
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.util.DisplayMetrics
;
import
android.view.Gravity
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.view.WindowManager
;
import
android.widget.FrameLayout
;
import
android.widget.LinearLayout
;
import
android.widget.PopupWindow
;
...
...
@@ -15,6 +17,7 @@ import android.widget.TextView;
import
com.ruiwenliu.wrapper.dialog.BaseDialog
;
import
com.ruiwenliu.wrapper.dialog.BasePopupWindow
;
import
com.ruiwenliu.wrapper.util.ViewHolder
;
import
com.rv.component.utils.DisplayUtil
;
import
com.rv.home.R
;
import
com.rv.home.rv.module.ui.main.home.adapter.OrderCarPriceDetailAdapter
;
import
com.rv.home.rv.module.ui.main.home.bean.OrderCarPriceDetailBean
;
...
...
@@ -23,17 +26,30 @@ import com.rv.home.rv.module.ui.main.home.bean.OrderCarPriceDetailBean;
* Desc:租车订单价格明细
*/
public
class
OrderCarPriceDetailPw
extends
BasePopupWindow
{
//public class OrderCarPriceDetailPw extends BasePopupWindow {
public
class
OrderCarPriceDetailPw
extends
BaseDialog
{
private
final
Activity
activity
;
private
OrderCarPriceDetailAdapter
detailAdapter
;
private
TextView
tvTitle
;
public
OrderCarPriceDetailPw
(
@NonNull
Activity
activity
)
{
super
(
activity
);
setClippingEnabled
(
true
);
setOutsideTouchable
(
true
);
setFocusable
(
true
);
setHeight
(
ViewGroup
.
LayoutParams
.
WRAP_CONTENT
);
this
.
activity
=
activity
;
// setClippingEnabled(true);
// setOutsideTouchable(true);
// setFocusable(true);
// setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
setDialogParams
(
ViewGroup
.
LayoutParams
.
MATCH_PARENT
,
ViewGroup
.
LayoutParams
.
WRAP_CONTENT
,
Gravity
.
BOTTOM
);
// WindowManager wm = (WindowManager) activity.getSystemService(activity.WINDOW_SERVICE);
// DisplayMetrics metrics = new DisplayMetrics();
// wm.getDefaultDisplay().getMetrics(metrics);
// if (metrics.heightPixels < DisplayUtil.dip2px(activity, 450)) {
// setDialogParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.BOTTOM);
//
// } else {
// setDialogParams(ViewGroup.LayoutParams.MATCH_PARENT, DisplayUtil.dip2px(activity, 450), Gravity.BOTTOM);
// }
}
@Override
...
...
@@ -51,6 +67,7 @@ public class OrderCarPriceDetailPw extends BasePopupWindow {
recyclerView
.
setLayoutManager
(
new
LinearLayoutManager
(
getDialogContext
()));
detailAdapter
=
new
OrderCarPriceDetailAdapter
();
recyclerView
.
setAdapter
(
detailAdapter
);
}
public
void
setNewData
(
OrderCarPriceDetailBean
bean
)
{
...
...
module_home/src/main/res/layout/rv_item_order_car_price_detail.xml
View file @
8e5af147
...
...
@@ -27,7 +27,7 @@
android:id=
"@+id/tv_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"
222222222222
"
android:text=
""
android:textColor=
"@color/textMain"
android:textSize=
"@dimen/text_14"
/>
...
...
@@ -46,7 +46,7 @@
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:text=
"
222222222
"
android:text=
""
android:textColor=
"@color/textLightGrey"
android:textSize=
"@dimen/text_14"
/>
...
...
@@ -56,7 +56,7 @@
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"right"
android:text=
"
55555555555
"
android:text=
""
android:textColor=
"@color/textMain"
android:textSize=
"@dimen/text_14"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment