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
2069dc7e
authored
Dec 07, 2017
by
罗翻
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dataBingding
parent
a0d4cd6a
Hide whitespace changes
Inline
Side-by-side
Showing
35 changed files
with
742 additions
and
338 deletions
annotation_lib/build/libs/annotation_lib.jar
app/src/main/java/com/dayu/bigfish/base/BaseBingdActivity.java
app/src/main/java/com/dayu/bigfish/presenter/Withdrawals/WithdrawalsContract.java
app/src/main/java/com/dayu/bigfish/presenter/Withdrawals/WithdrawalsPresenter.java
app/src/main/java/com/dayu/bigfish/presenter/homefourtab/HomeFourContract.java
app/src/main/java/com/dayu/bigfish/presenter/homefourtab/HomeFourPresenter.java
app/src/main/java/com/dayu/bigfish/presenter/main/MainContract.java
app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java
app/src/main/java/com/dayu/bigfish/presenter/processorder/ProcessOrderContract.java
app/src/main/java/com/dayu/bigfish/presenter/processorder/ProcessOrderPresenter.java
app/src/main/java/com/dayu/bigfish/presenter/setting/SettingContract.java
app/src/main/java/com/dayu/bigfish/presenter/setting/SettingPresenter.java
app/src/main/java/com/dayu/bigfish/presenter/subcribeTime/SubcribeContract.java
app/src/main/java/com/dayu/bigfish/presenter/subcribeTime/SubcribeTimePresenter.java
app/src/main/java/com/dayu/bigfish/presenter/worksRecord/WorksRecordPresenter.java
app/src/main/java/com/dayu/bigfish/presenter/worksRecord/WroksRecordContract.java
app/src/main/java/com/dayu/bigfish/ui/FeedBackActivity.java
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
app/src/main/java/com/dayu/bigfish/ui/OrderRecordActivity.java
app/src/main/java/com/dayu/bigfish/ui/ProcessOrderActivity.java
app/src/main/java/com/dayu/bigfish/ui/SettingActivity.java
app/src/main/java/com/dayu/bigfish/ui/SubcribeTimeActivity.java
app/src/main/java/com/dayu/bigfish/ui/WithdrawalsActivity.java
app/src/main/java/com/dayu/bigfish/ui/fragment/HomePersonFragment.java
app/src/main/res/layout/activity_accountbalance_layout.xml
app/src/main/res/layout/activity_feedback.xml
app/src/main/res/layout/activity_main.xml
app/src/main/res/layout/activity_order_details.xml
app/src/main/res/layout/activity_order_record.xml
app/src/main/res/layout/activity_process_order.xml
app/src/main/res/layout/activity_setting.xml
app/src/main/res/layout/activity_subscribe_time.xml
app/src/main/res/layout/activity_withdrawals.xml
app/src/main/res/layout/fragment_personal_center.xml
app/src/main/res/values/strings.xml
annotation_lib/build/libs/annotation_lib.jar
View file @
2069dc7e
No preview for this file type
app/src/main/java/com/dayu/bigfish/base/BaseBingdActivity.java
View file @
2069dc7e
...
@@ -27,7 +27,9 @@ public abstract class BaseBingdActivity<P extends BasePresenter, B extends ViewD
...
@@ -27,7 +27,9 @@ public abstract class BaseBingdActivity<P extends BasePresenter, B extends ViewD
Class
mPresenterClass
=
(
Class
)
((
ParameterizedType
)
(
this
.
getClass
()
Class
mPresenterClass
=
(
Class
)
((
ParameterizedType
)
(
this
.
getClass
()
.
getGenericSuperclass
())).
getActualTypeArguments
()[
0
];
.
getGenericSuperclass
())).
getActualTypeArguments
()[
0
];
mPresenter
=
InstanceUtil
.
getInstance
(
mPresenterClass
);
mPresenter
=
InstanceUtil
.
getInstance
(
mPresenterClass
);
if
(
mPresenter
!=
null
)
mPresenter
.
setView
(
this
,
this
);
if
(
mPresenter
!=
null
)
{
mPresenter
.
setView
(
this
,
this
);
}
}
}
}
}
...
...
app/src/main/java/com/dayu/bigfish/presenter/Withdrawals/WithdrawalsContract.java
View file @
2069dc7e
...
@@ -14,8 +14,15 @@ public interface WithdrawalsContract {
...
@@ -14,8 +14,15 @@ public interface WithdrawalsContract {
interface
View
extends
BaseView
{
interface
View
extends
BaseView
{
void
querSuccess
(
AlipayInfo
info
);
void
querSuccess
(
AlipayInfo
info
);
void
boundSuccess
(
boolean
flag
);
void
boundSuccess
(
boolean
flag
);
void
modifySuccess
(
boolean
flag
);
void
modifySuccess
(
boolean
flag
);
/**
* 提交信息.
*/
void
comfirm
();
}
}
abstract
class
Presenter
extends
BasePresenter
<
View
>
{
abstract
class
Presenter
extends
BasePresenter
<
View
>
{
...
@@ -25,5 +32,10 @@ public interface WithdrawalsContract {
...
@@ -25,5 +32,10 @@ public interface WithdrawalsContract {
public
abstract
void
modifyAlipay
(
RequestBody
body
);
public
abstract
void
modifyAlipay
(
RequestBody
body
);
/**
* 提交信息.
*/
public
abstract
void
comfirm
();
}
}
}
}
app/src/main/java/com/dayu/bigfish/presenter/Withdrawals/WithdrawalsPresenter.java
View file @
2069dc7e
...
@@ -46,4 +46,9 @@ public class WithdrawalsPresenter extends WithdrawalsContract.Presenter {
...
@@ -46,4 +46,9 @@ public class WithdrawalsPresenter extends WithdrawalsContract.Presenter {
}
}
}));
}));
}
}
@Override
public
void
comfirm
()
{
mView
.
comfirm
();
}
}
}
app/src/main/java/com/dayu/bigfish/presenter/homefourtab/HomeFourContract.java
View file @
2069dc7e
...
@@ -24,6 +24,21 @@ public interface HomeFourContract {
...
@@ -24,6 +24,21 @@ public interface HomeFourContract {
void
getAccountBalanceSuccess
(
TodayBalance
todayBalance
);
void
getAccountBalanceSuccess
(
TodayBalance
todayBalance
);
void
getAlipayAccountSuccess
(
AlipayInfo
info
);
void
getAlipayAccountSuccess
(
AlipayInfo
info
);
/**
* 跳转账户余额.
*/
void
dumpToAccount
();
/**
* 跳转到设置.
*/
void
dumpToSetting
();
/**
* 跳转到工单记录.
*/
void
dumpToOrderRecord
();
}
}
abstract
class
Presenter
extends
BasePresenter
<
View
>
{
abstract
class
Presenter
extends
BasePresenter
<
View
>
{
...
@@ -31,5 +46,20 @@ public interface HomeFourContract {
...
@@ -31,5 +46,20 @@ public interface HomeFourContract {
public
abstract
void
getAlipayAccount
(
int
accountId
);
public
abstract
void
getAlipayAccount
(
int
accountId
);
public
abstract
void
getAllData
(
int
userId
,
int
siteId
);
public
abstract
void
getAllData
(
int
userId
,
int
siteId
);
/**
* 跳转账户余额.
*/
public
abstract
void
dumpToAccount
();
/**
* 跳转到设置.
*/
public
abstract
void
dumpToSetting
();
/**
* 跳转到工单记录.
*/
public
abstract
void
dumpToOrderRecord
();
}
}
}
}
app/src/main/java/com/dayu/bigfish/presenter/homefourtab/HomeFourPresenter.java
View file @
2069dc7e
...
@@ -36,7 +36,7 @@ public class HomeFourPresenter extends HomeFourContract.Presenter {
...
@@ -36,7 +36,7 @@ public class HomeFourPresenter extends HomeFourContract.Presenter {
public
void
getAllData
(
int
userId
,
int
siteId
)
{
public
void
getAllData
(
int
userId
,
int
siteId
)
{
Observable
.
mergeDelayError
(
ApiFactory
.
getEngineerInfo
(
userId
),
ApiFactory
.
getAchievement
(
siteId
,
userId
),
Observable
.
mergeDelayError
(
ApiFactory
.
getEngineerInfo
(
userId
),
ApiFactory
.
getAchievement
(
siteId
,
userId
),
ApiFactory
.
getOrderScore
(
siteId
,
userId
),
ApiFactory
.
getTodayBalance
(
userId
)).
subscribe
(
ApiFactory
.
getOrderScore
(
siteId
,
userId
),
ApiFactory
.
getTodayBalance
(
userId
)).
subscribe
(
baseObserver
(
o
->
{
baseObserver
(
o
->
{
if
(
o
instanceof
EngineerInfo
)
{
if
(
o
instanceof
EngineerInfo
)
{
mView
.
getPersonalInfoSuccess
((
EngineerInfo
)
o
);
mView
.
getPersonalInfoSuccess
((
EngineerInfo
)
o
);
}
else
if
(
o
instanceof
TodayAchievement
)
{
}
else
if
(
o
instanceof
TodayAchievement
)
{
...
@@ -49,4 +49,19 @@ public class HomeFourPresenter extends HomeFourContract.Presenter {
...
@@ -49,4 +49,19 @@ public class HomeFourPresenter extends HomeFourContract.Presenter {
}));
}));
}
}
@Override
public
void
dumpToAccount
()
{
mView
.
dumpToAccount
();
}
@Override
public
void
dumpToSetting
()
{
mView
.
dumpToSetting
();
}
@Override
public
void
dumpToOrderRecord
()
{
mView
.
dumpToOrderRecord
();
}
}
}
app/src/main/java/com/dayu/bigfish/presenter/main/MainContract.java
View file @
2069dc7e
...
@@ -45,6 +45,11 @@ public interface MainContract {
...
@@ -45,6 +45,11 @@ public interface MainContract {
* @param flag
* @param flag
*/
*/
void
isShowRedIcon
(
boolean
flag
);
void
isShowRedIcon
(
boolean
flag
);
/**
* 跳转到待接单.
*/
void
dumpReceActivity
();
}
}
abstract
class
Presenter
extends
BasePresenter
<
View
>
{
abstract
class
Presenter
extends
BasePresenter
<
View
>
{
...
@@ -91,5 +96,10 @@ public interface MainContract {
...
@@ -91,5 +96,10 @@ public interface MainContract {
*/
*/
public
abstract
void
getHxNum
(
String
hxAccout
);
public
abstract
void
getHxNum
(
String
hxAccout
);
/**
* 跳转到待接单.
*/
public
abstract
void
dumpReceActivity
();
}
}
}
}
app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java
View file @
2069dc7e
...
@@ -98,4 +98,9 @@ public class MainPresenter extends MainContract.Presenter {
...
@@ -98,4 +98,9 @@ public class MainPresenter extends MainContract.Presenter {
}));
}));
}
}
@Override
public
void
dumpReceActivity
()
{
mView
.
dumpReceActivity
();
}
}
}
app/src/main/java/com/dayu/bigfish/presenter/processorder/ProcessOrderContract.java
View file @
2069dc7e
...
@@ -18,6 +18,26 @@ public interface ProcessOrderContract {
...
@@ -18,6 +18,26 @@ public interface ProcessOrderContract {
void
getOrderInfoSuccess
(
OrderDetail
detail
);
void
getOrderInfoSuccess
(
OrderDetail
detail
);
void
commitPhotoSuccess
(
List
<
String
>
list
);
void
commitPhotoSuccess
(
List
<
String
>
list
);
/**
* 保存订单.
*/
void
saveOrder
();
/**
* 是否需要付费.
*/
void
swtichButton
();
/**
* 提交订单.
*/
void
submitOrder
();
/**
* 跳转sop.
*/
void
dumpToSop
();
}
}
abstract
class
Presenter
extends
BasePresenter
<
View
>
{
abstract
class
Presenter
extends
BasePresenter
<
View
>
{
...
@@ -28,5 +48,21 @@ public interface ProcessOrderContract {
...
@@ -28,5 +48,21 @@ public interface ProcessOrderContract {
String
servicePrice
,
String
materialCost
,
String
otherPrice
);
String
servicePrice
,
String
materialCost
,
String
otherPrice
);
public
abstract
void
commitPhoto
(
List
<
String
>
imageUrl
);
public
abstract
void
commitPhoto
(
List
<
String
>
imageUrl
);
/**
* 保存订单.
*/
public
abstract
void
saveOrder
();
/**
* 提交订单.
*/
public
abstract
void
submitOrder
();
/**
* 跳转sop.
*/
public
abstract
void
dumpToSop
();
}
}
}
}
app/src/main/java/com/dayu/bigfish/presenter/processorder/ProcessOrderPresenter.java
View file @
2069dc7e
...
@@ -101,4 +101,20 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
...
@@ -101,4 +101,20 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
}
}
}));
}));
}
}
@Override
public
void
saveOrder
()
{
mView
.
saveOrder
();
}
@Override
public
void
submitOrder
()
{
mView
.
submitOrder
();
}
@Override
public
void
dumpToSop
()
{
mView
.
dumpToSop
();
}
}
}
app/src/main/java/com/dayu/bigfish/presenter/setting/SettingContract.java
View file @
2069dc7e
...
@@ -11,9 +11,69 @@ public interface SettingContract {
...
@@ -11,9 +11,69 @@ public interface SettingContract {
interface
View
extends
BaseView
{
interface
View
extends
BaseView
{
void
getNewVersionSuccess
(
String
code
);
void
getNewVersionSuccess
(
String
code
);
/**
* 退出登录.
*/
void
exite
();
/**
* 清除缓存.
*/
void
clearCach
();
/**
* 检查更新.
*/
void
checkVersion
();
/**
* 拨打电话.
*/
void
takePhone
();
/**
* 跳转到关于我们.
*/
void
dumpToAboutus
();
/**
* 跳转到问题反馈.
*/
void
dumpToFeed
();
}
}
abstract
class
Presenter
extends
BasePresenter
<
View
>
{
abstract
class
Presenter
extends
BasePresenter
<
View
>
{
public
abstract
void
updataVersion
();
public
abstract
void
updataVersion
();
/**
* 退出登录.
*/
public
abstract
void
exite
();
/**
* 清除缓存.
*/
public
abstract
void
clearCach
();
/**
* 检查更新.
*/
public
abstract
void
checkVersion
();
/**
* 拨打电话.
*/
public
abstract
void
takePhone
();
/**
* 跳转到关于我们.
*/
public
abstract
void
dumpToAboutus
();
/**
* 跳转到问题反馈.
*/
public
abstract
void
dumpToFeed
();
}
}
}
}
app/src/main/java/com/dayu/bigfish/presenter/setting/SettingPresenter.java
View file @
2069dc7e
...
@@ -26,4 +26,34 @@ public class SettingPresenter extends SettingContract.Presenter {
...
@@ -26,4 +26,34 @@ public class SettingPresenter extends SettingContract.Presenter {
}));
}));
}
}
@Override
public
void
exite
()
{
mView
.
exite
();
}
@Override
public
void
clearCach
()
{
mView
.
clearCach
();
}
@Override
public
void
checkVersion
()
{
mView
.
checkVersion
();
}
@Override
public
void
takePhone
()
{
mView
.
takePhone
();
}
@Override
public
void
dumpToAboutus
()
{
mView
.
dumpToAboutus
();
}
@Override
public
void
dumpToFeed
()
{
mView
.
dumpToFeed
();
}
}
}
app/src/main/java/com/dayu/bigfish/presenter/subcribeTime/SubcribeContract.java
View file @
2069dc7e
...
@@ -3,6 +3,7 @@ package com.dayu.bigfish.presenter.subcribeTime;
...
@@ -3,6 +3,7 @@ package com.dayu.bigfish.presenter.subcribeTime;
import
com.dayu.bigfish.base.BasePresenter
;
import
com.dayu.bigfish.base.BasePresenter
;
import
com.dayu.bigfish.base.BaseView
;
import
com.dayu.bigfish.base.BaseView
;
import
com.dayu.bigfish.ui.SubcribeTimeActivity
;
/**
/**
* Created by luo on 2016/8/4.
* Created by luo on 2016/8/4.
...
@@ -11,9 +12,43 @@ public interface SubcribeContract {
...
@@ -11,9 +12,43 @@ public interface SubcribeContract {
interface
View
extends
BaseView
{
interface
View
extends
BaseView
{
void
subcribeTimeSuccess
();
void
subcribeTimeSuccess
();
/**
* 预约时间.
*/
void
subcribeTime
();
/**
* 选择日期.
*/
void
selectDay
();
/**
* 选择时间.
*
*/
void
selectTime
();
}
}
abstract
class
Presenter
extends
BasePresenter
<
View
>
{
abstract
class
Presenter
extends
BasePresenter
<
SubcribeTimeActivity
>
{
public
abstract
void
subcribeTime
(
int
orderId
,
String
doorTime
,
String
doorComment
);
public
abstract
void
subcribeTime
(
int
orderId
,
String
doorTime
,
String
doorComment
);
/**
* 预约时间.
*/
public
abstract
void
subcribeTime
();
/**
* 选择日期.
*/
public
abstract
void
selectDay
();
/**
* 选择时间.
*
* @param day
*/
public
abstract
void
selectTime
(
String
day
);
}
}
}
}
app/src/main/java/com/dayu/bigfish/presenter/subcribeTime/SubcribeTimePresenter.java
View file @
2069dc7e
package
com
.
dayu
.
bigfish
.
presenter
.
subcribeTime
;
package
com
.
dayu
.
bigfish
.
presenter
.
subcribeTime
;
import
android.text.TextUtils
;
import
com.app.annotation.apt.InstanceFactory
;
import
com.app.annotation.apt.InstanceFactory
;
import
com.apt.ApiFactory
;
import
com.apt.ApiFactory
;
import
com.dayu.bigfish.R
;
import
io.reactivex.functions.Consumer
;
import
io.reactivex.functions.Consumer
;
...
@@ -14,6 +17,7 @@ public class SubcribeTimePresenter extends SubcribeContract.Presenter {
...
@@ -14,6 +17,7 @@ public class SubcribeTimePresenter extends SubcribeContract.Presenter {
public
void
onAttached
()
{
public
void
onAttached
()
{
}
}
@Override
@Override
public
void
subcribeTime
(
int
orderId
,
String
doorTime
,
String
doorComment
)
{
public
void
subcribeTime
(
int
orderId
,
String
doorTime
,
String
doorComment
)
{
ApiFactory
.
subcriceTime
(
orderId
,
doorTime
,
doorComment
).
subscribe
(
baseObserver
(
new
Consumer
<
Boolean
>()
{
ApiFactory
.
subcriceTime
(
orderId
,
doorTime
,
doorComment
).
subscribe
(
baseObserver
(
new
Consumer
<
Boolean
>()
{
...
@@ -23,4 +27,23 @@ public class SubcribeTimePresenter extends SubcribeContract.Presenter {
...
@@ -23,4 +27,23 @@ public class SubcribeTimePresenter extends SubcribeContract.Presenter {
}
}
}));
}));
}
}
@Override
public
void
subcribeTime
()
{
mView
.
subcribeTime
();
}
@Override
public
void
selectDay
()
{
mView
.
selectDay
();
}
@Override
public
void
selectTime
(
String
day
)
{
if
(
TextUtils
.
isEmpty
(
day
))
{
mView
.
showToast
(
mActivity
.
getString
(
R
.
string
.
input_day_first
));
return
;
}
mView
.
selectTime
();
}
}
}
app/src/main/java/com/dayu/bigfish/presenter/worksRecord/WorksRecordPresenter.java
View file @
2069dc7e
...
@@ -25,11 +25,16 @@ public class WorksRecordPresenter extends WroksRecordContract.Presenter {
...
@@ -25,11 +25,16 @@ public class WorksRecordPresenter extends WroksRecordContract.Presenter {
public
void
accept
(
BasePageBean
<
Order
>
orderBasePageBean
)
throws
Exception
{
public
void
accept
(
BasePageBean
<
Order
>
orderBasePageBean
)
throws
Exception
{
mView
.
getWorksRecord
(
orderBasePageBean
);
mView
.
getWorksRecord
(
orderBasePageBean
);
}
}
},
new
Consumer
<
Throwable
>()
{
},
throwable
->
mView
.
getWorkRecordFail
()));
@Override
}
public
void
accept
(
Throwable
throwable
)
throws
Exception
{
mView
.
getWorkRecordFail
();
@Override
}
public
void
hideSearch
()
{
}));
mView
.
hideSearch
();
}
@Override
public
void
showSearch
()
{
mView
.
showSearch
();
}
}
}
}
app/src/main/java/com/dayu/bigfish/presenter/worksRecord/WroksRecordContract.java
View file @
2069dc7e
package
com
.
dayu
.
bigfish
.
presenter
.
worksRecord
;
package
com
.
dayu
.
bigfish
.
presenter
.
worksRecord
;
import
android.text.Editable
;
import
com.dayu.bigfish.base.BasePageBean
;
import
com.dayu.bigfish.base.BasePageBean
;
import
com.dayu.bigfish.base.BasePresenter
;
import
com.dayu.bigfish.base.BasePresenter
;
import
com.dayu.bigfish.base.BaseView
;
import
com.dayu.bigfish.base.BaseView
;
...
@@ -14,6 +16,7 @@ public interface WroksRecordContract {
...
@@ -14,6 +16,7 @@ public interface WroksRecordContract {
interface
View
extends
BaseView
{
interface
View
extends
BaseView
{
/**
/**
* 获取完成订单列表成功.
* 获取完成订单列表成功.
*
* @param orders
* @param orders
*/
*/
void
getWorksRecord
(
BasePageBean
<
Order
>
orders
);
void
getWorksRecord
(
BasePageBean
<
Order
>
orders
);
...
@@ -22,17 +25,44 @@ public interface WroksRecordContract {
...
@@ -22,17 +25,44 @@ public interface WroksRecordContract {
* 获取完成订单列表失败.
* 获取完成订单列表失败.
*/
*/
void
getWorkRecordFail
();
void
getWorkRecordFail
();
/**
* 关闭搜索.
*/
void
hideSearch
();
/**
* 开启搜索.
*/
void
showSearch
();
/**
* 搜索订单
*/
void
doSearch
(
Editable
s
);
}
}
abstract
class
Presenter
extends
BasePresenter
<
View
>
{
abstract
class
Presenter
extends
BasePresenter
<
View
>
{
/**
/**
* 获取完成订单
* 获取完成订单
* @param state 5,已完成.
*
* @param state 5,已完成.
* @param engineerId
* @param engineerId
* @param siteId
* @param siteId
* @param page
* @param page
* @param pageSize
* @param pageSize
*/
*/
public
abstract
void
getWorksRecord
(
int
state
,
int
engineerId
,
int
siteId
,
int
page
,
int
pageSize
);
public
abstract
void
getWorksRecord
(
int
state
,
int
engineerId
,
int
siteId
,
int
page
,
int
pageSize
);
/**
* 关闭搜索.
*/
public
abstract
void
hideSearch
();
/**
* 开启搜索.
*/
public
abstract
void
showSearch
();
}
}
}
}
app/src/main/java/com/dayu/bigfish/ui/FeedBackActivity.java
View file @
2069dc7e
...
@@ -26,9 +26,9 @@ public class FeedBackActivity extends BaseBingdActivity<FeedBackPresenter, Activ
...
@@ -26,9 +26,9 @@ public class FeedBackActivity extends BaseBingdActivity<FeedBackPresenter, Activ
@Override
@Override
public
void
initView
()
{
public
void
initView
()
{
mBind
.
setPresenter
(
mPresenter
);
userName
=
GetUserInfo
.
getUserName
(
this
);
userName
=
GetUserInfo
.
getUserName
(
this
);
userPhone
=
GetUserInfo
.
getUserPhone
(
this
);
userPhone
=
GetUserInfo
.
getUserPhone
(
this
);
mBind
.
titleBack
.
setOnClickListener
(
o
->
finish
());
mBind
.
submitIdea
.
setOnClickListener
(
o
->
{
mBind
.
submitIdea
.
setOnClickListener
(
o
->
{
mComment
=
mBind
.
etContent
.
getText
().
toString
();
mComment
=
mBind
.
etContent
.
getText
().
toString
();
mPresenter
.
comFirmSuggist
(
mComment
,
userName
,
userPhone
);
mPresenter
.
comFirmSuggist
(
mComment
,
userName
,
userPhone
);
...
...
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
View file @
2069dc7e
...
@@ -82,6 +82,7 @@ public class MainActivity extends BaseBingdActivity<MainPresenter, ActivityMainB
...
@@ -82,6 +82,7 @@ public class MainActivity extends BaseBingdActivity<MainPresenter, ActivityMainB
@Override
@Override
public
void
initView
()
{
public
void
initView
()
{
mBind
.
setPresenter
(
mPresenter
);
mAccountId
=
GetUserInfo
.
getACCOUNT_ID
(
mActivity
);
mAccountId
=
GetUserInfo
.
getACCOUNT_ID
(
mActivity
);
mSiteId
=
GetUserInfo
.
getSITE_ID
(
mActivity
);
mSiteId
=
GetUserInfo
.
getSITE_ID
(
mActivity
);
firstFragment
=
HomeFirstTabFragment
.
newInstance
();
firstFragment
=
HomeFirstTabFragment
.
newInstance
();
...
@@ -123,7 +124,6 @@ public class MainActivity extends BaseBingdActivity<MainPresenter, ActivityMainB
...
@@ -123,7 +124,6 @@ public class MainActivity extends BaseBingdActivity<MainPresenter, ActivityMainB
resetSelected
(
3
);
resetSelected
(
3
);
mPosition
=
3
;
mPosition
=
3
;
});
});
mBind
.
tabGetOrder
.
setOnClickListener
(
o
->
dumpReceActivity
());
}
}
private
void
request
()
{
private
void
request
()
{
...
@@ -164,6 +164,13 @@ public class MainActivity extends BaseBingdActivity<MainPresenter, ActivityMainB
...
@@ -164,6 +164,13 @@ public class MainActivity extends BaseBingdActivity<MainPresenter, ActivityMainB
}
}
@Override
public
void
dumpReceActivity
()
{
Intent
intent
=
new
Intent
(
mActivity
,
ReceivingActivity
.
class
);
startActivity
(
intent
);
overridePendingTransition
(
R
.
anim
.
slide_bottom_in
,
0
);
}
/**
/**
* 弹窗选择是否更新(软更新)
* 弹窗选择是否更新(软更新)
...
@@ -229,12 +236,6 @@ public class MainActivity extends BaseBingdActivity<MainPresenter, ActivityMainB
...
@@ -229,12 +236,6 @@ public class MainActivity extends BaseBingdActivity<MainPresenter, ActivityMainB
}
}
private
void
dumpReceActivity
()
{
Intent
intent
=
new
Intent
(
mActivity
,
ReceivingActivity
.
class
);
startActivity
(
intent
);
overridePendingTransition
(
R
.
anim
.
slide_bottom_in
,
0
);
}
public
void
resetSelected
(
int
position
)
{
public
void
resetSelected
(
int
position
)
{
for
(
int
i
=
0
;
i
<
mTabs
.
length
;
i
++)
{
for
(
int
i
=
0
;
i
<
mTabs
.
length
;
i
++)
{
mTabs
[
i
].
setSelected
(
false
);
mTabs
[
i
].
setSelected
(
false
);
...
...
app/src/main/java/com/dayu/bigfish/ui/OrderRecordActivity.java
View file @
2069dc7e
...
@@ -30,7 +30,8 @@ import java.util.ArrayList;
...
@@ -30,7 +30,8 @@ import java.util.ArrayList;
* on 2017/9/29.
* on 2017/9/29.
*/
*/
public
class
OrderRecordActivity
extends
BaseBingdActivity
<
WorksRecordPresenter
,
ActivityOrderRecordBinding
>
implements
WroksRecordContract
.
View
,
BaseQuickAdapter
.
RequestLoadMoreListener
,
SwipeRefreshLayout
.
OnRefreshListener
{
public
class
OrderRecordActivity
extends
BaseBingdActivity
<
WorksRecordPresenter
,
ActivityOrderRecordBinding
>
implements
WroksRecordContract
.
View
,
BaseQuickAdapter
.
RequestLoadMoreListener
,
SwipeRefreshLayout
.
OnRefreshListener
{
public
ArrayList
<
Order
>
mList
=
new
ArrayList
<>();
public
ArrayList
<
Order
>
mList
=
new
ArrayList
<>();
private
int
siteId
;
private
int
siteId
;
private
int
userId
;
private
int
userId
;
...
@@ -48,6 +49,7 @@ public class OrderRecordActivity extends BaseBingdActivity<WorksRecordPresenter,
...
@@ -48,6 +49,7 @@ public class OrderRecordActivity extends BaseBingdActivity<WorksRecordPresenter,
@Override
@Override
public
void
initView
()
{
public
void
initView
()
{
mBind
.
setPresenter
(
mPresenter
);
siteId
=
GetUserInfo
.
getSITE_ID
(
mActivity
);
siteId
=
GetUserInfo
.
getSITE_ID
(
mActivity
);
userId
=
GetUserInfo
.
getACCOUNT_ID
(
mActivity
);
userId
=
GetUserInfo
.
getACCOUNT_ID
(
mActivity
);
mBind
.
tvTitle
.
setText
(
getString
(
R
.
string
.
history_order
));
mBind
.
tvTitle
.
setText
(
getString
(
R
.
string
.
history_order
));
...
@@ -64,12 +66,6 @@ public class OrderRecordActivity extends BaseBingdActivity<WorksRecordPresenter,
...
@@ -64,12 +66,6 @@ public class OrderRecordActivity extends BaseBingdActivity<WorksRecordPresenter,
}
}
private
void
initListener
()
{
private
void
initListener
()
{
mBind
.
titleBack
.
setOnClickListener
(
o
->
finish
());
mBind
.
ivSaecher
.
setOnClickListener
(
o
->
{
mBind
.
rlTitle
.
setVisibility
(
View
.
GONE
);
mBind
.
rlSeacher
.
setVisibility
(
View
.
VISIBLE
);
});
mBind
.
tvCancel
.
setOnClickListener
(
o
->
hideSearch
());
mAdapter
.
setOnItemClickListener
((
adapter
,
view
,
position
)
->
{
mAdapter
.
setOnItemClickListener
((
adapter
,
view
,
position
)
->
{
Order
data
=
(
Order
)
adapter
.
getData
().
get
(
position
);
Order
data
=
(
Order
)
adapter
.
getData
().
get
(
position
);
dumpDetail
(
data
.
getId
());
dumpDetail
(
data
.
getId
());
...
@@ -94,35 +90,6 @@ public class OrderRecordActivity extends BaseBingdActivity<WorksRecordPresenter,
...
@@ -94,35 +90,6 @@ public class OrderRecordActivity extends BaseBingdActivity<WorksRecordPresenter,
});
});
}
}
private
void
doSearch
(
Editable
s
)
{
mAdapter
.
setEnableLoadMore
(
false
);
String
str
=
s
.
toString
();
if
(
mList
==
null
)
{
return
;
}
ArrayList
<
Order
>
list
=
new
ArrayList
<>();
for
(
Order
data
:
mList
)
{
if
(
TextUtils
.
isEmpty
(
str
)
||
(
data
.
getCustomerMobile
().
contains
(
str
)
&&
data
.
getAnyContacts
()
==
1
))
{
list
.
add
(
data
);
}
}
mAdapter
.
setNewData
(
list
);
}
public
void
hideSearch
()
{
try
{
mBind
.
etSeacher
.
setText
(
""
);
mBind
.
rlSeacher
.
setVisibility
(
View
.
GONE
);
mBind
.
rlTitle
.
setVisibility
(
View
.
VISIBLE
);
InputMethodManager
imm
=
(
InputMethodManager
)
mActivity
.
getSystemService
(
Context
.
INPUT_METHOD_SERVICE
);
imm
.
hideSoftInputFromWindow
(
mActivity
.
getCurrentFocus
().
getWindowToken
(),
0
);
}
catch
(
NullPointerException
e
)
{
}
}
public
void
dumpDetail
(
int
id
)
{
public
void
dumpDetail
(
int
id
)
{
Intent
intent
=
new
Intent
(
OrderRecordActivity
.
this
,
OrderDetailsActivity
.
class
);
Intent
intent
=
new
Intent
(
OrderRecordActivity
.
this
,
OrderDetailsActivity
.
class
);
intent
.
putExtra
(
"orderId"
,
id
);
intent
.
putExtra
(
"orderId"
,
id
);
...
@@ -167,6 +134,41 @@ public class OrderRecordActivity extends BaseBingdActivity<WorksRecordPresenter,
...
@@ -167,6 +134,41 @@ public class OrderRecordActivity extends BaseBingdActivity<WorksRecordPresenter,
}
}
@Override
@Override
public
void
hideSearch
()
{
try
{
mBind
.
etSeacher
.
setText
(
""
);
mBind
.
rlSeacher
.
setVisibility
(
View
.
GONE
);
mBind
.
rlTitle
.
setVisibility
(
View
.
VISIBLE
);
InputMethodManager
imm
=
(
InputMethodManager
)
mActivity
.
getSystemService
(
Context
.
INPUT_METHOD_SERVICE
);
imm
.
hideSoftInputFromWindow
(
mActivity
.
getCurrentFocus
().
getWindowToken
(),
0
);
}
catch
(
NullPointerException
e
)
{
}
}
@Override
public
void
showSearch
()
{
mBind
.
rlTitle
.
setVisibility
(
View
.
GONE
);
mBind
.
rlSeacher
.
setVisibility
(
View
.
VISIBLE
);
}
@Override
public
void
doSearch
(
Editable
s
)
{
mAdapter
.
setEnableLoadMore
(
false
);
String
str
=
s
.
toString
();
if
(
mList
==
null
)
{
return
;
}
ArrayList
<
Order
>
list
=
new
ArrayList
<>();
for
(
Order
data
:
mList
)
{
if
(
TextUtils
.
isEmpty
(
str
)
||
(
data
.
getCustomerMobile
().
contains
(
str
)
&&
data
.
getAnyContacts
()
==
1
))
{
list
.
add
(
data
);
}
}
mAdapter
.
setNewData
(
list
);
}
@Override
public
void
onLoadMoreRequested
()
{
public
void
onLoadMoreRequested
()
{
mRefreshState
=
2
;
mRefreshState
=
2
;
mPresenter
.
getWorksRecord
(
Constants
.
FINISH_ORDER
,
userId
,
siteId
,
mPage
,
mPageSize
);
mPresenter
.
getWorksRecord
(
Constants
.
FINISH_ORDER
,
userId
,
siteId
,
mPage
,
mPageSize
);
...
...
app/src/main/java/com/dayu/bigfish/ui/ProcessOrderActivity.java
View file @
2069dc7e
...
@@ -80,23 +80,13 @@ public class ProcessOrderActivity extends BaseBingdActivity<ProcessOrderPresente
...
@@ -80,23 +80,13 @@ public class ProcessOrderActivity extends BaseBingdActivity<ProcessOrderPresente
@Override
@Override
public
void
initView
()
{
public
void
initView
()
{
mBind
.
setPresenter
(
mPresenter
);
mOrderInfoDao
=
GreenDaoManager
.
getInstance
().
getmDaoSession
().
getOrderInfoDao
();
mOrderInfoDao
=
GreenDaoManager
.
getInstance
().
getmDaoSession
().
getOrderInfoDao
();
mSelectList
=
new
ArrayList
<>();
mSelectList
=
new
ArrayList
<>();
mIvWeight
=
(
UtilsScreen
.
getScreenWidth
(
mActivity
)
-
UtilsScreen
.
dip2px
(
mActivity
,
20
))
/
5
;
mIvWeight
=
(
UtilsScreen
.
getScreenWidth
(
mActivity
)
-
UtilsScreen
.
dip2px
(
mActivity
,
20
))
/
5
;
mAddIV
=
new
ImageView
(
mActivity
);
mAddIV
=
new
ImageView
(
mActivity
);
mAddIV
.
setLayoutParams
(
new
ViewGroup
.
LayoutParams
(
mIvWeight
,
mIvWeight
));
mAddIV
.
setLayoutParams
(
new
ViewGroup
.
LayoutParams
(
mIvWeight
,
mIvWeight
));
mAddIV
.
setImageResource
(
R
.
mipmap
.
settopic_pictrue
);
mAddIV
.
setImageResource
(
R
.
mipmap
.
settopic_pictrue
);
mAddIV
.
setOnClickListener
(
v
->
choosePic
());
// isSwitch = (boolean) get(this, "big_fish", "imageSwitch", false);
// if (isSwitch) {
// mBind.ivSwitch.setSwitchButton(isSwitch);
// mBind.rlPay.setVisibility(View.VISIBLE);
// isPay = 2; //支付费用
// } else {
// mBind.ivSwitch.setSwitchButton(isSwitch);
// mBind.rlPay.setVisibility(View.GONE);
// isPay = 1;//不支付费用
// }
initData
();
initData
();
initListener
();
initListener
();
ProgressUtil
.
startLoad
(
mActivity
);
ProgressUtil
.
startLoad
(
mActivity
);
...
@@ -149,80 +139,42 @@ public class ProcessOrderActivity extends BaseBingdActivity<ProcessOrderPresente
...
@@ -149,80 +139,42 @@ public class ProcessOrderActivity extends BaseBingdActivity<ProcessOrderPresente
}
}
private
void
initListener
()
{
private
void
initListener
()
{
mBind
.
tvBack
.
setOnClickListener
(
o
->
finish
());
mAddIV
.
setOnClickListener
(
v
->
choosePic
());
mBind
.
save
.
setOnClickListener
(
o
->
saveOrder
());
mBind
.
ivSwitch
.
setOnClickListener
(
o
->
swtichButton
());
mBind
.
ivSwitch
.
setOnClickListener
(
o
->
switchButton
());
mBind
.
submit
.
setOnClickListener
(
o
->
submitOrder
());
mBind
.
tvModifySop
.
setOnClickListener
(
o
->
dumpSOPActivity
(
orderId
,
finshPosition
));
}
}
private
void
submitOrder
()
{
if
(
mImages
.
size
()
!=
0
)
{
ProgressUtil
.
startLoad
(
mActivity
);
mPresenter
.
commitPhoto
(
mImages
);
}
else
{
getData
();
ProgressUtil
.
startLoad
(
mActivity
);
mPresenter
.
commitOrder
(
null
,
orderId
,
mServeInfo
,
engineerId
,
isPay
,
mDoorPrice
,
mDoorInfo
,
mServePrice
,
mMeterailPrice
,
mOtherPrice
);
}
}
private
void
switchButton
()
{
@Override
mBind
.
ivSwitch
.
changeSwitchButton
();
public
void
dumpToSop
()
{
if
(
mBind
.
ivSwitch
.
getSwitchButton
())
{
Intent
intent
=
new
Intent
(
mActivity
,
SopWebViewActivity
.
class
);
mBind
.
rlPay
.
setVisibility
(
View
.
VISIBLE
);
intent
.
putExtra
(
Constants
.
ORDER_ID
,
orderId
);
isPay
=
2
;
intent
.
putExtra
(
Constants
.
ORDER_POSTION
,
finshPosition
);
}
else
{
mActivity
.
startActivity
(
intent
);
mBind
.
etServeInfo
.
setText
(
""
);
mBind
.
etDoorPrice
.
setText
(
""
);
mBind
.
etServePrice
.
setText
(
""
);
mBind
.
etMaterialsPrice
.
setText
(
""
);
mBind
.
etOtherPrice
.
setText
(
""
);
mBind
.
etDoorInfo
.
setText
(
""
);
mBind
.
rlPay
.
setVisibility
(
View
.
GONE
);
isPay
=
1
;
}
}
}
private
void
saveOrder
()
{
public
void
choosePic
()
{
OrderInfo
orderBean
=
new
OrderInfo
();
PictureSelectionModel
selector
=
PictureSelector
.
create
(
mActivity
)
getData
();
.
openGallery
(
PictureMimeType
.
ofImage
())
//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
if
(!
TextUtils
.
isEmpty
(
mServeInfo
))
{
.
maxSelectNum
(
5
-
mImages
.
size
())
// 最大图片选择数量 int
orderBean
.
setServerRecord
(
mServeInfo
);
.
imageSpanCount
(
4
)
// 每行显示个数 int
}
.
selectionMode
(
PictureConfig
.
MULTIPLE
)
// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
if
(!
TextUtils
.
isEmpty
(
mDoorPrice
))
{
.
previewImage
(
true
)
// 是否可预览图片 true or false
orderBean
.
setDoorPrice
(
mDoorPrice
);
.
isCamera
(
true
)
// 是否显示拍照按钮 true or false
}
.
isZoomAnim
(
true
)
// 图片列表点击 缩放效果 默认true
if
(!
TextUtils
.
isEmpty
(
mServePrice
))
{
.
sizeMultiplier
(
0.5f
)
// glide 加coose载图片大小 0~1之间 如设置 .glideOverride()无效
orderBean
.
setServerPrice
(
mServePrice
);
.
setOutputCameraPath
(
"/CustomPath"
)
// 自定义拍照保存路径,可不填
}
.
compress
(
true
)
// 是否压缩 true or false
if
(!
TextUtils
.
isEmpty
(
mMeterailPrice
))
{
.
glideOverride
(
200
,
200
)
// int glide 加载宽高,越小图片列表越流畅,但会影响列表图片浏览的清晰度
orderBean
.
setMaterialCost
(
mMeterailPrice
);
.
hideBottomControls
(
true
)
// 是否显示uCrop工具栏,默认不显示 true or false
}
.
compressSavePath
(
getPath
())
//压缩图片保存地址
if
(!
TextUtils
.
isEmpty
(
mOtherPrice
))
{
.
previewEggs
(
true
)
// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
orderBean
.
setOtherPrice
(
mOtherPrice
);
// .minimumCompressSize(100)// 小于100kb的图片不压缩
}
.
synOrAsy
(
true
);
//同步true或异步false 压缩 默认同步、
if
(!
TextUtils
.
isEmpty
(
mDoorInfo
))
{
// .enableCrop(true)//是否裁剪
orderBean
.
setOtherInfo
(
mDoorInfo
);
// .freeStyleCropEnabled(true)
}
selector
.
forResult
(
PictureConfig
.
CHOOSE_REQUEST
);
orderBean
.
setId
(
orderId
);
orderBean
.
setEngineerId
(
engineerId
);
if
(
mImages
!=
null
)
{
orderBean
.
setImgPath
(
mImages
);
}
mOrderInfoDao
.
insertOrReplace
(
orderBean
);
ToastUtils
.
showShortToast
(
getString
(
R
.
string
.
order_save_success
));
finish
();
}
}
private
void
dumpSOPActivity
(
int
id
,
int
adapterPosition
)
{
Intent
intent
=
new
Intent
(
mActivity
,
SopWebViewActivity
.
class
);
intent
.
putExtra
(
Constants
.
ORDER_ID
,
id
);
intent
.
putExtra
(
Constants
.
ORDER_POSTION
,
adapterPosition
);
mActivity
.
startActivity
(
intent
);
}
private
void
getData
()
{
private
void
getData
()
{
mServeInfo
=
mBind
.
etServeInfo
.
getText
().
toString
();
mServeInfo
=
mBind
.
etServeInfo
.
getText
().
toString
();
...
@@ -268,32 +220,6 @@ public class ProcessOrderActivity extends BaseBingdActivity<ProcessOrderPresente
...
@@ -268,32 +220,6 @@ public class ProcessOrderActivity extends BaseBingdActivity<ProcessOrderPresente
}
}
}
}
public
void
choosePic
()
{
PictureSelectionModel
selector
=
PictureSelector
.
create
(
mActivity
)
.
openGallery
(
PictureMimeType
.
ofImage
())
//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
.
maxSelectNum
(
5
-
mImages
.
size
())
// 最大图片选择数量 int
.
imageSpanCount
(
4
)
// 每行显示个数 int
.
selectionMode
(
PictureConfig
.
MULTIPLE
)
// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
.
previewImage
(
true
)
// 是否可预览图片 true or false
.
isCamera
(
true
)
// 是否显示拍照按钮 true or false
.
isZoomAnim
(
true
)
// 图片列表点击 缩放效果 默认true
.
sizeMultiplier
(
0.5f
)
// glide 加coose载图片大小 0~1之间 如设置 .glideOverride()无效
.
setOutputCameraPath
(
"/CustomPath"
)
// 自定义拍照保存路径,可不填
.
compress
(
true
)
// 是否压缩 true or false
.
glideOverride
(
200
,
200
)
// int glide 加载宽高,越小图片列表越流畅,但会影响列表图片浏览的清晰度
.
hideBottomControls
(
true
)
// 是否显示uCrop工具栏,默认不显示 true or false
.
compressSavePath
(
getPath
())
//压缩图片保存地址
.
previewEggs
(
true
)
// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
// .minimumCompressSize(100)// 小于100kb的图片不压缩
.
synOrAsy
(
true
);
//同步true或异步false 压缩 默认同步、
// .enableCrop(true)//是否裁剪
// .freeStyleCropEnabled(true)
// if (!mState) {
// selector.selectionMedia(mSelectList);
// }
selector
.
forResult
(
PictureConfig
.
CHOOSE_REQUEST
);
}
private
String
getPath
()
{
private
String
getPath
()
{
String
path
=
Environment
.
getExternalStorageDirectory
()
+
"/dayu/image/"
;
String
path
=
Environment
.
getExternalStorageDirectory
()
+
"/dayu/image/"
;
File
file
=
new
File
(
path
);
File
file
=
new
File
(
path
);
...
@@ -346,6 +272,70 @@ public class ProcessOrderActivity extends BaseBingdActivity<ProcessOrderPresente
...
@@ -346,6 +272,70 @@ public class ProcessOrderActivity extends BaseBingdActivity<ProcessOrderPresente
}
}
@Override
@Override
public
void
saveOrder
()
{
OrderInfo
orderBean
=
new
OrderInfo
();
getData
();
if
(!
TextUtils
.
isEmpty
(
mServeInfo
))
{
orderBean
.
setServerRecord
(
mServeInfo
);
}
if
(!
TextUtils
.
isEmpty
(
mDoorPrice
))
{
orderBean
.
setDoorPrice
(
mDoorPrice
);
}
if
(!
TextUtils
.
isEmpty
(
mServePrice
))
{
orderBean
.
setServerPrice
(
mServePrice
);
}
if
(!
TextUtils
.
isEmpty
(
mMeterailPrice
))
{
orderBean
.
setMaterialCost
(
mMeterailPrice
);
}
if
(!
TextUtils
.
isEmpty
(
mOtherPrice
))
{
orderBean
.
setOtherPrice
(
mOtherPrice
);
}
if
(!
TextUtils
.
isEmpty
(
mDoorInfo
))
{
orderBean
.
setOtherInfo
(
mDoorInfo
);
}
orderBean
.
setId
(
orderId
);
orderBean
.
setEngineerId
(
engineerId
);
if
(
mImages
!=
null
)
{
orderBean
.
setImgPath
(
mImages
);
}
mOrderInfoDao
.
insertOrReplace
(
orderBean
);
ToastUtils
.
showShortToast
(
getString
(
R
.
string
.
order_save_success
));
finish
();
}
@Override
public
void
swtichButton
()
{
mBind
.
ivSwitch
.
changeSwitchButton
();
if
(
mBind
.
ivSwitch
.
getSwitchButton
())
{
mBind
.
rlPay
.
setVisibility
(
View
.
VISIBLE
);
isPay
=
2
;
}
else
{
mBind
.
etServeInfo
.
setText
(
""
);
mBind
.
etDoorPrice
.
setText
(
""
);
mBind
.
etServePrice
.
setText
(
""
);
mBind
.
etMaterialsPrice
.
setText
(
""
);
mBind
.
etOtherPrice
.
setText
(
""
);
mBind
.
etDoorInfo
.
setText
(
""
);
mBind
.
rlPay
.
setVisibility
(
View
.
GONE
);
isPay
=
1
;
}
}
@Override
public
void
submitOrder
()
{
if
(
mImages
.
size
()
!=
0
)
{
ProgressUtil
.
startLoad
(
mActivity
);
mPresenter
.
commitPhoto
(
mImages
);
}
else
{
getData
();
ProgressUtil
.
startLoad
(
mActivity
);
mPresenter
.
commitOrder
(
null
,
orderId
,
mServeInfo
,
engineerId
,
isPay
,
mDoorPrice
,
mDoorInfo
,
mServePrice
,
mMeterailPrice
,
mOtherPrice
);
}
}
@Override
protected
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
protected
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
);
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
);
if
(
resultCode
==
RESULT_OK
)
{
if
(
resultCode
==
RESULT_OK
)
{
...
...
app/src/main/java/com/dayu/bigfish/ui/SettingActivity.java
View file @
2069dc7e
...
@@ -29,7 +29,8 @@ import io.reactivex.Observable;
...
@@ -29,7 +29,8 @@ import io.reactivex.Observable;
* 2017/9/2.
* 2017/9/2.
*/
*/
public
class
SettingActivity
extends
BaseBingdActivity
<
SettingPresenter
,
ActivitySettingBinding
>
implements
SettingContract
.
View
{
public
class
SettingActivity
extends
BaseBingdActivity
<
SettingPresenter
,
ActivitySettingBinding
>
implements
SettingContract
.
View
{
private
String
mHxAccount
;
private
String
mHxAccount
;
private
String
mHxPwd
;
private
String
mHxPwd
;
...
@@ -41,39 +42,14 @@ public class SettingActivity extends BaseBingdActivity<SettingPresenter, Activit
...
@@ -41,39 +42,14 @@ public class SettingActivity extends BaseBingdActivity<SettingPresenter, Activit
@Override
@Override
public
void
initView
()
{
public
void
initView
()
{
mBind
.
setPresenter
(
mPresenter
);
initListener
();
initListener
();
mHxAccount
=
GetUserInfo
.
getHxUserId
(
mActivity
);
mHxAccount
=
GetUserInfo
.
getHxUserId
(
mActivity
);
mHxPwd
=
GetUserInfo
.
getHxPwd
(
mActivity
);
mHxPwd
=
GetUserInfo
.
getHxPwd
(
mActivity
);
}
}
private
void
initListener
()
{
private
void
initListener
()
{
mBind
.
exitButton
.
setOnClickListener
(
o
->
{
UserManager
.
getInstance
().
clearUserInfo
(
this
);
EMClient
.
getInstance
().
logout
(
true
);
Intent
Intents
=
new
Intent
(
this
,
LoginActivity
.
class
);
Intents
.
setFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TASK
|
Intent
.
FLAG_ACTIVITY_NEW_TASK
);
startActivity
(
Intents
);
});
mBind
.
titleBack
.
setOnClickListener
(
o
->
finish
());
mBind
.
setMessageSwitch
.
setOnClickListener
(
o
->
switchButton
());
mBind
.
setMessageSwitch
.
setOnClickListener
(
o
->
switchButton
());
mBind
.
setClearHuancun
.
setOnClickListener
(
o
->
clearCach
());
mBind
.
setJianceGengxin
.
setOnClickListener
(
o
->
{
ProgressUtil
.
startLoad
(
mActivity
);
mPresenter
.
updataVersion
();
});
mBind
.
setKefuPhone
.
setOnClickListener
(
o
->
{
Intent
intent1
=
new
Intent
(
Intent
.
ACTION_DIAL
);
intent1
.
setData
(
Uri
.
parse
(
"tel:400-0086-898"
));
startActivity
(
intent1
);
});
mBind
.
setGuanyuWe
.
setOnClickListener
(
o
->
{
Intent
intentAbout
=
new
Intent
(
this
,
AboutUs
.
class
);
startActivity
(
intentAbout
);
});
mBind
.
setCenterFankui
.
setOnClickListener
(
o
->
{
Intent
intentIdeaActivity
=
new
Intent
(
this
,
FeedBackActivity
.
class
);
startActivity
(
intentIdeaActivity
);
});
}
}
private
void
switchButton
()
{
private
void
switchButton
()
{
...
@@ -101,7 +77,8 @@ public class SettingActivity extends BaseBingdActivity<SettingPresenter, Activit
...
@@ -101,7 +77,8 @@ public class SettingActivity extends BaseBingdActivity<SettingPresenter, Activit
}
}
}
}
private
void
clearCach
()
{
@Override
public
void
clearCach
()
{
CustomDialog
dialog
=
new
CustomDialog
(
mActivity
,
R
.
style
.
custom_dialog2
,
getString
(
R
.
string
.
sure_clear_data
)
CustomDialog
dialog
=
new
CustomDialog
(
mActivity
,
R
.
style
.
custom_dialog2
,
getString
(
R
.
string
.
sure_clear_data
)
,
(
dialog1
,
confirm
)
->
{
,
(
dialog1
,
confirm
)
->
{
if
(
confirm
)
{
if
(
confirm
)
{
...
@@ -123,6 +100,31 @@ public class SettingActivity extends BaseBingdActivity<SettingPresenter, Activit
...
@@ -123,6 +100,31 @@ public class SettingActivity extends BaseBingdActivity<SettingPresenter, Activit
}
}
@Override
@Override
public
void
checkVersion
()
{
ProgressUtil
.
startLoad
(
mActivity
);
mPresenter
.
updataVersion
();
}
@Override
public
void
takePhone
()
{
Intent
intent1
=
new
Intent
(
Intent
.
ACTION_DIAL
);
intent1
.
setData
(
Uri
.
parse
(
"tel:400-0086-898"
));
startActivity
(
intent1
);
}
@Override
public
void
dumpToAboutus
()
{
Intent
intentAbout
=
new
Intent
(
this
,
AboutUs
.
class
);
startActivity
(
intentAbout
);
}
@Override
public
void
dumpToFeed
()
{
Intent
intentIdeaActivity
=
new
Intent
(
this
,
FeedBackActivity
.
class
);
startActivity
(
intentIdeaActivity
);
}
@Override
public
void
getNewVersionSuccess
(
String
code
)
{
public
void
getNewVersionSuccess
(
String
code
)
{
if
(
code
.
equals
(
AppUtils
.
getPackageNum
(
mActivity
)))
{
if
(
code
.
equals
(
AppUtils
.
getPackageNum
(
mActivity
)))
{
ToastUtils
.
showShortToast
(
getString
(
R
.
string
.
is_newversion
));
ToastUtils
.
showShortToast
(
getString
(
R
.
string
.
is_newversion
));
...
@@ -131,4 +133,13 @@ public class SettingActivity extends BaseBingdActivity<SettingPresenter, Activit
...
@@ -131,4 +133,13 @@ public class SettingActivity extends BaseBingdActivity<SettingPresenter, Activit
}
}
}
}
@Override
public
void
exite
()
{
UserManager
.
getInstance
().
clearUserInfo
(
this
);
EMClient
.
getInstance
().
logout
(
true
);
Intent
Intents
=
new
Intent
(
this
,
LoginActivity
.
class
);
Intents
.
setFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TASK
|
Intent
.
FLAG_ACTIVITY_NEW_TASK
);
startActivity
(
Intents
);
}
}
}
app/src/main/java/com/dayu/bigfish/ui/SubcribeTimeActivity.java
View file @
2069dc7e
...
@@ -57,6 +57,7 @@ public class SubcribeTimeActivity extends BaseBingdActivity<SubcribeTimePresente
...
@@ -57,6 +57,7 @@ public class SubcribeTimeActivity extends BaseBingdActivity<SubcribeTimePresente
@Override
@Override
public
void
initView
()
{
public
void
initView
()
{
mBind
.
setPresenter
(
mPresenter
);
Intent
intent
=
getIntent
();
Intent
intent
=
getIntent
();
orderId
=
intent
.
getIntExtra
(
Constants
.
ORDER_ID
,
0
);
orderId
=
intent
.
getIntExtra
(
Constants
.
ORDER_ID
,
0
);
finshPosition
=
intent
.
getIntExtra
(
Constants
.
ORDER_POSTION
,
0
);
finshPosition
=
intent
.
getIntExtra
(
Constants
.
ORDER_POSTION
,
0
);
...
@@ -68,21 +69,8 @@ public class SubcribeTimeActivity extends BaseBingdActivity<SubcribeTimePresente
...
@@ -68,21 +69,8 @@ public class SubcribeTimeActivity extends BaseBingdActivity<SubcribeTimePresente
}
else
if
(
mState
==
4
)
{
}
else
if
(
mState
==
4
)
{
mBind
.
tvTile
.
setText
(
getString
(
R
.
string
.
item_restart
));
mBind
.
tvTile
.
setText
(
getString
(
R
.
string
.
item_restart
));
}
}
initListener
();
}
}
private
void
initListener
()
{
mBind
.
ivBack
.
setOnClickListener
(
o
->
finish
());
mBind
.
btnSubmit
.
setOnClickListener
(
o
->
comfirmData
());
mBind
.
rlDay
.
setOnClickListener
(
o
->
selectDay
());
mBind
.
rlTime
.
setOnClickListener
(
o
->
{
if
(
TextUtils
.
isEmpty
(
mBind
.
tvDay
.
getText
().
toString
()))
{
ToastUtils
.
showShortToast
(
getString
(
R
.
string
.
input_day_first
));
return
;
}
selectTime
();
});
}
@Override
@Override
public
void
subcribeTimeSuccess
()
{
public
void
subcribeTimeSuccess
()
{
...
@@ -98,27 +86,59 @@ public class SubcribeTimeActivity extends BaseBingdActivity<SubcribeTimePresente
...
@@ -98,27 +86,59 @@ public class SubcribeTimeActivity extends BaseBingdActivity<SubcribeTimePresente
}
}
}
}
private
void
selectTime
()
{
@Override
TimePickerView
pvTime2
=
new
TimePickerView
.
Builder
(
SubcribeTimeActivity
.
this
,
new
TimePickerView
.
OnTimeSelectListener
()
{
public
void
subcribeTime
()
{
mInfo
=
mBind
.
etInfo
.
getText
().
toString
();
String
time
=
mBind
.
tvTime
.
getText
().
toString
().
trim
();
String
day
=
mBind
.
tvDay
.
getText
().
toString
().
trim
();
if
(
UtilsUserAccountMatcher
.
containsEmoji
(
mInfo
))
{
ToastUtils
.
showShortToast
(
getString
(
R
.
string
.
no_emoij
));
return
;
}
if
(
TextUtils
.
isEmpty
(
time
)
||
TextUtils
.
isEmpty
(
day
))
{
ToastUtils
.
showShortToast
(
getString
(
R
.
string
.
input_day_time
));
return
;
}
else
{
ProgressUtil
.
startLoad
(
mActivity
);
ToastUtils
.
showShortToast
(
getString
(
R
.
string
.
on_commite_data
));
try
{
String
d
=
UtilsDate
.
changeFormat
(
day
,
LONG_DATE
,
LONG_DATE_FORMAT
);
mTime
=
d
+
" "
+
time
+
":00"
;
mPresenter
.
subcribeTime
(
orderId
,
mTime
,
mInfo
);
}
catch
(
ParseException
e
)
{
e
.
printStackTrace
();
}
}
}
@Override
public
void
selectDay
()
{
TimePickerView
pvTime
=
new
TimePickerView
.
Builder
(
SubcribeTimeActivity
.
this
,
new
TimePickerView
.
OnTimeSelectListener
()
{
@Override
@Override
public
void
onTimeSelect
(
Date
date2
,
View
v
)
{
//选中事件回调
public
void
onTimeSelect
(
Date
date2
,
View
v
)
{
//选中事件回调
String
nowtime
=
UtilsDate
.
getCurrDate
(
LONG_TIME_FORMAT_TWO
);
String
time
=
UtilsDate
.
getTime
(
date2
);
String
time
=
UtilsDate
.
dateToString
(
date2
,
LONG_TIME_FORMAT_TWO
);
if
(
UtilsDate
.
dayDiff
(
UtilsDate
.
getNowDate
(),
date2
)
>=
0
)
{
if
(
mIsToday
&&
UtilsDate
.
stringtoDate
(
nowtime
,
LONG_TIME_FORMAT_TWO
).
getTime
()
-
UtilsDate
.
stringtoDate
(
time
,
LONG_TIME_FORMAT_TWO
).
getTime
()
>=
0
)
{
mBind
.
tvDay
.
setText
(
time
);
}
else
{
ToastUtils
.
showShortToast
(
getString
(
R
.
string
.
input_right_time
));
ToastUtils
.
showShortToast
(
getString
(
R
.
string
.
input_right_time
));
return
;
return
;
}
int
year
=
UtilsDate
.
getYear
(
date2
);
int
month
=
UtilsDate
.
getMonth
(
date2
);
int
day
=
UtilsDate
.
getDay
(
date2
);
if
(
year
==
UtilsDate
.
getToYear
()
&&
month
==
UtilsDate
.
getToMonth
()
&&
day
==
UtilsDate
.
getToday
())
{
mIsToday
=
true
;
}
else
{
}
else
{
ToastUtils
.
showShortToast
(
time
);
mIsToday
=
false
;
mBind
.
tvTime
.
setText
(
time
);
}
}
}
}
})
})
.
setType
(
TimePickerView
.
Type
.
HOURS_MINS
)
//默认全部显示
.
setType
(
TimePickerView
.
Type
.
YEAR_MONTH_DAY
)
//默认全部显示
.
setCancelText
(
getString
(
R
.
string
.
cancle
))
//取消按钮文字
.
setCancelText
(
getString
(
R
.
string
.
cancle
))
//取消按钮文字
.
setSubmitText
(
getString
(
R
.
string
.
comfirm
))
//确认按钮文字
.
setSubmitText
(
getString
(
R
.
string
.
comfirm
))
//确认按钮文字
.
setContentSize
(
20
)
//滚轮文字大小
.
setContentSize
(
20
)
//滚轮文字大小
.
setTitleSize
(
20
)
//标题文字大小
.
setTitleSize
(
20
)
//标题文字大小
// .setTitleText("请选择
时间
")//标题文字
// .setTitleText("请选择
日期
")//标题文字
.
setOutSideCancelable
(
true
)
//点击屏幕,点在控件外部范围时,是否取消显示
.
setOutSideCancelable
(
true
)
//点击屏幕,点在控件外部范围时,是否取消显示
.
isCyclic
(
true
)
//是否循环滚动
.
isCyclic
(
true
)
//是否循环滚动
.
setTextColorCenter
(
Color
.
BLACK
)
//设置选中项的颜色
.
setTextColorCenter
(
Color
.
BLACK
)
//设置选中项的颜色
...
@@ -128,37 +148,32 @@ public class SubcribeTimeActivity extends BaseBingdActivity<SubcribeTimePresente
...
@@ -128,37 +148,32 @@ public class SubcribeTimeActivity extends BaseBingdActivity<SubcribeTimePresente
.
isCenterLabel
(
false
)
//是否只显示中间选中项的label文字,false则每项item全部都带有label。
.
isCenterLabel
(
false
)
//是否只显示中间选中项的label文字,false则每项item全部都带有label。
.
isDialog
(
true
)
//是否显示为对话框样式
.
isDialog
(
true
)
//是否显示为对话框样式
.
build
();
.
build
();
pvTime
2
.
setDate
(
Calendar
.
getInstance
());
pvTime
.
setDate
(
Calendar
.
getInstance
());
//注:根据需求来决定是否使用该方法(一般是精确到秒的情况),此项可以在弹出选择器的时候重新设置当前时间,避免在初始化之后由于时间已经设定,导致选中时间与当前时间不匹配的问题。
pvTime
2
.
show
();
pvTime
.
show
();
}
}
private
void
selectDay
()
{
@Override
TimePickerView
pvTime
=
new
TimePickerView
.
Builder
(
SubcribeTimeActivity
.
this
,
new
TimePickerView
.
OnTimeSelectListener
()
{
public
void
selectTime
()
{
TimePickerView
pvTime2
=
new
TimePickerView
.
Builder
(
SubcribeTimeActivity
.
this
,
new
TimePickerView
.
OnTimeSelectListener
()
{
@Override
@Override
public
void
onTimeSelect
(
Date
date2
,
View
v
)
{
//选中事件回调
public
void
onTimeSelect
(
Date
date2
,
View
v
)
{
//选中事件回调
String
time
=
UtilsDate
.
getTime
(
date2
);
String
nowtime
=
UtilsDate
.
getCurrDate
(
LONG_TIME_FORMAT_TWO
);
if
(
UtilsDate
.
dayDiff
(
UtilsDate
.
getNowDate
(),
date2
)
>=
0
)
{
String
time
=
UtilsDate
.
dateToString
(
date2
,
LONG_TIME_FORMAT_TWO
);
mBind
.
tvDay
.
setText
(
time
);
if
(
mIsToday
&&
UtilsDate
.
stringtoDate
(
nowtime
,
LONG_TIME_FORMAT_TWO
).
getTime
()
-
UtilsDate
.
stringtoDate
(
time
,
LONG_TIME_FORMAT_TWO
).
getTime
()
>=
0
)
{
}
else
{
ToastUtils
.
showShortToast
(
getString
(
R
.
string
.
input_right_time
));
ToastUtils
.
showShortToast
(
getString
(
R
.
string
.
input_right_time
));
return
;
return
;
}
int
year
=
UtilsDate
.
getYear
(
date2
);
int
month
=
UtilsDate
.
getMonth
(
date2
);
int
day
=
UtilsDate
.
getDay
(
date2
);
if
(
year
==
UtilsDate
.
getToYear
()
&&
month
==
UtilsDate
.
getToMonth
()
&&
day
==
UtilsDate
.
getToday
())
{
mIsToday
=
true
;
}
else
{
}
else
{
mIsToday
=
false
;
ToastUtils
.
showShortToast
(
time
);
mBind
.
tvTime
.
setText
(
time
);
}
}
}
}
})
})
.
setType
(
TimePickerView
.
Type
.
YEAR_MONTH_DAY
)
//默认全部显示
.
setType
(
TimePickerView
.
Type
.
HOURS_MINS
)
//默认全部显示
.
setCancelText
(
getString
(
R
.
string
.
cancle
))
//取消按钮文字
.
setCancelText
(
getString
(
R
.
string
.
cancle
))
//取消按钮文字
.
setSubmitText
(
getString
(
R
.
string
.
comfirm
))
//确认按钮文字
.
setSubmitText
(
getString
(
R
.
string
.
comfirm
))
//确认按钮文字
.
setContentSize
(
20
)
//滚轮文字大小
.
setContentSize
(
20
)
//滚轮文字大小
.
setTitleSize
(
20
)
//标题文字大小
.
setTitleSize
(
20
)
//标题文字大小
// .setTitleText("请选择
日期
")//标题文字
// .setTitleText("请选择
时间
")//标题文字
.
setOutSideCancelable
(
true
)
//点击屏幕,点在控件外部范围时,是否取消显示
.
setOutSideCancelable
(
true
)
//点击屏幕,点在控件外部范围时,是否取消显示
.
isCyclic
(
true
)
//是否循环滚动
.
isCyclic
(
true
)
//是否循环滚动
.
setTextColorCenter
(
Color
.
BLACK
)
//设置选中项的颜色
.
setTextColorCenter
(
Color
.
BLACK
)
//设置选中项的颜色
...
@@ -168,31 +183,7 @@ public class SubcribeTimeActivity extends BaseBingdActivity<SubcribeTimePresente
...
@@ -168,31 +183,7 @@ public class SubcribeTimeActivity extends BaseBingdActivity<SubcribeTimePresente
.
isCenterLabel
(
false
)
//是否只显示中间选中项的label文字,false则每项item全部都带有label。
.
isCenterLabel
(
false
)
//是否只显示中间选中项的label文字,false则每项item全部都带有label。
.
isDialog
(
true
)
//是否显示为对话框样式
.
isDialog
(
true
)
//是否显示为对话框样式
.
build
();
.
build
();
pvTime
.
setDate
(
Calendar
.
getInstance
());
//注:根据需求来决定是否使用该方法(一般是精确到秒的情况),此项可以在弹出选择器的时候重新设置当前时间,避免在初始化之后由于时间已经设定,导致选中时间与当前时间不匹配的问题。
pvTime2
.
setDate
(
Calendar
.
getInstance
());
pvTime
.
show
();
pvTime2
.
show
();
}
private
void
comfirmData
()
{
mInfo
=
mBind
.
etInfo
.
getText
().
toString
();
String
time
=
mBind
.
tvTime
.
getText
().
toString
().
trim
();
String
day
=
mBind
.
tvDay
.
getText
().
toString
().
trim
();
if
(
UtilsUserAccountMatcher
.
containsEmoji
(
mInfo
))
{
ToastUtils
.
showShortToast
(
getString
(
R
.
string
.
no_emoij
));
return
;
}
if
(
TextUtils
.
isEmpty
(
time
)
||
TextUtils
.
isEmpty
(
day
))
{
ToastUtils
.
showShortToast
(
getString
(
R
.
string
.
input_day_time
));
return
;
}
else
{
ProgressUtil
.
startLoad
(
mActivity
);
ToastUtils
.
showShortToast
(
getString
(
R
.
string
.
on_commite_data
));
try
{
String
d
=
UtilsDate
.
changeFormat
(
day
,
LONG_DATE
,
LONG_DATE_FORMAT
);
mTime
=
d
+
" "
+
time
+
":00"
;
mPresenter
.
subcribeTime
(
orderId
,
mTime
,
mInfo
);
}
catch
(
ParseException
e
)
{
e
.
printStackTrace
();
}
}
}
}
}
}
app/src/main/java/com/dayu/bigfish/ui/WithdrawalsActivity.java
View file @
2069dc7e
...
@@ -42,19 +42,10 @@ public class WithdrawalsActivity extends BaseBingdActivity<WithdrawalsPresenter,
...
@@ -42,19 +42,10 @@ public class WithdrawalsActivity extends BaseBingdActivity<WithdrawalsPresenter,
@Override
@Override
public
void
initView
()
{
public
void
initView
()
{
mBind
.
setPresenter
(
mPresenter
);
mUserId
=
GetUserInfo
.
getACCOUNT_ID
(
MyApplication
.
getContext
());
mUserId
=
GetUserInfo
.
getACCOUNT_ID
(
MyApplication
.
getContext
());
ProgressUtil
.
startLoad
(
mActivity
);
ProgressUtil
.
startLoad
(
mActivity
);
mPresenter
.
querAlipay
(
mUserId
);
mPresenter
.
querAlipay
(
mUserId
);
mBind
.
ivBack
.
setOnClickListener
(
o
->
finish
());
mBind
.
tvComfirm
.
setOnClickListener
(
o
->
{
if
(
mState
==
0
)
{
ProgressUtil
.
startLoad
(
mActivity
);
mPresenter
.
boundAlipay
(
getInfo
());
}
else
{
ProgressUtil
.
startLoad
(
mActivity
);
mPresenter
.
modifyAlipay
(
getInfo
());
}
});
}
}
public
RequestBody
getInfo
()
{
public
RequestBody
getInfo
()
{
...
@@ -119,4 +110,14 @@ public class WithdrawalsActivity extends BaseBingdActivity<WithdrawalsPresenter,
...
@@ -119,4 +110,14 @@ public class WithdrawalsActivity extends BaseBingdActivity<WithdrawalsPresenter,
ToastUtils
.
showShortToast
(
getString
(
R
.
string
.
modify_alipay_account_success
));
ToastUtils
.
showShortToast
(
getString
(
R
.
string
.
modify_alipay_account_success
));
finish
();
finish
();
}
}
@Override
public
void
comfirm
()
{
ProgressUtil
.
startLoad
(
mActivity
);
if
(
mState
==
0
)
{
mPresenter
.
boundAlipay
(
getInfo
());
}
else
{
mPresenter
.
modifyAlipay
(
getInfo
());
}
}
}
}
app/src/main/java/com/dayu/bigfish/ui/fragment/HomePersonFragment.java
View file @
2069dc7e
package
com
.
dayu
.
bigfish
.
ui
.
fragment
;
package
com
.
dayu
.
bigfish
.
ui
.
fragment
;
import
android.app.Dialog
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.content.res.AssetManager
;
import
android.content.res.AssetManager
;
import
android.graphics.Bitmap
;
import
android.graphics.Bitmap
;
...
@@ -60,6 +59,7 @@ public class HomePersonFragment extends BaseBingFragment<HomeFourPresenter, Frag
...
@@ -60,6 +59,7 @@ public class HomePersonFragment extends BaseBingFragment<HomeFourPresenter, Frag
@Override
@Override
public
View
initView
(
View
view
)
{
public
View
initView
(
View
view
)
{
mBind
.
setPresenter
(
mPresenter
);
userId
=
GetUserInfo
.
getACCOUNT_ID
(
MyApplication
.
getContext
());
userId
=
GetUserInfo
.
getACCOUNT_ID
(
MyApplication
.
getContext
());
siteId
=
GetUserInfo
.
getSITE_ID
(
MyApplication
.
getContext
());
siteId
=
GetUserInfo
.
getSITE_ID
(
MyApplication
.
getContext
());
AssetManager
mgr
=
mActivity
.
getAssets
();
AssetManager
mgr
=
mActivity
.
getAssets
();
...
@@ -79,7 +79,6 @@ public class HomePersonFragment extends BaseBingFragment<HomeFourPresenter, Frag
...
@@ -79,7 +79,6 @@ public class HomePersonFragment extends BaseBingFragment<HomeFourPresenter, Frag
.
apply
(
options
)
.
apply
(
options
)
.
into
(
mBind
.
ivHeader
);
.
into
(
mBind
.
ivHeader
);
}
}
initListener
();
return
view
;
return
view
;
}
}
...
@@ -88,22 +87,6 @@ public class HomePersonFragment extends BaseBingFragment<HomeFourPresenter, Frag
...
@@ -88,22 +87,6 @@ public class HomePersonFragment extends BaseBingFragment<HomeFourPresenter, Frag
return
R
.
layout
.
fragment_personal_center
;
return
R
.
layout
.
fragment_personal_center
;
}
}
private
void
initListener
()
{
mBind
.
ivSetting
.
setOnClickListener
(
o
->
{
Intent
intentSetting
=
new
Intent
(
mActivity
,
SettingActivity
.
class
);
startActivity
(
intentSetting
);
});
mBind
.
rlOrderRecord
.
setOnClickListener
(
o
->
{
Intent
intent
=
new
Intent
(
mActivity
,
OrderRecordActivity
.
class
);
startActivity
(
intent
);
});
mBind
.
rlAccountBalcance
.
setOnClickListener
(
o
->
{
Intent
intent
=
new
Intent
(
mActivity
,
AccountBalanceActivity
.
class
);
intent
.
putExtra
(
Constants
.
ACCOUNT_BALANCE
,
mAccountBalance
);
startActivity
(
intent
);
});
}
@Override
@Override
protected
void
lazyLoad
()
{
protected
void
lazyLoad
()
{
...
@@ -131,18 +114,15 @@ public class HomePersonFragment extends BaseBingFragment<HomeFourPresenter, Frag
...
@@ -131,18 +114,15 @@ public class HomePersonFragment extends BaseBingFragment<HomeFourPresenter, Frag
private
void
showAlertDialog
()
{
private
void
showAlertDialog
()
{
CustomDialog
dialog
=
new
CustomDialog
(
mActivity
,
R
.
style
.
custom_dialog2
,
mActivity
.
getString
(
R
.
string
.
not_set_account
)
CustomDialog
dialog
=
new
CustomDialog
(
mActivity
,
R
.
style
.
custom_dialog2
,
mActivity
.
getString
(
R
.
string
.
not_set_account
)
,
new
CustomDialog
.
OnCloseListener
()
{
,
(
dialog1
,
confirm
)
->
{
@Override
if
(
confirm
)
{
public
void
onClick
(
Dialog
dialog
,
boolean
confirm
)
{
Intent
intent
=
new
Intent
(
mActivity
,
WithdrawalsActivity
.
class
);
if
(
confirm
)
{
startActivity
(
intent
);
Intent
intent
=
new
Intent
(
mActivity
,
WithdrawalsActivity
.
class
);
dialog1
.
dismiss
();
startActivity
(
intent
);
}
else
{
dialog
.
dismiss
();
}
}
else
{
dialog1
.
dismiss
();
}
});
dialog
.
dismiss
();
}
});
dialog
.
setTitle
(
mActivity
.
getString
(
R
.
string
.
notice
))
dialog
.
setTitle
(
mActivity
.
getString
(
R
.
string
.
notice
))
.
setNegativeButton
(
mActivity
.
getString
(
R
.
string
.
not_set_account
))
.
setNegativeButton
(
mActivity
.
getString
(
R
.
string
.
not_set_account
))
.
setPositiveButton
(
mActivity
.
getString
(
R
.
string
.
go_set_up
));
.
setPositiveButton
(
mActivity
.
getString
(
R
.
string
.
go_set_up
));
...
@@ -194,6 +174,25 @@ public class HomePersonFragment extends BaseBingFragment<HomeFourPresenter, Frag
...
@@ -194,6 +174,25 @@ public class HomePersonFragment extends BaseBingFragment<HomeFourPresenter, Frag
}
}
}
}
@Override
public
void
dumpToAccount
()
{
Intent
intent
=
new
Intent
(
mActivity
,
AccountBalanceActivity
.
class
);
intent
.
putExtra
(
Constants
.
ACCOUNT_BALANCE
,
mAccountBalance
);
startActivity
(
intent
);
}
@Override
public
void
dumpToSetting
()
{
Intent
intentSetting
=
new
Intent
(
mActivity
,
SettingActivity
.
class
);
startActivity
(
intentSetting
);
}
@Override
public
void
dumpToOrderRecord
()
{
Intent
intent
=
new
Intent
(
mActivity
,
OrderRecordActivity
.
class
);
startActivity
(
intent
);
}
/**
/**
* drawStars.
* drawStars.
*
*
...
...
app/src/main/res/layout/activity_accountbalance_layout.xml
View file @
2069dc7e
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
>
<data>
<data>
...
...
app/src/main/res/layout/activity_feedback.xml
View file @
2069dc7e
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<data>
<import
type=
"com.dayu.bigfish.presenter.feedback.FeedBackPresenter"
/>
<variable
name=
"presenter"
type=
"FeedBackPresenter"
/>
</data>
<RelativeLayout
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
...
@@ -21,6 +27,7 @@
...
@@ -21,6 +27,7 @@
<ImageView
<ImageView
android:id=
"@+id/title_back"
android:id=
"@+id/title_back"
style=
"@style/title_image_back"
style=
"@style/title_image_back"
android:onClick=
"@{()->presenter.dumpBack()}"
/>
/>
</RelativeLayout>
</RelativeLayout>
...
...
app/src/main/res/layout/activity_main.xml
View file @
2069dc7e
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<data>
<import
type=
"com.dayu.bigfish.presenter.main.MainPresenter"
/>
<variable
name=
"presenter"
type=
"MainPresenter"
/>
</data>
<LinearLayout
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
...
@@ -73,6 +79,7 @@
...
@@ -73,6 +79,7 @@
android:layout_weight=
"1"
android:layout_weight=
"1"
android:background=
"@drawable/tab_blue_react"
android:background=
"@drawable/tab_blue_react"
android:gravity=
"center"
android:gravity=
"center"
android:onClick=
"@{()->presenter.dumpReceActivity()}"
android:orientation=
"vertical"
android:orientation=
"vertical"
>
>
...
...
app/src/main/res/layout/activity_order_details.xml
View file @
2069dc7e
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<LinearLayout
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/cl_home_listview_bg"
android:orientation=
"vertical"
>
<RelativeLayout
<LinearLayout
xmlns:app=
"http://schemas.android.com/apk/res-auto"
style=
"@style/title"
android:layout_width=
"match_parent"
>
android:layout_height=
"match_parent"
android:background=
"@color/cl_home_listview_bg"
<ImageView
android:orientation=
"vertical"
>
android:id=
"@+id/title_back"
style=
"@style/title_image_back"
<RelativeLayout
style=
"@style/title"
>
<ImageView
android:id=
"@+id/title_back"
style=
"@style/title_image_back"
/>
<TextView
android:id=
"@+id/text_title"
style=
"@style/text_title"
android:text=
"@string/tv_work_order_one"
/>
</RelativeLayout>
<android.support.design.widget.TabLayout
android:id=
"@+id/tablayout"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_40"
android:background=
"@color/cl_white"
app:tabIndicatorColor=
"@color/cl_receiving_order_item_data"
app:tabMaxWidth=
"0dp"
app:tabSelectedTextColor=
"@color/cl_receiving_order_item_data"
app:tabTextAppearance=
"@style/TabLayoutTextStyle"
app:tabTextColor=
"@color/cl_tab_line"
/>
/>
<TextView
<ImageView
android:id=
"@+id/text_title"
style=
"@style/line"
style=
"@style/text_title"
android:text=
"@string/tv_work_order_one"
/>
/>
</RelativeLayout>
<android.support.v4.view.ViewPager
android:id=
"@+id/view_pager"
<android.support.design.widget.TabLayout
android:layout_width=
"match_parent"
android:id=
"@+id/tablayout"
android:layout_height=
"match_parent"
android:layout_width=
"match_parent"
android:layout_marginTop=
"@dimen/dp_10"
android:layout_height=
"@dimen/dp_40"
android:background=
"@color/cl_white"
/>
android:background=
"@color/cl_white"
app:tabIndicatorColor=
"@color/cl_receiving_order_item_data"
app:tabSelectedTextColor=
"@color/cl_receiving_order_item_data"
app:tabTextAppearance=
"@style/TabLayoutTextStyle"
app:tabTextColor=
"@color/cl_tab_line"
app:tabMaxWidth=
"0dp"
/>
<ImageView
style=
"@style/line"
/>
<android.support.v4.view.ViewPager
android:id=
"@+id/view_pager"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginTop=
"@dimen/dp_10"
android:background=
"@color/cl_white"
/>
</LinearLayout>
</LinearLayout>
</layout>
</layout>
\ No newline at end of file
app/src/main/res/layout/activity_order_record.xml
View file @
2069dc7e
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<data>
<import
type=
"com.dayu.bigfish.presenter.worksRecord.WorksRecordPresenter"
/>
<variable
name=
"presenter"
type=
"WorksRecordPresenter"
/>
</data>
<LinearLayout
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
...
@@ -21,7 +30,9 @@
...
@@ -21,7 +30,9 @@
<ImageView
<ImageView
android:id=
"@+id/title_back"
android:id=
"@+id/title_back"
style=
"@style/title_image_back"
/>
style=
"@style/title_image_back"
android:onClick=
"@{()->presenter.dumpBack()}"
/>
<ImageView
<ImageView
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -36,6 +47,7 @@
...
@@ -36,6 +47,7 @@
android:layout_alignParentRight=
"true"
android:layout_alignParentRight=
"true"
android:layout_centerVertical=
"true"
android:layout_centerVertical=
"true"
android:layout_marginRight=
"20dp"
android:layout_marginRight=
"20dp"
android:onClick=
"@{()->presenter.showSearch()}"
android:src=
"@mipmap/seacher"
/>
android:src=
"@mipmap/seacher"
/>
</RelativeLayout>
</RelativeLayout>
...
@@ -52,7 +64,8 @@
...
@@ -52,7 +64,8 @@
android:layout_marginLeft=
"10dp"
android:layout_marginLeft=
"10dp"
android:layout_toRightOf=
"@+id/iv"
android:layout_toRightOf=
"@+id/iv"
android:background=
"@null"
android:background=
"@null"
android:hint=
"@string/find_customer_mobile"
/>
android:hint=
"@string/find_customer_mobile"
/>
<ImageView
<ImageView
android:id=
"@+id/iv"
android:id=
"@+id/iv"
...
@@ -67,6 +80,7 @@
...
@@ -67,6 +80,7 @@
android:layout_centerVertical=
"true"
android:layout_centerVertical=
"true"
android:layout_marginRight=
"20dp"
android:layout_marginRight=
"20dp"
android:gravity=
"center"
android:gravity=
"center"
android:onClick=
"@{()->presenter.hideSearch()}"
android:text=
"@string/cancle"
android:text=
"@string/cancle"
android:textColor=
"@color/cl_black"
android:textColor=
"@color/cl_black"
android:textSize=
"@dimen/dp_18"
android:textSize=
"@dimen/dp_18"
...
...
app/src/main/res/layout/activity_process_order.xml
View file @
2069dc7e
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<data>
<import
type=
"com.dayu.bigfish.presenter.processorder.ProcessOrderPresenter"
/>
<variable
name=
"presenter"
type=
"ProcessOrderPresenter"
/>
</data>
<RelativeLayout
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
...
@@ -20,7 +29,9 @@
...
@@ -20,7 +29,9 @@
<ImageView
<ImageView
android:id=
"@+id/tv_back"
android:id=
"@+id/tv_back"
style=
"@style/title_image_back"
/>
style=
"@style/title_image_back"
android:onClick=
"@{()->presenter.dumpBack()}"
/>
</RelativeLayout>
</RelativeLayout>
<TextView
<TextView
...
@@ -33,6 +44,7 @@
...
@@ -33,6 +44,7 @@
android:text=
"@string/sop_finish"
android:text=
"@string/sop_finish"
android:textColor=
"@color/white"
android:textColor=
"@color/white"
android:textSize=
"13.3sp"
android:textSize=
"13.3sp"
android:onClick=
"@{()->presenter.dumpToSop()}"
android:visibility=
"gone"
/>
android:visibility=
"gone"
/>
<ImageView
<ImageView
...
@@ -557,6 +569,7 @@
...
@@ -557,6 +569,7 @@
android:background=
"@mipmap/save_back"
android:background=
"@mipmap/save_back"
android:gravity=
"center"
android:gravity=
"center"
android:text=
"@string/tv_save_back"
android:text=
"@string/tv_save_back"
android:onClick=
"@{()->presenter.saveOrder()}"
android:textColor=
"@color/cl_tab_line"
android:textColor=
"@color/cl_tab_line"
/>
/>
...
@@ -570,6 +583,7 @@
...
@@ -570,6 +583,7 @@
android:layout_marginTop=
"@dimen/dp_33"
android:layout_marginTop=
"@dimen/dp_33"
android:background=
"@mipmap/save_submit"
android:background=
"@mipmap/save_submit"
android:text=
"@string/submit_order"
android:text=
"@string/submit_order"
android:onClick=
"@{()->presenter.submitOrder()}"
android:textColor=
"@color/cl_white"
android:textColor=
"@color/cl_white"
android:textSize=
"@dimen/sp_13.3"
android:textSize=
"@dimen/sp_13.3"
/>
/>
...
...
app/src/main/res/layout/activity_setting.xml
View file @
2069dc7e
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<data>
<import
type=
"com.dayu.bigfish.presenter.setting.SettingPresenter"
/>
<variable
name=
"presenter"
type=
"SettingPresenter"
/>
</data>
<LinearLayout
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
...
@@ -13,6 +19,7 @@
...
@@ -13,6 +19,7 @@
<ImageView
<ImageView
android:id=
"@+id/title_back"
android:id=
"@+id/title_back"
style=
"@style/title_image_back"
style=
"@style/title_image_back"
android:onClick=
"@{()->presenter.dumpBack()}"
/>
/>
<TextView
<TextView
...
@@ -74,6 +81,7 @@
...
@@ -74,6 +81,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"54dp"
android:layout_height=
"54dp"
android:background=
"@color/cl_white"
android:background=
"@color/cl_white"
android:onClick=
"@{()->presenter.clearCach()}"
>
>
<TextView
<TextView
...
@@ -117,6 +125,7 @@
...
@@ -117,6 +125,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"54dp"
android:layout_height=
"54dp"
android:background=
"@color/cl_white"
android:background=
"@color/cl_white"
android:onClick=
"@{()->presenter.checkVersion()}"
>
>
<TextView
<TextView
...
@@ -148,6 +157,7 @@
...
@@ -148,6 +157,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"54dp"
android:layout_height=
"54dp"
android:background=
"@color/cl_white"
android:background=
"@color/cl_white"
android:onClick=
"@{()->presenter.takePhone()}"
>
>
<TextView
<TextView
...
@@ -182,6 +192,7 @@
...
@@ -182,6 +192,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"54dp"
android:layout_height=
"54dp"
android:background=
"@color/cl_white"
android:background=
"@color/cl_white"
android:onClick=
"@{()->presenter.dumpToAboutus()}"
>
>
<TextView
<TextView
...
@@ -213,6 +224,7 @@
...
@@ -213,6 +224,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"54dp"
android:layout_height=
"54dp"
android:background=
"@color/cl_white"
android:background=
"@color/cl_white"
android:onClick=
"@{()->presenter.dumpToFeed()}"
>
>
<TextView
<TextView
...
@@ -244,6 +256,7 @@
...
@@ -244,6 +256,7 @@
android:background=
"@drawable/btn_login_selector"
android:background=
"@drawable/btn_login_selector"
android:text=
"@string/tv_exit_login"
android:text=
"@string/tv_exit_login"
android:textColor=
"@color/cl_white"
android:textColor=
"@color/cl_white"
android:onClick=
"@{()->presenter.exite()}"
/>
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
...
...
app/src/main/res/layout/activity_subscribe_time.xml
View file @
2069dc7e
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<data>
<import
type=
"com.dayu.bigfish.presenter.subcribeTime.SubcribeTimePresenter"
/>
<variable
name=
"presenter"
type=
"SubcribeTimePresenter"
/>
</data>
<RelativeLayout
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
...
@@ -20,6 +29,7 @@
...
@@ -20,6 +29,7 @@
<ImageView
<ImageView
android:id=
"@+id/iv_back"
android:id=
"@+id/iv_back"
style=
"@style/title_image_back"
style=
"@style/title_image_back"
android:onClick=
"@{()->presenter.dumpBack()}"
/>
/>
<ImageView
<ImageView
...
@@ -48,6 +58,7 @@
...
@@ -48,6 +58,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_54"
android:layout_height=
"@dimen/dp_54"
android:background=
"@color/cl_white"
android:background=
"@color/cl_white"
android:onClick=
"@{()->presenter.selectDay()}"
>
>
<TextView
<TextView
...
@@ -83,6 +94,7 @@
...
@@ -83,6 +94,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_54"
android:layout_height=
"@dimen/dp_54"
android:background=
"@color/cl_white"
android:background=
"@color/cl_white"
android:onClick=
"@{()->presenter.selectTime(tvDay.getText().toString())}"
>
>
<TextView
<TextView
...
@@ -164,6 +176,7 @@
...
@@ -164,6 +176,7 @@
android:layout_marginTop=
"@dimen/dp_33"
android:layout_marginTop=
"@dimen/dp_33"
android:background=
"@drawable/btn_login_selector"
android:background=
"@drawable/btn_login_selector"
android:gravity=
"center"
android:gravity=
"center"
android:onClick=
"@{()->presenter.subcribeTime()}"
android:text=
"@string/tv_time_text_confirm_subscribe"
android:text=
"@string/tv_time_text_confirm_subscribe"
android:textColor=
"@color/cl_white"
android:textColor=
"@color/cl_white"
android:textSize=
"@dimen/size_login_button_text"
android:textSize=
"@dimen/size_login_button_text"
...
...
app/src/main/res/layout/activity_withdrawals.xml
View file @
2069dc7e
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<data>
<import
type=
"com.dayu.bigfish.presenter.Withdrawals.WithdrawalsPresenter"
/>
<variable
name=
"presenter"
type=
"WithdrawalsPresenter"
/>
</data>
<LinearLayout
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
...
@@ -22,6 +31,7 @@
...
@@ -22,6 +31,7 @@
<ImageView
<ImageView
android:id=
"@+id/iv_back"
android:id=
"@+id/iv_back"
style=
"@style/title_image_back"
style=
"@style/title_image_back"
android:onClick=
"@{()->presenter.dumpBack()}"
/>
/>
<ImageView
<ImageView
...
@@ -186,6 +196,7 @@
...
@@ -186,6 +196,7 @@
android:background=
"@drawable/btn_login_selector"
android:background=
"@drawable/btn_login_selector"
android:gravity=
"center"
android:gravity=
"center"
android:text=
"@string/comfirm"
android:text=
"@string/comfirm"
android:onClick=
"@{()->presenter.comfirm()}"
android:textColor=
"@color/cl_white"
android:textColor=
"@color/cl_white"
android:textSize=
"14.7sp"
android:textSize=
"14.7sp"
/>
/>
...
...
app/src/main/res/layout/fragment_personal_center.xml
View file @
2069dc7e
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<data>
<import
type=
"com.dayu.bigfish.presenter.homefourtab.HomeFourPresenter"
/>
<variable
name=
"presenter"
type=
"HomeFourPresenter"
/>
</data>
<RelativeLayout
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
...
@@ -24,6 +33,7 @@
...
@@ -24,6 +33,7 @@
android:id=
"@+id/iv_setting"
android:id=
"@+id/iv_setting"
style=
"@style/title_right_image"
style=
"@style/title_right_image"
android:src=
"@mipmap/person_setting"
android:src=
"@mipmap/person_setting"
android:onClick=
"@{()->presenter.dumpToSetting()}"
/>
/>
</RelativeLayout>
</RelativeLayout>
...
@@ -190,6 +200,7 @@
...
@@ -190,6 +200,7 @@
android:layout_width=
"160dp"
android:layout_width=
"160dp"
android:layout_height=
"100dp"
android:layout_height=
"100dp"
android:layout_marginLeft=
"@dimen/dp_13.3"
android:layout_marginLeft=
"@dimen/dp_13.3"
android:onClick=
"@{()->presenter.dumpToAccount()}"
android:background=
"@drawable/personal_center_selector"
android:background=
"@drawable/personal_center_selector"
>
>
...
@@ -291,6 +302,7 @@
...
@@ -291,6 +302,7 @@
android:layout_width=
"160dp"
android:layout_width=
"160dp"
android:layout_height=
"100dp"
android:layout_height=
"100dp"
android:layout_marginLeft=
"@dimen/dp_13.3"
android:layout_marginLeft=
"@dimen/dp_13.3"
android:onClick=
"@{()->presenter.dumpToOrderRecord()}"
android:background=
"@drawable/personal_center_selector"
>
android:background=
"@drawable/personal_center_selector"
>
<TextView
<TextView
...
...
app/src/main/res/values/strings.xml
View file @
2069dc7e
...
@@ -143,7 +143,7 @@
...
@@ -143,7 +143,7 @@
<!--工单-->
<!--工单-->
<string
name=
"order_title"
>
我的工单
</string>
<string
name=
"order_title"
>
我的工单
</string>
<string
name=
"order_history"
>
工单历史
</string>
<string
name=
"order_history"
>
工单历史
</string>
<string
name=
"webview_title"
>
sop
</string>
<string
name=
"webview_title"
>
SOP
</string>
<string
name=
"order_not_exite"
>
该订单不存在
</string>
<string
name=
"order_not_exite"
>
该订单不存在
</string>
<string
name=
"get_info_failed"
>
获取数据失败
</string>
<string
name=
"get_info_failed"
>
获取数据失败
</string>
<string
name=
"no_appointment"
>
无预期
</string>
<string
name=
"no_appointment"
>
无预期
</string>
...
...
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