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
76944fa8
authored
9 months ago
by
xuxuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
选择地址问题修复
parent
4493baf5
dev_xx_web
…
dev
dev_xx
dev_xx_241116
dev_xx_250108_toast
dev_xx_250224_report
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
55 additions
and
35 deletions
baseSDK/src/main/java/com/dayu/utils/UtilsDate.java
learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/HomeLearnFragment.java
orderCenter/src/main/java/com/dayu/order/ui/activity/OrderDetailsClockActivity.java
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderReceivingFragment.java
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/BusinessTypeActivity.java
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
baseSDK/src/main/java/com/dayu/utils/UtilsDate.java
View file @
76944fa8
...
...
@@ -1474,6 +1474,21 @@ public class UtilsDate {
return
formatDate
(
l
,
destPattern
);
}
public
static
String
changeFormat
(
String
date
,
String
srcPattern
,
String
destPattern
,
boolean
showToday
,
boolean
showTomorrow
)
throws
ParseException
{
if
(
showToday
&&
IsToday
(
date
)){
return
"今天"
;
}
if
(
showTomorrow
&&
IsNextday
(
date
)){
return
"明天"
;
}
long
l
=
parseDate
(
date
,
srcPattern
);
return
formatDate
(
l
,
destPattern
);
}
/**
* for example : yyyy-MM-dd HH:mm:ss
*
...
...
This diff is collapsed.
Click to expand it.
learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/HomeLearnFragment.java
View file @
76944fa8
...
...
@@ -100,15 +100,17 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom
Api
.
getService
(
LearnService
.
class
).
getLearTabNum
(
mUserId
).
compose
(
Api
.
applySchedulers
())
.
subscribe
(
mPresenter
.
baseObserver
(
data
->
{
tabBean
=
data
;
if
(
data
.
getEnterKnowledge
()
==
1
){
list_fragments
.
remove
(
webFragment
);
commeWebViewFragment
=
CommeWebViewFragment
.
newInstance
();
list_fragments
.
add
(
commeWebViewFragment
);
}
else
{
if
(
data
.
getEnterKnowledge
()
==
1
)
{
if
(
list_fragments
.
contains
(
commeWebViewFragment
))
{
list_fragments
.
remove
(
commeWebViewFragment
);
list_fragments
.
add
(
KnowledgeCenterFragment
.
newInstance
());
}
}
else
{
String
url
=
data
.
getPaperListUrl
()
+
"?accountId="
+
mUserInfo
.
getAccountId
()
+
"&token="
+
mUserInfo
.
getToken
();
webFragment
.
setUrl
(
url
);
commeWebViewFragment
.
setUrl
(
data
.
getGptUrl
()
+
"?accountId="
+
mUserInfo
.
getAccountId
()
+
"&token="
+
mUserInfo
.
getToken
());
}
commeWebViewFragment
.
setUrl
(
data
.
getGptUrl
()
+
"?accountId="
+
mUserInfo
.
getAccountId
()
+
"&token="
+
mUserInfo
.
getToken
());
setTabNum
();
}));
}
...
...
@@ -124,11 +126,11 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom
list_fragments
.
add
(
webFragment
);
//智能助手
//
commeWebViewFragment = CommeWebViewFragment.newInstance();
//
list_fragments.add(commeWebViewFragment);
commeWebViewFragment
=
CommeWebViewFragment
.
newInstance
();
list_fragments
.
add
(
commeWebViewFragment
);
//HTO 知识库
list_fragments
.
add
(
KnowledgeCenterFragment
.
newInstance
());
//
list_fragments.add(KnowledgeCenterFragment.newInstance());
// list_fragments.add(new TCVideoListFragment());
adapter
=
new
FragmentAdapter
(
getFragmentManager
(),
list_fragments
);
...
...
@@ -295,15 +297,15 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom
}
Observable
.
timer
(
500
,
TimeUnit
.
MILLISECONDS
).
subscribeOn
(
Schedulers
.
io
())
.
observeOn
(
AndroidSchedulers
.
mainThread
()).
subscribe
(
aLong
->
{
if
(
data
.
isEmpty
())
{
mBind
.
notice
.
setVisibility
(
View
.
GONE
);
}
else
{
mBind
.
notice
.
setVisibility
(
View
.
VISIBLE
);
}
mBind
.
notice
.
setFocusable
(
true
);
mBind
.
notice
.
requestFocus
();
mBind
.
notice
.
setText
(
tip
.
toString
());
});
if
(
data
.
isEmpty
())
{
mBind
.
notice
.
setVisibility
(
View
.
GONE
);
}
else
{
mBind
.
notice
.
setVisibility
(
View
.
VISIBLE
);
}
mBind
.
notice
.
setFocusable
(
true
);
mBind
.
notice
.
requestFocus
();
mBind
.
notice
.
setText
(
tip
.
toString
());
});
}));
}
...
...
This diff is collapsed.
Click to expand it.
orderCenter/src/main/java/com/dayu/order/ui/activity/OrderDetailsClockActivity.java
View file @
76944fa8
...
...
@@ -405,9 +405,11 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres
}
else
if
(
code
.
equals
(
"STATISTIC0012"
))
{
//没有相应技能
buttonStr
=
"马上去增加技能"
;
}
else
if
(
code
.
equals
(
"STATISTIC0013"
))
{
//没有设置服务区域
buttonStr
=
"马上去修改地区"
;
// buttonStr = "马上去修改地区";
buttonStr
=
"好的"
;
}
else
if
(
code
.
equals
(
"STATISTIC0014"
))
{
//城市不匹配
buttonStr
=
"马上去修改地区"
;
// buttonStr = "马上去修改地区";
buttonStr
=
"好的"
;
}
else
if
(
code
.
equals
(
"STATISTIC0015"
))
{
//没有授权认证
buttonStr
=
"马上去申请认证"
;
}
else
if
(
code
.
equals
(
"STATISTIC0016"
))
{
//没有权限接
...
...
This diff is collapsed.
Click to expand it.
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
View file @
76944fa8
...
...
@@ -120,6 +120,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder
.
orderLineTwo
.
setVisibility
(
View
.
VISIBLE
);
holder
.
tvItemProcess
.
setVisibility
(
View
.
VISIBLE
);
holder
.
navigation
.
setOnClickListener
(
v
->
LocationUtils
.
openMap
(
mContext
,
address
,
this
::
showOpenMarketDialog
));
holder
.
tvOrderTime
.
setText
(
R
.
string
.
tv_home_tab_one_subscribe_time
);
final
int
id
=
item
.
getId
();
if
(
item
.
getAnyContacts
()
==
0
)
{
...
...
@@ -517,7 +518,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
if
(
7
==
item
.
getSource
()
||
8
==
item
.
getSource
()){
//按天用工单 展示开始日期
holder
.
itemTime
.
setVisibility
(
View
.
GONE
);
dateTime
=
UtilsDate
.
changeFormat
(
time
,
FORMAT_ONE
,
MON_DAY_FORMAT
);
dateTime
=
UtilsDate
.
changeFormat
(
time
,
FORMAT_ONE
,
MON_DAY_FORMAT
,
true
,
true
);
holder
.
itemTody
.
setText
(
dateTime
);
holder
.
itemTody
.
setTypeface
(
Typeface
.
create
(
Typeface
.
DEFAULT
,
Typeface
.
BOLD
));
holder
.
itemTody
.
setTextColor
(
Color
.
parseColor
(
"#3faafc"
));
...
...
This diff is collapsed.
Click to expand it.
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderReceivingFragment.java
View file @
76944fa8
...
...
@@ -206,9 +206,11 @@ public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, Fra
}
else
if
(
code
.
equals
(
"STATISTIC0012"
))
{
//没有相应技能
buttonStr
=
"马上去增加技能"
;
}
else
if
(
code
.
equals
(
"STATISTIC0013"
))
{
//没有设置服务区域
buttonStr
=
"马上去修改地区"
;
// buttonStr = "马上去修改地区";
buttonStr
=
"好的"
;
}
else
if
(
code
.
equals
(
"STATISTIC0014"
))
{
//城市不匹配
buttonStr
=
"马上去修改地区"
;
// buttonStr = "马上去修改地区";
buttonStr
=
"好的"
;
}
else
if
(
code
.
equals
(
"STATISTIC0015"
))
{
//没有授权认证
buttonStr
=
"马上去申请认证"
;
}
else
if
(
code
.
equals
(
"STATISTIC0016"
))
{
//没有权限接
...
...
This diff is collapsed.
Click to expand it.
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/BusinessTypeActivity.java
View file @
76944fa8
...
...
@@ -83,7 +83,7 @@ public class BusinessTypeActivity extends BaseActivity<SImplePresenter, Activity
mBind
.
tvSubmit
.
setOnClickListener
(
v
->
saveData
());
initData
();
initRefresh
();
//
initAddrListener();
initAddrListener
();
}
private
void
initRefresh
()
{
...
...
@@ -248,15 +248,13 @@ public class BusinessTypeActivity extends BaseActivity<SImplePresenter, Activity
//
// }
showDialog
();
// ServiceSaveBean saveBean = new ServiceSaveBean(
// dayPrice,
// provinceId, provinceName,
// cityId, cityName,
// areaId, areaName,
// ids
// );
ServiceSaveBean
saveBean
=
new
ServiceSaveBean
(
ids
);
ServiceSaveBean
saveBean
=
new
ServiceSaveBean
(
dayPrice
,
provinceId
,
provinceName
,
cityId
,
cityName
,
areaId
,
areaName
,
ids
);
Api
.
getService
(
UserService2
.
class
).
saveServiceTypeNew
(
saveBean
,
mUserId
).
compose
(
Api
.
applySchedulers
())
.
subscribe
(
mPresenter
.
baseObserver
(
bool
->
{
...
...
This diff is collapsed.
Click to expand it.
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
View file @
76944fa8
...
...
@@ -810,9 +810,9 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
//更新选择地址布局显示
private
void
updateAddressView
()
{
cityId
=
cityList
.
size
()
>
0
?
cityId
:
0
;
cityName
=
cityList
.
size
()
>
0
?
cityName
:
""
;
cityName
=
cityList
.
size
()
>
0
?
cityName
:
"
请选择市
"
;
areaId
=
areaList
.
size
()
>
0
?
areaId
:
0
;
areaName
=
areaList
.
size
()
>
0
?
areaName
:
""
;
areaName
=
areaList
.
size
()
>
0
?
areaName
:
"
请选择区
"
;
mBind
.
province
.
setText
(
provinceName
);
mBind
.
city
.
setText
(
cityName
);
mBind
.
area
.
setText
(
areaName
);
...
...
This diff is collapsed.
Click to expand it.
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