gaojian/xz_cultural
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新闻详情页-接口方式

Browse Source
This commit is contained in:
itgaojian 2023-03-08 09:06:04 +08:00
parent fbcd9c7b9f
commit 530c9ae01c
26 changed files with 3090 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java
View File

@ -110,6 +110,7 @@ public class PathConfig {
public static final String PATH_MODULE_MAIN_CHOOSE_CITY = "/modulemain/activity/choosecity";//选择城市 public static final String PATH_MODULE_MAIN_CHOOSE_CITY = "/modulemain/activity/choosecity";//选择城市
public static final String PATH_MODULE_MAIN_NEWS_WEB = "/modulemain/activity/newsweb";//连接新闻页 public static final String PATH_MODULE_MAIN_NEWS_WEB = "/modulemain/activity/newsweb";//连接新闻页
public static final String PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE = "/modulemain/activity/newsInterface";//新闻详情页面-接口方式
//======================Map================================================== //======================Map==================================================
public static final String PATH_MODULE_MAP_NAVIGATION = "/modulemap/activity/navigation";//地图 public static final String PATH_MODULE_MAP_NAVIGATION = "/modulemap/activity/navigation";//地图
public static final String PATH_MODULE_MAP_SHOW_ICON = "/modulemap/activity/showicon";//文化地图 public static final String PATH_MODULE_MAP_SHOW_ICON = "/modulemap/activity/showicon";//文化地图
@ -251,7 +252,7 @@ public class PathConfig {
public static final String DID_EDU = "e18d7126-f3b0-49cb-aeee-070e54889942";//学历 public static final String DID_EDU = "e18d7126-f3b0-49cb-aeee-070e54889942";//学历
public static final String DID_NATIVE = "";//籍贯 public static final String DID_NATIVE = "";//籍贯
public static final String DID_SEX = "90f09612-9deb-4229-8d73-d6a865056cde";//性别 public static final String DID_SEX = "90f09612-9deb-4229-8d73-d6a865056cde";//性别
public static final String DID_NATION = "61f86a5a-22b2-4d14-8cdb-46d3cd2bd864";//民族 public static final String DID_NATION = "039dca8f-7639-41fa-993b-34f8bbc3a3d5";//民族
public static final String DID_ADDRESS = "";//地址 public static final String DID_ADDRESS = "";//地址
public static final String DID_SERVICE_AREA = "761d8633-3c2f-4e92-b32d-fb50d3dc07b7";//服务区域 public static final String DID_SERVICE_AREA = "761d8633-3c2f-4e92-b32d-fb50d3dc07b7";//服务区域
public static final String DID_SERVICE_TYPE = "a223b308-014a-4e89-93fa-035a564e7fda";//服务类别 public static final String DID_SERVICE_TYPE = "a223b308-014a-4e89-93fa-035a564e7fda";//服务类别
@ -273,4 +274,5 @@ public class PathConfig {
public static final String PATH_MODULE_SHOP_ACTIVITY_SHOP_MINE_ORDER = "/moduleshop/activity/shopOrderList";//我的订单 public static final String PATH_MODULE_SHOP_ACTIVITY_SHOP_MINE_ORDER = "/moduleshop/activity/shopOrderList";//我的订单
public static final String PATH_MODULE_SHOP_ACTIVITY_SHOP_MINE_ORDER_DETAIL = "/moduleshop/activity/shopOrderDetail";//我的订单 public static final String PATH_MODULE_SHOP_ACTIVITY_SHOP_MINE_ORDER_DETAIL = "/moduleshop/activity/shopOrderDetail";//我的订单
public static final String PATH_MODULE_SHOP_ACTIVITY_SHOP_ADD_ADDRESS = "/moduleshop/activity/shopAddAddress";//新增收货地 public static final String PATH_MODULE_SHOP_ACTIVITY_SHOP_ADD_ADDRESS = "/moduleshop/activity/shopAddAddress";//新增收货地
} }

7
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java
View File

@ -9,7 +9,7 @@ import com.sucstepsoft.cm_utils.constant.PathConfig;
*/ */
public class BaseUrlApi { public class BaseUrlApi {
// public static final String IP_URL = "http://v3.xzszwhy.cn/";/* 测试IP */ // public static final String IP_URL = "http://v3.xzszwhy.cn/";/* 测试IP */
public static final String IP_URL = "http://192.168.0.120:8081/";/* 测试IP */ public static final String IP_URL = "http://192.168.0.120:8081/";/* 测试IP */
public static final String BASE_SYSTEM_IP = "http://192.168.0.120:8081/xzszwhy/";/*测试IP*/ public static final String BASE_SYSTEM_IP = "http://192.168.0.120:8081/xzszwhy/";/*测试IP*/
@ -54,6 +54,8 @@ public class BaseUrlApi {
public static final String BASE_PLACE_IP = BASE_SYSTEM_IP;/* 场馆 */ public static final String BASE_PLACE_IP = BASE_SYSTEM_IP;/* 场馆 */
public static final String BASE_VOLUNTEER_IP = BASE_SYSTEM_IP;/* 志愿者 */ public static final String BASE_VOLUNTEER_IP = BASE_SYSTEM_IP;/* 志愿者 */
public static final String BASE_LIVE_IP = IP_URL + "live/"; public static final String BASE_LIVE_IP = IP_URL + "live/";
public static final String BASE_BIG_DATA = "http://v3.xzszwhy.cn/" + "module/";//大数据接口
public static final String BASE_LIVE_URL = BASE_SYSTEM_IP;//直播回放视频url public static final String BASE_LIVE_URL = BASE_SYSTEM_IP;//直播回放视频url
public static final String BASE_CULTURAL_SHARE = BASE_SYSTEM_IP;/* 文化分享 */ public static final String BASE_CULTURAL_SHARE = BASE_SYSTEM_IP;/* 文化分享 */
public static final String BASE_LEGACY_IP = BASE_SYSTEM_IP;//非遗数据库 public static final String BASE_LEGACY_IP = BASE_SYSTEM_IP;//非遗数据库
@ -67,7 +69,8 @@ public class BaseUrlApi {
// public static final String BASE_NEWS_DETAIL = "http://192.168.0.104/";//新闻 // public static final String BASE_NEWS_DETAIL = "http://192.168.0.104/";//新闻
public static final String BASE_NEWS_DETAIL = IP_URL;//新闻 // public static final String BASE_NEWS_DETAIL = IP_URL;//新闻
public static final String BASE_NEWS_DETAIL = "http://192.168.0.120:80/";//新闻
// public static final String BASE_IMG_URL = BASE_IP + "route/file/download/true/"; // public static final String BASE_IMG_URL = BASE_IP + "route/file/download/true/";
// GET /app/appversion/downloadapp/{appVersionId} // GET /app/appversion/downloadapp/{appVersionId}
public static final String APP_DOWNLOAD_URL = BASE_URL + "app/appversion/download/" + PathConfig.APP_VERSION_ID; public static final String APP_DOWNLOAD_URL = BASE_URL + "app/appversion/download/" + PathConfig.APP_VERSION_ID;

2
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/BaseUrlInterceptor.java
View File

@ -46,6 +46,8 @@ public class BaseUrlInterceptor implements Interceptor {
newBaseUrl = HttpUrl.parse(BaseUrlApi.BASE_CULTURAL_SHARE); newBaseUrl = HttpUrl.parse(BaseUrlApi.BASE_CULTURAL_SHARE);
} else if ("shop".equals(headerValue)) { } else if ("shop".equals(headerValue)) {
newBaseUrl = HttpUrl.parse(BaseUrlApi.BASE_SHOP_IP); newBaseUrl = HttpUrl.parse(BaseUrlApi.BASE_SHOP_IP);
}else if("bigdata".equals(headerValue)){
newBaseUrl = HttpUrl.parse(BaseUrlApi.BASE_BIG_DATA);
} else { } else {
newBaseUrl = oldHttpUrl; newBaseUrl = oldHttpUrl;
} }

54
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BannerImageTextAllAdapter.java Executable file
View File

@ -0,0 +1,54 @@
package com.sucstepsoft.cm_utils.core.widget.base;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.sucstepsoft.cm_utils.R;
import com.sucstepsoft.cm_utils.core.beans.BaseImageBean;
import com.sucstepsoft.cm_utils.utils.ConvertUtils;
import com.youth.banner.adapter.BannerAdapter;
import java.util.List;
/**
* 作者: adam
* 日期: 2020/6/10 - 5:51 PM
* 邮箱: itgaojian@163.com
* 描述:
*/
public class BannerImageTextAllAdapter extends BannerAdapter<BaseImageBean, BannerTextHolder> {
public BannerImageTextAllAdapter(List<BaseImageBean> datas) {
super(datas);
}
@Override
public BannerTextHolder onCreateHolder(ViewGroup parent, int viewType) {
View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_banner_text_all, parent, false);
return new BannerTextHolder(itemView);
}
@Override
public void onBindView(BannerTextHolder holder, BaseImageBean data, int position, int size) {
RoundedCornersTransform roundedCornersTransform = new RoundedCornersTransform(holder.itemView.getContext(), ConvertUtils.dp2px(2));
roundedCornersTransform.setNeedCorner(false, false, false, false);
RequestOptions options = new RequestOptions()
.error(R.drawable.ic_img_default_banner)
.placeholder(R.drawable.ic_img_default_banner)
.transform(roundedCornersTransform)
.skipMemoryCache(false)
.diskCacheStrategy(DiskCacheStrategy.RESOURCE)
.fitCenter();
Glide.with(holder.itemView.getContext())
.asBitmap()
.load(data.getImgUrl())
.apply(options)
.into(holder.mIvCover);
holder.mTvName.setText(data.getName());
}
}

26
cm_utils/src/main/res/layout/item_banner_text_all.xml Executable file
View File

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_cover"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
tools:src="@drawable/ic_img_default_banner" />
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:id="@+id/tv_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="@color/trans_black"
android:padding="8dp"
android:textColor="@color/white"
tools:text="新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题" />
</RelativeLayout>

259
modulecultural/src/main/res/layout/activity_register_volunteer_single.xml
View File

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/white"> android:background="@color/white">
@ -261,78 +259,6 @@
android:hint="请选择从业状况" /> android:hint="请选择从业状况" />
</LinearLayout> </LinearLayout>
<LinearLayout style="@style/register_item_container">
<TextView
android:id="@+id/tv_service_area_title"
style="@style/register_text_title"
android:text="服务区域:" />
<TextView
android:id="@+id/tv_service_area_content"
style="@style/register_text_sel"
android:hint="请选择服务区域" />
</LinearLayout>
<LinearLayout style="@style/register_item_container">
<TextView
android:id="@+id/tv_vocation_title"
style="@style/register_text_title"
android:text="职业:" />
<TextView
android:id="@+id/tv_vocation_content"
style="@style/register_text_sel"
android:hint="请选择职业" />
</LinearLayout>
<LinearLayout
style="@style/register_item_container"
android:visibility="visible">
<TextView
android:id="@+id/tv_unit_title"
style="@style/register_text_title"
android:text="工作单位及职务:" />
<EditText
android:id="@+id/et_unit_content"
style="@style/register_input"
android:hint="请输入工作单位及职务" />
</LinearLayout>
<LinearLayout
style="@style/register_item_container"
android:visibility="visible">
<TextView
android:id="@+id/tv_like_title"
style="@style/register_text_title"
android:text="特长爱好:" />
<EditText
android:id="@+id/et_like_content"
style="@style/register_input"
android:hint="请输入特长爱好" />
</LinearLayout>
<LinearLayout
style="@style/register_item_container"
android:visibility="visible">
<TextView
android:id="@+id/tv_resume_title"
style="@style/register_text_title"
android:text="个人简历:" />
<EditText
android:id="@+id/et_resume_content"
style="@style/register_input"
android:hint="请输入个人简历"
android:minLines="3" />
</LinearLayout>
<LinearLayout <LinearLayout
style="@style/register_item_container" style="@style/register_item_container"
android:gravity="center_vertical"> android:gravity="center_vertical">
@ -347,7 +273,9 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:orientation="horizontal"> android:gravity="right"
android:orientation="horizontal"
android:paddingRight="20dp">
<RadioButton <RadioButton
android:id="@+id/rb_true" android:id="@+id/rb_true"
@ -355,6 +283,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:button="@drawable/sel_radio_red" android:button="@drawable/sel_radio_red"
android:checked="true" android:checked="true"
android:paddingLeft="10dp"
android:text="是" /> android:text="是" />
<RadioButton <RadioButton
@ -363,63 +292,189 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="30dp" android:layout_marginLeft="30dp"
android:button="@drawable/sel_radio_red" android:button="@drawable/sel_radio_red"
android:paddingLeft="10dp"
android:text="否" /> android:text="否" />
</RadioGroup> </RadioGroup>
</LinearLayout> </LinearLayout>
<LinearLayout style="@style/register_item_container">
<TextView
android:id="@+id/tv_expert_title"
style="@style/register_text_title"
android:text="服务意向:" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_export_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
</LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="90dp" android:layout_marginLeft="10dp"
android:background="@color/gray_line" /> android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/register_item_container"> <LinearLayout style="@style/register_item_container">
<TextView <TextView
android:id="@+id/tv_expert_area_title" android:id="@+id/tv_service_area_title"
style="@style/register_text_title" style="@style/register_text_title"
android:text="服务领域或行业:" /> android:text="服务区域:" />
<androidx.recyclerview.widget.RecyclerView <TextView
android:id="@+id/rlv_export_area_content" android:id="@+id/tv_service_area_content"
android:layout_width="0dp" style="@style/register_text_sel"
android:layout_height="wrap_content" android:drawablePadding="10dp"
android:layout_weight="1" /> android:gravity="right"
android:hint="请选择服务区域" />
</LinearLayout> </LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginLeft="90dp" android:layout_marginLeft="10dp"
android:background="@color/gray_line" /> android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/register_item_container">
<TextView
android:id="@+id/tv_vocation_title"
style="@style/register_text_title"
android:text="职业:" />
<TextView
android:id="@+id/tv_vocation_content"
style="@style/register_text_sel"
android:drawablePadding="10dp"
android:gravity="right"
android:hint="请选择职业" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="5dp"
android:background="@color/gray_line_deep" />
<LinearLayout <LinearLayout
style="@style/register_item_container" style="@style/register_item_container"
android:visibility="visible"> android:visibility="visible">
<TextView <TextView
android:id="@+id/tv_remark_title" android:id="@+id/tv_unit_title"
style="@style/register_text_title" style="@style/register_text_title"
android:text="工作单位及职务:" />
<EditText
android:id="@+id/et_unit_content"
style="@style/register_input"
android:background="@null"
android:gravity="right"
android:hint="请输入工作单位及职务" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout
style="@style/register_item_container"
android:visibility="visible">
<TextView
android:id="@+id/tv_like_title"
style="@style/register_text_title"
android:text="特长爱好:" />
<EditText
android:id="@+id/et_like_content"
style="@style/register_input"
android:background="@null"
android:gravity="right"
android:hint="请输入特长爱好" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout
style="@style/register_item_container_ver"
android:visibility="visible">
<TextView
android:id="@+id/tv_resume_title"
style="@style/register_text_title_ver"
android:text="个人简历:" />
<EditText
android:id="@+id/et_resume_content"
style="@style/register_input_ver"
android:layout_marginTop="5dp"
android:background="@drawable/shp_rectangle_gray"
android:gravity="left"
android:hint="请输入个人简历"
android:minLines="4" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="5dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/register_item_container_ver">
<TextView
android:id="@+id/tv_expert_title"
style="@style/register_text_title_ver"
android:text="服务意向:" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_export_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/register_item_container_ver">
<TextView
android:id="@+id/tv_expert_area_title"
style="@style/register_text_title_ver"
android:text="服务领域或行业:" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_export_area_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="5dp"
android:background="@color/gray_line_deep" />
<LinearLayout
style="@style/register_item_container_ver"
android:visibility="visible">
<TextView
android:id="@+id/tv_remark_title"
style="@style/register_text_title_ver"
android:text="备注:" /> android:text="备注:" />
<EditText <EditText
android:id="@+id/et_remark_content" android:id="@+id/et_remark_content"
style="@style/register_input" style="@style/register_input_ver"
android:layout_marginTop="5dp"
android:background="@drawable/shp_rectangle_gray"
android:gravity="left"
android:hint="请输入备注" android:hint="请输入备注"
android:minLines="3" /> android:minLines="3" />
</LinearLayout> </LinearLayout>

41
modulecultural/src/main/res/layout/activity_register_volunteer_team.xml
View File

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/white"> android:background="@color/white">
@ -21,9 +19,18 @@
<EditText <EditText
android:id="@+id/et_team_name" android:id="@+id/et_team_name"
style="@style/register_input" style="@style/register_input"
android:background="@null"
android:gravity="right"
android:hint="请输入团队名称" /> android:hint="请输入团队名称" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/register_item_container"> <LinearLayout style="@style/register_item_container">
<TextView <TextView
@ -34,10 +41,19 @@
<EditText <EditText
android:id="@+id/et_team_count" android:id="@+id/et_team_count"
style="@style/register_input" style="@style/register_input"
android:background="@null"
android:gravity="right"
android:hint="请输入团队限制人数" android:hint="请输入团队限制人数"
android:inputType="number" /> android:inputType="number" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout <LinearLayout
style="@style/register_item_container" style="@style/register_item_container"
android:visibility="gone"> android:visibility="gone">
@ -53,6 +69,7 @@
android:hint="请选择团队成员" /> android:hint="请选择团队成员" />
</LinearLayout> </LinearLayout>
<LinearLayout style="@style/register_item_container"> <LinearLayout style="@style/register_item_container">
<TextView <TextView
@ -63,19 +80,31 @@
<TextView <TextView
android:id="@+id/tv_area" android:id="@+id/tv_area"
style="@style/register_text_sel" style="@style/register_text_sel"
android:hint="请选择所属区域" /> android:drawablePadding="10dp"
android:gravity="right"
android:hint="请选择所属区域"
android:paddingRight="0dp" />
</LinearLayout> </LinearLayout>
<LinearLayout style="@style/register_item_container"> <View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/register_item_container_ver">
<TextView <TextView
android:id="@+id/tv_team_desc_title" android:id="@+id/tv_team_desc_title"
style="@style/register_text_title" style="@style/register_text_title_ver"
android:text="团队介绍:" /> android:text="团队介绍:" />
<EditText <EditText
android:id="@+id/et_team_desc_content" android:id="@+id/et_team_desc_content"
style="@style/register_input" style="@style/register_input_ver"
android:layout_marginTop="5dp"
android:background="@drawable/shp_rectangle_gray"
android:gravity="start" android:gravity="start"
android:hint="请输入团队介绍" android:hint="请输入团队介绍"
android:minLines="5" /> android:minLines="5" />

147
modulecultural/src/main/res/layout/activity_vounteer_publish.xml
View File

@ -22,9 +22,19 @@
<TextView <TextView
android:id="@+id/tv_choose_area" android:id="@+id/tv_choose_area"
style="@style/register_text_sel" style="@style/register_text_sel"
android:hint="请选择活动区域" /> android:drawablePadding="10dp"
android:gravity="right"
android:hint="请选择活动区域"
android:paddingRight="0dp" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/register_item_container"> <LinearLayout style="@style/register_item_container">
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
@ -35,9 +45,18 @@
<EditText <EditText
android:id="@+id/et_name" android:id="@+id/et_name"
style="@style/register_input" style="@style/register_input"
android:background="@null"
android:gravity="right"
android:hint="请输入活动名称" /> android:hint="请输入活动名称" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/register_item_container"> <LinearLayout style="@style/register_item_container">
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
@ -47,9 +66,18 @@
<EditText <EditText
android:id="@+id/et_contact_name" android:id="@+id/et_contact_name"
style="@style/register_input" style="@style/register_input"
android:background="@null"
android:gravity="right"
android:hint="请输入活动联系人姓名" /> android:hint="请输入活动联系人姓名" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/register_item_container"> <LinearLayout style="@style/register_item_container">
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
@ -59,10 +87,19 @@
<EditText <EditText
android:id="@+id/et_phone" android:id="@+id/et_phone"
style="@style/register_input" style="@style/register_input"
android:background="@null"
android:gravity="right"
android:hint="请输入联系方式" android:hint="请输入联系方式"
android:inputType="number" /> android:inputType="number" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/register_item_container"> <LinearLayout style="@style/register_item_container">
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
@ -72,38 +109,56 @@
<EditText <EditText
android:id="@+id/et_peo_count" android:id="@+id/et_peo_count"
style="@style/register_input" style="@style/register_input"
android:background="@null"
android:gravity="right"
android:hint="请输入活动人数限制" android:hint="请输入活动人数限制"
android:inputType="number" /> android:inputType="number" />
</LinearLayout> </LinearLayout>
<LinearLayout style="@style/register_item_container"> <View
android:layout_width="match_parent"
android:layout_height="5dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/register_item_container_ver">
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
style="@style/register_text_title" style="@style/register_text_title_ver"
android:text="活动简介:" /> android:text="活动简介:" />
<EditText <EditText
android:id="@+id/et_desc" android:id="@+id/et_desc"
style="@style/register_input" style="@style/register_input_ver"
android:layout_marginTop="8dp"
android:background="@drawable/shp_rectangle_gray"
android:gravity="left" android:gravity="left"
android:hint="请输入活动简介" android:hint="请输入活动简介"
android:minLines="5" /> android:minLines="5" />
</LinearLayout> </LinearLayout>
<LinearLayout style="@style/register_item_container">
<LinearLayout style="@style/register_item_container_ver">
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
style="@style/register_text_title" style="@style/register_text_title_ver"
android:text="服务内容:" /> android:text="服务内容:" />
<EditText <EditText
android:id="@+id/et_service_content" android:id="@+id/et_service_content"
style="@style/register_input" style="@style/register_input_ver"
android:layout_marginTop="8dp"
android:background="@drawable/shp_rectangle_gray"
android:gravity="left" android:gravity="left"
android:hint="请输入服务内容" android:hint="请输入服务内容"
android:minLines="5" /> android:minLines="5" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/register_item_container"> <LinearLayout style="@style/register_item_container">
@ -114,10 +169,18 @@
<EditText <EditText
android:id="@+id/et_request" android:id="@+id/et_request"
style="@style/register_input" style="@style/register_input"
android:gravity="left" android:background="@null"
android:gravity="right"
android:hint="请输入活动要求" /> android:hint="请输入活动要求" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/register_item_container"> <LinearLayout style="@style/register_item_container">
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
@ -127,10 +190,18 @@
<EditText <EditText
android:id="@+id/et_service_awards" android:id="@+id/et_service_awards"
style="@style/register_input" style="@style/register_input"
android:gravity="left" android:background="@null"
android:gravity="right"
android:hint="请输入活动奖补" /> android:hint="请输入活动奖补" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/register_item_container"> <LinearLayout style="@style/register_item_container">
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
@ -141,9 +212,19 @@
<TextView <TextView
android:id="@+id/tv_start_time_content" android:id="@+id/tv_start_time_content"
style="@style/register_text_sel" style="@style/register_text_sel"
android:hint="请选择开始时间" /> android:drawablePadding="10dp"
android:gravity="right"
android:hint="请选择开始时间"
android:paddingRight="0dp" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/register_item_container"> <LinearLayout style="@style/register_item_container">
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
@ -153,9 +234,19 @@
<TextView <TextView
android:id="@+id/tv_end_time_content" android:id="@+id/tv_end_time_content"
style="@style/register_text_sel" style="@style/register_text_sel"
android:hint="请选择结束时间" /> android:drawablePadding="10dp"
android:gravity="right"
android:hint="请选择结束时间"
android:paddingRight="0dp" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/register_item_container"> <LinearLayout style="@style/register_item_container">
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
@ -168,7 +259,9 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:orientation="horizontal"> android:gravity="right"
android:orientation="horizontal"
android:paddingRight="10dp">
<RadioButton <RadioButton
android:id="@+id/rb_service_single" android:id="@+id/rb_service_single"
@ -176,17 +269,27 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:button="@drawable/sel_radio_red" android:button="@drawable/sel_radio_red"
android:checked="true" android:checked="true"
android:paddingLeft="10dp"
android:text="志愿者" /> android:text="志愿者" />
<RadioButton <RadioButton
android:id="@+id/rb_service_team" android:id="@+id/rb_service_team"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:button="@drawable/sel_radio_red" android:button="@drawable/sel_radio_red"
android:paddingLeft="10dp"
android:text="志愿团队" /> android:text="志愿团队" />
</RadioGroup> </RadioGroup>
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout <LinearLayout
android:id="@+id/ll_choose_team" android:id="@+id/ll_choose_team"
style="@style/register_item_container"> style="@style/register_item_container">
@ -199,22 +302,32 @@
<TextView <TextView
android:id="@+id/tv_choose_team" android:id="@+id/tv_choose_team"
style="@style/register_text_sel" style="@style/register_text_sel"
android:hint="请选择志愿者团队" /> android:drawablePadding="10dp"
android:gravity="right"
android:hint="请选择志愿者团队"
android:paddingRight="0dp" />
</LinearLayout> </LinearLayout>
<LinearLayout style="@style/register_item_container"> <View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/register_item_container_ver">
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:id="@+id/tv_photos_title" android:id="@+id/tv_photos_title"
style="@style/register_text_title" style="@style/register_text_title_ver"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="宣传照片:" /> android:text="宣传照片:" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_photos" android:id="@+id/rlv_photos"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" /> android:layout_marginTop="5dp" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout

29
modulecultural/src/main/res/values/styles.xml
View File

@ -7,7 +7,19 @@
<item name="android:layout_marginLeft">10dp</item> <item name="android:layout_marginLeft">10dp</item>
<item name="android:layout_marginRight">10dp</item> <item name="android:layout_marginRight">10dp</item>
<item name="android:layout_weight">1</item> <item name="android:layout_weight">1</item>
<item name="android:background">@drawable/shape_bottom_line</item> <item name="android:paddingTop">5dp</item>
<item name="android:paddingBottom">5dp</item>
<item name="android:paddingLeft">5dp</item>
<item name="android:paddingRight">5dp</item>
<item name="android:textSize">13sp</item>
</style>
<style name="register_input_ver">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginLeft">10dp</item>
<item name="android:layout_marginRight">10dp</item>
<item name="android:layout_weight">1</item>
<item name="android:paddingTop">5dp</item> <item name="android:paddingTop">5dp</item>
<item name="android:paddingBottom">5dp</item> <item name="android:paddingBottom">5dp</item>
<item name="android:paddingLeft">5dp</item> <item name="android:paddingLeft">5dp</item>
@ -23,13 +35,19 @@
<item name="android:textSize">12sp</item> <item name="android:textSize">12sp</item>
</style> </style>
<style name="register_text_title_ver">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textColor">#242424</item>
<item name="android:textSize">12sp</item>
</style>
<style name="register_text_sel"> <style name="register_text_sel">
<item name="android:layout_width">0dp</item> <item name="android:layout_width">0dp</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginLeft">10dp</item> <item name="android:layout_marginLeft">10dp</item>
<item name="android:layout_marginRight">10dp</item> <item name="android:layout_marginRight">10dp</item>
<item name="android:layout_weight">1</item> <item name="android:layout_weight">1</item>
<item name="android:background">@drawable/shape_bottom_line</item>
<item name="android:clickable">true</item> <item name="android:clickable">true</item>
<item name="android:focusable">true</item> <item name="android:focusable">true</item>
<item name="android:drawableRight">@drawable/ic_arrow_yellow_down</item> <item name="android:drawableRight">@drawable/ic_arrow_yellow_down</item>
@ -67,6 +85,13 @@
<item name="android:padding">8dp</item> <item name="android:padding">8dp</item>
</style> </style>
<style name="register_item_container_ver">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:orientation">vertical</item>
<item name="android:padding">8dp</item>
</style>
<style name="register_item_container_no_padding"> <style name="register_item_container_no_padding">
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>

284
moduleijkplayer/src/main/java/com/tengshisoft/moduleijkplayer/controller/AudioControlView.java Executable file
View File

@ -0,0 +1,284 @@
package com.tengshisoft.moduleijkplayer.controller;
import static com.tengshisoft.moduleijkplayer.util.PlayerUtils.stringForTime;
import android.app.Activity;
import android.content.Context;
import android.content.pm.ActivityInfo;
import android.os.Build;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.AlphaAnimation;
import android.view.animation.Animation;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.SeekBar;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.tengshisoft.moduleijkplayer.R;
import com.tengshisoft.moduleijkplayer.player.VideoView;
import com.tengshisoft.moduleijkplayer.util.PlayerUtils;
/**
* 音频控制
*/
public class AudioControlView extends FrameLayout implements IControlComponent, View.OnClickListener, SeekBar.OnSeekBarChangeListener {
protected ControlWrapper mControlWrapper;
private TextView mTotalTime, mCurrTime;
private LinearLayout mBottomContainer;
private SeekBar mVideoProgress;
private ProgressBar mBottomProgress;
private ImageView mPlayButton;
private boolean mIsDragging;
private boolean isFullScreen = true;
private boolean mIsShowBottomProgress = true;
public AudioControlView(@NonNull Context context) {
super(context);
}
public void setFullScreen(boolean isfull) {
this.isFullScreen = isfull;
}
public AudioControlView(@NonNull Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
}
public AudioControlView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
{
setVisibility(GONE);
LayoutInflater.from(getContext()).inflate(getLayoutId(), this, true);
mBottomContainer = findViewById(R.id.bottom_container);
mVideoProgress = findViewById(R.id.seekBar);
mVideoProgress.setOnSeekBarChangeListener(this);
mTotalTime = findViewById(R.id.total_time);
mCurrTime = findViewById(R.id.curr_time);
mPlayButton = findViewById(R.id.iv_play);
mPlayButton.setOnClickListener(this);
mBottomProgress = findViewById(R.id.bottom_progress);
//5.1以下系统SeekBar高度需要设置成WRAP_CONTENT
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) {
mVideoProgress.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
}
}
protected int getLayoutId() {
return R.layout.dkplayer_layout_audio_control_view;
}
/**
* 是否显示底部进度条，默认显示
*/
public void showBottomProgress(boolean isShow) {
mIsShowBottomProgress = isShow;
}
@Override
public void attach(@NonNull ControlWrapper controlWrapper) {
mControlWrapper = controlWrapper;
}
@Override
public View getView() {
return this;
}
@Override
public void onVisibilityChanged(boolean isVisible, Animation anim) {
if (isVisible) {
mBottomContainer.setVisibility(VISIBLE);
if (anim != null) {
mBottomContainer.startAnimation(anim);
}
if (mIsShowBottomProgress) {
mBottomProgress.setVisibility(GONE);
}
} else {
mBottomContainer.setVisibility(GONE);
if (anim != null) {
mBottomContainer.startAnimation(anim);
}
if (mIsShowBottomProgress) {
mBottomProgress.setVisibility(VISIBLE);
AlphaAnimation animation = new AlphaAnimation(0f, 1f);
animation.setDuration(300);
mBottomProgress.startAnimation(animation);
}
}
}
@Override
public void onPlayStateChanged(int playState) {
switch (playState) {
case VideoView.STATE_IDLE:
case VideoView.STATE_PLAYBACK_COMPLETED:
setVisibility(GONE);
mBottomProgress.setProgress(0);
mBottomProgress.setSecondaryProgress(0);
mVideoProgress.setProgress(0);
mVideoProgress.setSecondaryProgress(0);
break;
case VideoView.STATE_START_ABORT:
case VideoView.STATE_PREPARING:
case VideoView.STATE_PREPARED:
case VideoView.STATE_ERROR:
setVisibility(GONE);
break;
case VideoView.STATE_PLAYING:
mPlayButton.setSelected(true);
if (mIsShowBottomProgress) {
if (mControlWrapper.isShowing()) {
mBottomProgress.setVisibility(GONE);
mBottomContainer.setVisibility(VISIBLE);
} else {
mBottomContainer.setVisibility(GONE);
mBottomProgress.setVisibility(VISIBLE);
}
} else {
mBottomContainer.setVisibility(GONE);
}
setVisibility(VISIBLE);
//开始刷新进度
mControlWrapper.startProgress();
break;
case VideoView.STATE_PAUSED:
mPlayButton.setSelected(false);
break;
case VideoView.STATE_BUFFERING:
case VideoView.STATE_BUFFERED:
mPlayButton.setSelected(mControlWrapper.isPlaying());
break;
}
}
@Override
public void onPlayerStateChanged(int playerState) {
// switch (playerState) {
// case VideoView.PLAYER_NORMAL:
// mFullScreen.setSelected(false);
// break;
// case VideoView.PLAYER_FULL_SCREEN:
// mFullScreen.setSelected(true);
// break;
// }
Activity activity = PlayerUtils.scanForActivity(getContext());
if (activity != null && mControlWrapper.hasCutout()) {
int orientation = activity.getRequestedOrientation();
int cutoutHeight = mControlWrapper.getCutoutHeight();
if (orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
mBottomContainer.setPadding(0, 0, 0, 0);
mBottomProgress.setPadding(0, 0, 0, 0);
} else if (orientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
mBottomContainer.setPadding(cutoutHeight, 0, 0, 0);
mBottomProgress.setPadding(cutoutHeight, 0, 0, 0);
} else if (orientation == ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE) {
mBottomContainer.setPadding(0, 0, cutoutHeight, 0);
mBottomProgress.setPadding(0, 0, cutoutHeight, 0);
}
}
}
@Override
public void setProgress(int duration, int position) {
if (mIsDragging) {
return;
}
if (mVideoProgress != null) {
if (duration > 0) {
mVideoProgress.setEnabled(true);
int pos = (int) (position * 1.0 / duration * mVideoProgress.getMax());
mVideoProgress.setProgress(pos);
mBottomProgress.setProgress(pos);
} else {
mVideoProgress.setEnabled(false);
}
int percent = mControlWrapper.getBufferedPercentage();
if (percent >= 95) { //解决缓冲进度不能100%问题
mVideoProgress.setSecondaryProgress(mVideoProgress.getMax());
mBottomProgress.setSecondaryProgress(mBottomProgress.getMax());
} else {
mVideoProgress.setSecondaryProgress(percent * 10);
mBottomProgress.setSecondaryProgress(percent * 10);
}
}
if (mTotalTime != null)
mTotalTime.setText(stringForTime(duration));
if (mCurrTime != null)
mCurrTime.setText(stringForTime(position));
}
@Override
public void onLockStateChanged(boolean isLocked) {
onVisibilityChanged(!isLocked, null);
}
@Override
public void onClick(View v) {
int id = v.getId();
if (id == R.id.fullscreen) {
if (isFullScreen) {
toggleFullScreen();
}
} else if (id == R.id.iv_play) {
mControlWrapper.togglePlay();
}
}
/**
* 横竖屏切换
*/
private void toggleFullScreen() {
Activity activity = PlayerUtils.scanForActivity(getContext());
mControlWrapper.toggleFullScreen(activity);
}
@Override
public void onStartTrackingTouch(SeekBar seekBar) {
mIsDragging = true;
mControlWrapper.stopProgress();
mControlWrapper.stopFadeOut();
}
@Override
public void onStopTrackingTouch(SeekBar seekBar) {
long duration = mControlWrapper.getDuration();
long newPosition = (duration * seekBar.getProgress()) / mVideoProgress.getMax();
mControlWrapper.seekTo((int) newPosition);
mIsDragging = false;
mControlWrapper.startProgress();
mControlWrapper.startFadeOut();
}
@Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
if (!fromUser) {
return;
}
long duration = mControlWrapper.getDuration();
long newPosition = (duration * progress) / mVideoProgress.getMax();
if (mCurrTime != null)
mCurrTime.setText(stringForTime((int) newPosition));
}
}

69
moduleijkplayer/src/main/res/layout/dkplayer_layout_audio_control_view.xml Executable file
View File

@ -0,0 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
<LinearLayout
android:id="@+id/bottom_container"
android:layout_width="match_parent"
android:layout_height="@dimen/dkplayer_controller_height"
android:layout_gravity="bottom"
android:gravity="center_vertical"
android:paddingRight="20dp"
android:background="@drawable/dkplayer_shape_stardard_controller_bottom_bg"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_play"
android:layout_width="@dimen/dkplayer_controller_height"
android:layout_height="@dimen/dkplayer_controller_height"
android:padding="@dimen/dkplayer_controller_icon_padding"
android:src="@drawable/dkplayer_selector_play_button" />
<TextView
android:id="@+id/curr_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:textSize="@dimen/dkplayer_controller_time_text_size"
tools:text="00:00" />
<SeekBar
android:id="@+id/seekBar"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_gravity="center_vertical"
android:layout_marginEnd="10dp"
android:layout_marginStart="10dp"
android:layout_weight="1"
android:background="@null"
android:max="1000"
android:maxHeight="2dp"
android:minHeight="2dp"
android:paddingEnd="0dp"
android:paddingStart="0dp"
android:progressDrawable="@drawable/dkplayer_layer_progress_bar"
android:thumb="@drawable/dkplayer_seekbar_thumb"
android:thumbOffset="0dp" />
<TextView
android:id="@+id/total_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:textSize="@dimen/dkplayer_controller_time_text_size"
tools:text="00:00" />
</LinearLayout>
<ProgressBar
android:id="@+id/bottom_progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_gravity="bottom"
android:max="1000"
android:progressDrawable="@drawable/dkplayer_layer_progress_bar"
android:visibility="gone" />
</FrameLayout>

1
modulemain/build.gradle
View File

@ -41,6 +41,7 @@ dependencies {
implementation project(':moduleactivity') implementation project(':moduleactivity')
implementation project(':modulecultural') implementation project(':modulecultural')
implementation project(':moduleshop') implementation project(':moduleshop')
implementation project(':moduleijkplayer')
implementation files('libs/BaiduLBS_Android.jar') implementation files('libs/BaiduLBS_Android.jar')
implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.appcompat:appcompat:1.1.0'
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'

30
modulemain/src/main/AndroidManifest.xml
View File

@ -18,9 +18,11 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- Required --> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- Required -->
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" <uses-permission
android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
tools:ignore="ProtectedPermissions" /> tools:ignore="ProtectedPermissions" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" <uses-permission
android:name="android.permission.WRITE_SETTINGS"
tools:ignore="ProtectedPermissions" /> <!-- Optional. Required for location feature --> tools:ignore="ProtectedPermissions" /> <!-- Optional. Required for location feature -->
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" /> <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
@ -31,31 +33,37 @@
<application <application
android:maxAspectRatio="2.4" android:maxAspectRatio="2.4"
android:resizeableActivity="true"> android:resizeableActivity="true">
<activity
android:name=".cultural.activitys.news.NewsLocalDetailActivity"
android:configChanges="keyboardHidden|orientation|screenSize|screenLayout"
android:exported="false"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity <activity
android:name=".cultural.activitys.news.NewsWebActivity" android:name=".cultural.activitys.news.NewsWebActivity"
android:configChanges="keyboardHidden|orientation|screenSize|screenLayout" android:configChanges="keyboardHidden|orientation|screenSize|screenLayout"
android:launchMode="singleTop"
android:exported="false" android:exported="false"
android:launchMode="singleTop"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".cultural.activitys.news.NewsPdfActivity" android:name=".cultural.activitys.news.NewsPdfActivity"
android:launchMode="singleTop"
android:exported="false" android:exported="false"
android:launchMode="singleTop"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".cultural.activitys.base.ChooseCityActivity" android:name=".cultural.activitys.base.ChooseCityActivity"
android:launchMode="singleTop"
android:exported="false" android:exported="false"
android:launchMode="singleTop"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".cultural.activitys.base.ForgatPwdActivity" android:name=".cultural.activitys.base.ForgatPwdActivity"
android:launchMode="singleTop"
android:exported="false" android:exported="false"
android:launchMode="singleTop"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".cultural.activitys.base.RegisterActivity" android:name=".cultural.activitys.base.RegisterActivity"
android:launchMode="singleTop"
android:exported="false" android:exported="false"
android:launchMode="singleTop"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<meta-data <meta-data
@ -75,8 +83,8 @@
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".cultural.activitys.base.DemoActivity" android:name=".cultural.activitys.base.DemoActivity"
android:launchMode="singleTop"
android:exported="false" android:exported="false"
android:launchMode="singleTop"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".cultural.activitys.news.NewsDetailActivity" android:name=".cultural.activitys.news.NewsDetailActivity"
@ -85,13 +93,13 @@
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".cultural.activitys.base.LoginActivity" android:name=".cultural.activitys.base.LoginActivity"
android:launchMode="singleTop"
android:exported="false" android:exported="false"
android:launchMode="singleTop"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".cultural.activitys.base.MainActivity" android:name=".cultural.activitys.base.MainActivity"
android:launchMode="singleTask"
android:exported="false" android:exported="false"
android:launchMode="singleTask"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".cultural.activitys.news.NewsListActivity" android:name=".cultural.activitys.news.NewsListActivity"
@ -100,8 +108,8 @@
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".cultural.activitys.base.SplashActivity" android:name=".cultural.activitys.base.SplashActivity"
android:screenOrientation="portrait"
android:exported="true" android:exported="true"
android:screenOrientation="portrait"
android:theme="@style/LaunchTheme"> android:theme="@style/LaunchTheme">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

34
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsDetailActivity.java
View File

@ -39,6 +39,7 @@ import com.google.gson.Gson;
import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.sucstepsoft.cm_utils.constant.PathConfig; import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.core.beans.AddPhotoBean; import com.sucstepsoft.cm_utils.core.beans.AddPhotoBean;
import com.sucstepsoft.cm_utils.core.beans.BaseSuccessBean;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi; import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager; import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity; import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
@ -349,6 +350,39 @@ public class NewsDetailActivity extends BaseActivity {
.navigation(); .navigation();
} }
}); });
doSaveRead();
}
/**
* 保存浏览量
*/
private void doSaveRead() {
RetrofitManager.getInstance()
.create(HomeApi.class)
.doSaveRead("安卓" + mNId)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<BaseSuccessBean>() {
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onNext(BaseSuccessBean baseSuccessBean) {
}
@Override
public void onError(Throwable e) {
}
@Override
public void onComplete() {
}
});
} }
private void showShareDialog() { private void showShareDialog() {

27
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsListActivity.java
View File

@ -1,17 +1,14 @@
package com.tengshisoft.mudulemain.cultural.activitys.news; package com.tengshisoft.mudulemain.cultural.activitys.news;
import android.graphics.Color; import android.graphics.Color;
import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator;
import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
import com.sucstepsoft.cm_utils.constant.PathConfig; import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi; import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager; import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
@ -22,25 +19,13 @@ import com.sucstepsoft.cm_utils.utils.UserLgUtils;
import com.tengshisoft.mudulemain.R; import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.R2; import com.tengshisoft.mudulemain.R2;
import com.tengshisoft.mudulemain.cultural.adapter.NewsAdapter; import com.tengshisoft.mudulemain.cultural.adapter.NewsAdapter;
import com.tengshisoft.mudulemain.cultural.adapter.NewsMenuAdapter;
import com.tengshisoft.mudulemain.cultural.beans.NewsCommentCount; import com.tengshisoft.mudulemain.cultural.beans.NewsCommentCount;
import com.tengshisoft.mudulemain.cultural.beans.NewsItemBean; import com.tengshisoft.mudulemain.cultural.beans.NewsItemBean;
import com.tengshisoft.mudulemain.cultural.beans.NewsTabBean;
import com.tengshisoft.mudulemain.cultural.fragment.HomeFragment;
import com.tengshisoft.mudulemain.cultural.fragment.NewsFragment;
import com.tengshisoft.mudulemain.cultural.net.HomeApi; import com.tengshisoft.mudulemain.cultural.net.HomeApi;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager2.adapter.FragmentStateAdapter;
import androidx.viewpager2.widget.ViewPager2;
import butterknife.BindInt;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.Unbinder; import butterknife.Unbinder;
@ -62,6 +47,7 @@ public class NewsListActivity extends BaseActivity {
private int mTotalPage = 0; private int mTotalPage = 0;
private int mCurrentPage = 1; private int mCurrentPage = 1;
private String mType; private String mType;
private String mPId;
@Override @Override
protected int setLayoutId() { protected int setLayoutId() {
@ -72,6 +58,7 @@ public class NewsListActivity extends BaseActivity {
public void initData() { public void initData() {
mBind = ButterKnife.bind(this); mBind = ButterKnife.bind(this);
mType = getIntent().getStringExtra("id"); mType = getIntent().getStringExtra("id");
mPId = getIntent().getStringExtra("pId");
String title = getIntent().getStringExtra("title"); String title = getIntent().getStringExtra("title");
mTvBaseTitle.setText(title); mTvBaseTitle.setText(title);
mAdapter = new NewsAdapter(mActivity, mNewsDatas); mAdapter = new NewsAdapter(mActivity, mNewsDatas);
@ -113,7 +100,7 @@ public class NewsListActivity extends BaseActivity {
private void getNewsListByType(int page) { private void getNewsListByType(int page) {
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(HomeApi.class) .create(HomeApi.class)
.getNewsList(mType, page + "") .getNewsList("", mPId, page + "")
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<NewsItemBean>() { .subscribe(new Observer<NewsItemBean>() {
@ -293,7 +280,7 @@ public class NewsListActivity extends BaseActivity {
private void getNewsListByTypeToken(int page) { private void getNewsListByTypeToken(int page) {
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(HomeApi.class) .create(HomeApi.class)
.getNewsListByToken(mType, page + "", UserLgUtils.getToken()) .getNewsListByToken("", mPId, page + "", UserLgUtils.getToken())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<NewsItemBean>() { .subscribe(new Observer<NewsItemBean>() {

1244
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsLocalDetailActivity.java Normal file
View File

File diff suppressed because it is too large Load Diff

10
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsMainActivity.java
View File

@ -48,6 +48,7 @@ public class NewsMainActivity extends BaseActivity {
private Disposable mDisposable; private Disposable mDisposable;
private String mId; private String mId;
private String mTitle; private String mTitle;
private String mPId;
@Override @Override
@ -55,6 +56,7 @@ public class NewsMainActivity extends BaseActivity {
mBind = ButterKnife.bind(this); mBind = ButterKnife.bind(this);
mTitle = getIntent().getStringExtra("title"); mTitle = getIntent().getStringExtra("title");
mId = getIntent().getStringExtra("id"); mId = getIntent().getStringExtra("id");
mPId = getIntent().getStringExtra("pId");
refreshView(STATE_LOAD_LOADING); refreshView(STATE_LOAD_LOADING);
mTvBaseTitle.setText(mTitle); mTvBaseTitle.setText(mTitle);
getNewsTabs(); getNewsTabs();
@ -79,10 +81,18 @@ public class NewsMainActivity extends BaseActivity {
public void onNext(List<NewsTabBean> newsTabBeans) { public void onNext(List<NewsTabBean> newsTabBeans) {
if (mFragments != null) { if (mFragments != null) {
if (newsTabBeans != null && newsTabBeans.size() > 0) { if (newsTabBeans != null && newsTabBeans.size() > 0) {
NewsTabBean allBean = new NewsTabBean();
allBean.setDirectoriesName("全部");
allBean.setNewsDirectoriesId("");
allBean.setDirectoriesParentId(mPId);
allBean.setDirectoriesView("2");
newsTabBeans.add(0, allBean);
mTabs = newsTabBeans; mTabs = newsTabBeans;
for (int i = 0; i < newsTabBeans.size(); i++) { for (int i = 0; i < newsTabBeans.size(); i++) {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("type", newsTabBeans.get(i).getNewsDirectoriesId()); bundle.putString("type", newsTabBeans.get(i).getNewsDirectoriesId());
bundle.putString("pId", "");
BaseFragment fragment = null; BaseFragment fragment = null;
//0 外部链接 1存在子集 2没有子集 //0 外部链接 1存在子集 2没有子集
if ("0".equals(newsTabBeans.get(i).getDirectoriesView())) { if ("0".equals(newsTabBeans.get(i).getDirectoriesView())) {

30
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java
View File

@ -250,7 +250,13 @@ public class HomeFragment extends BaseFragment {
@Override @Override
public void onNext(List<NewsTabBean> newsTabBeans) { public void onNext(List<NewsTabBean> newsTabBeans) {
createNewsContent(newsTabBeans); if (newsTabBeans.size() > 0) {
createNewsContent(newsTabBeans);
} else {
if (mNewsSkeleton != null) {
mNewsSkeleton.hide();
}
}
} }
@Override @Override
@ -287,6 +293,8 @@ public class HomeFragment extends BaseFragment {
public void onNext(List<NewsTabBean> newsTabBeans) { public void onNext(List<NewsTabBean> newsTabBeans) {
if (newsTabBeans != null && newsTabBeans.size() > 0) { if (newsTabBeans != null && newsTabBeans.size() > 0) {
buildMainFuncMenu(newsTabBeans); buildMainFuncMenu(newsTabBeans);
} else {
} }
} }
@ -471,7 +479,8 @@ public class HomeFragment extends BaseFragment {
url = rowsBean.getTemplateRecordUrl(); url = rowsBean.getTemplateRecordUrl();
} }
ARouter.getInstance() ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL) // .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL) //TODO 连接
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)//TODO 接口方式
.withString("id", rowsBean.getNewsContentId()) .withString("id", rowsBean.getNewsContentId())
.withString("url", url) .withString("url", url)
.withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论 .withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论
@ -488,7 +497,7 @@ public class HomeFragment extends BaseFragment {
private void getBannerData() { private void getBannerData() {
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(HomeApi.class) .create(HomeApi.class)
.getMainNewsList(PathConfig.NEWS_BANNER_ID, "5", "1") .getMainNewsList(PathConfig.NEWS_BANNER_ID, "", "5", "1")
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<NewsItemBean>() { .subscribe(new Observer<NewsItemBean>() {
@ -668,7 +677,7 @@ public class HomeFragment extends BaseFragment {
private void getNewsList(NewsTabBean newsTabBean, BaseRecyclerAdapter adapter, RecyclerView rlvContent, CustomStateView stateView) { private void getNewsList(NewsTabBean newsTabBean, BaseRecyclerAdapter adapter, RecyclerView rlvContent, CustomStateView stateView) {
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(HomeApi.class) .create(HomeApi.class)
.getNewsTabListByPid(newsTabBean.getNewsDirectoriesId(), "5", "1") .getNewsTabListByPid("", newsTabBean.getNewsDirectoriesId(), "5", "1")
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<NewsItemBean>() { .subscribe(new Observer<NewsItemBean>() {
@ -885,6 +894,7 @@ public class HomeFragment extends BaseFragment {
//列表 //列表
ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_LIST) ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_LIST)
.withString("id", mainFuncBean.getNewsDirectoriesId()) .withString("id", mainFuncBean.getNewsDirectoriesId())
.withString("pId", mainFuncBean.getNewsDirectoriesId())
.withString("title", mainFuncBean.getDirectoriesName()) .withString("title", mainFuncBean.getDirectoriesName())
.navigation(); .navigation();
} else if ("0".equals(mainFuncBean.getDirectoriesView())) { } else if ("0".equals(mainFuncBean.getDirectoriesView())) {
@ -897,6 +907,7 @@ public class HomeFragment extends BaseFragment {
ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN) ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN)
.withString("title", mainFuncBean.getDirectoriesName()) .withString("title", mainFuncBean.getDirectoriesName())
.withString("id", mainFuncBean.getNewsDirectoriesId()) .withString("id", mainFuncBean.getNewsDirectoriesId())
.withString("pId", mainFuncBean.getNewsDirectoriesId())
.navigation(); .navigation();
} }
//在线培训 文化旅游 文化动态 展览展示 数图资源 //在线培训 文化旅游 文化动态 展览展示 数图资源
@ -964,11 +975,11 @@ public class HomeFragment extends BaseFragment {
titleLayout.addView(ivLeft); titleLayout.addView(ivLeft);
titleLayout.addView(titleView); titleLayout.addView(titleView);
titleLayout.addView(ivRight); titleLayout.addView(ivRight);
titleLayout.setOnClickListener(v -> ARouter.getInstance() // titleLayout.setOnClickListener(v -> ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_LIST) // .build(PathConfig.PATH_MODULE_MAIN_NEWS_LIST)
.withString("id", b.getNewsDirectoriesId()) // .withString("id", b.getNewsDirectoriesId())
.withString("title", b.getDirectoriesName()) // .withString("title", b.getDirectoriesName())
.navigation()); // .navigation());
//分割线 //分割线
View line = new View(mActivity); View line = new View(mActivity);
LinearLayout.LayoutParams lineParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT); LinearLayout.LayoutParams lineParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
@ -1029,6 +1040,7 @@ public class HomeFragment extends BaseFragment {
getBannerData(); getBannerData();
getMainCommendList(); getMainCommendList();
getLiveList(); getLiveList();
mSrlView.finishRefresh();
} }
@Override @Override

22
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java
View File

@ -4,17 +4,19 @@ import android.graphics.Color;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.ethanhua.skeleton.RecyclerViewSkeletonScreen; import com.ethanhua.skeleton.RecyclerViewSkeletonScreen;
import com.ethanhua.skeleton.Skeleton; import com.ethanhua.skeleton.Skeleton;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.sucstepsoft.cm_utils.constant.PathConfig; import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi; import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager; import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
import com.sucstepsoft.cm_utils.core.widget.base.BaseFragment; import com.sucstepsoft.cm_utils.core.widget.base.BaseFragment;
import com.sucstepsoft.cm_utils.core.widget.views.ItemSplitDivider; import com.sucstepsoft.cm_utils.core.widget.views.ItemSplitDivider;
import com.sucstepsoft.cm_utils.utils.ExceptionHandler; import com.sucstepsoft.cm_utils.utils.ExceptionHandler;
import com.sucstepsoft.cm_utils.utils.LogUtils;
import com.sucstepsoft.cm_utils.utils.UserLgUtils; import com.sucstepsoft.cm_utils.utils.UserLgUtils;
import com.tengshisoft.mudulemain.R; import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.R2; import com.tengshisoft.mudulemain.R2;
@ -25,13 +27,9 @@ import com.tengshisoft.mudulemain.cultural.beans.NewsItemBean;
import com.tengshisoft.mudulemain.cultural.beans.NewsTabBean; import com.tengshisoft.mudulemain.cultural.beans.NewsTabBean;
import com.tengshisoft.mudulemain.cultural.net.HomeApi; import com.tengshisoft.mudulemain.cultural.net.HomeApi;
import java.security.MessageDigest;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.Unbinder; import butterknife.Unbinder;
@ -61,7 +59,8 @@ public class NewsFragment extends BaseFragment {
private NewsAdapter mAdapter; private NewsAdapter mAdapter;
private int mTotalPage = 0; private int mTotalPage = 0;
private int mCurrentPage = 1; private int mCurrentPage = 1;
private String mType; private String mType;//newsId
private String mPid;//newsPid
private RecyclerViewSkeletonScreen mNewsSkeleton; private RecyclerViewSkeletonScreen mNewsSkeleton;
private Disposable mD1; private Disposable mD1;
private Disposable mD2; private Disposable mD2;
@ -73,6 +72,7 @@ public class NewsFragment extends BaseFragment {
setStateView(STATE_SUCCESS); setStateView(STATE_SUCCESS);
mAdapter = new NewsAdapter(mActivity, mNewsDatas); mAdapter = new NewsAdapter(mActivity, mNewsDatas);
mType = getArguments().getString("type"); mType = getArguments().getString("type");
mPid = getArguments().getString("pId");
mCurrentPage = 1; mCurrentPage = 1;
mTotalPage = 0; mTotalPage = 0;
mNewsDatas.clear(); mNewsDatas.clear();
@ -104,6 +104,7 @@ public class NewsFragment extends BaseFragment {
ARouter.getInstance() ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_LIST) .build(PathConfig.PATH_MODULE_MAIN_NEWS_LIST)
.withString("id", newsTabBean.getNewsDirectoriesId()) .withString("id", newsTabBean.getNewsDirectoriesId())
.withString("pId", newsTabBean.getNewsDirectoriesId())
.withString("title", newsTabBean.getDirectoriesName()) .withString("title", newsTabBean.getDirectoriesName())
.navigation(); .navigation();
} }
@ -136,7 +137,8 @@ public class NewsFragment extends BaseFragment {
url = rowsBean.getTemplateRecordUrl(); url = rowsBean.getTemplateRecordUrl();
} }
ARouter.getInstance() ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL) // .build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)
.withString("id", rowsBean.getNewsContentId()) .withString("id", rowsBean.getNewsContentId())
.withString("url", url) .withString("url", url)
.withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论 .withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论
@ -152,7 +154,7 @@ public class NewsFragment extends BaseFragment {
private void getNewsListByTypeToken(int page) { private void getNewsListByTypeToken(int page) {
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(HomeApi.class) .create(HomeApi.class)
.getNewsListByToken(mType, page + "", UserLgUtils.getToken()) .getNewsListByToken(mType, "", page + "", UserLgUtils.getToken())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<NewsItemBean>() { .subscribe(new Observer<NewsItemBean>() {
@ -260,7 +262,7 @@ public class NewsFragment extends BaseFragment {
private void getNewsListByType(int page) { private void getNewsListByType(int page) {
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(HomeApi.class) .create(HomeApi.class)
.getNewsList(mType, page + "") .getNewsList(mType, "", page + "")
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<NewsItemBean>() { .subscribe(new Observer<NewsItemBean>() {

22
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java
View File

@ -136,8 +136,8 @@ public interface HomeApi {
*/ */
@Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json", "need_area:true"}) @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json", "need_area:true"})
@GET("app/newscontent/listpagenewscontentrelease") @GET("app/newscontent/listpagenewscontentrelease")
Observable<NewsItemBean> getNewsTabListByPid(@Query("newsDirectoriesId") String pid, @Query("rows") String rows, @Query("page") String page); // Observable<NewsItemBean> getNewsTabListByPid(@Query("newsDirectoriesId") String pid, @Query("rows") String rows, @Query("page") String page);
// Observable<NewsItemBean> getNewsTabListByPid(@Query("newsDirectoriesParentId") String pid, @Query("rows") String rows, @Query("page") String page); Observable<NewsItemBean> getNewsTabListByPid(@Query("newsDirectoriesId") String pid, @Query("newsDirectoriesParentId") String pId, @Query("rows") String rows, @Query("page") String page);
/** /**
* 获取新闻列表-不需要token * 获取新闻列表-不需要token
@ -145,6 +145,7 @@ public interface HomeApi {
@Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json", "need_area:true"}) @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json", "need_area:true"})
@GET("app/newscontent/listpagenewscontentrelease") @GET("app/newscontent/listpagenewscontentrelease")
Observable<NewsItemBean> getNewsList(@Query("newsDirectoriesId") String newsDirectoriesId, Observable<NewsItemBean> getNewsList(@Query("newsDirectoriesId") String newsDirectoriesId,
@Query("newsDirectoriesParentId") String pId,
@Query("page") String page); @Query("page") String page);
/** /**
@ -160,6 +161,7 @@ public interface HomeApi {
@Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json", "need_area:true"}) @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json", "need_area:true"})
@GET("app/newscontent/listpagenewscontentrelease") @GET("app/newscontent/listpagenewscontentrelease")
Observable<NewsItemBean> getMainNewsList(@Query("newsDirectoriesId") String newsDirectoriesId, Observable<NewsItemBean> getMainNewsList(@Query("newsDirectoriesId") String newsDirectoriesId,
@Query("newsDirectoriesParentId") String pId,
@Query("rows") String rows, @Query("page") String page); @Query("rows") String rows, @Query("page") String page);
/** /**
@ -168,6 +170,7 @@ public interface HomeApi {
@Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json", "need_area:true"}) @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json", "need_area:true"})
@GET("app/newscontent/listpagenewscontent") @GET("app/newscontent/listpagenewscontent")
Observable<NewsItemBean> getNewsListByToken(@Query("newsDirectoriesId") String newsDirectoriesId, Observable<NewsItemBean> getNewsListByToken(@Query("newsDirectoriesId") String newsDirectoriesId,
@Query("newsDirectoriesParentId") String pId,
@Query("page") String page, @Header("token") String token); @Query("page") String page, @Header("token") String token);
/** /**
@ -185,6 +188,21 @@ public interface HomeApi {
@GET("app/newscontent/getnewscontentbyidrelease/{id}") @GET("app/newscontent/getnewscontentbyidrelease/{id}")
Observable<NewsDetailBean> getNewsDetail(@Path("id") String id); Observable<NewsDetailBean> getNewsDetail(@Path("id") String id);
/**
* 新闻访问量
* http://v3.xzszwhy.cn/module/
*/
@Headers({"base_url_name:bigdata", "Content-Type:application/json", "Accept:application/json"})
@GET("app/contentcensusrelease/log")
Observable<BaseSuccessBean> doSaveRead(@Query("requestUrl") String id);
/**
* 搜索热词
* ?requestUrl=安卓QUERY要搜索的内容END
*/
@Headers({"base_url_name:bigdata", "Content-Type:application/json", "Accept:application/json"})
@GET("app/contentcensusrelease/log")
Observable<BaseSuccessBean> bigDataKeywords(@Query("requestUrl") String id);
/** /**
* 获取评论列表 * 获取评论列表

219
modulemain/src/main/res/layout/activity_news_local_detail.xml Normal file
View File

@ -0,0 +1,219 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
tools:context=".cultural.activitys.news.NewsDetailActivity">
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/srl_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="45dp">
<androidx.core.widget.NestedScrollView
android:id="@+id/nsl_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:descendantFocusability="blocksDescendants"
android:fillViewport="true"
android:scrollbars="none">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_news_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:descendantFocusability="blocksDescendants"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_title_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="vertical"
android:visibility="gone">
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:id="@+id/tv_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingLeft="20dp"
android:paddingRight="20dp"
app:text_type_cus="2"
tools:text="新闻标题" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:gravity="center"
android:orientation="horizontal">
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:id="@+id/tv_source"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/gray_text"
android:textSize="12sp"
tools:text="新闻来源:网络" />
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:textColor="@color/gray_text"
android:textSize="12sp"
tools:text="发布时间:2022-22-22" />
</LinearLayout>
</LinearLayout>
<!--====================视频===========================-->
<LinearLayout
android:id="@+id/ll_video"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/black"
android:orientation="vertical">
<com.tengshisoft.moduleijkplayer.player.VideoView
android:id="@+id/vv_video"
android:layout_width="match_parent"
android:layout_height="240dp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_video_category"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:orientation="vertical">
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_catelog_indic_line"
android:drawablePadding="10dp"
android:gravity="center_vertical"
android:text="视频详情"
app:text_type_cus="1" />
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:id="@+id/tv_video_txt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="18dp"
android:layout_marginTop="10dp"
android:text="视频详情"
app:text_type_cus="1" />
</LinearLayout>
</LinearLayout>
<!--====================图片===========================-->
<RelativeLayout
android:id="@+id/rl_img"
android:layout_width="match_parent"
android:layout_height="500dp"
android:orientation="vertical"
android:visibility="gone">
<com.youth.banner.Banner
android:id="@+id/bn_img"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</RelativeLayout>
<!--====================音频===========================-->
<LinearLayout
android:id="@+id/ll_audio"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/black"
android:orientation="vertical">
<com.tengshisoft.moduleijkplayer.player.VideoView
android:id="@+id/vv_audio"
android:layout_width="match_parent"
android:layout_height="240dp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_audio_category"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:orientation="vertical">
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_catelog_indic_line"
android:drawablePadding="10dp"
android:gravity="center_vertical"
android:text="音频详情"
app:text_type_cus="1" />
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:id="@+id/tv_audio_txt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="18dp"
android:layout_marginTop="10dp"
android:text="音频内容"
app:text_type_cus="1" />
</LinearLayout>
</LinearLayout>
<!--====================文章===========================-->
<com.sucstepsoft.cm_utils.core.widget.views.NestedScrollWebView
android:id="@+id/nwv_content"
android:layout_width="match_parent"
android:layout_height="300dp"
android:focusable="true"
android:focusableInTouchMode="true"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:scrollbars="none"
android:visibility="gone" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_comment"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
<include
android:id="@+id/ll_input_comment"
layout="@layout/layout_bottom_comment" />
</RelativeLayout>

371
modulemain/src/main/res/layout/item_skeleton_news_content_local.xml Executable file
View File

@ -0,0 +1,371 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<View
android:id="@+id/tv_title"
android:layout_width="match_parent"
android:layout_height="16dp"
android:layout_gravity="center"
android:layout_marginLeft="50dp"
android:layout_marginTop="10dp"
android:layout_marginRight="50dp"
android:background="@color/light_transparent" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginTop="5dp"
android:layout_marginRight="30dp">
<View
android:id="@+id/img_news"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_margin="3dp"
android:background="@color/light_transparent" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/img_news"
android:orientation="vertical">
<View
android:layout_width="100dp"
android:layout_height="8dp"
android:background="@color/light_transparent" />
<View
android:layout_width="200dp"
android:layout_height="8dp"
android:layout_marginTop="5dp"
android:background="@color/light_transparent" />
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<View
android:layout_width="180dp"
android:layout_height="180dp"
android:layout_marginLeft="16dp"
android:background="@color/light_transparent" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="12dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="60dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="12dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="12dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="50dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="12dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="30dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="12dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="50dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="12dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="50dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="12dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="12dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:background="@color/light_transparent" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="16dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="16dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="16dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="16dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="16dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="16dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="16dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="16dp"
android:background="@color/light_transparent" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginTop="5dp"
android:layout_marginRight="30dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<View
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_margin="3dp"
android:background="@color/light_transparent" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:orientation="vertical">
<View
android:layout_width="100dp"
android:layout_height="8dp"
android:background="@color/light_transparent" />
<View
android:layout_width="200dp"
android:layout_height="8dp"
android:layout_marginTop="5dp"
android:background="@color/light_transparent" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="16dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="16dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="16dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="16dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="16dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="16dp"
android:background="@color/light_transparent" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="12dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="60dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="12dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="12dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="50dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="12dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="30dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="12dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="50dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="12dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="50dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="12dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:background="@color/light_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="12dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:background="@color/light_transparent" />
</LinearLayout>
<View
android:layout_width="180dp"
android:layout_height="180dp"
android:layout_marginRight="16dp"
android:background="@color/light_transparent" />
</LinearLayout>
</LinearLayout>

123
modulemine/src/main/res/layout/activity_new_mine_info_edit.xml
View File

@ -29,6 +29,12 @@
android:hint="请输入昵称" /> android:hint="请输入昵称" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
@ -42,6 +48,13 @@
android:hint="请输入邮箱" /> android:hint="请输入邮箱" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -54,6 +67,13 @@
android:hint="请输入联系电话" /> android:hint="请输入联系电话" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -66,6 +86,13 @@
android:hint="请输入姓名" /> android:hint="请输入姓名" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -78,6 +105,13 @@
android:hint="请选择性别" /> android:hint="请选择性别" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -90,6 +124,13 @@
android:hint="请选择生日" /> android:hint="请选择生日" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -102,6 +143,13 @@
android:hint="请输入身份证号码" /> android:hint="请输入身份证号码" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -114,6 +162,13 @@
android:hint="请选择民族" /> android:hint="请选择民族" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -126,6 +181,13 @@
android:hint="请输入籍贯" /> android:hint="请输入籍贯" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -138,6 +200,12 @@
android:hint="请选择政治面貌" /> android:hint="请选择政治面貌" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
@ -151,6 +219,13 @@
android:hint="请输入QQ号" /> android:hint="请输入QQ号" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -163,6 +238,13 @@
android:hint="请输入微信号" /> android:hint="请输入微信号" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -175,6 +257,13 @@
android:hint="请输入微博号" /> android:hint="请输入微博号" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -187,6 +276,13 @@
android:hint="请输入现住址" /> android:hint="请输入现住址" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -199,6 +295,13 @@
android:hint="请输入地区邮编" /> android:hint="请输入地区邮编" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -211,6 +314,12 @@
android:hint="请输入详细地址" /> android:hint="请输入详细地址" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
@ -224,6 +333,13 @@
android:hint="请选择学历" /> android:hint="请选择学历" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -236,6 +352,13 @@
android:hint="请选择就业状况" /> android:hint="请选择就业状况" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_ver_content"> <LinearLayout style="@style/item_ver_content">
<TextView <TextView

126
modulemine/src/main/res/layout/activity_new_mine_infor_detail.xml
View File

@ -29,6 +29,13 @@
android:hint="未录入" /> android:hint="未录入" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
@ -42,6 +49,13 @@
android:hint="未录入" /> android:hint="未录入" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -54,6 +68,13 @@
android:hint="未录入" /> android:hint="未录入" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -66,6 +87,13 @@
android:hint="未录入" /> android:hint="未录入" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -78,6 +106,13 @@
android:hint="未录入" /> android:hint="未录入" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -90,6 +125,13 @@
android:hint="未录入" /> android:hint="未录入" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -102,6 +144,13 @@
android:hint="未录入" /> android:hint="未录入" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -114,6 +163,13 @@
android:hint="未录入" /> android:hint="未录入" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -126,6 +182,13 @@
android:hint="未录入" /> android:hint="未录入" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -138,6 +201,12 @@
android:hint="未录入" /> android:hint="未录入" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
@ -151,6 +220,13 @@
android:hint="未录入" /> android:hint="未录入" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -163,6 +239,13 @@
android:hint="未录入" /> android:hint="未录入" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -175,6 +258,13 @@
android:hint="未录入" /> android:hint="未录入" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -187,6 +277,13 @@
android:hint="未录入" /> android:hint="未录入" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -199,6 +296,13 @@
android:hint="未录入" /> android:hint="未录入" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -211,6 +315,12 @@
android:hint="未录入" /> android:hint="未录入" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
@ -224,6 +334,13 @@
android:hint="未录入" /> android:hint="未录入" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_hor_content"> <LinearLayout style="@style/item_hor_content">
<TextView <TextView
@ -236,6 +353,13 @@
android:hint="未录入" /> android:hint="未录入" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/gray_line_deep" />
<LinearLayout style="@style/item_ver_content"> <LinearLayout style="@style/item_ver_content">
<TextView <TextView
@ -251,7 +375,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginTop="5dp" android:layout_marginTop="8dp"
android:background="@drawable/shp_rectangle_gray_df" android:background="@drawable/shp_rectangle_gray_df"
android:gravity="left" android:gravity="left"
android:hint="未录入" android:hint="未录入"

196
modulemine/src/main/res/layout/activity_setting.xml
View File

@ -18,65 +18,65 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<androidx.cardview.widget.CardView <LinearLayout
android:id="@+id/ll_change_phone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dp" android:layout_margin="5dp"
app:cardCornerRadius="5dp" android:gravity="center_vertical"
app:cardElevation="3dp"> android:orientation="horizontal"
android:padding="8dp">
<LinearLayout <ImageView
android:id="@+id/ll_change_phone" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_user_couant" />
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dp" android:layout_marginLeft="5dp"
android:gravity="center_vertical" android:drawableRight="@drawable/ic_arrow_cir"
android:orientation="horizontal" android:text="个人信息"
android:padding="8dp"> android:textSize="15sp" />
</LinearLayout>
<ImageView <View
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="1dp"
android:src="@drawable/ic_user_couant" /> android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="@color/gray_line_deep" />
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView <LinearLayout
android:layout_width="wrap_content" android:id="@+id/ll_reset_phone"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="个人信息"
android:textSize="15sp" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dp" android:layout_margin="5dp"
app:cardCornerRadius="5dp" android:gravity="center_vertical"
app:cardElevation="3dp"> android:orientation="horizontal"
android:padding="8dp">
<LinearLayout <ImageView
android:id="@+id/ll_reset_phone" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_change_phone" />
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dp" android:layout_marginLeft="5dp"
android:gravity="center_vertical" android:drawableRight="@drawable/ic_arrow_cir"
android:orientation="horizontal" android:text="重新绑定手机"
android:padding="8dp"> android:textSize="15sp" />
</LinearLayout>
<ImageView <View
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="1dp"
android:src="@drawable/ic_change_phone" /> android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView android:background="@color/gray_line_deep" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="重新绑定手机"
android:textSize="15sp" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -110,86 +110,72 @@
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView <LinearLayout
android:id="@+id/ll_clear"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dp" android:layout_margin="5dp"
android:visibility="gone" android:gravity="center_vertical"
app:cardCornerRadius="5dp" android:orientation="horizontal"
app:cardElevation="3dp"> android:padding="8dp"
android:visibility="gone">
<LinearLayout <ImageView
android:id="@+id/ll_clear" android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dp" android:src="@drawable/ic_clear_cache" />
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="8dp">
<ImageView <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/ic_clear_cache" /> android:layout_marginLeft="5dp"
android:text="清除缓存"
android:textSize="15sp" />
</LinearLayout>
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView <RelativeLayout
android:layout_width="wrap_content" android:id="@+id/ll_check_update"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="清除缓存"
android:textSize="15sp" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dp" android:layout_margin="5dp"
app:cardCornerRadius="5dp" android:gravity="center_vertical"
app:cardElevation="3dp"> android:orientation="horizontal"
android:padding="8dp">
<RelativeLayout <ImageView
android:id="@+id/ll_check_update" android:id="@+id/iv_ic"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dp" android:layout_centerVertical="true"
android:gravity="center_vertical" android:src="@drawable/ic_check_update" />
android:orientation="horizontal"
android:padding="8dp">
<ImageView <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:id="@+id/iv_ic" 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_marginLeft="5dp"
android:src="@drawable/ic_check_update" /> android:layout_toRightOf="@id/iv_ic"
android:text="检查更新"
android:textSize="15sp" />
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:layout_width="wrap_content" android:id="@+id/tv_version"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_centerVertical="true" android:layout_height="wrap_content"
android:layout_marginLeft="5dp" android:layout_alignParentRight="true"
android:layout_toRightOf="@id/iv_ic" android:layout_centerVertical="true"
android:text="检查更新" android:layout_marginLeft="5dp"
android:textSize="15sp" /> android:text="v1.2.2"
android:textSize="15sp" />
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView </RelativeLayout>
android:id="@+id/tv_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:text="v1.2.2"
android:textSize="15sp" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:id="@+id/tv_login_out" android:id="@+id/tv_login_out"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="20dp" android:layout_marginLeft="20dp"
android:layout_marginTop="50dp"
android:layout_marginRight="20dp"
android:background="@drawable/sel_btn_activity_sign_up" android:background="@drawable/sel_btn_activity_sign_up"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"

2
moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/OrderListActivity.java
View File

@ -29,7 +29,7 @@ import butterknife.Unbinder;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
/** /**
* 我的订单 * 我的商城订单
*/ */
@Route(path = PathConfig.PATH_MODULE_SHOP_ACTIVITY_SHOP_MINE_ORDER) @Route(path = PathConfig.PATH_MODULE_SHOP_ACTIVITY_SHOP_MINE_ORDER)
public class OrderListActivity extends BaseActivity { public class OrderListActivity extends BaseActivity {