Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
HBHAndroid
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨秀秀
HBHAndroid
Commits
62369df9
Commit
62369df9
authored
Oct 27, 2023
by
小费同学阿
💬
Committed by
杨秀秀
Nov 21, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
68649 【商户APP-Android】店员管理-底部应该不显示暂无数据,应该是~没有更多啦~
parent
4d57560e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
61 additions
and
10 deletions
+61
-10
AssistantManagementRequest.kt
...erchanthbh/data/http/requst/AssistantManagementRequest.kt
+3
-2
ShareRequest.kt
.../java/com/xx/merchanthbh/data/http/requst/ShareRequest.kt
+2
-1
AssistantManagementActivity.java
...merchanthbh/ui/assistant/AssistantManagementActivity.java
+46
-2
AssistantManagementViewModel.java
...erchanthbh/ui/assistant/AssistantManagementViewModel.java
+10
-3
activity_assistant_management.xml
app/src/main/res/layout/activity_assistant_management.xml
+0
-2
No files found.
app/src/main/java/com/xx/merchanthbh/data/http/requst/AssistantManagementRequest.kt
View file @
62369df9
package
com.xx.merchanthbh.data.http.requst
import
android.graphics.pdf.PdfDocument.Page
import
com.xx.merchanthbh.data.http.BaseRespons
import
com.xx.merchanthbh.data.http.requst.body.MerchantMsgbody
import
com.xx.merchanthbh.data.http.respons.AssistantInformationBean
...
...
@@ -14,8 +15,8 @@ class AssistantManagementRequest : BaseRespons() {
* 加载店员列表
* 获取搜索关键词
*/
fun
getAssistantList
(
searchWord
:
String
):
Observable
<
BaseResponse
<
List
<
AssistantInformationBean
>
>>
{
return
apiService
.
getAssistantList
(
searchWord
)
fun
getAssistantList
(
searchWord
:
String
,
page
:
Int
):
Observable
<
BasePageResponse
<
AssistantInformationBean
>>
{
return
apiService
.
getAssistantList
(
searchWord
,
page
)
}
...
...
app/src/main/java/com/xx/merchanthbh/data/http/requst/ShareRequest.kt
View file @
62369df9
...
...
@@ -24,7 +24,8 @@ class ShareRequest: BaseRespons() {
* 获取搜索关键词
*/
fun
getAssistantList
():
Observable
<
BaseResponse
<
List
<
AssistantInformationBean
>>>
{
return
apiService
.
getAssistantList
(
""
)
return
apiService
.
getAssistantListAll
(
""
)
}
data class
ShareTotalListBody
(
var
activityName
:
String
?,
...
...
app/src/main/java/com/xx/merchanthbh/ui/assistant/AssistantManagementActivity.java
View file @
62369df9
...
...
@@ -5,11 +5,16 @@ import android.os.Bundle;
import
android.util.Log
;
import
android.view.View
;
import
androidx.annotation.NonNull
;
import
androidx.lifecycle.Observer
;
import
com.scwang.smart.refresh.layout.api.RefreshLayout
;
import
com.scwang.smart.refresh.layout.listener.OnLoadMoreListener
;
import
com.scwang.smart.refresh.layout.listener.OnRefreshListener
;
import
com.xx.merchanthbh.BR
;
import
com.xx.merchanthbh.R
;
import
com.xx.merchanthbh.activity.adapter.AssistantInformationAdapter
;
import
com.xx.merchanthbh.activity.adapter.OrderListAdapter
;
import
com.xx.merchanthbh.data.http.requst.AssistantManagementRequest
;
import
com.xx.merchanthbh.data.http.respons.AppealFilesBean
;
import
com.xx.merchanthbh.data.http.respons.AssistantInformationBean
;
...
...
@@ -21,11 +26,13 @@ import java.util.List;
import
me.goldze.mvvmhabit.base.BaseActivity
;
public
class
AssistantManagementActivity
extends
BaseActivity
<
ActivityAssistantManagementBinding
,
AssistantManagementViewModel
>
{
public
class
AssistantManagementActivity
extends
BaseActivity
<
ActivityAssistantManagementBinding
,
AssistantManagementViewModel
>
implements
OnRefreshListener
,
OnLoadMoreListener
{
// 重写初始方法调用参数
@Override
public
void
initData
()
{
super
.
initData
();
binding
.
refresh
.
setOnRefreshListener
(
this
);
binding
.
refresh
.
setOnLoadMoreListener
(
this
);
// 获取适配器上下文
viewModel
.
adapter
=
new
AssistantInformationAdapter
(
this
,
viewModel
);
binding
.
refresh
.
setEnableFooterFollowWhenNoMoreData
(
true
);
...
...
@@ -54,7 +61,31 @@ public class AssistantManagementActivity extends BaseActivity<ActivityAssistantM
}
}
});
viewModel
.
loadMoreStatic
.
observe
(
this
,
new
Observer
<
Integer
>()
{
@Override
public
void
onChanged
(
Integer
it
)
{
if
(
it
==
1
)
{
/*隐藏recycleView和它的暂无数据列表*/
binding
.
rvAssistantList
.
setVisibility
(
View
.
VISIBLE
);
binding
.
llNoData
.
setVisibility
(
View
.
GONE
);
/*结束加载*/
binding
.
refresh
.
finishLoadMore
();
}
else
if
(
it
==
2
)
{
/*隐藏recycleView和它的暂无数据列表*/
binding
.
rvAssistantList
.
setVisibility
(
View
.
VISIBLE
);
binding
.
llNoData
.
setVisibility
(
View
.
GONE
);
/*结束加载*/
binding
.
refresh
.
finishLoadMoreWithNoMoreData
();
}
else
if
(
it
==
3
)
{
/*显示recycleView和它的暂无数据列表*/
binding
.
rvAssistantList
.
setVisibility
(
View
.
GONE
);
binding
.
llNoData
.
setVisibility
(
View
.
VISIBLE
);
binding
.
refresh
.
setEnableLoadMore
(
false
);
}
binding
.
refresh
.
finishRefresh
();
}
});
}
@Override
...
...
@@ -90,4 +121,17 @@ public class AssistantManagementActivity extends BaseActivity<ActivityAssistantM
AssistantManagementRequest
lm
=
new
AssistantManagementRequest
();
return
new
AssistantManagementViewModel
(
getApplication
(),
lm
);
}
@Override
public
void
onLoadMore
(
RefreshLayout
refreshLayout
)
{
viewModel
.
page
++;
viewModel
.
geAssistantList
();
}
@Override
public
void
onRefresh
(
@NonNull
RefreshLayout
refreshLayout
)
{
viewModel
.
page
=
1
;
viewModel
.
geAssistantList
();
binding
.
refresh
.
setEnableFooterFollowWhenNoMoreData
(
true
);
}
}
app/src/main/java/com/xx/merchanthbh/ui/assistant/AssistantManagementViewModel.java
View file @
62369df9
...
...
@@ -25,12 +25,14 @@ import java.util.List;
import
io.reactivex.rxjava3.disposables.Disposable
;
import
io.reactivex.rxjava3.functions.Consumer
;
import
me.goldze.mvvmhabit.base.BaseViewModel
;
import
me.goldze.mvvmhabit.base.ListBaseViewModel
;
import
me.goldze.mvvmhabit.binding.command.BindingAction
;
import
me.goldze.mvvmhabit.binding.command.BindingCommand
;
import
me.goldze.mvvmhabit.http.ApiDisposableObserver
;
import
me.goldze.mvvmhabit.http.ApiDisposablePageObserver
;
import
me.goldze.mvvmhabit.utils.RxUtils
;
public
class
AssistantManagementViewModel
extends
BaseViewModel
<
AssistantManagementRequest
>
{
public
class
AssistantManagementViewModel
extends
List
BaseViewModel
<
AssistantManagementRequest
>
{
public
String
oldSearch
=
""
;
//搜索内容绑定
...
...
@@ -75,14 +77,14 @@ public class AssistantManagementViewModel extends BaseViewModel<AssistantManagem
// 店员列表赋值
public
void
geAssistantList
()
{
model
.
getAssistantList
(
searchWord
.
get
()).
compose
(
RxUtils
.
schedulersTransformer
())
//线程调度
model
.
getAssistantList
(
searchWord
.
get
()
,
page
).
compose
(
RxUtils
.
schedulersTransformer
())
//线程调度
.
doOnSubscribe
(
AssistantManagementViewModel
.
this
)
.
doOnSubscribe
(
new
Consumer
<
Disposable
>()
{
@Override
public
void
accept
(
Disposable
disposable
)
throws
Exception
{
showDialog
(
"请稍等"
);
}
}).
subscribe
(
new
ApiDisposable
Observer
<
List
<
AssistantInformationBean
>
>()
{
}).
subscribe
(
new
ApiDisposable
PageObserver
<
AssistantInformationBean
>()
{
@Override
public
void
onSuccess
(
List
<
AssistantInformationBean
>
resultBean
)
{
/*存值*/
...
...
@@ -102,6 +104,11 @@ public class AssistantManagementViewModel extends BaseViewModel<AssistantManagem
dismissDialog
();
}
@Override
public
void
getTotal
(
int
total
)
{
}
});
}
...
...
app/src/main/res/layout/activity_assistant_management.xml
View file @
62369df9
...
...
@@ -138,8 +138,6 @@
android:gravity=
"center"
android:orientation=
"vertical"
android:visibility=
"gone"
>
<ImageView
android:layout_width=
"120dp"
android:layout_height=
"129dp"
...
...
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