Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
android
/
dayu
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
27d9bf05
authored
Apr 13, 2020
by
mReturn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug
parent
eefe9dea
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
153 additions
and
68 deletions
app/src/main/java/com/dayu/bigfish/utils/HxManager.java
baseSDK/src/main/java/com/dayu/common/Constants.java
baseSDK/src/main/res/values/strings.xml
build.gradle
orderCenter/src/main/java/com/dayu/order/presenter/orderdoing/OrderDoingPresenter.java
userCenter/src/main/java/com/dayu/usercenter/api/UserService2.java
userCenter/src/main/java/com/dayu/usercenter/model/bean/CommonRecordListBean.java
userCenter/src/main/java/com/dayu/usercenter/model/bean/UserIncomeBean.java
userCenter/src/main/java/com/dayu/usercenter/presenter/homeuser/HomeUserContract.java
userCenter/src/main/java/com/dayu/usercenter/presenter/homeuser/HomeUserPresenter.java
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/CashRecordActivity.java
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/CommonRecordActivity.java
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/SaleRecordArriveFragment.java
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/SaleRecordDetailFragment.java
userCenter/src/main/res/layout/activity_cash_record.xml
userCenter/src/main/res/layout/activity_sale_record.xml
userCenter/src/main/res/layout/fragment_home_user.xml
userCenter/src/main/res/layout/fragment_sale_record_arrive.xml
userCenter/src/main/res/layout/item_record_arrive.xml
userCenter/src/main/res/values/styles.xml
app/src/main/java/com/dayu/bigfish/utils/HxManager.java
View file @
27d9bf05
...
...
@@ -228,9 +228,9 @@ public class HxManager {
//注册环信消息监听
EMClient
.
getInstance
().
chatManager
().
addMessageListener
(
msgListener
);
//注册一个监听连接状态的listener
if
(!
BuildConfig
.
DEBUG
)
{
EMClient
.
getInstance
().
addConnectionListener
(
new
MyConnectionListener
());
}
//
if (!BuildConfig.DEBUG) {
//
EMClient.getInstance().addConnectionListener(new MyConnectionListener());
//
}
}
//实现ConnectionListener接口
...
...
baseSDK/src/main/java/com/dayu/common/Constants.java
View file @
27d9bf05
...
...
@@ -35,30 +35,30 @@ public class Constants {
/**
* 测试环境配置.
*/
public
static
final
int
LOG_LEVEL
=
LogUtils
.
LEVEL_ALL
;
public
static
final
String
ENVIROMENT
=
"debug"
;
public
static
final
String
BASE_URL
=
"http://47.94.101.239:3112"
;
public
final
static
String
UP_PHOTO
=
"/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"
;
public
final
static
String
WEB_SOP
=
"http://47.94.101.239:9004/#/sop"
;
public
final
static
String
CHECK_MULTI_WEB_SOP
=
"http://47.94.101.239:9004/#/manyServiceResult"
;
public
final
static
String
MULTI_WEB_SOP
=
"http://47.94.101.239:9004/#/manySop"
;
public
final
static
String
WEB_SOP_DETAIL
=
"http://47.94.101.239:9004/#/sopdetail"
;
public
final
static
String
WEB_ZHI_SHI
=
"http://47.94.101.239:9004/#/detail"
;
public
static
final
boolean
IS_DEBUG
=
true
;
//
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
//
public static final String ENVIROMENT = "debug";
//
public static final String BASE_URL = "http://47.94.101.239:3112";
//
public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
//
public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
//
public final static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
//
public final static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
//
public final static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
//
public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
//
public static final boolean IS_DEBUG = true;
/**
* uat环境配置.
*/
//
public static final String ENVIROMENT = "uat";
//
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
//
public static final String BASE_URL = "http://47.95.223.6:3112";
//
public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
//
public final static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
//
public final static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
//
public final static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
//
public final static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
//
public final static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
//
public static final boolean IS_DEBUG = true;
public
static
final
String
ENVIROMENT
=
"uat"
;
public
static
final
int
LOG_LEVEL
=
LogUtils
.
LEVEL_ALL
;
public
static
final
String
BASE_URL
=
"http://47.95.223.6:3112"
;
public
final
static
String
UP_PHOTO
=
"/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"
;
public
final
static
String
WEB_SOP
=
"http://47.95.223.6:9004/#/sop"
;
public
final
static
String
WEB_SOP_DETAIL
=
"http://47.95.223.6:9004/#/sopdetail"
;
public
final
static
String
WEB_ZHI_SHI
=
"http://47.95.223.6:9004/#/detail"
;
public
final
static
String
CHECK_MULTI_WEB_SOP
=
"http://47.95.223.6:9004/#/manyServiceResult"
;
public
final
static
String
MULTI_WEB_SOP
=
"http://47.95.223.6:9004/#/manySop"
;
public
static
final
boolean
IS_DEBUG
=
true
;
/**
* 正式环境.
...
...
baseSDK/src/main/res/values/strings.xml
View file @
27d9bf05
...
...
@@ -384,7 +384,7 @@
<string
name=
"reassignment_reason"
>
改派原因
</string>
<string
name=
"cancle_reason"
>
取消原因
</string>
<string
name=
"check_reason"
>
查看结果
</string>
<string
name=
"check_accept"
>
查
看验收申请
</string>
<string
name=
"check_accept"
>
查看验收
</string>
<string
name=
"check_location"
>
查看位置
</string>
<string
name=
"part_record"
>
备件记录
</string>
<string
name=
"no_remark"
>
备注:暂无
</string>
...
...
@@ -909,7 +909,7 @@ C) 雿輻憭折掉撟喳餈葉鈭抒嚗恥
<string
name=
"user_platform_reward"
>
平台奖励
</string>
<string
name=
"user_service_income"
>
服务收入
</string>
<string
name=
"user_service_record"
>
服务业绩
</string>
<string
name=
"user_sale_record"
>
销售
业绩
</string>
<string
name=
"user_sale_record"
>
销
售奖励
</string>
<string
name=
"user_word_orders"
>
工单总数
</string>
<string
name=
"user_business_type"
>
业务品类
</string>
<string
name=
"user_info_setting"
>
个人资料设置
</string>
...
...
build.gradle
View file @
27d9bf05
...
...
@@ -5,8 +5,8 @@ buildscript {
ext
.
build_tools_version
=
"27.0.3"
ext
.
min_sdk_version
=
16
ext
.
target_sdk_version
=
25
ext
.
version_code
=
24
0
ext
.
verson_name
=
"
dev_2.4.0
"
ext
.
version_code
=
24
2
ext
.
verson_name
=
"
2.4.2
"
ext
.
gradle_version
=
'3.1.4'
ext
.
isReleaseMinify
=
true
ext
.
isDebugMinify
=
false
...
...
orderCenter/src/main/java/com/dayu/order/presenter/orderdoing/OrderDoingPresenter.java
View file @
27d9bf05
...
...
@@ -79,7 +79,8 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
@Override
public
void
loadMore
()
{
if
(
mView
instanceof
OrderDoneFragment
){
getDoneOrders
();
getOrders
(
mState
,
mUserId
,
mSiteId
,
mPage
,
Constants
.
PAGESIZE
);
// getDoneOrders();
}
else
{
getOrders
(
mState
,
mUserId
,
mSiteId
,
mPage
,
Constants
.
PAGESIZE
);
}
...
...
userCenter/src/main/java/com/dayu/usercenter/api/UserService2.java
View file @
27d9bf05
...
...
@@ -17,6 +17,7 @@ import com.dayu.usercenter.model.bean.ServiceTypeBean;
import
com.dayu.usercenter.model.bean.StarRatioBean
;
import
com.dayu.base.api.protocol.TreeAddressBean
;
import
com.dayu.usercenter.model.bean.UserBankInfoBean
;
import
com.dayu.usercenter.model.bean.UserIncomeBean
;
import
com.dayu.usercenter.model.bean.UserInfoBean
;
import
com.dayu.usercenter.model.bean.UserLicenceBean
;
...
...
@@ -209,6 +210,8 @@ public interface UserService2 {
*/
@GET
(
Constants
.
API_7800
+
"/payAccountRewardItem"
)
Observable
<
BaseResponse
<
BasePageBean
<
SaleRecordListBean
>>>
getSaleRecordList
(
@Query
(
"accountId"
)
int
accountId
,
@Query
(
"rewardType"
)
int
rewardType
,
@Query
(
"type"
)
int
type
,
@Query
(
"page"
)
int
page
,
@Query
(
"pageSize"
)
int
pageSize
);
...
...
@@ -236,5 +239,13 @@ public interface UserService2 {
@Query
(
"page"
)
int
page
,
@Query
(
"pageSize"
)
int
pageSize
);
/**
* 用户页-现金到账,销售奖励,服务收入,邀请奖励,平台奖励
* @param accountId
* @return
*/
@GET
(
Constants
.
API_7800
+
"/payAccountRewardItem/engineerIncome/accountId/{accountId}"
)
Observable
<
BaseResponse
<
UserIncomeBean
>>
getIncoms
(
@Path
(
"accountId"
)
int
accountId
);
}
userCenter/src/main/java/com/dayu/usercenter/model/bean/CommonRecordListBean.java
View file @
27d9bf05
...
...
@@ -26,7 +26,7 @@ public class CommonRecordListBean {
private
int
providerId
;
private
String
providerName
;
private
String
rewardItem
;
private
int
rewardPrice
;
private
double
rewardPrice
;
private
String
rewardTime
;
private
int
rewardType
;
private
int
status
;
...
...
@@ -96,11 +96,11 @@ public class CommonRecordListBean {
this
.
rewardItem
=
rewardItem
;
}
public
int
getRewardPrice
()
{
public
double
getRewardPrice
()
{
return
rewardPrice
;
}
public
void
setRewardPrice
(
int
rewardPrice
)
{
public
void
setRewardPrice
(
double
rewardPrice
)
{
this
.
rewardPrice
=
rewardPrice
;
}
...
...
userCenter/src/main/java/com/dayu/usercenter/model/bean/UserIncomeBean.java
0 → 100644
View file @
27d9bf05
package
com
.
dayu
.
usercenter
.
model
.
bean
;
public
class
UserIncomeBean
{
/**
* withdrawPrice : 410.4
* salesRewardPrice : null
* servicePrice : 367.2
* inviteRewardPrice : 21.6
* platformRewardPrice : null
*/
private
double
withdrawPrice
;
private
double
salesRewardPrice
;
private
double
servicePrice
;
private
double
inviteRewardPrice
;
private
double
platformRewardPrice
;
public
double
getWithdrawPrice
()
{
return
withdrawPrice
;
}
public
void
setWithdrawPrice
(
double
withdrawPrice
)
{
this
.
withdrawPrice
=
withdrawPrice
;
}
public
double
getSalesRewardPrice
()
{
return
salesRewardPrice
;
}
public
void
setSalesRewardPrice
(
double
salesRewardPrice
)
{
this
.
salesRewardPrice
=
salesRewardPrice
;
}
public
double
getServicePrice
()
{
return
servicePrice
;
}
public
void
setServicePrice
(
double
servicePrice
)
{
this
.
servicePrice
=
servicePrice
;
}
public
double
getInviteRewardPrice
()
{
return
inviteRewardPrice
;
}
public
void
setInviteRewardPrice
(
double
inviteRewardPrice
)
{
this
.
inviteRewardPrice
=
inviteRewardPrice
;
}
public
double
getPlatformRewardPrice
()
{
return
platformRewardPrice
;
}
public
void
setPlatformRewardPrice
(
double
platformRewardPrice
)
{
this
.
platformRewardPrice
=
platformRewardPrice
;
}
}
userCenter/src/main/java/com/dayu/usercenter/presenter/homeuser/HomeUserContract.java
View file @
27d9bf05
...
...
@@ -6,7 +6,7 @@ import com.dayu.common.BaseView;
import
com.dayu.usercenter.data.protocol.EngineerInfo
;
import
com.dayu.usercenter.data.protocol.OrderRecord
;
import
com.dayu.usercenter.data.protocol.TodayAchievement
;
import
com.dayu.usercenter.
data.protocol.TodayBalance
;
import
com.dayu.usercenter.
model.bean.UserIncomeBean
;
/**
* Created by luo on 2016/8/4.
...
...
@@ -37,6 +37,7 @@ public interface HomeUserContract {
void
requestError
();
void
setIncomData
(
UserIncomeBean
data
);
}
abstract
class
Presenter
extends
BasePresenter
<
View
>
{
...
...
userCenter/src/main/java/com/dayu/usercenter/presenter/homeuser/HomeUserPresenter.java
View file @
27d9bf05
...
...
@@ -4,8 +4,10 @@ import android.content.Intent;
import
android.databinding.ObservableField
;
import
android.os.Bundle
;
import
com.dayu.base.api.Api
;
import
com.dayu.common.Constants
;
import
com.dayu.usercenter.api.UserApiFactory
;
import
com.dayu.usercenter.api.UserService2
;
import
com.dayu.usercenter.ui.activity2.BusinessTypeActivity
;
import
com.dayu.usercenter.ui.activity2.CashRecordActivity
;
import
com.dayu.usercenter.ui.activity2.InvateNewActivity
;
...
...
@@ -43,6 +45,7 @@ public class HomeUserPresenter extends HomeUserContract.Presenter {
mUid
=
userId
;
getUserInfo
();
getRecordInfo
();
getIncomData
();
}
public
void
getUserInfo
()
{
...
...
@@ -59,6 +62,11 @@ public class HomeUserPresenter extends HomeUserContract.Presenter {
,
responeThrowable
->
mView
.
requestError
()));
}
private
void
getIncomData
()
{
Api
.
getService
(
UserService2
.
class
).
getIncoms
(
mUid
).
compose
(
Api
.
applySchedulers
())
.
subscribe
(
baseObserver
(
data
->
mView
.
setIncomData
(
data
)));
}
@Override
public
void
dumpToSetting
()
{
...
...
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/CashRecordActivity.java
View file @
27d9bf05
...
...
@@ -11,11 +11,8 @@ import com.dayu.common.Constants;
import
com.dayu.usercenter.R
;
import
com.dayu.usercenter.api.UserService2
;
import
com.dayu.usercenter.databinding.ActivityCashRecordBinding
;
import
com.dayu.usercenter.event.RefreshSaleRecordEvent
;
import
com.dayu.usercenter.model.bean.SaleArriveListBean
;
import
org.greenrobot.eventbus.EventBus
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
@@ -43,7 +40,6 @@ public class CashRecordActivity extends BaseActivity<SImplePresenter,ActivityCas
getDetailData
();
});
mBind
.
refreshLayout
.
setOnLoadMoreListener
(
refreshLayout
->
{
EventBus
.
getDefault
().
post
(
new
RefreshSaleRecordEvent
());
getDetailData
();
});
showDialog
();
...
...
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/CommonRecordActivity.java
View file @
27d9bf05
...
...
@@ -13,12 +13,7 @@ import com.dayu.common.Constants;
import
com.dayu.usercenter.R
;
import
com.dayu.usercenter.api.UserService2
;
import
com.dayu.usercenter.databinding.ActivityCommonRecordBinding
;
import
com.dayu.usercenter.event.RefreshSaleRecordEvent
;
import
com.dayu.usercenter.model.bean.CommonRecordListBean
;
import
com.dayu.usercenter.model.bean.SaleArriveListBean
;
import
com.dayu.usercenter.model.bean.SaleRecordListBean
;
import
org.greenrobot.eventbus.EventBus
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
@@ -62,7 +57,6 @@ public class CommonRecordActivity extends BaseActivity<SImplePresenter,ActivityC
getDetailData
();
});
mBind
.
refreshLayout
.
setOnLoadMoreListener
(
refreshLayout
->
{
EventBus
.
getDefault
().
post
(
new
RefreshSaleRecordEvent
());
getDetailData
();
});
showDialog
();
...
...
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
View file @
27d9bf05
...
...
@@ -22,12 +22,11 @@ import com.dayu.usercenter.data.protocol.TodayAchievement;
import
com.dayu.usercenter.databinding.FragmentHomeUserBinding
;
import
com.dayu.usercenter.event.RefreshUserInfoEvent
;
import
com.dayu.usercenter.event.RefreshUserRecordEvent
;
import
com.dayu.usercenter.model.bean.UserIncomeBean
;
import
com.dayu.usercenter.presenter.homeuser.HomeUserContract
;
import
com.dayu.usercenter.presenter.homeuser.HomeUserPresenter
;
import
com.dayu.usercenter.ui.activity.WithdrawalsActivity
;
import
com.dayu.usercenter.ui.activity2.CommonRecordActivity
;
import
com.dayu.usercenter.ui.activity2.UserInfoActivity
;
import
com.dayu.utils.CommonUtils
;
import
com.dayu.utils.ProgressUtil
;
import
com.dayu.utils.SPUtils
;
import
com.dayu.utils.UserManager
;
...
...
@@ -146,12 +145,21 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
mScore
=
record
.
getScore
()
+
""
;
drawStars
(
mBind
.
tvStar
,
mScore
,
"5"
);
mBind
.
tvSaleReward
.
setText
(
""
+
record
.
getSalesPrice
());
// mBind.tvSaleRecord.setText(record.getSalesCount() + "");
mBind
.
tvServiceIncome
.
setText
(
""
+
record
.
getServiceTotalPrice
());
//
mBind.tvSaleReward.setText(""+record.getSalesPrice());
//
//
mBind.tvSaleRecord.setText(record.getSalesCount() + "");
//
mBind.tvServiceIncome.setText(""+record.getServiceTotalPrice());
mBind
.
tvBusinessType
.
setText
(
record
.
getCategoryCounts
()+
""
);
}
@Override
public
void
setIncomData
(
UserIncomeBean
data
)
{
mBind
.
tvCashArrive
.
setText
(
"¥"
+
data
.
getWithdrawPrice
());
mBind
.
tvSaleReward
.
setText
(
"¥"
+
data
.
getSalesRewardPrice
());
mBind
.
tvServiceIncome
.
setText
(
"¥"
+
data
.
getServicePrice
());
mBind
.
tvInvateReward
.
setText
(
"¥"
+
data
.
getInviteRewardPrice
());
mBind
.
tvPlatformReward
.
setText
(
"¥"
+
data
.
getPlatformRewardPrice
());
}
@Override
public
void
showAlipayDialog
()
{
...
...
@@ -182,6 +190,8 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
}
private
void
showAlertDialog
()
{
CustomDialog
dialog
=
new
CustomDialog
(
mActivity
,
R
.
style
.
CustomDialog
,
mActivity
.
getString
(
R
.
string
.
not_set_account
)
,
(
dialog1
,
confirm
)
->
{
...
...
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/SaleRecordArriveFragment.java
View file @
27d9bf05
...
...
@@ -39,16 +39,16 @@ public class SaleRecordArriveFragment extends BaseFragment<SImplePresenter,Fragm
public
void
initView
()
{
initUser
();
mBind
.
refreshLayout
.
setEnableLoadMore
(
false
);
mBind
.
refreshLayout
.
setOnRefreshListener
(
refreshLayout
->
{
page
=
1
;
getDetailData
();
}
);
mBind
.
refreshLayout
.
setOnLoadMoreListener
(
refreshLayout
->
{
EventBus
.
getDefault
().
post
(
new
RefreshSaleRecordEvent
());
getDetailData
();
});
showDialog
();
getDetailData
();
//
mBind.refreshLayout.setOnRefreshListener(refreshLayout -> {
//
page = 1;
//
getDetailData();
// EventBus.getDefault().post(new RefreshSaleRecordEvent()
);
// });
// mBind.refreshLayout.setOnLoadMoreListener(refreshLayout -> {
//
getDetailData();
//
});
//
showDialog();
//
getDetailData();
}
private
void
getDetailData
(){
...
...
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/SaleRecordDetailFragment.java
View file @
27d9bf05
...
...
@@ -41,9 +41,9 @@ public class SaleRecordDetailFragment extends BaseFragment<SImplePresenter,Fragm
mBind
.
refreshLayout
.
setOnRefreshListener
(
refreshLayout
->
{
page
=
1
;
getDetailData
();
EventBus
.
getDefault
().
post
(
new
RefreshSaleRecordEvent
());
});
mBind
.
refreshLayout
.
setOnLoadMoreListener
(
refreshLayout
->
{
EventBus
.
getDefault
().
post
(
new
RefreshSaleRecordEvent
());
getDetailData
();
});
showDialog
();
...
...
@@ -51,7 +51,7 @@ public class SaleRecordDetailFragment extends BaseFragment<SImplePresenter,Fragm
}
private
void
getDetailData
(){
Api
.
getService
(
UserService2
.
class
).
getSaleRecordList
(
mUserId
,
page
,
Constants
.
PAGESIZE
).
compose
(
Api
.
applySchedulers
())
Api
.
getService
(
UserService2
.
class
).
getSaleRecordList
(
mUserId
,
1
,
1
,
page
,
Constants
.
PAGESIZE
).
compose
(
Api
.
applySchedulers
())
.
subscribe
(
mPresenter
.
baseObserver
(
data
->{
mBind
.
refreshLayout
.
finishRefresh
();
mBind
.
refreshLayout
.
finishLoadMore
();
...
...
userCenter/src/main/res/layout/activity_cash_record.xml
View file @
27d9bf05
...
...
@@ -30,7 +30,8 @@
android:layout_width=
"match_parent"
android:layout_height=
"40dp"
android:layout_marginTop=
"5dp"
android:padding=
"1dp"
android:paddingLeft=
"1dp"
android:paddingRight=
"1dp"
android:orientation=
"horizontal"
>
<TextView
...
...
@@ -57,15 +58,14 @@
android:id=
"@+id/refresh_layout"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginBottom=
"65dp"
android:paddingLeft=
"15dp"
android:paddingRight=
"15dp"
>
android:layout_marginBottom=
"65dp"
>
<android.support.v7.widget.RecyclerView
android:layout_marginLeft=
"1dp"
android:layout_marginRight=
"1dp"
android:id=
"@+id/rv_cache"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"15dp"
android:overScrollMode=
"never"
/>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout>
...
...
userCenter/src/main/res/layout/activity_sale_record.xml
View file @
27d9bf05
...
...
@@ -87,6 +87,7 @@
android:gravity=
"center"
android:text=
"@string/reward_detail"
/>
<Button
android:visibility=
"gone"
android:id=
"@+id/btn_record"
android:layout_width=
"0dp"
android:layout_weight=
"1"
...
...
userCenter/src/main/res/layout/fragment_home_user.xml
View file @
27d9bf05
...
...
@@ -246,6 +246,7 @@
<TextView
android:id=
"@+id/tv_cash_arrive"
style=
"@style/tv_user_bottom2"
android:textSize=
"26sp"
android:layout_marginTop=
"0dp"
android:layout_marginLeft=
"10dp"
android:text=
"0"
...
...
userCenter/src/main/res/layout/fragment_sale_record_arrive.xml
View file @
27d9bf05
...
...
@@ -23,7 +23,7 @@
style=
"@style/sale_item_text"
android:layout_width=
"0dp"
android:layout_height=
"match_parent"
android:layout_weight=
"
2
"
android:layout_weight=
"
1.5
"
android:background=
"@drawable/bg_order_step_title1"
android:gravity=
"center"
android:text=
"@string/arrive_time"
/>
...
...
userCenter/src/main/res/layout/item_record_arrive.xml
View file @
27d9bf05
...
...
@@ -8,11 +8,13 @@
android:id=
"@+id/tv_item1"
style=
"@style/sale_item_text"
android:layout_width=
"0dp"
android:layout_weight=
"
2
"
android:layout_weight=
"
1.5
"
android:layout_height=
"match_parent"
android:background=
"@drawable/bg_order_step_item1"
android:gravity=
"center"
android:maxLines=
"5"
android:paddingTop=
"5dp"
android:paddingBottom=
"5dp"
/>
<TextView
...
...
@@ -21,9 +23,11 @@
android:layout_width=
"0dp"
android:layout_weight=
"1"
android:layout_height=
"match_parent"
android:background=
"@drawable/bg_order_step_item
2
"
android:background=
"@drawable/bg_order_step_item
3
"
android:gravity=
"center"
android:maxLines=
"5"
android:paddingTop=
"5dp"
android:paddingBottom=
"5dp"
/>
</LinearLayout>
...
...
userCenter/src/main/res/values/styles.xml
View file @
27d9bf05
...
...
@@ -30,7 +30,7 @@
<item
name=
"android:layout_height"
>
wrap_content
</item>
<item
name=
"android:layout_marginTop"
>
@dimen/dp_10
</item>
<item
name=
"android:textColor"
>
@color/cl_home_button
</item>
<item
name=
"android:textSize"
>
2
6
sp
</item>
<item
name=
"android:textSize"
>
2
2
sp
</item>
</style>
</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