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
3e8069aa
Commit
3e8069aa
authored
Jul 20, 2019
by
linfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
租车和旅游优惠券 优惠券列表
parent
dc7993c9
Changes
22
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
561 additions
and
73 deletions
+561
-73
Constance.java
MyFrame/src/main/java/com/frame/base/url/Constance.java
+2
-0
HttpApi.java
...per/src/main/java/com/ruiwenliu/wrapper/http/HttpApi.java
+6
-0
RxRequestResult.java
...main/java/com/ruiwenliu/wrapper/http/RxRequestResult.java
+0
-1
MvpPresenter.java
...in/java/com/ruiwenliu/wrapper/presenter/MvpPresenter.java
+19
-1
colors.xml
RvWrapper/src/main/res/values/colors.xml
+1
-0
shape_rv_bg_talk_yellow_circle.xml
.../src/main/res/drawable/shape_rv_bg_talk_yellow_circle.xml
+9
-0
DiscoveryRecommendAdapter.java
...com/xxfc/discovery/adapter/DiscoveryRecommendAdapter.java
+0
-7
DiscoveryApi.java
...ry/src/main/java/com/xxfc/discovery/api/DiscoveryApi.java
+3
-0
DiscoveryIMTokenBean.java
...in/java/com/xxfc/discovery/bean/DiscoveryIMTokenBean.java
+20
-0
ImageSources.java
...y/src/main/java/com/xxfc/discovery/bean/ImageSources.java
+16
-24
PatFragment.java
...rc/main/java/com/xxfc/discovery/fragment/PatFragment.java
+1
-1
PostPatActivity.java
...c/main/java/com/xxfc/discovery/other/PostPatActivity.java
+37
-28
fragment_pat.xml
module_discovery/src/main/res/layout/fragment_pat.xml
+1
-1
build.gradle
module_mine/build.gradle
+1
-0
MineFragment.java
module_mine/src/main/java/com/rv/rvmine/MineFragment.java
+7
-1
activity_mine.xml
module_mine/src/main/res/layout/activity_mine.xml
+59
-3
ExpiredCouponFragment.java
.../java/com/xxrv/coupon/fragment/ExpiredCouponFragment.java
+1
-1
AndroidManifest.xml
plugin_wallet/src/main/AndroidManifest.xml
+2
-1
WalletActivity.java
...rc/main/java/com/xxrv/wallet/activity/WalletActivity.java
+39
-1
WithdrawActivity.java
.../main/java/com/xxrv/wallet/activity/WithdrawActivity.java
+33
-0
activity_wallet.xml
plugin_wallet/src/main/res/layout/activity_wallet.xml
+235
-3
activity_withdraw.xml
plugin_wallet/src/main/res/layout/activity_withdraw.xml
+69
-0
No files found.
MyFrame/src/main/java/com/frame/base/url/Constance.java
View file @
3e8069aa
...
@@ -47,4 +47,6 @@ public final class Constance {
...
@@ -47,4 +47,6 @@ public final class Constance {
public
static
final
String
ACTIVITY_URL_COUPONALL
=
"/xxrv/coupon/CouponAllActivity"
;
public
static
final
String
ACTIVITY_URL_COUPONALL
=
"/xxrv/coupon/CouponAllActivity"
;
public
static
final
String
ACTIVITY_URL_CARCOUPON
=
"/xxrv/coupon/CarCouponActivity"
;
public
static
final
String
ACTIVITY_URL_CARCOUPON
=
"/xxrv/coupon/CarCouponActivity"
;
public
static
final
String
ACTIVITY_URL_WALLET
=
"/wallet/activity/WalletActivity"
;
}
}
RvWrapper/src/main/java/com/ruiwenliu/wrapper/http/HttpApi.java
View file @
3e8069aa
...
@@ -85,6 +85,12 @@ public interface HttpApi {
...
@@ -85,6 +85,12 @@ public interface HttpApi {
@POST
@POST
Observable
<
Response
<
ResponseBody
>>
rxPost
(
@Url
String
url
,
@FieldMap
Map
<
String
,
Object
>
fieldMap
);
Observable
<
Response
<
ResponseBody
>>
rxPost
(
@Url
String
url
,
@FieldMap
Map
<
String
,
Object
>
fieldMap
);
@FormUrlEncoded
@POST
Observable
<
Response
<
ResponseBody
>>
rxPost2
(
@Url
String
url
,
@HeaderMap
Map
<
String
,
Object
>
headMap
);
/**
/**
* post请求
* post请求
* @param url
* @param url
...
...
RvWrapper/src/main/java/com/ruiwenliu/wrapper/http/RxRequestResult.java
View file @
3e8069aa
...
@@ -64,7 +64,6 @@ public class RxRequestResult<T extends BaseBean, V extends BaseView<T>> extends
...
@@ -64,7 +64,6 @@ public class RxRequestResult<T extends BaseBean, V extends BaseView<T>> extends
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
}
else
{
}
else
{
baseView
.
onShowError
(
"服务器链接失败"
,
response
.
code
());
baseView
.
onShowError
(
"服务器链接失败"
,
response
.
code
());
}
}
...
...
RvWrapper/src/main/java/com/ruiwenliu/wrapper/presenter/MvpPresenter.java
View file @
3e8069aa
...
@@ -138,7 +138,6 @@ public abstract class MvpPresenter<V extends BaseView> extends RetrofitPresenter
...
@@ -138,7 +138,6 @@ public abstract class MvpPresenter<V extends BaseView> extends RetrofitPresenter
}
}
/**
/**
* post请求
* post请求
* @param position
* @param position
...
@@ -190,6 +189,25 @@ public abstract class MvpPresenter<V extends BaseView> extends RetrofitPresenter
...
@@ -190,6 +189,25 @@ public abstract class MvpPresenter<V extends BaseView> extends RetrofitPresenter
toSubscribe
(
createService
(
HttpApi
.
class
,
baseUrl
).
rxPost
(
url
,
objectMap
,
headMap
),
new
RxRequestResult
<>(
position
,
bean
,
getView
()),
position
);
toSubscribe
(
createService
(
HttpApi
.
class
,
baseUrl
).
rxPost
(
url
,
objectMap
,
headMap
),
new
RxRequestResult
<>(
position
,
bean
,
getView
()),
position
);
}
}
/**
* * post请求
* @param baseUrl
* @param position
* @param url
* @param bean
* @param headMap
* @param isShow
* @param <T>
*/
public
<
T
extends
BaseBean
>
void
postHead
(
String
baseUrl
,
int
position
,
String
url
,
Class
<
T
>
bean
,
Map
<
String
,
Object
>
headMap
,
boolean
isShow
)
{
if
(
isShow
&&
getView
()!=
null
){
getView
().
onShowLoading
();
Log
.
i
(
"mvppresentnnt"
,
"getData: ---------- 99999999999999999999999999999999999999999"
);
}
toSubscribe
(
createService
(
HttpApi
.
class
,
baseUrl
).
rxPost2
(
url
,
headMap
),
new
RxRequestResult
<>(
position
,
bean
,
getView
()),
position
);
}
/**
/**
* post请求 加json数据
* post请求 加json数据
...
...
RvWrapper/src/main/res/values/colors.xml
View file @
3e8069aa
...
@@ -40,6 +40,7 @@
...
@@ -40,6 +40,7 @@
<color
name=
"gray_f8f3c9"
>
#F8F3C9
</color>
<color
name=
"gray_f8f3c9"
>
#F8F3C9
</color>
<color
name=
"gray_30000000"
>
#30000000
</color>
<color
name=
"gray_30000000"
>
#30000000
</color>
<color
name=
"gray_FFFCF8"
>
#FFFCF8
</color>
<color
name=
"gray_FFFCF8"
>
#FFFCF8
</color>
<color
name=
"gray_F8F3C9"
>
#F8F3C9
</color>
<!--end-->
<!--end-->
...
...
component_resource/src/main/res/drawable/shape_rv_bg_talk_yellow_circle.xml
0 → 100644
View file @
3e8069aa
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:shape=
"rectangle"
>
<!--空心框 圆角 少量红-->
<corners
android:radius=
"50dp"
/>
<stroke
android:width=
"1dp"
android:color=
"#F8F3C9"
/>
</shape>
\ No newline at end of file
module_discovery/src/main/java/com/xxfc/discovery/adapter/DiscoveryRecommendAdapter.java
View file @
3e8069aa
...
@@ -19,7 +19,6 @@ public class DiscoveryRecommendAdapter extends BaseQuickAdapter<DiscoveryRecomme
...
@@ -19,7 +19,6 @@ public class DiscoveryRecommendAdapter extends BaseQuickAdapter<DiscoveryRecomme
super
(
R
.
layout
.
rv_item_discovery_recommend
);
super
(
R
.
layout
.
rv_item_discovery_recommend
);
}
}
private
int
selectPosition
;
@Override
@Override
protected
void
convert
(
BaseViewHolder
helper
,
DiscoveryRecommendBean
.
DataBeanX
.
DataBean
item
)
{
protected
void
convert
(
BaseViewHolder
helper
,
DiscoveryRecommendBean
.
DataBeanX
.
DataBean
item
)
{
...
@@ -46,10 +45,4 @@ public class DiscoveryRecommendAdapter extends BaseQuickAdapter<DiscoveryRecomme
...
@@ -46,10 +45,4 @@ public class DiscoveryRecommendAdapter extends BaseQuickAdapter<DiscoveryRecomme
helper
.
addOnClickListener
(
R
.
id
.
ll_item_islike
);
helper
.
addOnClickListener
(
R
.
id
.
ll_item_islike
);
}
}
@Override
public
int
getItemCount
()
{
return
6
;
}
}
}
module_discovery/src/main/java/com/xxfc/discovery/api/DiscoveryApi.java
View file @
3e8069aa
...
@@ -31,6 +31,9 @@ public interface DiscoveryApi extends RvFrameConfig {
...
@@ -31,6 +31,9 @@ public interface DiscoveryApi extends RvFrameConfig {
// 添加消息(拍拍、段视频)
// 添加消息(拍拍、段视频)
String
DISCOVERY_MSG_ADD
=
"https://xxfcim.upyuns.com/xxfcim/b/circle/msg/add"
;
String
DISCOVERY_MSG_ADD
=
"https://xxfcim.upyuns.com/xxfcim/b/circle/msg/add"
;
//im登录
String
DISCOVERY_IM_LOGIN
=
HOST
+
"/api/auth/jwt/imi/login"
;
public
static
String
HTTP_URL_FILE_UPLOAD
=
RvFrameConfig
.
VEHICLE_UPLOAD
+
"file/app/unauth/upload"
;
//文件上传
public
static
String
HTTP_URL_FILE_UPLOAD
=
RvFrameConfig
.
VEHICLE_UPLOAD
+
"file/app/unauth/upload"
;
//文件上传
// String HTTP_URL_FILE_UPLOADS = RvFrameConfig.VEHICLE_UPLOAD + "file/app/unauth/uploadFiles";//多张图片上传
// String HTTP_URL_FILE_UPLOADS = RvFrameConfig.VEHICLE_UPLOAD + "file/app/unauth/uploadFiles";//多张图片上传
...
...
module_discovery/src/main/java/com/xxfc/discovery/bean/DiscoveryIMTokenBean.java
0 → 100644
View file @
3e8069aa
package
com
.
xxfc
.
discovery
.
bean
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
java.io.Serializable
;
import
java.util.List
;
public
class
DiscoveryIMTokenBean
extends
BaseBean
{
private
String
data
;
private
boolean
rel
;
public
String
getData
()
{
return
data
;
}
public
void
setData
(
String
data
)
{
this
.
data
=
data
;
}
}
module_discovery/src/main/java/com/xxfc/discovery/bean/ImageSources.java
View file @
3e8069aa
package
com
.
xxfc
.
discovery
.
bean
;
package
com
.
xxfc
.
discovery
.
bean
;
public
class
ImageSources
{
public
class
ImageSources
{
private
String
o
riginal
FileName
;
private
String
oFileName
;
private
String
o
riginal
Url
;
private
String
oUrl
;
private
String
t
humbnail
Url
;
private
String
tUrl
;
private
int
status
;
private
long
length
;
// 语音视频文件的时长,返回数据后,自己在添加上去的
private
long
length
;
// 语音视频文件的时长,返回数据后,自己在添加上去的
private
long
size
;
// 语音视频文件的大小,返回数据后,自己在添加上去的
private
long
size
;
// 语音视频文件的大小,返回数据后,自己在添加上去的
public
String
getOriginalFileName
()
{
public
String
getoFileName
()
{
return
originalFileName
;
return
oFileName
;
}
public
void
setOriginalFileName
(
String
originalFileName
)
{
this
.
originalFileName
=
originalFileName
;
}
public
String
getOriginalUrl
()
{
return
originalUrl
;
}
}
public
void
set
OriginalUrl
(
String
originalUrl
)
{
public
void
set
oFileName
(
String
oFileName
)
{
this
.
o
riginalUrl
=
originalUrl
;
this
.
o
FileName
=
oFileName
;
}
}
public
String
get
Thumbnail
Url
()
{
public
String
get
o
Url
()
{
return
thumbnail
Url
;
return
o
Url
;
}
}
public
void
set
ThumbnailUrl
(
String
thumbnail
Url
)
{
public
void
set
oUrl
(
String
o
Url
)
{
this
.
thumbnailUrl
=
thumbnail
Url
;
this
.
oUrl
=
o
Url
;
}
}
public
int
getStatus
()
{
public
String
gettUrl
()
{
return
status
;
return
tUrl
;
}
}
public
void
set
Status
(
int
status
)
{
public
void
set
tUrl
(
String
tUrl
)
{
this
.
status
=
status
;
this
.
tUrl
=
tUrl
;
}
}
public
long
getLength
()
{
public
long
getLength
()
{
...
...
module_discovery/src/main/java/com/xxfc/discovery/fragment/PatFragment.java
View file @
3e8069aa
...
@@ -43,7 +43,7 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Bas
...
@@ -43,7 +43,7 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Bas
private
int
mPage
;
private
int
mPage
;
public
static
PatFragment
getInstance
(
int
type
)
{
public
static
PatFragment
getInstance
(
int
type
)
{
Bundle
bundl
=
new
Bundle
();
Bundle
bundl
=
new
Bundle
();
bundl
.
putInt
(
"type"
,
type
);
bundl
.
putInt
(
"type"
,
type
);
...
...
module_discovery/src/main/java/com/xxfc/discovery/other/PostPatActivity.java
View file @
3e8069aa
...
@@ -40,6 +40,7 @@ import com.rv.component.utils.Inc;
...
@@ -40,6 +40,7 @@ import com.rv.component.utils.Inc;
import
com.xxfc.discovery.R
;
import
com.xxfc.discovery.R
;
import
com.xxfc.discovery.R2
;
import
com.xxfc.discovery.R2
;
import
com.xxfc.discovery.api.DiscoveryApi
;
import
com.xxfc.discovery.api.DiscoveryApi
;
import
com.xxfc.discovery.bean.DiscoveryIMTokenBean
;
import
com.xxfc.discovery.bean.DiscoveryUploadImageBean
;
import
com.xxfc.discovery.bean.DiscoveryUploadImageBean
;
import
com.xxfc.discovery.bean.ImageSources
;
import
com.xxfc.discovery.bean.ImageSources
;
import
com.xxfc.discovery.presenter.DiscoveryPresenter
;
import
com.xxfc.discovery.presenter.DiscoveryPresenter
;
...
@@ -94,6 +95,7 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
...
@@ -94,6 +95,7 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
private
LatLng
mLatLng
;
//当前城市经纬度
private
LatLng
mLatLng
;
//当前城市经纬度
private
String
addrStr
;
private
String
addrStr
;
private
LocationManager
locationManager
;
private
LocationManager
locationManager
;
private
ArrayList
<
ImageSources
>
sourcesList
;
@Override
@Override
protected
int
setLayout
()
{
protected
int
setLayout
()
{
...
@@ -129,46 +131,53 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
...
@@ -129,46 +131,53 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
DiscoveryUploadImageBean
bean
=
(
DiscoveryUploadImageBean
)
result
;
DiscoveryUploadImageBean
bean
=
(
DiscoveryUploadImageBean
)
result
;
upData
(
bean
.
getData
());
upData
(
bean
.
getData
());
break
;
break
;
case
1
:
DiscoveryIMTokenBean
intokenBean
=
(
DiscoveryIMTokenBean
)
result
;
setData
(
intokenBean
);
break
;
}
}
}
}
private
void
setData
(
DiscoveryIMTokenBean
intokenBean
)
{
if
(
intokenBean
==
null
){
return
;
}
Map
<
String
,
Object
>
map
=
new
LinkedHashMap
<>();
map
.
put
(
"access_token"
,
intokenBean
.
getData
());
map
.
put
(
"type"
,
"2"
);
map
.
put
(
"flag"
,
"3"
);
map
.
put
(
"visible"
,
"1"
);
map
.
put
(
"text"
,
etContent
.
getText
().
toString
());
map
.
put
(
"images"
,
JSON
.
toJSONString
(
sourcesList
));
if
(!
TextUtils
.
isEmpty
(
addrStr
))
{
// 纬度
map
.
put
(
"latitude"
,
String
.
valueOf
(
latLatitude
));
// 经度
map
.
put
(
"longitude"
,
String
.
valueOf
(
lonLongitude
));
// 位置
map
.
put
(
"location"
,
addrStr
);
}
map
.
put
(
"cityId"
,
"0"
);
mPresenter
.
postData
(
2
,
DiscoveryApi
.
DISCOVERY_MSG_ADD
,
BaseBean
.
class
,
map
,
true
);
}
private
void
upData
(
List
<
DiscoveryUploadImageBean
.
DataBean
>
data
)
{
private
void
upData
(
List
<
DiscoveryUploadImageBean
.
DataBean
>
data
)
{
ArrayList
<
ImageSources
>
sourcesList
=
new
ArrayList
<>();
sourcesList
=
new
ArrayList
<>();
if
(
data
!=
null
){
if
(
data
!=
null
){
for
(
int
i
=
0
;
i
<
data
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
data
.
size
();
i
++)
{
ImageSources
sources
=
new
ImageSources
();
ImageSources
sources
=
new
ImageSources
();
sources
.
set
Original
FileName
(
data
.
get
(
i
).
getFileName
());
sources
.
set
o
FileName
(
data
.
get
(
i
).
getFileName
());
sources
.
set
Original
Url
(
data
.
get
(
i
).
getImgUrl
());
sources
.
set
o
Url
(
data
.
get
(
i
).
getImgUrl
());
sources
.
set
Thumbnail
Url
(
data
.
get
(
i
).
getImgUrl
());
sources
.
set
t
Url
(
data
.
get
(
i
).
getImgUrl
());
sourcesList
.
add
(
sources
);
sourcesList
.
add
(
sources
);
}
}
}
}
Map
<
String
,
Object
>
headMap
=
new
LinkedHashMap
<>();
if
(
OkGoUtil
.
getToken
()
!=
null
)
{
if
(
OkGoUtil
.
getToken
()
!=
null
)
{
// mPresenter.postData(DiscoveryApi.IMA_BASEUSRL,1, DiscoveryApi.DISCOVERY_MSG_ADD, BaseBean.class, map, headMap,true);
Map
<
String
,
Object
>
headMap
=
new
LinkedHashMap
<>();
headMap
.
put
(
"Authorization"
,
OkGoUtil
.
getToken
());
mPresenter
.
postData
(
RvFrameConfig
.
HOST
,
1
,
DiscoveryApi
.
DISCOVERY_IM_LOGIN
,
DiscoveryIMTokenBean
.
class
,
headMap
,
headMap
,
true
);
// headMap.put("Authorization", imToken);
// headMap.put("content-type ","application/json");
Map
<
String
,
Object
>
map
=
new
LinkedHashMap
<>();
map
.
put
(
"access_token"
,
OkGoUtil
.
getToken
());
map
.
put
(
"type"
,
"2"
);
map
.
put
(
"flag"
,
"3"
);
map
.
put
(
"visible"
,
"1"
);
map
.
put
(
"text"
,
etContent
.
getText
().
toString
());
map
.
put
(
"images"
,
JSON
.
toJSONString
(
sourcesList
));
if
(!
TextUtils
.
isEmpty
(
addrStr
))
{
// 纬度
map
.
put
(
"latitude"
,
String
.
valueOf
(
latLatitude
));
// 经度
map
.
put
(
"longitude"
,
String
.
valueOf
(
lonLongitude
));
// 位置
map
.
put
(
"location"
,
addrStr
);
}
map
.
put
(
"cityId"
,
"0"
);
mPresenter
.
postData
(
DiscoveryApi
.
IMA_BASEUSRL
,
1
,
DiscoveryApi
.
DISCOVERY_MSG_ADD
,
BaseBean
.
class
,
map
,
headMap
,
true
);
}
}
}
}
...
...
module_discovery/src/main/res/layout/fragment_pat.xml
View file @
3e8069aa
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<android.support.v4.widget.NestedScrollView
<android.support.v4.widget.NestedScrollView
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"
wrap_cont
ent"
>
android:layout_height=
"
match_par
ent"
>
<LinearLayout
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
...
module_mine/build.gradle
View file @
3e8069aa
...
@@ -50,4 +50,5 @@ dependencies {
...
@@ -50,4 +50,5 @@ dependencies {
api
project
(
':plugin_share'
)
api
project
(
':plugin_share'
)
api
project
(
':plugin_coupon'
)
api
project
(
':plugin_coupon'
)
implementation
project
(
':plugin_points'
)
implementation
project
(
':plugin_points'
)
implementation
project
(
':plugin_wallet'
)
}
}
module_mine/src/main/java/com/rv/rvmine/MineFragment.java
View file @
3e8069aa
...
@@ -200,7 +200,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
...
@@ -200,7 +200,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
@OnClick
({
R2
.
id
.
iv_avatar
,
R2
.
id
.
tv_login
,
R2
.
id
.
tv_verified
,
R2
.
id
.
rl_item_to_be_paid
,
R2
.
id
.
rl_item_staying
,
@OnClick
({
R2
.
id
.
iv_avatar
,
R2
.
id
.
tv_login
,
R2
.
id
.
tv_verified
,
R2
.
id
.
rl_item_to_be_paid
,
R2
.
id
.
rl_item_staying
,
R2
.
id
.
rl_item_traveling
,
R2
.
id
.
rl_item_completed
,
R2
.
id
.
rl_item_all
,
R2
.
id
.
rl_item_collection
,
R2
.
id
.
rl_item_personal_information
,
R2
.
id
.
rl_item_traveling
,
R2
.
id
.
rl_item_completed
,
R2
.
id
.
rl_item_all
,
R2
.
id
.
rl_item_collection
,
R2
.
id
.
rl_item_personal_information
,
R2
.
id
.
rl_item_setting
,
R2
.
id
.
rl_item_driver
,
R2
.
id
.
rl_item_traveler
,
R2
.
id
.
rl_item_setting
,
R2
.
id
.
rl_item_driver
,
R2
.
id
.
rl_item_traveler
,
R2
.
id
.
tv_view_privileges
,
R2
.
id
.
rl_item_share
,
R2
.
id
.
rl_item_coupon
})
R2
.
id
.
tv_view_privileges
,
R2
.
id
.
rl_item_share
,
R2
.
id
.
rl_item_coupon
,
R2
.
id
.
rl_item_integral
,
R2
.
id
.
rl_item_wallet
})
public
void
onViewClicked
(
View
view
)
{
public
void
onViewClicked
(
View
view
)
{
int
id
=
view
.
getId
();
int
id
=
view
.
getId
();
if
(
id
==
R
.
id
.
iv_avatar
)
{
if
(
id
==
R
.
id
.
iv_avatar
)
{
...
@@ -282,6 +282,12 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
...
@@ -282,6 +282,12 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
}
else
if
(
id
==
R
.
id
.
rl_item_share
)
{
}
else
if
(
id
==
R
.
id
.
rl_item_share
)
{
if
(
isLogin
())
return
;
if
(
isLogin
())
return
;
startActivity
(
new
Intent
(
_mActivity
,
ShareActivity
.
class
));
startActivity
(
new
Intent
(
_mActivity
,
ShareActivity
.
class
));
}
else
if
(
id
==
R
.
id
.
rl_item_integral
){
}
else
if
(
id
==
R
.
id
.
rl_item_wallet
){
ARouter
.
getInstance
()
.
build
(
Constance
.
ACTIVITY_URL_WALLET
)
.
navigation
();
}
}
}
}
...
...
module_mine/src/main/res/layout/activity_mine.xml
View file @
3e8069aa
...
@@ -538,22 +538,78 @@
...
@@ -538,22 +538,78 @@
</RelativeLayout>
</RelativeLayout>
<RelativeLayout
<RelativeLayout
android:id=
"@+id/rl_item_share"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"@dimen/size_60"
android:layout_height=
"@dimen/size_60"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:orientation=
"vertical"
></RelativeLayout>
android:orientation=
"vertical"
>
<ImageView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerHorizontal=
"true"
android:src=
"@drawable/mycenter_icon_visitors"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentBottom=
"true"
android:layout_centerHorizontal=
"true"
android:layout_marginTop=
"@dimen/size_18"
android:text=
"分享"
android:textColor=
"@color/colorMain"
android:textSize=
"@dimen/size_12"
/>
</RelativeLayout>
<RelativeLayout
<RelativeLayout
android:id=
"@+id/rl_item_integral"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"@dimen/size_60"
android:layout_height=
"@dimen/size_60"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:orientation=
"vertical"
></RelativeLayout>
android:orientation=
"vertical"
>
<ImageView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerHorizontal=
"true"
android:src=
"@drawable/mycenter_icon_visitors"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentBottom=
"true"
android:layout_centerHorizontal=
"true"
android:layout_marginTop=
"@dimen/size_18"
android:text=
"积分"
android:textColor=
"@color/colorMain"
android:textSize=
"@dimen/size_12"
/>
</RelativeLayout>
<RelativeLayout
<RelativeLayout
android:id=
"@+id/rl_item_wallet"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"@dimen/size_60"
android:layout_height=
"@dimen/size_60"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:orientation=
"vertical"
></RelativeLayout>
android:orientation=
"vertical"
>
<ImageView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerHorizontal=
"true"
android:src=
"@drawable/mycenter_icon_visitors"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentBottom=
"true"
android:layout_centerHorizontal=
"true"
android:layout_marginTop=
"@dimen/size_18"
android:text=
"钱包"
android:textColor=
"@color/colorMain"
android:textSize=
"@dimen/size_12"
/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
...
...
plugin_coupon/src/main/java/com/xxrv/coupon/fragment/ExpiredCouponFragment.java
View file @
3e8069aa
...
@@ -72,7 +72,7 @@ public class ExpiredCouponFragment extends BaseFragment<CouponAllPresenter> impl
...
@@ -72,7 +72,7 @@ public class ExpiredCouponFragment extends BaseFragment<CouponAllPresenter> impl
if
(
OkGoUtil
.
getToken
()
!=
null
)
if
(
OkGoUtil
.
getToken
()
!=
null
)
headMap
.
put
(
"Authorization"
,
OkGoUtil
.
getToken
());
headMap
.
put
(
"Authorization"
,
OkGoUtil
.
getToken
());
Map
<
String
,
Object
>
map
=
new
LinkedHashMap
<>();
Map
<
String
,
Object
>
map
=
new
LinkedHashMap
<>();
map
.
put
(
"type"
,
"
3
"
);
map
.
put
(
"type"
,
"
2
"
);
mPresenter
.
getData
(
RvFrameConfig
.
HOST
,
0
,
CouponApi
.
HTTP_URL_COUPON_LIST
,
CouponBean
.
class
,
map
,
headMap
,
false
);
mPresenter
.
getData
(
RvFrameConfig
.
HOST
,
0
,
CouponApi
.
HTTP_URL_COUPON_LIST
,
CouponBean
.
class
,
map
,
headMap
,
false
);
}
}
...
...
plugin_wallet/src/main/AndroidManifest.xml
View file @
3e8069aa
...
@@ -3,7 +3,8 @@
...
@@ -3,7 +3,8 @@
package=
"com.xxrv.wallet"
>
package=
"com.xxrv.wallet"
>
<application>
<application>
<activity
android:name=
".activity.WalletActivity"
></activity>
<activity
android:name=
".activity.WithdrawActivity"
></activity>
<activity
android:name=
".activity.WalletActivity"
/>
</application>
</application>
</manifest>
</manifest>
\ No newline at end of file
plugin_wallet/src/main/java/com/xxrv/wallet/activity/WalletActivity.java
View file @
3e8069aa
package
com
.
xxrv
.
wallet
.
activity
;
package
com
.
xxrv
.
wallet
.
activity
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.support.v7.app.AppCompatActivity
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.view.View
;
import
android.widget.TextView
;
import
com.alibaba.android.arouter.facade.annotation.Route
;
import
com.frame.base.url.Constance
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseStatusActivity
;
import
com.ruiwenliu.wrapper.base.BaseStatusActivity
;
import
com.ruiwenliu.wrapper.weight.TitleView
;
import
com.ruiwenliu.wrapper.weight.TitleView
;
import
com.xxrv.wallet.R
;
import
com.xxrv.wallet.R
;
import
com.xxrv.wallet.R2
;
import
com.xxrv.wallet.presenter.WalletPresenter
;
import
com.xxrv.wallet.presenter.WalletPresenter
;
import
butterknife.BindView
;
import
butterknife.OnClick
;
/**
/**
* 钱包
* 钱包
*/
*/
@Route
(
path
=
Constance
.
ACTIVITY_URL_WALLET
)
public
class
WalletActivity
extends
BaseStatusActivity
<
WalletPresenter
>
{
public
class
WalletActivity
extends
BaseStatusActivity
<
WalletPresenter
>
{
@BindView
(
R2
.
id
.
tv_wallet_balance
)
TextView
tvWalletBalance
;
@BindView
(
R2
.
id
.
tv_today_amount
)
TextView
tvTodayAmount
;
@BindView
(
R2
.
id
.
tv_total_amount
)
TextView
tvTotalAmount
;
@BindView
(
R2
.
id
.
tv_not_amount
)
TextView
tvNotAmount
;
@Override
@Override
protected
int
setLayout
()
{
protected
int
setLayout
()
{
return
R
.
layout
.
activity_wallet
;
return
R
.
layout
.
activity_wallet
;
...
@@ -29,4 +46,25 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
...
@@ -29,4 +46,25 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> {
public
void
onShowResult
(
int
requestType
,
BaseBean
result
)
{
public
void
onShowResult
(
int
requestType
,
BaseBean
result
)
{
}
}
@OnClick
({
R2
.
id
.
iv_back
,
R2
.
id
.
tv_item_withdraw
,
R2
.
id
.
rl_item_consumer_details
,
R2
.
id
.
rl_item_commission_record
,
R2
.
id
.
rl_item_withdrawals_record
})
public
void
onViewClicked
(
View
view
)
{
int
id
=
view
.
getId
();
if
(
id
==
R
.
id
.
iv_back
)
{
finish
();
}
else
if
(
id
==
R
.
id
.
tv_item_withdraw
)
{
//提现
}
else
if
(
id
==
R
.
id
.
rl_item_consumer_details
)
{
//消费明细
}
else
if
(
id
==
R
.
id
.
rl_item_commission_record
)
{
//佣金记录
}
else
if
(
id
==
R
.
id
.
rl_item_withdrawals_record
)
{
//提现记录
}
}
}
}
plugin_wallet/src/main/java/com/xxrv/wallet/activity/WithdrawActivity.java
0 → 100644
View file @
3e8069aa
package
com
.
xxrv
.
wallet
.
activity
;
import
android.content.Intent
;
import
android.support.v7.app.AppCompatActivity
;
import
android.os.Bundle
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseStatusActivity
;
import
com.ruiwenliu.wrapper.weight.TitleView
;
import
com.xxrv.wallet.R
;
import
com.xxrv.wallet.presenter.WalletPresenter
;
/**
* 提现
*/
public
class
WithdrawActivity
extends
BaseStatusActivity
<
WalletPresenter
>
{
@Override
protected
int
setLayout
()
{
return
R
.
layout
.
activity_withdraw
;
}
@Override
protected
void
initView
(
Bundle
savedInstanceState
,
TitleView
titleView
,
Intent
intent
)
{
}
@Override
public
void
onShowResult
(
int
requestType
,
BaseBean
result
)
{
}
}
plugin_wallet/src/main/res/layout/activity_wallet.xml
View file @
3e8069aa
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
android:background=
"@color/colorLine"
tools:context=
".activity.WalletActivity"
>
tools:context=
".activity.WalletActivity"
>
<LinearLayout
android:background=
"@color/colorYellow"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/size_220"
android:orientation=
"vertical"
>
</android.support.constraint.ConstraintLayout>
<RelativeLayout
\ No newline at end of file
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/size_50"
>
<ImageView
android:id=
"@+id/iv_back"
android:layout_width=
"@dimen/size_32"
android:layout_height=
"@dimen/size_32"
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"@dimen/size_5"
android:padding=
"@dimen/size_8"
android:src=
"@drawable/rv_common_icon_back_dark"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textSize=
"@dimen/text_18"
android:layout_centerInParent=
"true"
android:textColor=
"@color/colorWrite"
android:text=
"我的钱包"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_weight=
"1"
android:layout_marginLeft=
"@dimen/size_15"
android:layout_height=
"0dp"
>
<LinearLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:orientation=
"vertical"
>
<TextView
android:id=
"@+id/tv_wallet_balance"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textSize=
"@dimen/text_25"
android:textColor=
"@color/colorWrite"
android:text=
"¥0.00"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/size_5"
android:textSize=
"@dimen/text_12"
android:textColor=
"@color/gray_F8F3C9"
android:text=
"钱包余额(元)"
/>
</LinearLayout>
<TextView
android:id=
"@+id/tv_item_withdraw"
android:layout_width=
"@dimen/size_60"
android:layout_height=
"@dimen/size_30"
android:gravity=
"center"
android:layout_marginRight=
"@dimen/size_30"
android:layout_centerVertical=
"true"
android:layout_alignParentRight=
"true"
android:textColor=
"@color/gray_F8F3C9"
android:background=
"@drawable/shape_rv_bg_talk_yellow_circle"
android:textSize=
"@dimen/text_14"
android:text=
"提现"
/>
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:orientation=
"horizontal"
android:layout_width=
"match_parent"
android:background=
"@color/colorWrite"
android:layout_height=
"@dimen/size_80"
>
<LinearLayout
android:layout_width=
"0dp"
android:layout_weight=
"1"
android:orientation=
"vertical"
android:gravity=
"center"
android:layout_height=
"match_parent"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textSize=
"@dimen/text_12"
android:textColor=
"@color/textGray"
android:text=
"今日收益(元)"
/>
<TextView
android:id=
"@+id/tv_today_amount"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/size_10"
android:textSize=
"@dimen/text_18"
android:textStyle=
"bold"
android:textColor=
"@color/colorMain"
android:text=
"1021"
/>
</LinearLayout>
<LinearLayout
android:layout_width=
"0dp"
android:layout_weight=
"1"
android:orientation=
"vertical"
android:gravity=
"center"
android:layout_height=
"match_parent"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textSize=
"@dimen/text_12"
android:textColor=
"@color/textGray"
android:text=
"总收益(元)"
/>
<TextView
android:id=
"@+id/tv_total_amount"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/size_10"
android:textSize=
"@dimen/text_18"
android:textStyle=
"bold"
android:textColor=
"@color/colorMain"
android:text=
"108594"
/>
</LinearLayout>
<LinearLayout
android:layout_width=
"0dp"
android:layout_weight=
"1"
android:orientation=
"vertical"
android:gravity=
"center"
android:layout_height=
"match_parent"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textSize=
"@dimen/text_12"
android:textColor=
"@color/textGray"
android:text=
"未入账(元)"
/>
<TextView
android:id=
"@+id/tv_not_amount"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/size_10"
android:textSize=
"@dimen/text_18"
android:textStyle=
"bold"
android:textColor=
"@color/colorMain"
android:text=
"5290"
/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:background=
"@color/colorWrite"
android:layout_marginTop=
"@dimen/size_15"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingLeft=
"@dimen/size_15"
android:paddingRight=
"@dimen/size_15"
android:orientation=
"vertical"
>
<RelativeLayout
android:id=
"@+id/rl_item_consumer_details"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/size_50"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textSize=
"@dimen/text_14"
android:layout_centerVertical=
"true"
android:textColor=
"@color/colorMain"
android:text=
"消费明细"
/>
<ImageView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_alignParentRight=
"true"
android:src=
"@drawable/common_icon_rig_gray"
/>
</RelativeLayout>
<include
layout=
"@layout/common_line"
/>
<RelativeLayout
android:id=
"@+id/rl_item_commission_record"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/size_50"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textSize=
"@dimen/text_14"
android:layout_centerVertical=
"true"
android:textColor=
"@color/colorMain"
android:text=
"佣金记录"
/>
<ImageView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_alignParentRight=
"true"
android:src=
"@drawable/common_icon_rig_gray"
/>
</RelativeLayout>
<include
layout=
"@layout/common_line"
/>
<RelativeLayout
android:id=
"@+id/rl_item_withdrawals_record"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/size_50"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textSize=
"@dimen/text_14"
android:layout_centerVertical=
"true"
android:textColor=
"@color/colorMain"
android:text=
"提现记录"
/>
<ImageView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_alignParentRight=
"true"
android:src=
"@drawable/common_icon_rig_gray"
/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
plugin_wallet/src/main/res/layout/activity_withdraw.xml
0 → 100644
View file @
3e8069aa
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/colorWrite"
android:orientation=
"vertical"
tools:context=
".activity.WithdrawActivity"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
android:layout_weight=
"1"
android:orientation=
"vertical"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/size_15"
android:layout_marginTop=
"@dimen/size_15"
android:text=
"到账 支付宝账户"
android:textColor=
"@color/textGray"
android:textSize=
"@dimen/text_16"
/>
<LinearLayout
android:layout_marginLeft=
"@dimen/size_60"
android:layout_marginTop=
"@dimen/size_20"
android:layout_marginRight=
"@dimen/size_15"
android:orientation=
"vertical"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/size_50"
>
<EditText
android:id=
"@+id/et_phone"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@null"
android:gravity=
"left|center_vertical"
android:hint=
"请输入到账支付宝账号"
android:text=
""
android:textColorHint=
"@color/colorGray"
android:textColor=
"@color/colorMain"
android:textSize=
"@dimen/text_16"
/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/size_10"
android:layout_marginBottom=
"@dimen/size_15"
android:gravity=
"center"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:paddingLeft=
"@dimen/size_30"
android:paddingRight=
"@dimen/size_30"
android:text=
"提现规则"
android:textColor=
"@color/text_Gray"
android:textSize=
"@dimen/text_14"
/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
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