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
7a202982
authored
Dec 20, 2023
by
wukun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1220
parent
718af5b9
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
70 additions
and
35 deletions
baseSDK/src/main/java/com/dayu/widgets/MyJzvdStd.java
build.gradle
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
orderCenter/src/main/java/com/dayu/order/ui/fragment/OperateDetailFragment.java
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderOperateFragment.java
orderCenter/src/main/res/layout/fragment_multi_detail.xml
orderCenter/src/main/res/layout/fragment_operate_detail.xml
userCenter/src/main/res/layout/fragment_home_user.xml
baseSDK/src/main/java/com/dayu/widgets/MyJzvdStd.java
View file @
7a202982
...
@@ -2,8 +2,6 @@ package com.dayu.widgets;
...
@@ -2,8 +2,6 @@ package com.dayu.widgets;
import
android.content.Context
;
import
android.content.Context
;
import
android.util.AttributeSet
;
import
android.util.AttributeSet
;
import
android.util.Log
;
import
android.view.View
;
import
com.dayu.baselibrary.R
;
import
com.dayu.baselibrary.R
;
import
com.dayu.utils.ToastUtils
;
import
com.dayu.utils.ToastUtils
;
...
@@ -23,27 +21,6 @@ public class MyJzvdStd extends JzvdStd {
...
@@ -23,27 +21,6 @@ public class MyJzvdStd extends JzvdStd {
public
MyJzvdStd
(
Context
context
,
AttributeSet
attrs
)
{
public
MyJzvdStd
(
Context
context
,
AttributeSet
attrs
)
{
super
(
context
,
attrs
);
super
(
context
,
attrs
);
View
viewById
=
findViewById
(
R
.
id
.
thumb
);
View
start_layout
=
findViewById
(
R
.
id
.
start_layout
);
View
start
=
findViewById
(
R
.
id
.
start
);
viewById
.
setOnClickListener
(
new
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
Log
.
e
(
TAG
,
"onClick: 111111111111"
);
}
});
start_layout
.
setOnClickListener
(
new
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
Log
.
e
(
TAG
,
"onClick: 111111111112"
);
}
});
start
.
setOnClickListener
(
new
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
Log
.
e
(
TAG
,
"onClick: 111111111113"
);
}
});
}
}
@Override
@Override
...
...
build.gradle
View file @
7a202982
...
@@ -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
=
29
ext
.
target_sdk_version
=
29
ext
.
version_code
=
31
7
ext
.
version_code
=
31
8
ext
.
verson_name
=
"3.1.
7
"
ext
.
verson_name
=
"3.1.
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
...
...
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
View file @
7a202982
...
@@ -29,7 +29,6 @@ import com.dayu.location.base.LocationUtils;
...
@@ -29,7 +29,6 @@ import com.dayu.location.base.LocationUtils;
import
com.dayu.order.R
;
import
com.dayu.order.R
;
import
com.dayu.order.api.OrderApiFactory
;
import
com.dayu.order.api.OrderApiFactory
;
import
com.dayu.order.api.OrderService
;
import
com.dayu.order.api.OrderService
;
import
com.dayu.order.api.protocol.OperateInfo
;
import
com.dayu.order.api.protocol.OrderDetail
;
import
com.dayu.order.api.protocol.OrderDetail
;
import
com.dayu.order.api.protocol.Spu
;
import
com.dayu.order.api.protocol.Spu
;
import
com.dayu.order.api.protocol.bean.GreenPersionSiteInfo
;
import
com.dayu.order.api.protocol.bean.GreenPersionSiteInfo
;
...
@@ -311,7 +310,7 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
...
@@ -311,7 +310,7 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
}
}
// commentList = transData(data.getData());
// commentList = transData(data.getData());
commentList
.
addAll
(
data
.
getData
());
commentList
.
addAll
(
data
.
getData
());
mBind
.
tvComponent
.
setText
(
"
留言
. "
+
data
.
getTotalRows
());
mBind
.
tvComponent
.
setText
(
"
沟通记录
. "
+
data
.
getTotalRows
());
mCommentAdapter
.
setData
(
commentList
);
mCommentAdapter
.
setData
(
commentList
);
// mBind.refreshLayout.setEnableLoadMore(page < data.getTotalPages());
// mBind.refreshLayout.setEnableLoadMore(page < data.getTotalPages());
page
+=
1
;
page
+=
1
;
...
...
orderCenter/src/main/java/com/dayu/order/ui/fragment/OperateDetailFragment.java
View file @
7a202982
...
@@ -4,11 +4,15 @@ import android.annotation.SuppressLint;
...
@@ -4,11 +4,15 @@ import android.annotation.SuppressLint;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
android.view.View
;
import
android.view.View
;
import
android.widget.ImageView
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
import
com.alibaba.android.arouter.launcher.ARouter
;
import
com.alibaba.android.arouter.launcher.ARouter
;
import
com.badoo.mobile.util.WeakHandler
;
import
com.badoo.mobile.util.WeakHandler
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseViewHolder
;
import
com.dayu.base.api.Api
;
import
com.dayu.base.api.protocol.CommentBean
;
import
com.dayu.base.api.protocol.CommentBean
;
import
com.dayu.base.api.protocol.CommentPostData
;
import
com.dayu.base.api.protocol.CommentPostData
;
import
com.dayu.base.api.protocol.CommentReplyData
;
import
com.dayu.base.api.protocol.CommentReplyData
;
...
@@ -20,8 +24,12 @@ import com.dayu.common.Constants;
...
@@ -20,8 +24,12 @@ import com.dayu.common.Constants;
import
com.dayu.event.UserInfo
;
import
com.dayu.event.UserInfo
;
import
com.dayu.order.R
;
import
com.dayu.order.R
;
import
com.dayu.order.api.OrderApiFactory
;
import
com.dayu.order.api.OrderApiFactory
;
import
com.dayu.order.api.OrderService
;
import
com.dayu.order.api.protocol.OperateInfo
;
import
com.dayu.order.api.protocol.OperateInfo
;
import
com.dayu.order.api.protocol.OrderDetail
;
import
com.dayu.order.api.protocol.bean.OrderToolsBean
;
import
com.dayu.order.databinding.FragmentOperateDetailBinding
;
import
com.dayu.order.databinding.FragmentOperateDetailBinding
;
import
com.dayu.order.ui.view.ToolImageDialog
;
import
com.dayu.provider.router.RouterPath
;
import
com.dayu.provider.router.RouterPath
;
import
com.dayu.utils.CommonUtils
;
import
com.dayu.utils.CommonUtils
;
import
com.dayu.utils.GlideImageLoader
;
import
com.dayu.utils.GlideImageLoader
;
...
@@ -51,9 +59,10 @@ public class OperateDetailFragment extends BaseFragment<SImplePresenter, Fragmen
...
@@ -51,9 +59,10 @@ public class OperateDetailFragment extends BaseFragment<SImplePresenter, Fragmen
private
WeakHandler
weakHandler
=
new
WeakHandler
();
private
WeakHandler
weakHandler
=
new
WeakHandler
();
private
ArrayList
<
String
>
phoneNum
;
private
ArrayList
<
String
>
phoneNum
;
public
static
OperateDetailFragment
newInstance
(
OperateInfo
info
,
int
createProviderId
,
ArrayList
<
String
>
phoneNum
)
{
public
static
OperateDetailFragment
newInstance
(
OperateInfo
info
,
OrderDetail
detail
,
int
createProviderId
,
ArrayList
<
String
>
phoneNum
)
{
Bundle
args
=
new
Bundle
();
Bundle
args
=
new
Bundle
();
args
.
putSerializable
(
Constants
.
OPERATE_DETAIL
,
info
);
args
.
putSerializable
(
Constants
.
OPERATE_DETAIL
,
info
);
args
.
putSerializable
(
Constants
.
ORDER_DETAIL
,
detail
);
args
.
putStringArrayList
(
Constants
.
OPERATE_DETAIL_PHONE
,
phoneNum
);
args
.
putStringArrayList
(
Constants
.
OPERATE_DETAIL_PHONE
,
phoneNum
);
args
.
putInt
(
Constants
.
ID
,
createProviderId
);
args
.
putInt
(
Constants
.
ID
,
createProviderId
);
OperateDetailFragment
fragment
=
new
OperateDetailFragment
();
OperateDetailFragment
fragment
=
new
OperateDetailFragment
();
...
@@ -67,6 +76,7 @@ public class OperateDetailFragment extends BaseFragment<SImplePresenter, Fragmen
...
@@ -67,6 +76,7 @@ public class OperateDetailFragment extends BaseFragment<SImplePresenter, Fragmen
userInfo
=
mUserInfo
;
userInfo
=
mUserInfo
;
GlideImageLoader
.
load
(
mActivity
,
mBind
.
ivAvatar
,
userInfo
.
getHeaderImg
(),
R
.
drawable
.
icon_user_default
);
GlideImageLoader
.
load
(
mActivity
,
mBind
.
ivAvatar
,
userInfo
.
getHeaderImg
(),
R
.
drawable
.
icon_user_default
);
operateInfo
=
(
OperateInfo
)
getArguments
().
getSerializable
(
Constants
.
OPERATE_DETAIL
);
operateInfo
=
(
OperateInfo
)
getArguments
().
getSerializable
(
Constants
.
OPERATE_DETAIL
);
OrderDetail
detail
=
(
OrderDetail
)
getArguments
().
getSerializable
(
Constants
.
ORDER_DETAIL
);
phoneNum
=
getArguments
().
getStringArrayList
(
Constants
.
OPERATE_DETAIL_PHONE
);
phoneNum
=
getArguments
().
getStringArrayList
(
Constants
.
OPERATE_DETAIL_PHONE
);
int
createProviderId
=
getArguments
().
getInt
(
Constants
.
ID
);
int
createProviderId
=
getArguments
().
getInt
(
Constants
.
ID
);
getCommentData
();
getCommentData
();
...
@@ -100,6 +110,37 @@ public class OperateDetailFragment extends BaseFragment<SImplePresenter, Fragmen
...
@@ -100,6 +110,37 @@ public class OperateDetailFragment extends BaseFragment<SImplePresenter, Fragmen
Bundle
bundle
=
new
Bundle
();
Bundle
bundle
=
new
Bundle
();
bundle
.
putInt
(
Constants
.
ID
,
createProviderId
);
bundle
.
putInt
(
Constants
.
ID
,
createProviderId
);
mBind
.
tvKonwledge
.
setOnClickListener
(
view
->
ARouter
.
getInstance
().
build
(
RouterPath
.
PATH_KNOWLEDGE_QUERY
).
navigation
());
mBind
.
tvKonwledge
.
setOnClickListener
(
view
->
ARouter
.
getInstance
().
build
(
RouterPath
.
PATH_KNOWLEDGE_QUERY
).
navigation
());
if
(
detail
.
getSpus
()
!=
null
&&
detail
.
getSpus
().
size
()
>
0
)
{
getToolsData
(
detail
.
getSpus
().
get
(
0
).
getKaSpuId
());
}
}
//工具列表
private
void
getToolsData
(
int
kaSpuId
)
{
Api
.
getService
(
OrderService
.
class
).
getTools
(
kaSpuId
,
1
).
compose
(
Api
.
applySchedulers
())
.
subscribe
(
mPresenter
.
baseObserver
(
results
->
{
if
(
results
!=
null
&&
results
.
size
()
>
0
)
setToolsAdapter
(
results
);
}));
}
private
void
setToolsAdapter
(
List
<
OrderToolsBean
>
results
)
{
BaseQuickAdapter
<
OrderToolsBean
,
BaseViewHolder
>
wrongAdapter
=
new
BaseQuickAdapter
<
OrderToolsBean
,
BaseViewHolder
>(
R
.
layout
.
item_order_tool
,
results
)
{
@Override
protected
void
convert
(
BaseViewHolder
helper
,
OrderToolsBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_title
,
item
.
getTitle
());
ImageView
ivPicture
=
helper
.
getView
(
R
.
id
.
iv_picture
);
GlideImageLoader
.
load
(
mContext
,
item
.
getImgUrl
(),
ivPicture
);
ivPicture
.
setOnClickListener
(
v
->
{
new
ToolImageDialog
().
show
(
getActivity
(),
item
.
getImgUrl
());
});
}
};
LinearLayoutManager
layoutManager
=
new
LinearLayoutManager
(
getContext
());
mBind
.
rvTools
.
setLayoutManager
(
layoutManager
);
mBind
.
rvTools
.
setAdapter
(
wrongAdapter
);
}
}
//下拉刷新
//下拉刷新
...
...
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderOperateFragment.java
View file @
7a202982
...
@@ -69,7 +69,7 @@ public class OrderOperateFragment extends BaseFragment<OperatePresenter,Fragment
...
@@ -69,7 +69,7 @@ public class OrderOperateFragment extends BaseFragment<OperatePresenter,Fragment
List
<
String
>
phones
=
new
ArrayList
<>();
List
<
String
>
phones
=
new
ArrayList
<>();
for
(
OperateInfo
info
:
operateInfos
){
for
(
OperateInfo
info
:
operateInfos
){
titles
.
add
(
info
.
getName
());
titles
.
add
(
info
.
getName
());
fragments
.
add
(
OperateDetailFragment
.
newInstance
(
info
,
detail
.
getCreateProviderId
(),
orderPhone
));
fragments
.
add
(
OperateDetailFragment
.
newInstance
(
info
,
detail
,
detail
.
getCreateProviderId
(),
orderPhone
));
if
(!
TextUtils
.
isEmpty
(
info
.
getHotline
())){
if
(!
TextUtils
.
isEmpty
(
info
.
getHotline
())){
phones
.
add
(
info
.
getHotline
());
phones
.
add
(
info
.
getHotline
());
}
}
...
...
orderCenter/src/main/res/layout/fragment_multi_detail.xml
View file @
7a202982
...
@@ -815,13 +815,15 @@
...
@@ -815,13 +815,15 @@
android:paddingTop=
"@dimen/dp_15"
android:paddingTop=
"@dimen/dp_15"
android:text=
"工具装备清单"
android:text=
"工具装备清单"
android:textColor=
"@color/cl_home_title_text_color"
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"14sp"
/>
android:textSize=
"14sp"
android:visibility=
"gone"
/>
<androidx.recyclerview.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_tools"
android:id=
"@+id/rv_tools"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:background=
"@color/white"
/>
android:background=
"@color/white"
android:visibility=
"gone"
/>
<TextView
<TextView
android:id=
"@+id/tv_component"
android:id=
"@+id/tv_component"
...
...
orderCenter/src/main/res/layout/fragment_operate_detail.xml
View file @
7a202982
...
@@ -117,7 +117,20 @@
...
@@ -117,7 +117,20 @@
android:src=
"@drawable/ic_search_white"
/>
android:src=
"@drawable/ic_search_white"
/>
</RelativeLayout>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
<TextView
android:layout_width=
"match_parent"
android:layout_height=
"43dp"
android:paddingLeft=
"15dp"
android:paddingTop=
"@dimen/dp_15"
android:text=
"工具装备清单"
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"14sp"
/>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_tools"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/white"
/>
<TextView
<TextView
android:id=
"@+id/tv_component"
android:id=
"@+id/tv_component"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -128,7 +141,8 @@
...
@@ -128,7 +141,8 @@
android:text=
"留言"
android:text=
"留言"
android:textColor=
"@color/cl_home_title_text_color"
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"14sp"
android:textSize=
"14sp"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
android:visibility=
"gone"
/>
<LinearLayout
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -136,7 +150,8 @@
...
@@ -136,7 +150,8 @@
android:layout_alignParentBottom=
"true"
android:layout_alignParentBottom=
"true"
android:layout_margin=
"10dp"
android:layout_margin=
"10dp"
android:background=
"@color/cl_white"
android:background=
"@color/cl_white"
android:orientation=
"horizontal"
>
android:orientation=
"horizontal"
android:visibility=
"gone"
>
<ImageView
<ImageView
android:id=
"@+id/iv_avatar"
android:id=
"@+id/iv_avatar"
...
@@ -173,7 +188,8 @@
...
@@ -173,7 +188,8 @@
<androidx.recyclerview.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rl_component"
android:id=
"@+id/rl_component"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
android:visibility=
"gone"
/>
</LinearLayout>
</LinearLayout>
...
...
userCenter/src/main/res/layout/fragment_home_user.xml
View file @
7a202982
...
@@ -441,7 +441,7 @@
...
@@ -441,7 +441,7 @@
style=
"@style/sale_item_text"
style=
"@style/sale_item_text"
android:layout_width=
"120dp"
android:layout_width=
"120dp"
android:layout_height=
"40dp"
android:layout_height=
"40dp"
android:background=
"@color/
cl_selector_hui
"
android:background=
"@color/
white
"
android:gravity=
"center"
android:gravity=
"center"
android:text=
"我的收费标准:"
android:text=
"我的收费标准:"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
/>
...
...
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