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
02801023
Commit
02801023
authored
Oct 24, 2023
by
david
Committed by
杨秀秀
Nov 21, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修复
parent
149acbe1
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
252 additions
and
204 deletions
+252
-204
CreditDetailActivity.java
...va/com/xx/hbhconsumer/ui/credit/CreditDetailActivity.java
+2
-3
HotSalesActivity.java
...java/com/xx/hbhconsumer/ui/hotsales/HotSalesActivity.java
+1
-1
MapActivity.java
.../src/main/java/com/xx/hbhconsumer/ui/map/MapActivity.java
+1
-1
MapViewModel.java
...src/main/java/com/xx/hbhconsumer/ui/map/MapViewModel.java
+6
-1
NewProductsActivity.java
...om/xx/hbhconsumer/ui/newproducts/NewProductsActivity.java
+7
-2
RegisterViewModel.java
...ava/com/xx/hbhconsumer/ui/register/RegisterViewModel.java
+3
-2
activity_coupon_list.xml
consumer/src/main/res/layout/activity_coupon_list.xml
+41
-38
activity_credit_detail.xml
consumer/src/main/res/layout/activity_credit_detail.xml
+41
-28
activity_credits_goods_detail.xml
...mer/src/main/res/layout/activity_credits_goods_detail.xml
+5
-0
activity_hot_sales.xml
consumer/src/main/res/layout/activity_hot_sales.xml
+36
-31
activity_low_price.xml
consumer/src/main/res/layout/activity_low_price.xml
+36
-33
activity_new_products.xml
consumer/src/main/res/layout/activity_new_products.xml
+37
-32
fragment_message_list.xml
consumer/src/main/res/layout/fragment_message_list.xml
+36
-32
No files found.
consumer/src/main/java/com/xx/hbhconsumer/ui/credit/CreditDetailActivity.java
View file @
02801023
...
@@ -56,9 +56,6 @@ public class CreditDetailActivity extends BaseActivity<ActivityCreditDetailBindi
...
@@ -56,9 +56,6 @@ public class CreditDetailActivity extends BaseActivity<ActivityCreditDetailBindi
viewModel
.
creditRecordBeanList
.
observe
(
this
,
creditRecordBeanList
->
{
viewModel
.
creditRecordBeanList
.
observe
(
this
,
creditRecordBeanList
->
{
if
(
creditRecordBeanList
!=
null
&&
!
creditRecordBeanList
.
isEmpty
())
{
if
(
creditRecordBeanList
!=
null
&&
!
creditRecordBeanList
.
isEmpty
())
{
creditAdapter
.
mList
=
creditRecordBeanList
;
creditAdapter
.
notifyDataSetChanged
();
binding
.
llNoData
.
setVisibility
(
View
.
GONE
);
binding
.
llNoData
.
setVisibility
(
View
.
GONE
);
}
else
{
}
else
{
binding
.
llNoData
.
setVisibility
(
View
.
VISIBLE
);
binding
.
llNoData
.
setVisibility
(
View
.
VISIBLE
);
...
@@ -74,6 +71,8 @@ public class CreditDetailActivity extends BaseActivity<ActivityCreditDetailBindi
...
@@ -74,6 +71,8 @@ public class CreditDetailActivity extends BaseActivity<ActivityCreditDetailBindi
}
else
{
}
else
{
binding
.
refresh
.
setEnableLoadMore
(
true
);
binding
.
refresh
.
setEnableLoadMore
(
true
);
}
}
creditAdapter
.
mList
=
creditRecordBeanList
;
creditAdapter
.
notifyDataSetChanged
();
});
});
...
...
consumer/src/main/java/com/xx/hbhconsumer/ui/hotsales/HotSalesActivity.java
View file @
02801023
...
@@ -64,6 +64,7 @@ public class HotSalesActivity extends BaseActivity<ActivityHotSalesBinding, HotS
...
@@ -64,6 +64,7 @@ public class HotSalesActivity extends BaseActivity<ActivityHotSalesBinding, HotS
if
(
viewModel
.
page
==
viewModel
.
totalPage
)
{
if
(
viewModel
.
page
==
viewModel
.
totalPage
)
{
binding
.
refresh
.
setEnableLoadMore
(
false
);
binding
.
refresh
.
setEnableLoadMore
(
false
);
binding
.
tvNoMore
.
setVisibility
(
View
.
VISIBLE
);
}
}
}
}
...
@@ -86,7 +87,6 @@ public class HotSalesActivity extends BaseActivity<ActivityHotSalesBinding, HotS
...
@@ -86,7 +87,6 @@ public class HotSalesActivity extends BaseActivity<ActivityHotSalesBinding, HotS
}
else
if
(
viewModel
.
page
==
viewModel
.
totalPage
)
{
}
else
if
(
viewModel
.
page
==
viewModel
.
totalPage
)
{
binding
.
refresh
.
setEnableLoadMore
(
false
);
binding
.
refresh
.
setEnableLoadMore
(
false
);
viewModel
.
loadData
();
viewModel
.
loadData
();
binding
.
tvNoMore
.
setVisibility
(
View
.
VISIBLE
);
}
else
{
}
else
{
viewModel
.
loadData
();
viewModel
.
loadData
();
}
}
...
...
consumer/src/main/java/com/xx/hbhconsumer/ui/map/MapActivity.java
View file @
02801023
...
@@ -343,7 +343,7 @@ public class MapActivity extends BaseActivity<ActivityMapBinding, MapViewModel>
...
@@ -343,7 +343,7 @@ public class MapActivity extends BaseActivity<ActivityMapBinding, MapViewModel>
}
}
//添加LineMarker
//添加LineMarker
FMLineMarker
lineMarker
=
new
FMLineMarker
(
segments
);
FMLineMarker
lineMarker
=
new
FMLineMarker
(
segments
);
lineMarker
.
setLineWidth
(
3
f
);
lineMarker
.
setLineWidth
(
6
f
);
mLineLayer
.
addMarker
(
lineMarker
);
mLineLayer
.
addMarker
(
lineMarker
);
}
}
...
...
consumer/src/main/java/com/xx/hbhconsumer/ui/map/MapViewModel.java
View file @
02801023
...
@@ -20,6 +20,7 @@ import me.goldze.mvvmhabit.binding.command.BindingCommand;
...
@@ -20,6 +20,7 @@ import me.goldze.mvvmhabit.binding.command.BindingCommand;
import
me.goldze.mvvmhabit.http.ApiDisposableObserver
;
import
me.goldze.mvvmhabit.http.ApiDisposableObserver
;
import
me.goldze.mvvmhabit.utils.RxUtils
;
import
me.goldze.mvvmhabit.utils.RxUtils
;
import
me.goldze.mvvmhabit.utils.StringUtils
;
import
me.goldze.mvvmhabit.utils.StringUtils
;
import
me.goldze.mvvmhabit.utils.ToastUtils
;
public
class
MapViewModel
extends
BaseViewModel
<
MapRequest
>
{
public
class
MapViewModel
extends
BaseViewModel
<
MapRequest
>
{
...
@@ -74,7 +75,11 @@ public class MapViewModel extends BaseViewModel<MapRequest> {
...
@@ -74,7 +75,11 @@ public class MapViewModel extends BaseViewModel<MapRequest> {
}
}
}
}
}
}
checkMap
(
newList
.
get
(
0
));
if
(
newList
.
isEmpty
())
{
ToastUtils
.
showShort
(
"暂无地图数据"
);
}
else
{
checkMap
(
newList
.
get
(
0
));
}
mapList
.
postValue
(
newList
);
mapList
.
postValue
(
newList
);
}
}
...
...
consumer/src/main/java/com/xx/hbhconsumer/ui/newproducts/NewProductsActivity.java
View file @
02801023
package
com
.
xx
.
hbhconsumer
.
ui
.
newproducts
;
package
com
.
xx
.
hbhconsumer
.
ui
.
newproducts
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.view.View
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.NonNull
;
import
androidx.lifecycle.Observer
;
import
androidx.lifecycle.Observer
;
...
@@ -59,6 +60,11 @@ public class NewProductsActivity extends BaseActivity<ActivityNewProductsBinding
...
@@ -59,6 +60,11 @@ public class NewProductsActivity extends BaseActivity<ActivityNewProductsBinding
}
else
{
}
else
{
binding
.
refresh
.
finishLoadMore
();
binding
.
refresh
.
finishLoadMore
();
}
}
if
(
viewModel
.
page
==
viewModel
.
totalPage
)
{
binding
.
refresh
.
setEnableLoadMore
(
false
);
binding
.
tvNoMore
.
setVisibility
(
View
.
VISIBLE
);
}
});
});
}
}
...
@@ -74,11 +80,10 @@ public class NewProductsActivity extends BaseActivity<ActivityNewProductsBinding
...
@@ -74,11 +80,10 @@ public class NewProductsActivity extends BaseActivity<ActivityNewProductsBinding
viewModel
.
page
++;
viewModel
.
page
++;
if
(
viewModel
.
page
>
viewModel
.
totalPage
)
{
if
(
viewModel
.
page
>
viewModel
.
totalPage
)
{
//
binding.tvNoMore.setVisibility(View.VISIBLE);
binding
.
tvNoMore
.
setVisibility
(
View
.
VISIBLE
);
}
else
if
(
viewModel
.
page
==
viewModel
.
totalPage
)
{
}
else
if
(
viewModel
.
page
==
viewModel
.
totalPage
)
{
binding
.
refresh
.
setEnableLoadMore
(
false
);
binding
.
refresh
.
setEnableLoadMore
(
false
);
viewModel
.
loadData
();
viewModel
.
loadData
();
// binding.tvNoMore.setVisibility(View.VISIBLE);
}
else
{
}
else
{
viewModel
.
loadData
();
viewModel
.
loadData
();
}
}
...
...
consumer/src/main/java/com/xx/hbhconsumer/ui/register/RegisterViewModel.java
View file @
02801023
...
@@ -12,6 +12,7 @@ import androidx.lifecycle.MutableLiveData;
...
@@ -12,6 +12,7 @@ import androidx.lifecycle.MutableLiveData;
import
com.xx.hbhconsumer.data.http.requst.LoginRequest
;
import
com.xx.hbhconsumer.data.http.requst.LoginRequest
;
import
com.xx.hbhconsumer.data.http.requst.body.RegisterRequest
;
import
com.xx.hbhconsumer.data.http.requst.body.RegisterRequest
;
import
com.xx.hbhconsumer.data.http.respons.RegisterBean
;
import
com.xx.hbhconsumer.data.http.respons.UserInfoBean
;
import
com.xx.hbhconsumer.data.http.respons.UserInfoBean
;
import
com.xx.hbhconsumer.data.local.LocalData
;
import
com.xx.hbhconsumer.data.local.LocalData
;
import
com.xx.hbhconsumer.ui.login.LoginActivity
;
import
com.xx.hbhconsumer.ui.login.LoginActivity
;
...
@@ -153,9 +154,9 @@ public class RegisterViewModel extends BaseViewModel<RegisterRequest> {
...
@@ -153,9 +154,9 @@ public class RegisterViewModel extends BaseViewModel<RegisterRequest> {
public
void
accept
(
Disposable
disposable
)
throws
Exception
{
public
void
accept
(
Disposable
disposable
)
throws
Exception
{
showDialog
(
"正在请求..."
);
showDialog
(
"正在请求..."
);
}
}
}).
subscribe
(
new
ApiDisposableObserver
<
String
>()
{
}).
subscribe
(
new
ApiDisposableObserver
<
RegisterBean
>()
{
@Override
@Override
public
void
onSuccess
(
String
resultBean
)
{
public
void
onSuccess
(
RegisterBean
resultBean
)
{
dismissDialog
();
dismissDialog
();
startActivity
(
LoginActivity
.
class
);
startActivity
(
LoginActivity
.
class
);
}
}
...
...
consumer/src/main/res/layout/activity_coupon_list.xml
View file @
02801023
...
@@ -49,49 +49,52 @@
...
@@ -49,49 +49,52 @@
<com.scwang.smart.refresh.header.BezierRadarHeader
<com.scwang.smart.refresh.header.BezierRadarHeader
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
/>
<androidx.core.widget.NestedScrollView
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
>
android:orientation=
"vertical"
>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_coupon_list"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginTop=
"17dp"
android:layout_marginLeft=
"17dp"
android:layout_marginRight=
"17dp"
android:orientation=
"vertical"
binding:layoutManager=
"@{LayoutManagers.linear(1,false)}"
/>
<TextView
android:id=
"@+id/tv_no_more"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:visibility=
"gone"
android:layout_below=
"@id/rv_search_goods_list"
android:text=
"~ 没有更多啦 ~"
android:textSize=
"13sp"
android:textColor=
"#FF999999"
/>
<!--暂无数据-->
<LinearLayout
<LinearLayout
android:id=
"@+id/ll_no_data"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:gravity=
"center"
android:orientation=
"vertical"
>
android:orientation=
"vertical"
android:visibility=
"gone"
>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_coupon_list"
<ImageView
android:layout_width=
"match_parent"
android:layout_width=
"120dp"
android:layout_height=
"match_parent"
android:layout_height=
"129dp"
android:layout_marginTop=
"17dp"
android:src=
"@mipmap/zhanwei_img_wushuju"
/>
android:layout_marginLeft=
"17dp"
android:layout_marginRight=
"17dp"
android:orientation=
"vertical"
binding:layoutManager=
"@{LayoutManagers.linear(1,false)}"
/>
<TextView
android:id=
"@+id/tv_no_more"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:visibility=
"gone"
android:layout_below=
"@id/rv_search_goods_list"
android:text=
"~ 没有更多啦 ~"
android:textSize=
"13sp"
android:textColor=
"#FF999999"
/>
<!--暂无数据-->
<LinearLayout
android:id=
"@+id/ll_no_data"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:gravity=
"center"
android:orientation=
"vertical"
android:visibility=
"gone"
>
<ImageView
android:layout_width=
"120dp"
android:layout_height=
"129dp"
android:src=
"@mipmap/zhanwei_img_wushuju"
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</
LinearLayout
>
</
androidx.core.widget.NestedScrollView
>
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
...
...
consumer/src/main/res/layout/activity_credit_detail.xml
View file @
02801023
...
@@ -140,39 +140,52 @@
...
@@ -140,39 +140,52 @@
<com.scwang.smart.refresh.header.BezierRadarHeader
<com.scwang.smart.refresh.header.BezierRadarHeader
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
/>
<androidx.core.widget.NestedScrollView
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
>
android:orientation=
"vertical"
>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_credit_record_list"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginLeft=
"17dp"
android:layout_marginTop=
"19dp"
android:layout_marginRight=
"17dp"
android:background=
"@drawable/bg_white_radius_12"
binding:layoutManager=
"@{LayoutManagers.linear(1,false)}"
/>
<!--暂无数据-->
<LinearLayout
<LinearLayout
android:id=
"@+id/ll_no_data"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:gravity=
"center"
android:orientation=
"vertical"
>
android:orientation=
"vertical"
android:visibility=
"gone"
>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_credit_record_list"
<ImageView
android:layout_width=
"match_parent"
android:layout_width=
"120dp"
android:layout_height=
"match_parent"
android:layout_height=
"129dp"
android:layout_marginLeft=
"17dp"
android:src=
"@mipmap/zhanwei_img_wushuju"
/>
android:layout_marginTop=
"19dp"
android:layout_marginRight=
"17dp"
android:background=
"@drawable/bg_white_radius_12"
binding:layoutManager=
"@{LayoutManagers.linear(1,false)}"
/>
<TextView
android:id=
"@+id/tv_no_more"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:visibility=
"gone"
android:layout_below=
"@id/rv_search_goods_list"
android:text=
"~ 没有更多啦 ~"
android:textSize=
"13sp"
android:textColor=
"#FF999999"
/>
<!--暂无数据-->
<LinearLayout
android:id=
"@+id/ll_no_data"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:gravity=
"center"
android:orientation=
"vertical"
android:visibility=
"gone"
>
<ImageView
android:layout_width=
"120dp"
android:layout_height=
"129dp"
android:src=
"@mipmap/zhanwei_img_wushuju"
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</
LinearLayout
>
</
androidx.core.widget.NestedScrollView
>
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
</RelativeLayout>
</RelativeLayout>
...
...
consumer/src/main/res/layout/activity_credits_goods_detail.xml
View file @
02801023
...
@@ -67,10 +67,15 @@
...
@@ -67,10 +67,15 @@
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_centerVertical=
"true"
android:layout_toRightOf=
"@id/tv_credit_num_name"
android:layout_alignParentRight=
"true"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"17dp"
android:layout_marginRight=
"17dp"
android:layout_marginLeft=
"17dp"
android:gravity=
"right"
android:textSize=
"14sp"
android:textSize=
"14sp"
android:textColor=
"#333333"
android:textColor=
"#333333"
android:maxLines=
"1"
android:ellipsize=
"end"
android:text=
"彩绘精致麻布靠枕"
/>
android:text=
"彩绘精致麻布靠枕"
/>
</RelativeLayout>
</RelativeLayout>
...
...
consumer/src/main/res/layout/activity_hot_sales.xml
View file @
02801023
...
@@ -52,45 +52,50 @@
...
@@ -52,45 +52,50 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
/>
<
LinearLayout
<
androidx.core.widget.NestedScrollView
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
>
android:orientation=
"vertical"
>
<LinearLayout
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_goods_list"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginTop=
"13dp"
android:orientation=
"vertical"
>
binding:layoutManager=
"@{LayoutManagers.linear(1,false)}"
/>
<TextView
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/tv_no_more"
android:id=
"@+id/rv_goods_list"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"match_parent"
android:gravity=
"center"
android:layout_marginTop=
"13dp"
android:visibility=
"gone"
binding:layoutManager=
"@{LayoutManagers.linear(1,false)}"
/>
android:layout_below=
"@id/rv_search_goods_list"
android:text=
"~ 没有更多啦 ~"
android:textSize=
"13sp"
android:textColor=
"#FF999999"
/>
<!--暂无数据-->
<TextView
<LinearLayout
android:id=
"@+id/tv_no_more"
android:id=
"@+id/ll_no_data"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"match_parent"
android:layout_marginBottom=
"17dp"
android:gravity=
"center"
android:gravity=
"center"
android:orientation=
"vertical"
android:visibility=
"gone"
android:visibility=
"gone"
>
android:layout_below=
"@id/rv_search_goods_list"
android:text=
"~ 没有更多啦 ~"
android:textSize=
"13sp"
android:textColor=
"#FF999999"
/>
<!--暂无数据-->
<LinearLayout
android:id=
"@+id/ll_no_data"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:gravity=
"center"
android:orientation=
"vertical"
android:visibility=
"gone"
>
<ImageView
<ImageView
android:layout_width=
"120dp"
android:layout_width=
"120dp"
android:layout_height=
"129dp"
android:layout_height=
"129dp"
android:src=
"@mipmap/zhanwei_img_wushuju"
/>
android:src=
"@mipmap/zhanwei_img_wushuju"
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</
LinearLayout
>
</
androidx.core.widget.NestedScrollView
>
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
...
...
consumer/src/main/res/layout/activity_low_price.xml
View file @
02801023
...
@@ -38,47 +38,50 @@
...
@@ -38,47 +38,50 @@
<com.scwang.smart.refresh.header.BezierRadarHeader
<com.scwang.smart.refresh.header.BezierRadarHeader
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
/>
<androidx.core.widget.NestedScrollView
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
>
android:orientation=
"vertical"
>
<LinearLayout
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_goods_list"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginTop=
"21dp"
android:orientation=
"vertical"
>
android:layout_marginLeft=
"17dp"
android:layout_marginRight=
"17dp"
/>
<TextView
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/tv_no_more"
android:id=
"@+id/rv_goods_list"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"match_parent"
android:gravity=
"center"
android:layout_marginTop=
"21dp"
android:visibility=
"gone"
android:layout_marginLeft=
"17dp"
android:layout_below=
"@id/rv_search_goods_list"
android:layout_marginRight=
"17dp"
/>
android:text=
"~ 没有更多啦 ~"
android:textSize=
"13sp"
android:textColor=
"#FF999999"
/>
<!--暂无数据-->
<TextView
<LinearLayout
android:id=
"@+id/tv_no_more"
android:id=
"@+id/ll_no_data"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"match_parent"
android:gravity=
"center"
android:gravity=
"center"
android:visibility=
"gone"
android:orientation=
"vertical"
android:layout_below=
"@id/rv_search_goods_list"
android:visibility=
"gone"
>
android:text=
"~ 没有更多啦 ~"
android:textSize=
"13sp"
android:textColor=
"#FF999999"
/>
<!--暂无数据-->
<LinearLayout
android:id=
"@+id/ll_no_data"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:gravity=
"center"
android:orientation=
"vertical"
android:visibility=
"gone"
>
<ImageView
<ImageView
android:layout_width=
"120dp"
android:layout_width=
"120dp"
android:layout_height=
"129dp"
android:layout_height=
"129dp"
android:src=
"@mipmap/zhanwei_img_wushuju"
/>
android:src=
"@mipmap/zhanwei_img_wushuju"
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</
LinearLayout
>
</
androidx.core.widget.NestedScrollView
>
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
...
...
consumer/src/main/res/layout/activity_new_products.xml
View file @
02801023
...
@@ -39,46 +39,51 @@
...
@@ -39,46 +39,51 @@
<com.scwang.smart.refresh.header.BezierRadarHeader
<com.scwang.smart.refresh.header.BezierRadarHeader
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
/>
<androidx.core.widget.NestedScrollView
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
>
android:orientation=
"vertical"
>
<LinearLayout
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_goods_list"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginTop=
"21dp"
android:orientation=
"vertical"
>
android:layout_marginLeft=
"17dp"
android:layout_marginRight=
"17dp"
/>
<TextView
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/tv_goods_no_more"
android:id=
"@+id/rv_goods_list"
android:layout_width=
"wrap_content"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"match_parent"
android:layout_centerHorizontal=
"true"
android:layout_marginTop=
"21dp"
android:layout_below=
"@id/rv_search_goods_list"
android:layout_marginLeft=
"17dp"
android:text=
"~ 没有更多啦 ~"
android:layout_marginRight=
"17dp"
/>
android:textSize=
"13sp"
android:textColor=
"#FF999999"
/>
<!--暂无数据-->
<TextView
<LinearLayout
android:id=
"@+id/tv_no_more"
android:id=
"@+id/ll_no_data"
android:layout_width=
"wrap_content"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"match_parent"
android:layout_marginBottom=
"17dp"
android:gravity=
"center"
android:visibility=
"gone"
android:orientation=
"vertical"
android:layout_centerHorizontal=
"true"
android:visibility=
"gone"
>
android:layout_below=
"@id/rv_search_goods_list"
android:text=
"~ 没有更多啦 ~"
android:textSize=
"13sp"
android:textColor=
"#FF999999"
/>
<!--暂无数据-->
<LinearLayout
android:id=
"@+id/ll_no_data"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:gravity=
"center"
android:orientation=
"vertical"
android:visibility=
"gone"
>
<ImageView
<ImageView
android:layout_width=
"120dp"
android:layout_width=
"120dp"
android:layout_height=
"129dp"
android:layout_height=
"129dp"
android:src=
"@mipmap/zhanwei_img_wushuju"
/>
android:src=
"@mipmap/zhanwei_img_wushuju"
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</
LinearLayout
>
</
androidx.core.widget.NestedScrollView
>
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
...
...
consumer/src/main/res/layout/fragment_message_list.xml
View file @
02801023
...
@@ -24,47 +24,51 @@
...
@@ -24,47 +24,51 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
/>
<
LinearLayout
<
androidx.core.widget.NestedScrollView
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
>
android:orientation=
"vertical"
>
<LinearLayout
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_message_list"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginTop=
"17dp"
android:orientation=
"vertical"
>
android:orientation=
"vertical"
binding:layoutManager=
"@{LayoutManagers.linear(1,false)}"
/>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_message_list"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginTop=
"17dp"
android:orientation=
"vertical"
binding:layoutManager=
"@{LayoutManagers.linear(1,false)}"
/>
<TextView
android:id=
"@+id/tv_no_more"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:visibility=
"gone"
android:layout_below=
"@id/rv_search_goods_list"
android:text=
"~ 没有更多啦 ~"
android:textSize=
"13sp"
android:textColor=
"#FF999999"
/>
<!--暂无数据-->
<TextView
<LinearLayout
android:id=
"@+id/tv_no_more"
android:id=
"@+id/ll_no_data"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"match_parent"
android:gravity=
"center"
android:gravity=
"center"
android:visibility=
"gone"
android:orientation=
"vertical"
android:layout_below=
"@id/rv_search_goods_list"
android:visibility=
"gone"
>
android:text=
"~ 没有更多啦 ~"
android:textSize=
"13sp"
android:textColor=
"#FF999999"
/>
<!--暂无数据-->
<LinearLayout
android:id=
"@+id/ll_no_data"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:gravity=
"center"
android:orientation=
"vertical"
android:visibility=
"gone"
>
<ImageView
<ImageView
android:layout_width=
"120dp"
android:layout_width=
"120dp"
android:layout_height=
"129dp"
android:layout_height=
"129dp"
android:src=
"@mipmap/zhanwei_img_wushuju"
/>
android:src=
"@mipmap/zhanwei_img_wushuju"
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</
LinearLayout
>
</
androidx.core.widget.NestedScrollView
>
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
</RelativeLayout>
</RelativeLayout>
...
...
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