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
5db54a31
Commit
5db54a31
authored
Jul 06, 2019
by
jianglx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 身份验证拍照无响应的问题 无授权;修改选择出游人大人小孩分开;修改添加出游人,小孩不需要填写电话号码与身份证号码;会员协议点击跳转到会员协议界面;修改会员界面可免费租车天数显示有误的问题
parent
dbeb8ce2
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
176 additions
and
98 deletions
+176
-98
IDCardCertificationActivity.java
...a/com/rv/rvmine/personal/IDCardCertificationActivity.java
+88
-46
AddAVisitorActivity.java
...main/java/com/rv/rvmine/traveler/AddAVisitorActivity.java
+22
-19
ChooseAVisitorActivity.java
...n/java/com/rv/rvmine/traveler/ChooseAVisitorActivity.java
+22
-1
TravelerConfirmOrderActivity.java
...va/com/rv/tourism/other/TravelerConfirmOrderActivity.java
+23
-23
build.gradle
plugin_member/build.gradle
+1
-0
MemberCenterActivity.java
...ber/src/main/java/com/rv.member/MemberCenterActivity.java
+6
-8
MemberListAdapter.java
...rc/main/java/com/rv.member/adapter/MemberListAdapter.java
+8
-1
shape_rv_bg_dark_gray.xml
...in_member/src/main/res/drawable/shape_rv_bg_dark_gray.xml
+5
-0
colors.xml
plugin_member/src/main/res/values/colors.xml
+1
-0
No files found.
module_mine/src/main/java/com/rv/rvmine/personal/IDCardCertificationActivity.java
View file @
5db54a31
...
@@ -6,6 +6,8 @@ import android.content.Context;
...
@@ -6,6 +6,8 @@ import android.content.Context;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.os.Build
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.support.annotation.NonNull
;
import
android.support.v4.content.ContextCompat
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
android.view.View
;
import
android.view.View
;
import
android.widget.EditText
;
import
android.widget.EditText
;
...
@@ -13,6 +15,7 @@ import android.widget.ImageView;
...
@@ -13,6 +15,7 @@ import android.widget.ImageView;
import
android.widget.LinearLayout
;
import
android.widget.LinearLayout
;
import
android.widget.RelativeLayout
;
import
android.widget.RelativeLayout
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
android.widget.Toast
;
import
com.alibaba.android.arouter.facade.annotation.Route
;
import
com.alibaba.android.arouter.facade.annotation.Route
;
import
com.base.utils.ui.datetime.selector.util.TextUtil
;
import
com.base.utils.ui.datetime.selector.util.TextUtil
;
...
@@ -36,6 +39,7 @@ import com.yuyife.okgo.OkGoUtil;
...
@@ -36,6 +39,7 @@ import com.yuyife.okgo.OkGoUtil;
import
java.io.File
;
import
java.io.File
;
import
java.util.LinkedHashMap
;
import
java.util.LinkedHashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
butterknife.BindView
;
import
butterknife.BindView
;
...
@@ -45,6 +49,7 @@ import io.reactivex.functions.Consumer;
...
@@ -45,6 +49,7 @@ import io.reactivex.functions.Consumer;
import
okhttp3.MediaType
;
import
okhttp3.MediaType
;
import
okhttp3.MultipartBody
;
import
okhttp3.MultipartBody
;
import
okhttp3.RequestBody
;
import
okhttp3.RequestBody
;
import
pub.devrel.easypermissions.AppSettingsDialog
;
import
pub.devrel.easypermissions.EasyPermissions
;
import
pub.devrel.easypermissions.EasyPermissions
;
import
top.zibin.luban.Luban
;
import
top.zibin.luban.Luban
;
import
top.zibin.luban.OnCompressListener
;
import
top.zibin.luban.OnCompressListener
;
...
@@ -53,7 +58,7 @@ import top.zibin.luban.OnCompressListener;
...
@@ -53,7 +58,7 @@ import top.zibin.luban.OnCompressListener;
* 实名认证
* 实名认证
*/
*/
@Route
(
path
=
Constance
.
ACTIVITY_URL_IDCARDCERTIFICATION
)
@Route
(
path
=
Constance
.
ACTIVITY_URL_IDCARDCERTIFICATION
)
public
class
IDCardCertificationActivity
extends
BaseStatusActivity
<
PickerPresenter
>
{
public
class
IDCardCertificationActivity
extends
BaseStatusActivity
<
PickerPresenter
>
implements
EasyPermissions
.
PermissionCallbacks
{
@BindView
(
R2
.
id
.
et_name
)
@BindView
(
R2
.
id
.
et_name
)
EditText
etName
;
EditText
etName
;
...
@@ -79,6 +84,7 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
...
@@ -79,6 +84,7 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
private
int
cardType
;
private
int
cardType
;
private
String
strCard
;
private
String
strCard
;
private
String
strCardCopy
;
private
String
strCardCopy
;
private
String
[]
photoPermissions
=
{};
public
static
Intent
getIntent
(
Context
context
)
{
public
static
Intent
getIntent
(
Context
context
)
{
...
@@ -124,11 +130,11 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
...
@@ -124,11 +130,11 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
@OnClick
({
R2
.
id
.
rl_card
,
R2
.
id
.
rl_card_copy
,
R2
.
id
.
tv_ok
})
@OnClick
({
R2
.
id
.
rl_card
,
R2
.
id
.
rl_card_copy
,
R2
.
id
.
tv_ok
})
public
void
onViewClicked
(
View
view
)
{
public
void
onViewClicked
(
View
view
)
{
int
id
=
view
.
getId
();
int
id
=
view
.
getId
();
if
(
id
==
R
.
id
.
rl_card
){
if
(
id
==
R
.
id
.
rl_card
)
{
showPickerDialog
(
0
);
showPickerDialog
(
0
);
}
else
if
(
id
==
R
.
id
.
rl_card_copy
)
{
}
else
if
(
id
==
R
.
id
.
rl_card_copy
)
{
showPickerDialog
(
1
);
showPickerDialog
(
1
);
}
else
if
(
id
==
R
.
id
.
tv_ok
)
{
}
else
if
(
id
==
R
.
id
.
tv_ok
)
{
String
name
=
etName
.
getText
().
toString
().
trim
();
String
name
=
etName
.
getText
().
toString
().
trim
();
if
(
TextUtils
.
isEmpty
(
name
))
{
if
(
TextUtils
.
isEmpty
(
name
))
{
showToast
(
"姓名不能为空!"
);
showToast
(
"姓名不能为空!"
);
...
@@ -156,7 +162,7 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
...
@@ -156,7 +162,7 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
return
;
return
;
}
}
verified
(
name
,
idCard
);
verified
(
name
,
idCard
);
}
}
}
}
...
@@ -166,9 +172,9 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
...
@@ -166,9 +172,9 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
);
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
);
if
(
requestCode
==
mPresenter
.
TYPE_ALBUM_CODE
)
{
if
(
requestCode
==
mPresenter
.
TYPE_ALBUM_CODE
)
{
if
(
data
!=
null
&&
data
.
getData
()
!=
null
)
{
if
(
data
!=
null
&&
data
.
getData
()
!=
null
)
{
if
(
cardType
==
0
){
if
(
cardType
==
0
)
{
llCard
.
setVisibility
(
View
.
GONE
);
llCard
.
setVisibility
(
View
.
GONE
);
}
else
{
}
else
{
llCardCopy
.
setVisibility
(
View
.
GONE
);
llCardCopy
.
setVisibility
(
View
.
GONE
);
}
}
GlideManager
.
getInstance
(
mActivity
).
loadImage
(
mPresenter
.
getUriUrl
(
data
.
getData
()),
cardType
==
0
?
ivCard
:
ivCardCopy
);
GlideManager
.
getInstance
(
mActivity
).
loadImage
(
mPresenter
.
getUriUrl
(
data
.
getData
()),
cardType
==
0
?
ivCard
:
ivCardCopy
);
...
@@ -178,9 +184,9 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
...
@@ -178,9 +184,9 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
}
}
if
(
requestCode
==
mPresenter
.
TYPE_CAMERA_CODE
)
{
if
(
requestCode
==
mPresenter
.
TYPE_CAMERA_CODE
)
{
if
(!
TextUtil
.
isEmpty
(
mPresenter
.
gerCameraStoreUrl
()))
{
if
(!
TextUtil
.
isEmpty
(
mPresenter
.
gerCameraStoreUrl
()))
{
if
(
cardType
==
0
){
if
(
cardType
==
0
)
{
llCard
.
setVisibility
(
View
.
GONE
);
llCard
.
setVisibility
(
View
.
GONE
);
}
else
{
}
else
{
llCardCopy
.
setVisibility
(
View
.
GONE
);
llCardCopy
.
setVisibility
(
View
.
GONE
);
}
}
String
url
=
String
.
format
(
"%1$s%2$s"
,
"file://"
,
mPresenter
.
gerCameraStoreUrl
());
String
url
=
String
.
format
(
"%1$s%2$s"
,
"file://"
,
mPresenter
.
gerCameraStoreUrl
());
...
@@ -188,9 +194,13 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
...
@@ -188,9 +194,13 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
uploadFile
(
new
File
(
mPresenter
.
gerCameraStoreUrl
()),
"camera"
);
uploadFile
(
new
File
(
mPresenter
.
gerCameraStoreUrl
()),
"camera"
);
}
}
}
}
if
(
requestCode
==
AppSettingsDialog
.
DEFAULT_SETTINGS_REQ_CODE
)
{
processPicker
();
}
}
}
private
int
typeCamera
;
/**
/**
* 显示相机弹窗
* 显示相机弹窗
...
@@ -206,11 +216,13 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
...
@@ -206,11 +216,13 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
public
void
onClick
(
View
v
)
{
public
void
onClick
(
View
v
)
{
int
i
=
v
.
getId
();
int
i
=
v
.
getId
();
if
(
i
==
com
.
rv
.
home
.
R
.
id
.
btn_camera
)
{
if
(
i
==
com
.
rv
.
home
.
R
.
id
.
btn_camera
)
{
processPicker
(
mPresenter
.
TYPE_CAMERA_CODE
);
typeCamera
=
mPresenter
.
TYPE_CAMERA_CODE
;
processPicker
();
dismiss
();
dismiss
();
}
else
if
(
i
==
com
.
rv
.
home
.
R
.
id
.
btn_album
)
{
}
else
if
(
i
==
com
.
rv
.
home
.
R
.
id
.
btn_album
)
{
processPicker
(
mPresenter
.
TYPE_ALBUM_CODE
);
typeCamera
=
mPresenter
.
TYPE_ALBUM_CODE
;
processPicker
();
dismiss
();
dismiss
();
}
else
if
(
i
==
com
.
rv
.
home
.
R
.
id
.
btn_cancel
)
{
}
else
if
(
i
==
com
.
rv
.
home
.
R
.
id
.
btn_cancel
)
{
...
@@ -228,35 +240,54 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
...
@@ -228,35 +240,54 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
* 打开相机和相册
* 打开相机和相册
*
*
* @param type 1、相机2、相册
* @param type 1、相机2、相册
* <p>
* 此处方法不奏效
*/
*/
// @SuppressLint("CheckResult")
// private void processPicker(final int type) {
// /**
// * 6.0以上手机做权限处理
// */
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
// new RxPermission(mActivity).request(
// new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,
// Manifest.permission.CAMERA}).subscribe(new Consumer<Boolean>() {
// @Override
// public void accept(Boolean aBoolean) throws Exception {
// if (aBoolean == true) {
// switch (type) {
// case 1001:
// mPresenter.openCamera(false);
// break;
// case 1002:
// mPresenter.openAlbum(false);
// break;
// }
//
// }
// }
// });
// } else {
// switch (type) {
// case 1001:
// mPresenter.openCamera(false);
// break;
// case 1002:
// mPresenter.openAlbum(false);
// break;
// }
// }
// }
private
String
[]
cameraPermissions
=
{
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
,
Manifest
.
permission
.
CAMERA
};
private
void
processPicker
()
{
@SuppressLint
(
"CheckResult"
)
private
void
processPicker
(
final
int
type
)
{
/**
* 6.0以上手机做权限处理
*/
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
N
)
{
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
N
)
{
new
RxPermission
(
mActivity
).
request
(
if
(!
EasyPermissions
.
hasPermissions
(
this
,
cameraPermissions
))
{
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
,
EasyPermissions
.
requestPermissions
(
this
,
"拍照需要此权限"
,
1
,
cameraPermissions
);
Manifest
.
permission
.
CAMERA
).
subscribe
(
new
Consumer
<
Boolean
>()
{
return
;
@Override
public
void
accept
(
Boolean
aBoolean
)
throws
Exception
{
if
(
aBoolean
==
true
)
{
switch
(
type
)
{
case
1001
:
mPresenter
.
openCamera
(
false
);
break
;
case
1002
:
mPresenter
.
openAlbum
(
false
);
break
;
}
}
}
}
}
});
switch
(
typeCamera
)
{
}
else
{
switch
(
type
)
{
case
1001
:
case
1001
:
mPresenter
.
openCamera
(
false
);
mPresenter
.
openCamera
(
false
);
break
;
break
;
...
@@ -265,8 +296,6 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
...
@@ -265,8 +296,6 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
break
;
break
;
}
}
}
}
}
/**
/**
...
@@ -308,7 +337,7 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
...
@@ -308,7 +337,7 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
private
void
verified
(
String
name
,
String
idCard
)
{
private
void
verified
(
String
name
,
String
idCard
)
{
// strCard ="https://xxtest.upyuns.com/image/app/20190605092021.jpg";
// strCard ="https://xxtest.upyuns.com/image/app/20190605092021.jpg";
// strCardCopy = "https://xxtest.upyuns.com/image/app/20190605092036.jpg";
// strCardCopy = "https://xxtest.upyuns.com/image/app/20190605092036.jpg";
mPresenter
.
postBodyData
(
RvFrameConfig
.
VEHICLE_CAR_POST
,
1
,
ApiConfig
.
HTTP_URL_CERTIFICATE
,
BaseBean
.
class
,
new
Verified
(
name
,
idCard
,
0
,
strCard
,
strCardCopy
),
getHeadMap
(),
true
);
mPresenter
.
postBodyData
(
RvFrameConfig
.
VEHICLE_CAR_POST
,
1
,
ApiConfig
.
HTTP_URL_CERTIFICATE
,
BaseBean
.
class
,
new
Verified
(
name
,
idCard
,
0
,
strCard
,
strCardCopy
),
getHeadMap
(),
true
);
}
}
...
@@ -319,6 +348,19 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
...
@@ -319,6 +348,19 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
return
headMap
;
return
headMap
;
}
}
@Override
public
void
onPermissionsGranted
(
int
requestCode
,
@NonNull
List
<
String
>
perms
)
{
processPicker
();
}
@Override
public
void
onPermissionsDenied
(
int
requestCode
,
@NonNull
List
<
String
>
perms
)
{
Toast
.
makeText
(
this
,
"用户授权失败"
,
Toast
.
LENGTH_SHORT
).
show
();
if
(
EasyPermissions
.
somePermissionPermanentlyDenied
(
this
,
perms
))
{
new
AppSettingsDialog
.
Builder
(
this
).
build
().
show
();
}
}
private
class
Verified
{
private
class
Verified
{
private
String
name
;
private
String
name
;
...
...
module_mine/src/main/java/com/rv/rvmine/traveler/AddAVisitorActivity.java
View file @
5db54a31
...
@@ -62,23 +62,23 @@ public class AddAVisitorActivity extends BaseStatusActivity<CommonPresenter> {
...
@@ -62,23 +62,23 @@ public class AddAVisitorActivity extends BaseStatusActivity<CommonPresenter> {
@Override
@Override
protected
void
initView
(
Bundle
savedInstanceState
,
TitleView
titleView
,
Intent
intent
)
{
protected
void
initView
(
Bundle
savedInstanceState
,
TitleView
titleView
,
Intent
intent
)
{
TravelerListBean
.
DataBean
dataBean
=
(
TravelerListBean
.
DataBean
)
intent
.
getSerializableExtra
(
"bean"
);
TravelerListBean
.
DataBean
dataBean
=
(
TravelerListBean
.
DataBean
)
intent
.
getSerializableExtra
(
"bean"
);
if
(
dataBean
!=
null
)
{
if
(
dataBean
!=
null
)
{
titleView
.
setTitle
(
"编辑出游人"
);
titleView
.
setTitle
(
"编辑出游人"
);
avisitorId
=
dataBean
.
getId
();
avisitorId
=
dataBean
.
getId
();
identityType
=
dataBean
.
getIsChild
();
identityType
=
dataBean
.
getIsChild
();
sexType
=
dataBean
.
getSex
();
sexType
=
dataBean
.
getSex
();
if
(
0
==
dataBean
.
getIsChild
())
{
if
(
0
==
dataBean
.
getIsChild
())
{
cbAdult
.
setChecked
(
true
);
cbAdult
.
setChecked
(
true
);
cbChild
.
setChecked
(
false
);
cbChild
.
setChecked
(
false
);
}
else
{
}
else
{
cbAdult
.
setChecked
(
false
);
cbAdult
.
setChecked
(
false
);
cbChild
.
setChecked
(
true
);
cbChild
.
setChecked
(
true
);
}
}
if
(
0
==
dataBean
.
getSex
()){
if
(
0
==
dataBean
.
getSex
())
{
cbMan
.
setChecked
(
false
);
cbMan
.
setChecked
(
false
);
cbGirl
.
setChecked
(
true
);
cbGirl
.
setChecked
(
true
);
}
else
{
}
else
{
cbMan
.
setChecked
(
true
);
cbMan
.
setChecked
(
true
);
cbGirl
.
setChecked
(
false
);
cbGirl
.
setChecked
(
false
);
}
}
...
@@ -86,7 +86,7 @@ public class AddAVisitorActivity extends BaseStatusActivity<CommonPresenter> {
...
@@ -86,7 +86,7 @@ public class AddAVisitorActivity extends BaseStatusActivity<CommonPresenter> {
etIdCard
.
setText
(
dataBean
.
getIdCard
());
etIdCard
.
setText
(
dataBean
.
getIdCard
());
etPhone
.
setText
(
dataBean
.
getPhone
());
etPhone
.
setText
(
dataBean
.
getPhone
());
}
else
{
}
else
{
titleView
.
setTitle
(
getString
(
R
.
string
.
add_a_visitor_title
));
titleView
.
setTitle
(
getString
(
R
.
string
.
add_a_visitor_title
));
}
}
...
@@ -96,23 +96,25 @@ public class AddAVisitorActivity extends BaseStatusActivity<CommonPresenter> {
...
@@ -96,23 +96,25 @@ public class AddAVisitorActivity extends BaseStatusActivity<CommonPresenter> {
@Override
@Override
public
void
onClick
(
View
v
)
{
public
void
onClick
(
View
v
)
{
String
name
=
etTravelerName
.
getText
().
toString
().
trim
();
String
name
=
etTravelerName
.
getText
().
toString
().
trim
();
if
(
TextUtil
.
isEmpty
(
name
)){
if
(
TextUtil
.
isEmpty
(
name
))
{
showToast
(
"姓名不能为空!"
);
showToast
(
"姓名不能为空!"
);
return
;
return
;
}
}
String
idCard
=
null
,
phone
=
null
;
String
idCard
=
etIdCard
.
getText
().
toString
().
trim
();
if
(
identityType
==
0
)
{
if
(
TextUtil
.
isEmpty
(
idCard
)){
idCard
=
etIdCard
.
getText
().
toString
().
trim
();
if
(
TextUtil
.
isEmpty
(
idCard
))
{
showToast
(
"身份证号不能为空!"
);
showToast
(
"身份证号不能为空!"
);
return
;
return
;
}
}
String
phone
=
etPhone
.
getText
().
toString
().
trim
();
phone
=
etPhone
.
getText
().
toString
().
trim
();
if
(
TextUtil
.
isEmpty
(
phone
))
{
if
(
TextUtil
.
isEmpty
(
phone
))
{
showToast
(
"手机号码不能为空!"
);
showToast
(
"手机号码不能为空!"
);
return
;
return
;
}
}
addAVisitor
(
name
,
idCard
,
phone
);
}
addAVisitor
(
name
,
idCard
,
phone
);
}
}
});
});
}
}
...
@@ -152,6 +154,7 @@ public class AddAVisitorActivity extends BaseStatusActivity<CommonPresenter> {
...
@@ -152,6 +154,7 @@ public class AddAVisitorActivity extends BaseStatusActivity<CommonPresenter> {
/**
/**
* 编辑或修改出游人信息
* 编辑或修改出游人信息
*
* @param name
* @param name
* @param idCard
* @param idCard
* @param phone
* @param phone
...
...
module_mine/src/main/java/com/rv/rvmine/traveler/ChooseAVisitorActivity.java
View file @
5db54a31
...
@@ -5,6 +5,7 @@ import android.content.Intent;
...
@@ -5,6 +5,7 @@ import android.content.Intent;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.support.v7.widget.RecyclerView
;
import
android.text.TextUtils
;
import
android.view.View
;
import
android.view.View
;
import
com.alibaba.android.arouter.facade.annotation.Route
;
import
com.alibaba.android.arouter.facade.annotation.Route
;
...
@@ -22,7 +23,9 @@ import com.rv.rvmine.adapter.TravelerListAdapter;
...
@@ -22,7 +23,9 @@ import com.rv.rvmine.adapter.TravelerListAdapter;
import
com.rv.rvmine.bean.TravelerListBean
;
import
com.rv.rvmine.bean.TravelerListBean
;
import
com.yuyife.okgo.OkGoUtil
;
import
com.yuyife.okgo.OkGoUtil
;
import
java.util.ArrayList
;
import
java.util.LinkedHashMap
;
import
java.util.LinkedHashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
butterknife.BindView
;
import
butterknife.BindView
;
...
@@ -41,6 +44,8 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
...
@@ -41,6 +44,8 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
private
final
int
TYPE_REQUEST_EDIT
=
2
;
private
final
int
TYPE_REQUEST_EDIT
=
2
;
private
int
mPage
;
private
int
mPage
;
private
int
countPage
;
private
int
countPage
;
private
int
visitorType
;
private
List
<
TravelerListBean
.
DataBean
>
visitors
=
new
ArrayList
<>();
public
static
Intent
getIntent
(
Context
context
)
{
public
static
Intent
getIntent
(
Context
context
)
{
return
new
Intent
(
context
,
ChooseAVisitorActivity
.
class
);
return
new
Intent
(
context
,
ChooseAVisitorActivity
.
class
);
...
@@ -54,6 +59,8 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
...
@@ -54,6 +59,8 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
@Override
@Override
protected
void
initView
(
Bundle
savedInstanceState
,
TitleView
titleView
,
Intent
intent
)
{
protected
void
initView
(
Bundle
savedInstanceState
,
TitleView
titleView
,
Intent
intent
)
{
visitorType
=
intent
.
getIntExtra
(
"visitorType"
,
-
1
);
titleView
.
setTitle
(
"选择出游人"
);
titleView
.
setTitle
(
"选择出游人"
);
titleView
.
setImageResource
(
R
.
id
.
iv_title_right
,
R
.
drawable
.
rv_common_icon_thestaff
);
titleView
.
setImageResource
(
R
.
id
.
iv_title_right
,
R
.
drawable
.
rv_common_icon_thestaff
);
titleView
.
setChildClickListener
(
R
.
id
.
iv_title_right
,
new
View
.
OnClickListener
()
{
titleView
.
setChildClickListener
(
R
.
id
.
iv_title_right
,
new
View
.
OnClickListener
()
{
...
@@ -127,7 +134,21 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
...
@@ -127,7 +134,21 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
mAdapter
.
setEmptyView
(
getEmptyView
(
recyclerView
,
-
1
,
"您还没有出游人信息哦"
));
mAdapter
.
setEmptyView
(
getEmptyView
(
recyclerView
,
-
1
,
"您还没有出游人信息哦"
));
return
;
return
;
}
}
mAdapter
.
setNewData
(
bean
.
getData
());
visitors
.
clear
();
if
(
visitorType
==
-
1
)
{
visitors
.
addAll
(
bean
.
getData
());
}
else
{
for
(
TravelerListBean
.
DataBean
b
:
bean
.
getData
())
{
if
(
visitorType
==
b
.
getIsChild
().
intValue
())
{
visitors
.
add
(
b
);
}
}
}
if
(
visitors
.
isEmpty
())
{
mAdapter
.
setEmptyView
(
getEmptyView
(
recyclerView
,
-
1
,
"您还没有出游人信息哦"
));
}
else
{
mAdapter
.
setNewData
(
visitors
);
}
}
}
}
}
module_tourism/src/main/java/com/rv/tourism/other/TravelerConfirmOrderActivity.java
View file @
5db54a31
...
@@ -171,7 +171,9 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
...
@@ -171,7 +171,9 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
mPosition
=
position
;
mPosition
=
position
;
tourist
=
(
BeanVisitorInformation
)
adapter
.
getItem
(
position
);
tourist
=
(
BeanVisitorInformation
)
adapter
.
getItem
(
position
);
ARouter
.
getInstance
().
build
(
Constance
.
ACTIVITY_URL_CHOOSEAVISITOR
).
navigation
(
mActivity
,
104
);
ARouter
.
getInstance
().
build
(
Constance
.
ACTIVITY_URL_CHOOSEAVISITOR
)
.
withInt
(
"visitorType"
,
Integer
.
valueOf
(
tourist
.
getIsChild
()))
.
navigation
(
mActivity
,
104
);
}
}
});
});
...
@@ -258,26 +260,26 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
...
@@ -258,26 +260,26 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
OrderPriceDetailBean
.
ChildrenBean
childrenBean1
=
new
OrderPriceDetailBean
.
ChildrenBean
();
OrderPriceDetailBean
.
ChildrenBean
childrenBean1
=
new
OrderPriceDetailBean
.
ChildrenBean
();
childrenBean1
.
setKey
(
"成人出游人费用"
);
childrenBean1
.
setKey
(
"成人出游人费用"
);
childrenBean1
.
setDetail
(
"¥"
+
dataBean
.
getPrice
()
+
"/人 *"
+
dataBean
.
getAdultNum
()
+
"人"
);
childrenBean1
.
setDetail
(
"¥"
+
dataBean
.
getPrice
()
+
"/人 *"
+
dataBean
.
getAdultNum
()
+
"人"
);
childrenBean1
.
setVal
(
"¥"
+
Integer
.
valueOf
(
dataBean
.
getPrice
())
*
Integer
.
valueOf
(
dataBean
.
getAdultNum
()));
childrenBean1
.
setVal
(
"¥"
+
Integer
.
valueOf
(
dataBean
.
getPrice
())
*
Integer
.
valueOf
(
dataBean
.
getAdultNum
()));
childrenBeanList
.
add
(
childrenBean1
);
childrenBeanList
.
add
(
childrenBean1
);
if
(
childNum
>
0
)
{
if
(
childNum
>
0
)
{
OrderPriceDetailBean
.
ChildrenBean
childrenBean2
=
new
OrderPriceDetailBean
.
ChildrenBean
();
OrderPriceDetailBean
.
ChildrenBean
childrenBean2
=
new
OrderPriceDetailBean
.
ChildrenBean
();
childrenBean2
.
setKey
(
"儿童出游人费用"
);
childrenBean2
.
setKey
(
"儿童出游人费用"
);
childrenBean2
.
setDetail
(
"¥"
+
dataBean
.
getChildPrice
()
+
"/人 *"
+
dataBean
.
getChildNum
()
+
"人"
);
childrenBean2
.
setDetail
(
"¥"
+
dataBean
.
getChildPrice
()
+
"/人 *"
+
dataBean
.
getChildNum
()
+
"人"
);
childrenBean2
.
setVal
(
"¥"
+
Integer
.
valueOf
(
dataBean
.
getChildPrice
())
*
Integer
.
valueOf
(
dataBean
.
getChildNum
()));
childrenBean2
.
setVal
(
"¥"
+
Integer
.
valueOf
(
dataBean
.
getChildPrice
())
*
Integer
.
valueOf
(
dataBean
.
getChildNum
()));
childrenBeanList
.
add
(
childrenBean2
);
childrenBeanList
.
add
(
childrenBean2
);
}
}
if
(
isInsuranceType
==
1
)
{
if
(
isInsuranceType
==
1
)
{
long
day
=
DateUtils
.
compareDateDay
(
dataBean
.
getEndTime
(),
dataBean
.
getStartTime
());
long
day
=
DateUtils
.
compareDateDay
(
dataBean
.
getEndTime
(),
dataBean
.
getStartTime
());
OrderPriceDetailBean
.
ChildrenBean
childrenBean3
=
new
OrderPriceDetailBean
.
ChildrenBean
();
OrderPriceDetailBean
.
ChildrenBean
childrenBean3
=
new
OrderPriceDetailBean
.
ChildrenBean
();
childrenBean3
.
setKey
(
"保险费用"
);
childrenBean3
.
setKey
(
"保险费用"
);
childrenBean3
.
setDetail
(
"¥"
+
info
.
getData
().
getInsurePrice
()
+
"/人 *"
+
(
adultNum
+
childNum
)
+
"人 *"
+
day
+
"天"
);
childrenBean3
.
setDetail
(
"¥"
+
info
.
getData
().
getInsurePrice
()
+
"/人 *"
+
(
adultNum
+
childNum
)
+
"人 *"
+
day
+
"天"
);
childrenBean3
.
setVal
(
"¥"
+
info
.
getData
().
getInsurePrice
()
*
(
adultNum
+
childNum
)
*
day
);
childrenBean3
.
setVal
(
"¥"
+
info
.
getData
().
getInsurePrice
()
*
(
adultNum
+
childNum
)
*
day
);
childrenBeanList
.
add
(
childrenBean3
);
childrenBeanList
.
add
(
childrenBean3
);
tvPaymentAmount
.
setText
(
String
.
format
(
"¥%1$s"
,
price
+
(
info
.
getData
().
getInsurePrice
()
*
(
adultNum
+
childNum
)
*
day
)));
tvPaymentAmount
.
setText
(
String
.
format
(
"¥%1$s"
,
price
+
(
info
.
getData
().
getInsurePrice
()
*
(
adultNum
+
childNum
)
*
day
)));
}
else
{
}
else
{
tvPaymentAmount
.
setText
(
String
.
format
(
"¥%1$s"
,
price
));
tvPaymentAmount
.
setText
(
String
.
format
(
"¥%1$s"
,
price
));
}
}
...
@@ -297,23 +299,22 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
...
@@ -297,23 +299,22 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
}
else
if
(
id
==
R
.
id
.
tv_confirm_order
)
{
}
else
if
(
id
==
R
.
id
.
tv_confirm_order
)
{
//确认订单
//确认订单
confirmOrder
();
confirmOrder
();
}
else
if
(
id
==
R
.
id
.
rl_item_notice
)
{
}
else
if
(
id
==
R
.
id
.
rl_item_notice
)
{
ARouter
.
getInstance
().
build
(
Constance
.
ACTIVITY_URL_WEBVIEW
)
ARouter
.
getInstance
().
build
(
Constance
.
ACTIVITY_URL_WEBVIEW
)
.
withString
(
"title"
,
"预订须知"
)
.
withString
(
"title"
,
"预订须知"
)
.
withString
(
"url"
,
TourismApi
.
HTTP_URL_CAR_TYPE_NOTICE
)
.
withString
(
"url"
,
TourismApi
.
HTTP_URL_CAR_TYPE_NOTICE
)
.
withInt
(
"type"
,
14
)
.
withInt
(
"type"
,
14
)
.
navigation
();
.
navigation
();
}
else
if
(
id
==
R
.
id
.
tv_contract
)
{
}
else
if
(
id
==
R
.
id
.
tv_contract
)
{
ARouter
.
getInstance
().
build
(
Constance
.
ACTIVITY_URL_WEBVIEW
)
ARouter
.
getInstance
().
build
(
Constance
.
ACTIVITY_URL_WEBVIEW
)
.
withString
(
"title"
,
"合同协议"
)
.
withString
(
"title"
,
"合同协议"
)
.
withString
(
"url"
,
TourismApi
.
HTTP_URL_CAR_TYPE_NOTICE
)
.
withString
(
"url"
,
TourismApi
.
HTTP_URL_CAR_TYPE_NOTICE
)
.
withInt
(
"type"
,
16
)
.
withInt
(
"type"
,
16
)
.
navigation
();
.
navigation
();
}
}
}
}
/**
/**
* 订单支付
* 订单支付
*/
*/
...
@@ -406,7 +407,7 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
...
@@ -406,7 +407,7 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
Map
<
String
,
Object
>
headMap
=
new
LinkedHashMap
<>();
Map
<
String
,
Object
>
headMap
=
new
LinkedHashMap
<>();
if
(
OkGoUtil
.
getToken
()
!=
null
)
if
(
OkGoUtil
.
getToken
()
!=
null
)
headMap
.
put
(
"Authorization"
,
OkGoUtil
.
getToken
());
headMap
.
put
(
"Authorization"
,
OkGoUtil
.
getToken
());
mPresenter
.
postBodyData
(
RvFrameConfig
.
ADMIN_POST
,
payType
,
TourismApi
.
COMMIT_ORDER
,
BeanTourOrderResponse
.
class
,
new
Tourist
(
etMailbox
.
getText
().
toString
().
trim
(),
name
,
phone
,
dataBean
.
getEndAddr
(),
endTime
,
dataBean
.
getGoodId
(),
ids
,
dataBean
.
getSpePriceId
(),
dataBean
.
getStartAddr
(),
dataBean
.
getStartCompanyId
(),
startTime
,
dataBean
.
getSiteId
(),
isInsuranceType
),
headMap
,
true
);
mPresenter
.
postBodyData
(
RvFrameConfig
.
ADMIN_POST
,
payType
,
TourismApi
.
COMMIT_ORDER
,
BeanTourOrderResponse
.
class
,
new
Tourist
(
etMailbox
.
getText
().
toString
().
trim
(),
name
,
phone
,
dataBean
.
getEndAddr
(),
endTime
,
dataBean
.
getGoodId
(),
ids
,
dataBean
.
getSpePriceId
(),
dataBean
.
getStartAddr
(),
dataBean
.
getStartCompanyId
(),
startTime
,
dataBean
.
getSiteId
(),
isInsuranceType
),
headMap
,
true
);
}
}
...
@@ -477,7 +478,6 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
...
@@ -477,7 +478,6 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
}
}
private
void
pay
(
BeanTourOrderPay
data
)
{
private
void
pay
(
BeanTourOrderPay
data
)
{
try
{
try
{
...
@@ -520,7 +520,7 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
...
@@ -520,7 +520,7 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
private
String
siteId
;
private
String
siteId
;
private
int
hasInsure
;
private
int
hasInsure
;
public
Tourist
(
String
contactEmail
,
String
contactMan
,
String
contactPhone
,
String
endAddr
,
String
endTime
,
String
goodId
,
String
tourUserIds
,
String
spePriceId
,
String
startAddr
,
String
startCompanyId
,
String
startTime
,
String
siteId
,
int
hasInsure
)
{
public
Tourist
(
String
contactEmail
,
String
contactMan
,
String
contactPhone
,
String
endAddr
,
String
endTime
,
String
goodId
,
String
tourUserIds
,
String
spePriceId
,
String
startAddr
,
String
startCompanyId
,
String
startTime
,
String
siteId
,
int
hasInsure
)
{
this
.
contactEmail
=
contactEmail
;
this
.
contactEmail
=
contactEmail
;
this
.
contactMan
=
contactMan
;
this
.
contactMan
=
contactMan
;
this
.
contactPhone
=
contactPhone
;
this
.
contactPhone
=
contactPhone
;
...
...
plugin_member/build.gradle
View file @
5db54a31
...
@@ -34,4 +34,5 @@ dependencies {
...
@@ -34,4 +34,5 @@ dependencies {
androidTestImplementation
'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation
'com.android.support.test.espresso:espresso-core:3.0.2'
implementation
project
(
':component_dialog'
)
implementation
project
(
':component_dialog'
)
implementation
project
(
':module_home'
)
implementation
project
(
':module_home'
)
implementation
project
(
':module_tourism'
)
}
}
plugin_member/src/main/java/com/rv.member/MemberCenterActivity.java
View file @
5db54a31
...
@@ -133,7 +133,7 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
...
@@ -133,7 +133,7 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
switch
(
requestType
)
{
switch
(
requestType
)
{
case
0
:
case
0
:
if
(
adapter
==
null
)
{
if
(
adapter
==
null
)
{
adapter
=
new
MemberListAdapter
(((
MemberListBean
)
result
).
getData
(),
memberLevel
,
freeUseDay
,
MemberCenterActivity
.
this
,
payListener
);
adapter
=
new
MemberListAdapter
(((
MemberListBean
)
result
).
getData
(),
memberLevel
,
freeUseDay
,
MemberCenterActivity
.
this
,
payListener
);
recyclerView
.
setAdapter
(
adapter
);
recyclerView
.
setAdapter
(
adapter
);
}
else
{
}
else
{
adapter
.
setDate
(((
MemberListBean
)
result
).
getData
());
adapter
.
setDate
(((
MemberListBean
)
result
).
getData
());
...
@@ -164,10 +164,8 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
...
@@ -164,10 +164,8 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
}
else
if
(
id
==
R
.
id
.
tv_verified
)
{
}
else
if
(
id
==
R
.
id
.
tv_verified
)
{
//实名认证
//实名认证
if
(!
isLogin
())
return
;
if
(!
isLogin
())
return
;
ComponentName
componentName
=
new
ComponentName
(
MemberCenterActivity
.
this
,
"com.rv.rvmine.personal.IDCardCertificationActivity"
);
ARouter
.
getInstance
().
build
(
Constance
.
ACTIVITY_URL_IDCARDCERTIFICATION
)
Intent
intent
=
new
Intent
();
.
navigation
(
this
,
REQUEST_VERIFIED
);
intent
.
setComponent
(
componentName
);
startActivityForResult
(
intent
,
REQUEST_VERIFIED
);
}
else
if
(
id
==
R
.
id
.
iv_title
)
{
}
else
if
(
id
==
R
.
id
.
iv_title
)
{
finish
();
finish
();
}
else
if
(
id
==
R
.
id
.
tv_consume_record
)
{
}
else
if
(
id
==
R
.
id
.
tv_consume_record
)
{
...
@@ -248,17 +246,17 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
...
@@ -248,17 +246,17 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
tvVerified
.
setVisibility
(
View
.
VISIBLE
);
tvVerified
.
setVisibility
(
View
.
VISIBLE
);
if
(
info
!=
null
)
{
if
(
info
!=
null
)
{
ivMember
.
setVisibility
(
View
.
VISIBLE
);
ivMember
.
setVisibility
(
View
.
VISIBLE
);
freeUseDay
=
info
.
getRentFreeDays
()
;
freeUseDay
=
info
.
getRentFreeDays
();
if
(
info
.
getIsMember
()
==
0
)
{
if
(
info
.
getIsMember
()
==
0
)
{
memberLevel
=
0
;
memberLevel
=
0
;
if
(
adapter
!=
null
)
{
if
(
adapter
!=
null
)
{
adapter
.
setMemberLevel
(
memberLevel
,
freeUseDay
);
adapter
.
setMemberLevel
(
memberLevel
,
freeUseDay
);
}
}
ivMember
.
setImageResource
(
R
.
drawable
.
mycenter_icon_goldmembership_1
);
ivMember
.
setImageResource
(
R
.
drawable
.
mycenter_icon_goldmembership_1
);
}
else
{
}
else
{
memberLevel
=
info
.
getMemberLevel
();
memberLevel
=
info
.
getMemberLevel
();
if
(
adapter
!=
null
)
{
if
(
adapter
!=
null
)
{
adapter
.
setMemberLevel
(
memberLevel
,
freeUseDay
);
adapter
.
setMemberLevel
(
memberLevel
,
freeUseDay
);
}
}
switch
(
info
.
getMemberLevel
())
{
switch
(
info
.
getMemberLevel
())
{
case
1
:
case
1
:
...
...
plugin_member/src/main/java/com/rv.member/adapter/MemberListAdapter.java
View file @
5db54a31
...
@@ -21,11 +21,14 @@ import android.widget.RelativeLayout;
...
@@ -21,11 +21,14 @@ import android.widget.RelativeLayout;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
com.alibaba.android.arouter.launcher.ARouter
;
import
com.frame.base.url.Constance
;
import
com.ruiwenliu.wrapper.util.glide.GlideManager
;
import
com.ruiwenliu.wrapper.util.glide.GlideManager
;
import
com.rv.member.R
;
import
com.rv.member.R
;
import
com.rv.member.bean.MemberListBean
;
import
com.rv.member.bean.MemberListBean
;
import
com.rv.member.view.MemberCardView
;
import
com.rv.member.view.MemberCardView
;
import
com.rv.tourism.api.TourismApi
;
import
java.util.List
;
import
java.util.List
;
...
@@ -118,7 +121,11 @@ public class MemberListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
...
@@ -118,7 +121,11 @@ public class MemberListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
viewHolder
.
tv_agreement
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
viewHolder
.
tv_agreement
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
@Override
public
void
onClick
(
View
view
)
{
public
void
onClick
(
View
view
)
{
ARouter
.
getInstance
().
build
(
Constance
.
ACTIVITY_URL_WEBVIEW
)
.
withString
(
"title"
,
"合同协议"
)
.
withString
(
"url"
,
TourismApi
.
HTTP_URL_CAR_TYPE_NOTICE
)
.
withInt
(
"type"
,
18
)
.
navigation
();
}
}
});
});
...
...
plugin_member/src/main/res/drawable/shape_rv_bg_dark_gray.xml
0 → 100644
View file @
5db54a31
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<corners
android:radius=
"5dp"
/>
<solid
android:color=
"@color/input_grap"
/>
</shape>
\ No newline at end of file
plugin_member/src/main/res/values/colors.xml
View file @
5db54a31
...
@@ -2,4 +2,5 @@
...
@@ -2,4 +2,5 @@
<resources>
<resources>
<color
name=
"white"
>
#ffffff
</color>
<color
name=
"white"
>
#ffffff
</color>
<color
name=
"color_999"
>
#999999
</color>
<color
name=
"color_999"
>
#999999
</color>
<color
name=
"input_grap"
>
#EEEEEE
</color>
</resources>
</resources>
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