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
4f64e85f
authored
2 months ago
by
han xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工单列表UI跟iOS统一
parent
528a3328
dev_xx_250414_sop
…
dev_xx_250224_report
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
50 additions
and
37 deletions
.idea/gradle.xml
baseSDK/src/main/java/com/dayu/common/Constants.java
build.gradle
orderCenter/src/main/java/com/dayu/order/presenter/subcribeTime/SubcribeTimePresenter.java
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
orderCenter/src/main/res/layout/serve_datails_item.xml
.idea/gradle.xml
View file @
4f64e85f
...
@@ -31,5 +31,6 @@
...
@@ -31,5 +31,6 @@
<option
name=
"resolveExternalAnnotations"
value=
"false"
/>
<option
name=
"resolveExternalAnnotations"
value=
"false"
/>
</GradleProjectSettings>
</GradleProjectSettings>
</option>
</option>
<option
name=
"offlineMode"
value=
"true"
/>
</component>
</component>
</project>
</project>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
baseSDK/src/main/java/com/dayu/common/Constants.java
View file @
4f64e85f
...
@@ -45,41 +45,41 @@ public class Constants {
...
@@ -45,41 +45,41 @@ public class Constants {
/**
/**
* dev环境配置.
* dev环境配置.
*/
*/
//
public static String ENVIROMENT = "debug";
public
static
String
ENVIROMENT
=
"debug"
;
//
public static String PHOTO = "dev";
public
static
String
PHOTO
=
"dev"
;
//
public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
public
static
int
LOG_LEVEL
=
LogUtils
.
LEVEL_ALL
;
//
public static String BASE_URL = "http://47.94.101.239:3112";
public
static
String
BASE_URL
=
"http://47.94.101.239:3112"
;
//
public static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
public
static
String
WEB_SOP
=
"http://47.94.101.239:9004/#/sop"
;
//
public static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
public
static
String
CHECK_MULTI_WEB_SOP
=
"http://47.94.101.239:9004/#/manyServiceResult"
;
//
public static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
public
static
String
MULTI_WEB_SOP
=
"http://47.94.101.239:9004/#/manySop"
;
//
public static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
public
static
String
WEB_SOP_DETAIL
=
"http://47.94.101.239:9004/#/sopdetail"
;
//
public static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
public
static
String
WEB_ZHI_SHI
=
"http://47.94.101.239:9004/#/detail"
;
//
public static final String UP_PHOTO = "/file/uploadMore?targetPath=dev/sp/mobile/android/business/checkApply";
public
static
final
String
UP_PHOTO
=
"/file/uploadMore?targetPath=dev/sp/mobile/android/business/checkApply"
;
//
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video";
public
static
final
String
UP_VIDEO
=
"/file/uploadVideoOne?targetPath=dev/video"
;
//
public static boolean IS_DEBUG = true;
public
static
boolean
IS_DEBUG
=
true
;
//
public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
public
static
String
VIDEO_SHARE_URL
=
"http://uat.kf.ai:9099/#/shareVideo?type=_type&id="
;
//uat 学习视频分享链接 type(课程: course 直播: live)
//
public static int XLR_PID = 239; //小绿人商家id
public
static
int
XLR_PID
=
239
;
//小绿人商家id
//
public static String SCHEME_9099 = "http://dev.kf.ai:9099/#/";
public
static
String
SCHEME_9099
=
"http://dev.kf.ai:9099/#/"
;
/**
/**
* uat测试环境配置.
* uat测试环境配置.
*/
*/
public
static
String
ENVIROMENT
=
"uat"
;
//
public static String ENVIROMENT = "uat";
public
static
String
PHOTO
=
"test"
;
//
public static String PHOTO = "test";
public
static
int
LOG_LEVEL
=
LogUtils
.
LEVEL_ALL
;
//
public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
public
static
String
BASE_URL
=
"http://47.95.223.6:3112"
;
//
public static String BASE_URL = "http://47.95.223.6:3112";
public
static
String
WEB_SOP
=
"http://47.95.223.6:9004/#/sop"
;
//
public static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
public
static
String
WEB_SOP_DETAIL
=
"http://47.95.223.6:9004/#/sopdetail"
;
//
public static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
public
static
String
WEB_ZHI_SHI
=
"http://47.95.223.6:9004/#/detail"
;
//
public static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
public
static
String
CHECK_MULTI_WEB_SOP
=
"http://47.95.223.6:9004/#/manyServiceResult"
;
//
public static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
public
static
String
MULTI_WEB_SOP
=
"http://47.95.223.6:9004/#/manySop"
;
//
public static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
public
static
final
String
UP_PHOTO
=
"/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"
;
//
public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
public
static
final
String
UP_VIDEO
=
"/file/uploadVideoOne?targetPath=test/video"
;
//
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=test/video";
public
static
boolean
IS_DEBUG
=
false
;
//
public static boolean IS_DEBUG = false;
public
static
String
VIDEO_SHARE_URL
=
"http://uat.kf.ai:9099/#/shareVideo?type=_type&id="
;
//uat 学习视频分享链接 type(课程: course 直播: live)
//
public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
public
static
int
XLR_PID
=
14
;
//小绿人商家id
//
public static int XLR_PID = 14; //小绿人商家id
public
static
String
SCHEME_9099
=
"http://uat.kf.ai:9099/#/"
;
//
public static String SCHEME_9099 = "http://uat.kf.ai:9099/#/";
/**
/**
...
...
This diff is collapsed.
Click to expand it.
build.gradle
View file @
4f64e85f
...
@@ -5,8 +5,8 @@ buildscript {
...
@@ -5,8 +5,8 @@ buildscript {
ext
.
build_tools_version
=
"29.0.2"
ext
.
build_tools_version
=
"29.0.2"
ext
.
min_sdk_version
=
21
ext
.
min_sdk_version
=
21
ext
.
target_sdk_version
=
30
ext
.
target_sdk_version
=
30
ext
.
version_code
=
32
7
ext
.
version_code
=
32
8
ext
.
verson_name
=
"3.2.
7
"
ext
.
verson_name
=
"3.2.
8
"
ext
.
gradle_version
=
'4.0.1'
ext
.
gradle_version
=
'4.0.1'
ext
.
isReleaseMinify
=
false
ext
.
isReleaseMinify
=
false
ext
.
isDebugMinify
=
false
ext
.
isDebugMinify
=
false
...
...
This diff is collapsed.
Click to expand it.
orderCenter/src/main/java/com/dayu/order/presenter/subcribeTime/SubcribeTimePresenter.java
View file @
4f64e85f
...
@@ -70,12 +70,12 @@ public class SubcribeTimePresenter extends SubcribeContract.Presenter {
...
@@ -70,12 +70,12 @@ public class SubcribeTimePresenter extends SubcribeContract.Presenter {
}
catch
(
ParseException
e
)
{
}
catch
(
ParseException
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
if
(
mState
==
SUBCRIBE_TIME
)
{
if
(
mState
==
SUBCRIBE_TIME
||
mState
==
ORDER_DOING
)
{
//250227改为跟iOS统一标题
mTitle
.
set
(
UIUtils
.
getString
(
R
.
string
.
tv_home_tab_one_subscribe_time
));
mTitle
.
set
(
UIUtils
.
getString
(
R
.
string
.
tv_home_tab_one_subscribe_time
));
}
else
if
(
mState
==
ORDER_YUYUE
)
{
}
else
if
(
mState
==
ORDER_YUYUE
)
{
mTitle
.
set
(
UIUtils
.
getString
(
R
.
string
.
tv_home_tab_updata_subscribe_time
));
mTitle
.
set
(
UIUtils
.
getString
(
R
.
string
.
tv_home_tab_updata_subscribe_time
));
}
else
if
(
mState
==
ORDER_DOING
)
{
//
} else if (mState == ORDER_DOING) {
mTitle
.
set
(
UIUtils
.
getString
(
R
.
string
.
item_restart
));
//
mTitle.set(UIUtils.getString(R.string.item_restart));
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
View file @
4f64e85f
...
@@ -150,6 +150,8 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
...
@@ -150,6 +150,8 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
//工单子状态:3已预约1未出发|3已预约2已出发|4进行中3无SOP处理|4进行中4SOP未完成|4进行中5SOP已完成
//工单子状态:3已预约1未出发|3已预约2已出发|4进行中3无SOP处理|4进行中4SOP未完成|4进行中5SOP已完成
String
time
=
""
;
String
time
=
""
;
holder
.
itemTextDetail
.
setVisibility
(
View
.
GONE
);
holder
.
itemTextDetail
.
setVisibility
(
View
.
GONE
);
holder
.
tvCount
.
setVisibility
(
View
.
GONE
);
holder
.
tvDaysCount
.
setVisibility
(
View
.
GONE
);
switch
(
item
.
getStatus
())
{
switch
(
item
.
getStatus
())
{
case
1
:
//待接单
case
1
:
//待接单
holder
.
rlItemEnd
.
setVisibility
(
View
.
GONE
);
holder
.
rlItemEnd
.
setVisibility
(
View
.
GONE
);
...
@@ -206,6 +208,8 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
...
@@ -206,6 +208,8 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder
.
orderLineTwo
.
setVisibility
(
View
.
GONE
);
holder
.
orderLineTwo
.
setVisibility
(
View
.
GONE
);
holder
.
itemUpdataTime
.
setVisibility
(
View
.
GONE
);
holder
.
itemUpdataTime
.
setVisibility
(
View
.
GONE
);
holder
.
tvItemMid
.
setVisibility
(
View
.
VISIBLE
);
holder
.
tvItemMid
.
setVisibility
(
View
.
VISIBLE
);
holder
.
itemTextUserName
.
setVisibility
(
View
.
GONE
);
holder
.
itemTextUserPhone
.
setVisibility
(
View
.
GONE
);
holder
.
tvOrderTime
.
setText
(
"预约时间"
);
holder
.
tvOrderTime
.
setText
(
"预约时间"
);
time
=
item
.
getAppointmentTime
();
time
=
item
.
getAppointmentTime
();
...
@@ -225,6 +229,9 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
...
@@ -225,6 +229,9 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder
.
orderLineOne
.
setVisibility
(
View
.
VISIBLE
);
holder
.
orderLineOne
.
setVisibility
(
View
.
VISIBLE
);
}
}
holder
.
itemUpdataTime
.
setText
(
mContext
.
getString
(
R
.
string
.
modify_appointment_time
));
holder
.
itemUpdataTime
.
setText
(
mContext
.
getString
(
R
.
string
.
modify_appointment_time
));
holder
.
itemTextUserName
.
setVisibility
(
View
.
GONE
);
holder
.
itemTextUserPhone
.
setVisibility
(
View
.
GONE
);
int
source
=
item
.
getSource
();
int
source
=
item
.
getSource
();
if
(
7
==
source
||
8
==
source
){
if
(
7
==
source
||
8
==
source
){
if
(
3
==
item
.
getStatus
()){
if
(
3
==
item
.
getStatus
()){
...
@@ -344,6 +351,8 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
...
@@ -344,6 +351,8 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
case
4
:
//待处理
case
4
:
//待处理
holder
.
tvItemProcess
.
setVisibility
(
View
.
GONE
);
holder
.
tvItemProcess
.
setVisibility
(
View
.
GONE
);
holder
.
tvItemEnd
.
setVisibility
(
View
.
VISIBLE
);
holder
.
tvItemEnd
.
setVisibility
(
View
.
VISIBLE
);
holder
.
itemTextUserName
.
setVisibility
(
View
.
GONE
);
holder
.
itemTextUserPhone
.
setVisibility
(
View
.
GONE
);
int
source1
=
item
.
getSource
();
int
source1
=
item
.
getSource
();
if
(
7
==
source1
||
8
==
source1
){
if
(
7
==
source1
||
8
==
source1
){
...
@@ -419,7 +428,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
...
@@ -419,7 +428,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder
.
tvItemProcess
.
setText
(
mContext
.
getString
(
R
.
string
.
begain_server
));
holder
.
tvItemProcess
.
setText
(
mContext
.
getString
(
R
.
string
.
begain_server
));
holder
.
tvItemEnd
.
setText
(
mContext
.
getString
(
R
.
string
.
begain_server
));
holder
.
tvItemEnd
.
setText
(
mContext
.
getString
(
R
.
string
.
begain_server
));
}
}
holder
.
itemUpdataTime
.
setText
(
mContext
.
getString
(
R
.
string
.
need_again_door
));
// holder.itemUpdataTime.setText(mContext.getString(R.string.need_again_door));//250227改为跟iOS统一标题
holder
.
tvItemProcess
.
setText
(
mContext
.
getString
(
R
.
string
.
process_order
));
holder
.
tvItemProcess
.
setText
(
mContext
.
getString
(
R
.
string
.
process_order
));
if
(!
haveCustomer
)
{
if
(!
haveCustomer
)
{
holder
.
itemTextPhone
.
setVisibility
(
View
.
GONE
);
holder
.
itemTextPhone
.
setVisibility
(
View
.
GONE
);
...
@@ -824,7 +833,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
...
@@ -824,7 +833,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
mItem
.
setSubStatus
(
integer
);
mItem
.
setSubStatus
(
integer
);
processClick
(
mItem
,
h
,
position
);
processClick
(
mItem
,
h
,
position
);
mBind
.
tvItemProcess
.
setText
(
mContext
.
getString
(
R
.
string
.
process_order
));
mBind
.
tvItemProcess
.
setText
(
mContext
.
getString
(
R
.
string
.
process_order
));
mBind
.
itemUpdataTime
.
setText
(
mContext
.
getString
(
R
.
string
.
need_again_door
));
// mBind.itemUpdataTime.setText(mContext.getString(R.string.need_again_door));//250227改为跟iOS统一标题
getLocation
();
getLocation
();
}
}
...
...
This diff is collapsed.
Click to expand it.
orderCenter/src/main/res/layout/serve_datails_item.xml
View file @
4f64e85f
...
@@ -85,6 +85,7 @@
...
@@ -85,6 +85,7 @@
android:gravity=
"right"
android:gravity=
"right"
android:text=
"验收报告"
android:text=
"验收报告"
android:visibility=
"gone"
android:visibility=
"gone"
android:layout_marginRight=
"@dimen/dp_10"
android:textColor=
"@color/cl_receiving_order_item_data"
android:textColor=
"@color/cl_receiving_order_item_data"
android:textSize=
"@dimen/sp_12"
/>
android:textSize=
"@dimen/sp_12"
/>
...
@@ -93,6 +94,7 @@
...
@@ -93,6 +94,7 @@
android:id=
"@+id/server_check"
android:id=
"@+id/server_check"
android:layout_width=
"84dp"
android:layout_width=
"84dp"
android:layout_height=
"22dp"
android:layout_height=
"22dp"
android:layout_marginRight=
"@dimen/dp_10"
android:gravity=
"right"
android:gravity=
"right"
tools:text=
"随机发冷风机"
tools:text=
"随机发冷风机"
android:textColor=
"@color/cl_receiving_order_item_data"
android:textColor=
"@color/cl_receiving_order_item_data"
...
...
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