diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java
index b7ca8ae..7f8d4d1 100755
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java
+++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java
@@ -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_NEWS_WEB = "/modulemain/activity/newsweb";//连接新闻页
+    public static final String PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE = "/modulemain/activity/newsInterface";//新闻详情页面-接口方式
     //======================Map==================================================
     public static final String PATH_MODULE_MAP_NAVIGATION = "/modulemap/activity/navigation";//地图
     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_NATIVE = "";//籍贯
     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_SERVICE_AREA = "761d8633-3c2f-4e92-b32d-fb50d3dc07b7";//服务区域
     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_DETAIL = "/moduleshop/activity/shopOrderDetail";//我的订单
     public static final String PATH_MODULE_SHOP_ACTIVITY_SHOP_ADD_ADDRESS = "/moduleshop/activity/shopAddAddress";//新增收货地
+
 }
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java
index 674c3ee..0fa5106 100755
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java
+++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java
@@ -9,7 +9,7 @@ import com.sucstepsoft.cm_utils.constant.PathConfig;
  */
 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 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_VOLUNTEER_IP = BASE_SYSTEM_IP;/* 志愿者 */
     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_CULTURAL_SHARE = 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 = 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/";
 //    GET /app/appversion/downloadapp/{appVersionId}
     public static final String APP_DOWNLOAD_URL = BASE_URL + "app/appversion/download/" + PathConfig.APP_VERSION_ID;
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/BaseUrlInterceptor.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/BaseUrlInterceptor.java
index 5d92b2d..c87843b 100755
--- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/BaseUrlInterceptor.java
+++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/conver/BaseUrlInterceptor.java
@@ -46,6 +46,8 @@ public class BaseUrlInterceptor implements Interceptor {
                 newBaseUrl = HttpUrl.parse(BaseUrlApi.BASE_CULTURAL_SHARE);
             } else if ("shop".equals(headerValue)) {
                 newBaseUrl = HttpUrl.parse(BaseUrlApi.BASE_SHOP_IP);
+            }else if("bigdata".equals(headerValue)){
+                newBaseUrl = HttpUrl.parse(BaseUrlApi.BASE_BIG_DATA);
             } else {
                 newBaseUrl = oldHttpUrl;
             }
diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BannerImageTextAllAdapter.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BannerImageTextAllAdapter.java
new file mode 100755
index 0000000..698f151
--- /dev/null
+++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BannerImageTextAllAdapter.java
@@ -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());
+    }
+}
diff --git a/cm_utils/src/main/res/layout/item_banner_text_all.xml b/cm_utils/src/main/res/layout/item_banner_text_all.xml
new file mode 100755
index 0000000..f47a645
--- /dev/null
+++ b/cm_utils/src/main/res/layout/item_banner_text_all.xml
@@ -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>
\ No newline at end of file
diff --git a/modulecultural/src/main/res/layout/activity_register_volunteer_single.xml b/modulecultural/src/main/res/layout/activity_register_volunteer_single.xml
index a61732d..6d6a119 100755
--- a/modulecultural/src/main/res/layout/activity_register_volunteer_single.xml
+++ b/modulecultural/src/main/res/layout/activity_register_volunteer_single.xml
@@ -1,8 +1,6 @@
 <?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">
@@ -261,78 +259,6 @@
                     android:hint="请选择从业状况" />
             </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
                 style="@style/register_item_container"
                 android:gravity="center_vertical">
@@ -347,7 +273,9 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:orientation="horizontal">
+                    android:gravity="right"
+                    android:orientation="horizontal"
+                    android:paddingRight="20dp">
 
                     <RadioButton
                         android:id="@+id/rb_true"
@@ -355,6 +283,7 @@
                         android:layout_height="wrap_content"
                         android:button="@drawable/sel_radio_red"
                         android:checked="true"
+                        android:paddingLeft="10dp"
                         android:text="是" />
 
                     <RadioButton
@@ -363,63 +292,189 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="30dp"
                         android:button="@drawable/sel_radio_red"
+                        android:paddingLeft="10dp"
                         android:text="否" />
                 </RadioGroup>
             </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
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="90dp"
-                android:background="@color/gray_line" />
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:background="@color/gray_line_deep" />
 
 
             <LinearLayout style="@style/register_item_container">
 
                 <TextView
-                    android:id="@+id/tv_expert_area_title"
+                    android:id="@+id/tv_service_area_title"
                     style="@style/register_text_title"
-                    android:text="服务领域或行业:" />
+                    android:text="服务区域:" />
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rlv_export_area_content"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1" />
+                <TextView
+                    android:id="@+id/tv_service_area_content"
+                    style="@style/register_text_sel"
+                    android:drawablePadding="10dp"
+                    android:gravity="right"
+                    android:hint="请选择服务区域" />
             </LinearLayout>
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="90dp"
-                android:background="@color/gray_line" />
+                android:layout_marginLeft="10dp"
+                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
                 style="@style/register_item_container"
                 android:visibility="visible">
 
                 <TextView
-                    android:id="@+id/tv_remark_title"
+                    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: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="备注:" />
 
                 <EditText
                     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:minLines="3" />
             </LinearLayout>
diff --git a/modulecultural/src/main/res/layout/activity_register_volunteer_team.xml b/modulecultural/src/main/res/layout/activity_register_volunteer_team.xml
index 1f33e79..a631f01 100755
--- a/modulecultural/src/main/res/layout/activity_register_volunteer_team.xml
+++ b/modulecultural/src/main/res/layout/activity_register_volunteer_team.xml
@@ -1,7 +1,5 @@
 <?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">
@@ -21,9 +19,18 @@
             <EditText
                 android:id="@+id/et_team_name"
                 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">
 
             <TextView
@@ -34,10 +41,19 @@
             <EditText
                 android:id="@+id/et_team_count"
                 style="@style/register_input"
+                android:background="@null"
+                android:gravity="right"
                 android:hint="请输入团队限制人数"
                 android:inputType="number" />
         </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="gone">
@@ -53,6 +69,7 @@
                 android:hint="请选择团队成员" />
         </LinearLayout>
 
+
         <LinearLayout style="@style/register_item_container">
 
             <TextView
@@ -63,19 +80,31 @@
             <TextView
                 android:id="@+id/tv_area"
                 style="@style/register_text_sel"
-                android:hint="请选择所属区域" />
+                android:drawablePadding="10dp"
+                android:gravity="right"
+                android:hint="请选择所属区域"
+                android:paddingRight="0dp" />
         </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
                 android:id="@+id/tv_team_desc_title"
-                style="@style/register_text_title"
+                style="@style/register_text_title_ver"
                 android:text="团队介绍:" />
 
             <EditText
                 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:hint="请输入团队介绍"
                 android:minLines="5" />
diff --git a/modulecultural/src/main/res/layout/activity_vounteer_publish.xml b/modulecultural/src/main/res/layout/activity_vounteer_publish.xml
index ee955d5..04bf13c 100755
--- a/modulecultural/src/main/res/layout/activity_vounteer_publish.xml
+++ b/modulecultural/src/main/res/layout/activity_vounteer_publish.xml
@@ -22,9 +22,19 @@
             <TextView
                 android:id="@+id/tv_choose_area"
                 style="@style/register_text_sel"
-                android:hint="请选择活动区域" />
+                android:drawablePadding="10dp"
+                android:gravity="right"
+                android:hint="请选择活动区域"
+                android:paddingRight="0dp" />
         </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">
 
             <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
@@ -35,9 +45,18 @@
             <EditText
                 android:id="@+id/et_name"
                 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">
 
             <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
@@ -47,9 +66,18 @@
             <EditText
                 android:id="@+id/et_contact_name"
                 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">
 
             <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
@@ -59,10 +87,19 @@
             <EditText
                 android:id="@+id/et_phone"
                 style="@style/register_input"
+                android:background="@null"
+                android:gravity="right"
                 android:hint="请输入联系方式"
                 android:inputType="number" />
         </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">
 
             <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
@@ -72,38 +109,56 @@
             <EditText
                 android:id="@+id/et_peo_count"
                 style="@style/register_input"
+                android:background="@null"
+                android:gravity="right"
                 android:hint="请输入活动人数限制"
                 android:inputType="number" />
         </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
-                style="@style/register_text_title"
+                style="@style/register_text_title_ver"
                 android:text="活动简介:" />
 
             <EditText
                 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:hint="请输入活动简介"
                 android:minLines="5" />
         </LinearLayout>
 
-        <LinearLayout style="@style/register_item_container">
+
+        <LinearLayout style="@style/register_item_container_ver">
 
             <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
-                style="@style/register_text_title"
+                style="@style/register_text_title_ver"
                 android:text="服务内容:" />
 
             <EditText
                 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:hint="请输入服务内容"
                 android:minLines="5" />
         </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">
 
@@ -114,10 +169,18 @@
             <EditText
                 android:id="@+id/et_request"
                 style="@style/register_input"
-                android:gravity="left"
+                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">
 
             <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
@@ -127,10 +190,18 @@
             <EditText
                 android:id="@+id/et_service_awards"
                 style="@style/register_input"
-                android:gravity="left"
+                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">
 
             <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
@@ -141,9 +212,19 @@
             <TextView
                 android:id="@+id/tv_start_time_content"
                 style="@style/register_text_sel"
-                android:hint="请选择开始时间" />
+                android:drawablePadding="10dp"
+                android:gravity="right"
+                android:hint="请选择开始时间"
+                android:paddingRight="0dp" />
         </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">
 
             <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
@@ -153,9 +234,19 @@
             <TextView
                 android:id="@+id/tv_end_time_content"
                 style="@style/register_text_sel"
-                android:hint="请选择结束时间" />
+                android:drawablePadding="10dp"
+                android:gravity="right"
+                android:hint="请选择结束时间"
+                android:paddingRight="0dp" />
         </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">
 
             <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
@@ -168,7 +259,9 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:orientation="horizontal">
+                android:gravity="right"
+                android:orientation="horizontal"
+                android:paddingRight="10dp">
 
                 <RadioButton
                     android:id="@+id/rb_service_single"
@@ -176,17 +269,27 @@
                     android:layout_height="wrap_content"
                     android:button="@drawable/sel_radio_red"
                     android:checked="true"
+                    android:paddingLeft="10dp"
                     android:text="志愿者" />
 
                 <RadioButton
                     android:id="@+id/rb_service_team"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
                     android:button="@drawable/sel_radio_red"
+                    android:paddingLeft="10dp"
                     android:text="志愿团队" />
             </RadioGroup>
         </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
             android:id="@+id/ll_choose_team"
             style="@style/register_item_container">
@@ -199,22 +302,32 @@
             <TextView
                 android:id="@+id/tv_choose_team"
                 style="@style/register_text_sel"
-                android:hint="请选择志愿者团队" />
+                android:drawablePadding="10dp"
+                android:gravity="right"
+                android:hint="请选择志愿者团队"
+                android:paddingRight="0dp" />
         </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
                 android:id="@+id/tv_photos_title"
-                style="@style/register_text_title"
+                style="@style/register_text_title_ver"
                 android:layout_gravity="center_vertical"
                 android:text="宣传照片:" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rlv_photos"
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1" />
+                android:layout_marginTop="5dp" />
         </LinearLayout>
 
         <LinearLayout
diff --git a/modulecultural/src/main/res/values/styles.xml b/modulecultural/src/main/res/values/styles.xml
index 26d477d..9011048 100755
--- a/modulecultural/src/main/res/values/styles.xml
+++ b/modulecultural/src/main/res/values/styles.xml
@@ -7,7 +7,19 @@
         <item name="android:layout_marginLeft">10dp</item>
         <item name="android:layout_marginRight">10dp</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:paddingBottom">5dp</item>
         <item name="android:paddingLeft">5dp</item>
@@ -23,13 +35,19 @@
         <item name="android:textSize">12sp</item>
     </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">
         <item name="android:layout_width">0dp</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:background">@drawable/shape_bottom_line</item>
         <item name="android:clickable">true</item>
         <item name="android:focusable">true</item>
         <item name="android:drawableRight">@drawable/ic_arrow_yellow_down</item>
@@ -67,6 +85,13 @@
         <item name="android:padding">8dp</item>
     </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">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
diff --git a/moduleijkplayer/src/main/java/com/tengshisoft/moduleijkplayer/controller/AudioControlView.java b/moduleijkplayer/src/main/java/com/tengshisoft/moduleijkplayer/controller/AudioControlView.java
new file mode 100755
index 0000000..ab4fb25
--- /dev/null
+++ b/moduleijkplayer/src/main/java/com/tengshisoft/moduleijkplayer/controller/AudioControlView.java
@@ -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));
+    }
+}
diff --git a/moduleijkplayer/src/main/res/layout/dkplayer_layout_audio_control_view.xml b/moduleijkplayer/src/main/res/layout/dkplayer_layout_audio_control_view.xml
new file mode 100755
index 0000000..6b5dd4b
--- /dev/null
+++ b/moduleijkplayer/src/main/res/layout/dkplayer_layout_audio_control_view.xml
@@ -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>
\ No newline at end of file
diff --git a/modulemain/build.gradle b/modulemain/build.gradle
index 065b803..3f65c5d 100755
--- a/modulemain/build.gradle
+++ b/modulemain/build.gradle
@@ -41,6 +41,7 @@ dependencies {
     implementation project(':moduleactivity')
     implementation project(':modulecultural')
     implementation project(':moduleshop')
+    implementation project(':moduleijkplayer')
     implementation files('libs/BaiduLBS_Android.jar')
     implementation 'androidx.appcompat:appcompat:1.1.0'
     testImplementation 'junit:junit:4.12'
diff --git a/modulemain/src/main/AndroidManifest.xml b/modulemain/src/main/AndroidManifest.xml
index d7135a9..0353622 100755
--- a/modulemain/src/main/AndroidManifest.xml
+++ b/modulemain/src/main/AndroidManifest.xml
@@ -18,9 +18,11 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- Required -->
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <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" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS"
+    <uses-permission
+        android:name="android.permission.WRITE_SETTINGS"
         tools:ignore="ProtectedPermissions" /> <!-- Optional. Required for location feature -->
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
@@ -31,31 +33,37 @@
     <application
         android:maxAspectRatio="2.4"
         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
             android:name=".cultural.activitys.news.NewsWebActivity"
             android:configChanges="keyboardHidden|orientation|screenSize|screenLayout"
-            android:launchMode="singleTop"
             android:exported="false"
+            android:launchMode="singleTop"
             android:screenOrientation="portrait" />
         <activity
             android:name=".cultural.activitys.news.NewsPdfActivity"
-            android:launchMode="singleTop"
             android:exported="false"
+            android:launchMode="singleTop"
             android:screenOrientation="portrait" />
         <activity
             android:name=".cultural.activitys.base.ChooseCityActivity"
-            android:launchMode="singleTop"
             android:exported="false"
+            android:launchMode="singleTop"
             android:screenOrientation="portrait" />
         <activity
             android:name=".cultural.activitys.base.ForgatPwdActivity"
-            android:launchMode="singleTop"
             android:exported="false"
+            android:launchMode="singleTop"
             android:screenOrientation="portrait" />
         <activity
             android:name=".cultural.activitys.base.RegisterActivity"
-            android:launchMode="singleTop"
             android:exported="false"
+            android:launchMode="singleTop"
             android:screenOrientation="portrait" />
 
         <meta-data
@@ -75,8 +83,8 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".cultural.activitys.base.DemoActivity"
-            android:launchMode="singleTop"
             android:exported="false"
+            android:launchMode="singleTop"
             android:screenOrientation="portrait" />
         <activity
             android:name=".cultural.activitys.news.NewsDetailActivity"
@@ -85,13 +93,13 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".cultural.activitys.base.LoginActivity"
-            android:launchMode="singleTop"
             android:exported="false"
+            android:launchMode="singleTop"
             android:screenOrientation="portrait" />
         <activity
             android:name=".cultural.activitys.base.MainActivity"
-            android:launchMode="singleTask"
             android:exported="false"
+            android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
             android:name=".cultural.activitys.news.NewsListActivity"
@@ -100,8 +108,8 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".cultural.activitys.base.SplashActivity"
-            android:screenOrientation="portrait"
             android:exported="true"
+            android:screenOrientation="portrait"
             android:theme="@style/LaunchTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsDetailActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsDetailActivity.java
index 249fde2..33e02cc 100755
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsDetailActivity.java
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsDetailActivity.java
@@ -39,6 +39,7 @@ import com.google.gson.Gson;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.sucstepsoft.cm_utils.constant.PathConfig;
 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.RetrofitManager;
 import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
@@ -349,6 +350,39 @@ public class NewsDetailActivity extends BaseActivity {
                         .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() {
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsListActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsListActivity.java
index f76fc52..4aec250 100755
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsListActivity.java
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsListActivity.java
@@ -1,17 +1,14 @@
 package com.tengshisoft.mudulemain.cultural.activitys.news;
 
 import android.graphics.Color;
-import android.os.Bundle;
 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.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.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.core.retrofit_net.BaseUrlApi;
 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.R2;
 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.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 java.util.ArrayList;
 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.ButterKnife;
 import butterknife.Unbinder;
@@ -62,6 +47,7 @@ public class NewsListActivity extends BaseActivity {
     private int mTotalPage = 0;
     private int mCurrentPage = 1;
     private String mType;
+    private String mPId;
 
     @Override
     protected int setLayoutId() {
@@ -72,6 +58,7 @@ public class NewsListActivity extends BaseActivity {
     public void initData() {
         mBind = ButterKnife.bind(this);
         mType = getIntent().getStringExtra("id");
+        mPId = getIntent().getStringExtra("pId");
         String title = getIntent().getStringExtra("title");
         mTvBaseTitle.setText(title);
         mAdapter = new NewsAdapter(mActivity, mNewsDatas);
@@ -113,7 +100,7 @@ public class NewsListActivity extends BaseActivity {
     private void getNewsListByType(int page) {
         RetrofitManager.getInstance()
                 .create(HomeApi.class)
-                .getNewsList(mType, page + "")
+                .getNewsList("", mPId, page + "")
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Observer<NewsItemBean>() {
@@ -293,7 +280,7 @@ public class NewsListActivity extends BaseActivity {
     private void getNewsListByTypeToken(int page) {
         RetrofitManager.getInstance()
                 .create(HomeApi.class)
-                .getNewsListByToken(mType, page + "", UserLgUtils.getToken())
+                .getNewsListByToken("", mPId, page + "", UserLgUtils.getToken())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Observer<NewsItemBean>() {
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsLocalDetailActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsLocalDetailActivity.java
new file mode 100644
index 0000000..2f50301
--- /dev/null
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsLocalDetailActivity.java
@@ -0,0 +1,1244 @@
+package com.tengshisoft.mudulemain.cultural.activitys.news;
+
+import android.app.AlertDialog;
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.database.Cursor;
+import android.graphics.Color;
+import android.net.Uri;
+import android.net.http.SslError;
+import android.os.Build;
+import android.os.Environment;
+import android.provider.MediaStore;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.View;
+import android.webkit.HttpAuthHandler;
+import android.webkit.JsResult;
+import android.webkit.SslErrorHandler;
+import android.webkit.WebChromeClient;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.core.content.FileProvider;
+import androidx.core.widget.NestedScrollView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.bumptech.glide.Glide;
+import com.ethanhua.skeleton.Skeleton;
+import com.ethanhua.skeleton.ViewSkeletonScreen;
+import com.google.gson.Gson;
+import com.scwang.smartrefresh.layout.SmartRefreshLayout;
+import com.sucstepsoft.cm_utils.constant.PathConfig;
+import com.sucstepsoft.cm_utils.core.beans.AddPhotoBean;
+import com.sucstepsoft.cm_utils.core.beans.BaseImageBean;
+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.RetrofitManager;
+import com.sucstepsoft.cm_utils.core.widget.base.BannerImageTextAllAdapter;
+import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
+import com.sucstepsoft.cm_utils.core.widget.views.BottomDialogShareView;
+import com.sucstepsoft.cm_utils.core.widget.views.ButtomDialogCommentView;
+import com.sucstepsoft.cm_utils.core.widget.views.ButtomDialogView;
+import com.sucstepsoft.cm_utils.core.widget.views.ItemSplitDivider;
+import com.sucstepsoft.cm_utils.core.widget.views.NestedScrollWebView;
+import com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView;
+import com.sucstepsoft.cm_utils.utils.ExceptionHandler;
+import com.sucstepsoft.cm_utils.utils.FileUtils;
+import com.sucstepsoft.cm_utils.utils.LogUtils;
+import com.sucstepsoft.cm_utils.utils.ProiderUtil;
+import com.sucstepsoft.cm_utils.utils.TimeUtils;
+import com.sucstepsoft.cm_utils.utils.UIUtil;
+import com.sucstepsoft.cm_utils.utils.UserLgUtils;
+import com.sucstepsoft.cm_utils.utils.toast.ToastUtils;
+import com.tengshisoft.moduleijkplayer.player.VideoView;
+import com.tengshisoft.mudulemain.R;
+import com.tengshisoft.mudulemain.R2;
+import com.tengshisoft.mudulemain.cultural.adapter.CommentAdapter;
+import com.tengshisoft.mudulemain.cultural.beans.BaseUserBean;
+import com.tengshisoft.mudulemain.cultural.beans.CollectBean;
+import com.tengshisoft.mudulemain.cultural.beans.CommentListBean;
+import com.tengshisoft.mudulemain.cultural.beans.CommentPublishBean;
+import com.tengshisoft.mudulemain.cultural.beans.LikeBean;
+import com.tengshisoft.mudulemain.cultural.beans.NewsDetailBean;
+import com.tengshisoft.mudulemain.cultural.net.HomeApi;
+import com.tengshisoft.mudulemain.cultural.widget.ButtomCommentListDialogView;
+import com.youth.banner.Banner;
+import com.youth.banner.transformer.ScaleInTransformer;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+import cn.jiguang.share.android.api.JShareInterface;
+import cn.jiguang.share.android.api.PlatActionListener;
+import cn.jiguang.share.android.api.Platform;
+import cn.jiguang.share.android.api.ShareParams;
+import cn.jiguang.share.qqmodel.QQ;
+import cn.jiguang.share.wechat.Wechat;
+import cn.jiguang.share.wechat.WechatMoments;
+import cn.jiguang.share.weibo.SinaWeibo;
+import io.reactivex.Observable;
+import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.Observer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
+import okhttp3.MediaType;
+import okhttp3.MultipartBody;
+import okhttp3.RequestBody;
+import top.zibin.luban.Luban;
+import top.zibin.luban.OnCompressListener;
+
+/**
+ * 新闻详情页面--接口方式
+ */
+@Route(path = PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)
+public class NewsLocalDetailActivity extends BaseActivity {
+    @BindView(R2.id.tv_input_comment)
+    TextView mTvInputComment;
+    @BindView(R2.id.iv_collect)
+    ImageView mIvCollect;
+    @BindView(R2.id.iv_share)
+    ImageView mIvShare;
+    @BindView(R2.id.nsl_content)
+    NestedScrollView mNslContent;
+    @BindView(R2.id.ll_news_content)
+    LinearLayout mLlNewsContent;
+    @BindView(R2.id.rlv_comment)
+    RecyclerView mRlvComment;
+    @BindView(R2.id.srl_content)
+    SmartRefreshLayout mSrlContent;
+    @BindView(R2.id.ll_input_comment)
+    LinearLayout mLlComment;
+    @BindView(R2.id.nwv_content)
+    NestedScrollWebView mWvContent;//文章 pdf  连接
+    @BindView(R2.id.ll_video)
+    LinearLayout mLlVideo;//视频
+    @BindView(R2.id.vv_video)
+    VideoView mVideo;
+    @BindView(R2.id.rlv_video_category)
+    RecyclerView mRlvVideoCategory;
+    @BindView(R2.id.tv_video_txt)
+    TypeFaceTextView mTvVideoTxt;
+    @BindView(R2.id.rl_img)
+    RelativeLayout mRlImg;//图片
+    @BindView(R2.id.bn_img)
+    Banner mBnImg;
+    @BindView(R2.id.tv_title)
+    TypeFaceTextView mTvTitle;
+    @BindView(R2.id.tv_source)
+    TypeFaceTextView mTvSource;
+    @BindView(R2.id.tv_time)
+    TypeFaceTextView mTvPublishTime;
+    @BindView(R2.id.ll_title_view)
+    LinearLayout mLlTitleView;
+
+
+    private AddPhotoBean mCurrentBean;
+    private String mPicPath;
+    private Unbinder mBind;
+    private ButtomDialogCommentView mCommentView;
+    private List<CommentListBean.RowsBean> mCommentDatas;
+    private CommentAdapter mAdapter;
+    private int mCommentPage = 1;
+    private int mCommentTotalSize = 0;
+    private String mNId;
+    private Disposable mDisposable;
+    private Disposable mLikeDisposable;
+    private String mIsCommentImg;
+    private String mIsComment;
+    private ButtomCommentListDialogView mItemCommentDialog;
+    private String mIsCollect;
+    private ViewSkeletonScreen mContentSkeleton;
+    private String mUrl;
+    private int mType;
+    private String mTitle;
+    private String mPhoto;
+    private File mDestFile;
+
+    @Override
+    protected int setLayoutId() {
+        return R.layout.activity_news_local_detail;
+    }
+
+
+    @Override
+    public void initData() {
+        super.initData();
+        mBind = ButterKnife.bind(this);
+        refreshView(STATE_LOAD_LOADING);
+        mTvBaseTitle.setText("详情");
+        mContentSkeleton = Skeleton.bind(mLlNewsContent)
+                .load(R.layout.item_skeleton_news_content_local)
+                .show();
+        mNId = getIntent().getStringExtra("id");
+        mUrl = getIntent().getStringExtra("url");
+        mTitle = getIntent().getStringExtra("title");
+        mPhoto = getIntent().getStringExtra("photo");
+        if (!TextUtils.isEmpty(mPhoto) && !mPhoto.endsWith("/")) {
+            Observable.create((ObservableOnSubscribe<File>) emitter -> {
+                        emitter.onNext(Glide.with(mActivity)
+                                .asFile()
+                                .load(mPhoto)
+                                .submit(300, 300)
+                                .get());
+                        emitter.onComplete();
+                    }).subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(new Observer<File>() {
+                        @Override
+                        public void onSubscribe(Disposable d) {
+
+                        }
+
+                        @Override
+                        public void onNext(File file) {
+
+                            File externalFilesDir = getExternalFilesDir(Environment.DIRECTORY_PICTURES);
+                            String fileName = System.currentTimeMillis() + ".jpg";
+                            mDestFile = new File(externalFilesDir, fileName);
+                            FileUtils.copyFile(file, mDestFile);
+                        }
+
+                        @Override
+                        public void onError(Throwable e) {
+
+                        }
+
+                        @Override
+                        public void onComplete() {
+
+                        }
+                    });
+        }
+        //是否可以评论
+        mIsComment = getIntent().getStringExtra("isComment");
+        if ("0".equals(mIsComment)) {
+            RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mSrlContent.getLayoutParams();
+            params.bottomMargin = 0;
+            mSrlContent.setLayoutParams(params);
+            mLlComment.setVisibility(View.GONE);
+        }
+        //评论是否可以上传照片
+        mIsCommentImg = getIntent().getStringExtra("isCommentImg");
+        mIsCollect = getIntent().getStringExtra("isCollect");
+        if ("0".equals(mIsCollect)) {
+            //未收藏
+            mIvCollect.setImageResource(R.drawable.ic_collect);
+        } else {
+            //已经搜藏
+            mIvCollect.setImageResource(R.drawable.ic_collect_check);
+        }
+        mIvShare.setOnClickListener(v -> showShareDialog());
+
+        mCommentDatas = new ArrayList<>();
+        mAdapter = new CommentAdapter(mActivity, mCommentDatas, true);
+        mAdapter.addShowPhotoListener(path -> {
+            ArrayList lis = new ArrayList();
+            lis.add(path);
+            ARouter.getInstance().build(PathConfig.PATH_MODULE_CAMERA_SHOW_IMG).withStringArrayList("imgUrls", lis).navigation();
+        });
+        LinearLayoutManager manager = new LinearLayoutManager(mActivity, LinearLayoutManager.VERTICAL, false);
+        mRlvComment.setLayoutManager(manager);
+        mRlvComment.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1,
+                Color.parseColor("#F2F2F2")));
+        mRlvComment.setAdapter(mAdapter);
+        mSrlContent.setEnableRefresh(false);
+        mAdapter.addCommentListener(this::doCommentItem);
+        mAdapter.addDelListener(this::doDelComment);
+        mAdapter.addLikeListener((bean, pos, view) -> {
+            if (mLikeDisposable != null && !mLikeDisposable.isDisposed()) {
+                //正在网络请求
+            } else {
+                if (!TextUtils.isEmpty(UserLgUtils.getToken())) {
+                    doLike(bean, pos);
+                } else {
+                    ARouter.getInstance()
+                            .build(PathConfig.PATH_MODULE_MAIN_LOGIN)
+                            .navigation();
+                }
+            }
+        });
+        mSrlContent.setOnLoadMoreListener(refreshLayout -> loadMoreData());
+        if (TextUtils.isEmpty(mNId)) {
+            refreshView(STATE_LOAD_ERROR);
+        }
+
+        mTvInputComment.setOnClickListener(v -> {
+            if (!TextUtils.isEmpty(UserLgUtils.getToken())) {
+                showCommentDialog();
+            } else {
+                ARouter.getInstance()
+                        .build(PathConfig.PATH_MODULE_MAIN_LOGIN)
+                        .navigation();
+            }
+        });
+        mIvCollect.setOnClickListener(v -> {
+            if (!TextUtils.isEmpty(UserLgUtils.getToken())) {
+                doCollect(mNId);
+            } else {
+                ARouter.getInstance()
+                        .build(PathConfig.PATH_MODULE_MAIN_LOGIN)
+                        .navigation();
+            }
+        });
+        getNewsDetail();
+        doSaveRead();
+    }
+
+    /**
+     * 保存浏览量
+     */
+    private void doSaveRead() {
+        RetrofitManager.getInstance()
+                .create(HomeApi.class)
+                .doSaveRead("APP" + 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 getNewsDetail() {
+        RetrofitManager.getInstance()
+                .create(HomeApi.class)
+                .getNewsDetail(mNId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<NewsDetailBean>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+
+                    }
+
+                    @Override
+                    public void onNext(NewsDetailBean newsDetailBean) {
+                        if (!"".equals(newsDetailBean.getNewsContentId())) {
+                            setDataToView(newsDetailBean);
+                        } else {
+                            refreshView(STATE_LOAD_ERROR);
+                        }
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        ExceptionHandler.handleException(e);
+                        refreshView(STATE_LOAD_ERROR);
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+    }
+
+    /**
+     * 加载详情数据
+     *
+     * @param newsDetailBean
+     */
+    private void setDataToView(NewsDetailBean newsDetailBean) {
+        if (mContentSkeleton != null) {
+            mContentSkeleton.hide();
+        }
+        //判断是什么类型新闻
+        //newsContentType  1 文章   2图片  3音频 4视频  5PDF  6链接
+        switch (newsDetailBean.getNewsContentType()) {
+            case "2": //图片
+                createImgView(newsDetailBean);
+                break;
+            case "3"://音频
+                break;
+            case "4"://视频
+                break;
+            case "5"://PDF
+                break;
+            case "6"://6链接
+                break;
+            case "1":
+            default:
+                mLlTitleView.setVisibility(View.VISIBLE);
+                mTvTitle.setText(newsDetailBean.getNewsContentTitle());
+                if (!TextUtils.isEmpty(newsDetailBean.getNewsContentResource())) {
+                    mTvSource.setText("新闻来源:" + newsDetailBean.getNewsContentResource());
+                }
+                if (!TextUtils.isEmpty(newsDetailBean.getNewsContentPublishTime())) {
+                    mTvPublishTime.setText("发布时间:" + newsDetailBean.getNewsContentPublishTime());
+                }
+                createWebView(newsDetailBean);
+                break;
+        }
+    }
+
+    private void showShareDialog() {
+        BottomDialogShareView shareView = new BottomDialogShareView.DialogBuilder(mActivity).build();
+        shareView.addOnChoseListener(new BottomDialogShareView.OnChoseListener() {
+            @Override
+            public void shareWeChart() {
+                shareToPlatform(1);
+            }
+
+            @Override
+            public void shareWeibo() {
+                shareToPlatform(2);
+            }
+
+            @Override
+            public void shareQQ() {
+                shareToPlatform(3);
+            }
+
+            @Override
+            public void shareMoment() {
+                shareToPlatform(4);
+            }
+        });
+        shareView.show();
+    }
+
+    private void shareToPlatform(int type) {
+        if (mType != 0) {
+            ToastUtils.showShort("该资讯不支持分享");
+        } else {
+            ShareParams params = new ShareParams();
+            if (type == 4) {
+                params.setTitle(mTitle);
+                params.setText("日喀则市数字文化云");
+            } else {
+                params.setTitle("日喀则市数字文化云");
+                params.setText(mTitle);
+            }
+            params.setShareType(Platform.SHARE_WEBPAGE);
+            params.setUrl(BaseUrlApi.BASE_NEWS_DETAIL + mUrl);
+            if (mDestFile != null) {
+                params.setImagePath(mDestFile.getAbsolutePath());
+            } else {
+                File externalFilesDir = mActivity.getExternalFilesDir(Environment.DIRECTORY_PICTURES);
+                String imgPath = externalFilesDir.getAbsolutePath() + File.separator + "sharelocalImg.png";
+                params.setImagePath(imgPath);
+            }
+            String platFormName = "";
+            if (type == 1) {
+                platFormName = Wechat.Name;
+            } else if (type == 2) {
+                platFormName = SinaWeibo.Name;
+
+            } else if (type == 3) {
+                platFormName = QQ.Name;
+            } else if (type == 4) {
+                platFormName = WechatMoments.Name;
+            } else {
+                platFormName = Wechat.Name;
+            }
+            JShareInterface.share(platFormName, params, new PlatActionListener() {
+                @Override
+                public void onComplete(Platform platform, int i, HashMap<String, Object> hashMap) {
+                }
+
+                @Override
+                public void onError(Platform platform, int i, int i1, Throwable throwable) {
+                    if (!TextUtils.isEmpty(throwable.getMessage()) && throwable.getMessage().contains("not install " +
+                            "app")) {
+                        String name = "微信";
+                        if (type == 1) {
+                            name = "微信";
+                        } else if (type == 2) {
+                            name = "微博";
+                        } else {
+                            name = "QQ";
+                        }
+                        ToastUtils.showShort("您还未安装" + name);
+                    }
+                }
+
+                @Override
+                public void onCancel(Platform platform, int i) {
+                    LogUtils.e("cancel");
+                }
+            });
+        }
+    }
+
+    /**
+     * 加载文章新闻
+     */
+    private void createWebView(NewsDetailBean b) {
+        mWvContent.setVisibility(View.VISIBLE);
+        WebSettings settings = mWvContent.getSettings();
+        settings.setCacheMode(WebSettings.LOAD_DEFAULT);
+        settings.setAppCacheEnabled(true);
+//        settings.setJavaScriptCanOpenWindowsAutomatically(true);
+//        settings.setBuiltInZoomControls(false);//显示放大缩小按钮(不支持已经适配好移动端的页面)
+        settings.setJavaScriptEnabled(true);//启用JS
+//        settings.setUseWideViewPort(true);  //双击缩放
+        settings.setBlockNetworkImage(true);//阻塞页面图片加载
+        settings.setDomStorageEnabled(true);
+//        settings.setLoadsImagesAutomatically(true);
+//        settings.setAllowFileAccess(true);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+        }
+        String data = b.getNewsContentContent();
+        mWvContent.loadData(data, "text/html", "utf-8");
+        mWvContent.setWebViewClient(new WebViewClient() {
+            @Override
+            public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+                handler.proceed();
+            }
+
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                super.onPageFinished(view, url);
+                mContentSkeleton.hide();
+                view.getSettings().setBlockNetworkImage(false);//开启页面图片加载
+                runOnUiThread(() -> mWvContent.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)));
+            }
+
+            @Override
+            public void onReceivedHttpAuthRequest(WebView view, HttpAuthHandler handler, String host, String realm) {
+                super.onReceivedHttpAuthRequest(view, handler, host, realm);
+
+            }
+
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                if (url.contains(BaseUrlApi.BASE_SYSTEM_IP + "news/route/file/download/true")) {
+                    //TODO 数图资源
+                    ARouter.getInstance()
+                            .build(PathConfig.PATH_MODULE_MAIN_NEWS_PDF)
+                            .withString("title", mTitle)
+                            .withString("url", url)
+                            .navigation();
+                } else {
+                    view.loadUrl(url);
+                }
+                return true;
+            }
+        });
+        mWvContent.setWebChromeClient(new WebChromeClient() {
+
+            @Override
+            public boolean onJsAlert(WebView view, String url, String message, JsResult result) {
+                return super.onJsAlert(view, url, message, result);
+            }
+        });
+    }
+
+    /**
+     * 加载音频新闻
+     */
+    private void createAudioView() {
+
+    }
+
+    /**
+     * 加载视频新闻
+     */
+    private void createVideoView() {
+
+    }
+
+    /**
+     * 加载图片新闻
+     */
+    private void createImgView(NewsDetailBean b) {
+        mRlImg.setVisibility(View.VISIBLE);
+        List<BaseImageBean> mBannerList = new ArrayList<>();
+        for (int i = 0; i < b.getFileList().size(); i++) {
+            NewsDetailBean.FileListBean fileListBean = b.getFileList().get(i);
+            BaseImageBean bannerBean = new BaseImageBean();
+//            bannerBean.setPhoto(BaseUrlApi.BASE_NEWS_IMG_URL + fileListBean.getContentFileFileId());
+            if (i / 2 == 0) {
+//                bannerBean.setPhoto(BaseUrlApi.BASE_NEWS_IMG_URL + fileListBean.getContentFileFileId());
+                bannerBean.setImgUrl("https://lmg.jj20.com/up/allimg/tp08/46042223542701-lp.jpg");
+            } else {
+                bannerBean.setImgUrl("https://www.ssfiction.com/wp-content/uploads/2020/08/20200805_5f2b1669e9a24.jpg");
+            }
+            bannerBean.setName(fileListBean.getContentFileText());
+            mBannerList.add(bannerBean);
+        }
+        BannerImageTextAllAdapter mBannerImageAdapter = new BannerImageTextAllAdapter(mBannerList);
+        mBnImg.setAdapter(mBannerImageAdapter);
+        mBnImg.setPageTransformer(new ScaleInTransformer());
+        mBnImg.setDelayTime(10000L);
+        mBnImg.start();
+    }
+
+    /**
+     * 收藏新闻
+     *
+     * @param nId
+     */
+    private void doCollect(String nId) {
+        ProgressDialog dialog = UIUtil.initDialog(mActivity, "收藏中...");
+        dialog.show();
+        CollectBean bean = new CollectBean();
+        bean.setNewsContentId(nId);
+        Gson gson = new Gson();
+        String obj = gson.toJson(bean);
+        RequestBody body = RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), obj);
+        RetrofitManager.getInstance()
+                .create(HomeApi.class)
+                .doCollectNews(body, UserLgUtils.getToken())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<BaseUserBean>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+
+                    }
+
+                    @Override
+                    public void onNext(BaseUserBean baseUserBean) {
+                        dialog.dismiss();
+                        ToastUtils.showShort("收藏成功");
+                        if ("0".equals(mIsCollect)) {
+                            //未收藏
+                            mIvCollect.setImageResource(R.drawable.ic_collect_check);
+                        } else {
+                            //已经搜藏
+                            mIvCollect.setImageResource(R.drawable.ic_collect);
+                        }
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        dialog.dismiss();
+                        ExceptionHandler.handleException(e);
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+    }
+
+
+    /**
+     * 删除自己的评论
+     *
+     * @param bean
+     * @param pos
+     */
+    private void doDelComment(CommentListBean.RowsBean bean, int pos) {
+        new AlertDialog.Builder(mActivity)
+                .setMessage("确定要删除这条评论吗?")
+                .setTitle("提示")
+                .setPositiveButton("确定", (dialog, which) -> {
+                    dialog.dismiss();
+                    ProgressDialog pDialog = UIUtil.initDialog(mActivity, "删除中...");
+                    pDialog.show();
+                    RetrofitManager.getInstance()
+                            .create(HomeApi.class)
+                            .doDelComment(bean.getNewsCommentId(), UserLgUtils.getToken())
+                            .subscribeOn(Schedulers.io())
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(new Observer<BaseUserBean>() {
+                                @Override
+                                public void onSubscribe(Disposable d) {
+
+                                }
+
+                                @Override
+                                public void onNext(BaseUserBean baseUserBean) {
+                                    pDialog.dismiss();
+                                    mCommentDatas.remove(pos);
+                                    mAdapter.notifyItemRemoved(pos);
+                                }
+
+                                @Override
+                                public void onError(Throwable e) {
+                                    pDialog.dismiss();
+                                    ExceptionHandler.handleException(e);
+                                }
+
+                                @Override
+                                public void onComplete() {
+
+                                }
+                            });
+                })
+                .setNegativeButton("取消", (dialog, which) -> dialog.dismiss()).create().show();
+    }
+
+
+    private void doCommentItem(CommentListBean.RowsBean bean, int pos, View v) {
+        showItemCommentDialog(bean, pos, v);
+    }
+
+    private void showItemCommentDialog(CommentListBean.RowsBean bean, int pos, View v) {
+        mItemCommentDialog = new ButtomCommentListDialogView.DialogBuilder(mActivity)
+                .setCommentBean(bean)
+                .setIscancelable(true)
+                .setActivity(NewsLocalDetailActivity.this)
+                .setIsShowOther(true)
+                .setIsShowImg(mIsCommentImg)
+                .setIsBackCancelable(true)
+                .setAdapter(mAdapter)
+                .setPosition(pos)
+                .build();
+        mItemCommentDialog.show();
+    }
+
+    /**
+     * 点赞
+     *
+     * @param rowsBean
+     * @param pos
+     */
+    private void doLike(CommentListBean.RowsBean rowsBean, int pos) {
+        LikeBean bean = new LikeBean();
+        bean.setNewsCommentId(rowsBean.getNewsCommentId());
+        Gson gson = new Gson();
+        String obj = gson.toJson(bean);
+        RequestBody body = RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), obj);
+        RetrofitManager.getInstance()
+                .create(HomeApi.class)
+                .doSaveLike(body, UserLgUtils.getToken())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<BaseUserBean>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+                        mLikeDisposable = d;
+                    }
+
+                    @Override
+                    public void onNext(BaseUserBean baseUserBean) {
+                        if (TextUtils.isEmpty(rowsBean.getCommentLikeStatus())) {
+                            //之前未点赞
+                            rowsBean.setCommentLikeStatus("1");
+                            rowsBean.setCommentLikeCount(rowsBean.getCommentLikeCount() + 1);
+                        } else {
+                            if ("0".equals(rowsBean.getCommentLikeStatus())) {
+                                //之前未点赞
+                                rowsBean.setCommentLikeStatus("1");
+                                rowsBean.setCommentLikeCount(rowsBean.getCommentLikeCount() + 1);
+                            } else {
+                                //之前点赞了
+                                rowsBean.setCommentLikeStatus("0");
+                                rowsBean.setCommentLikeCount(rowsBean.getCommentLikeCount() - 1);
+                            }
+                        }
+                        mAdapter.setItemData(pos);
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+    }
+
+    /**
+     * 加载更多
+     */
+    private void loadMoreData() {
+        if (mCommentDatas.size() < mCommentTotalSize) {
+            ++mCommentPage;
+            if (!TextUtils.isEmpty(UserLgUtils.getToken())) {
+                getCommentListByLogin(mCommentPage);
+            } else {
+                getCommentList(mCommentPage);
+            }
+        } else {
+            mSrlContent.setNoMoreData(true);
+        }
+    }
+
+    /**
+     * 获取评论列表
+     *
+     * @param page
+     */
+    private void getCommentList(int page) {
+        RetrofitManager.getInstance()
+                .create(HomeApi.class)
+                .getCommentList(page + "", mNId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<CommentListBean>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+                        mDisposable = d;
+                    }
+
+                    @Override
+                    public void onNext(CommentListBean list) {
+                        mCommentTotalSize = list.getTotal();
+                        if (page == 1) {
+                            if (list.getRows() != null && list.getRows().size() > 0) {
+                                refreshView(STATE_LOAD_SUCCESS);
+                                mCommentDatas = list.getRows();
+                                mAdapter.setData(mCommentDatas);
+                            } else {
+                                refreshView(STATE_LOAD_SUCCESS);
+                            }
+                        } else {
+                            if (list.getRows() != null && list.getRows().size() > 0) {
+                                mCommentDatas.addAll(list.getRows());
+                                mAdapter.setData(mCommentDatas);
+                                mSrlContent.finishLoadMore();
+                                mSrlContent.setNoMoreData(false);
+                            } else {
+                                mSrlContent.setNoMoreData(true);
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        if (page == 1) {
+                            //TODO 第一次加载
+//                            refreshViewByState(ERROR);
+                        } else {
+                            mSrlContent.finishRefresh();
+                            mSrlContent.finishLoadMore();
+                        }
+                        ExceptionHandler.handleException(e);
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+    }
+
+    /**
+     * 获取登录后的评论列表
+     *
+     * @param page
+     */
+    private void getCommentListByLogin(int page) {
+        RetrofitManager.getInstance()
+                .create(HomeApi.class)
+                .getCommentListByLogin(page + "", mNId, UserLgUtils.getToken())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<CommentListBean>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+                        mDisposable = d;
+                    }
+
+                    @Override
+                    public void onNext(CommentListBean list) {
+                        mCommentTotalSize = list.getTotal();
+                        if (page == 1) {
+                            if (list.getRows() != null && list.getRows().size() > 0) {
+                                refreshView(STATE_LOAD_SUCCESS);
+                                mCommentDatas = list.getRows();
+                                mAdapter.setData(mCommentDatas);
+                            } else {
+                                refreshView(STATE_LOAD_SUCCESS);
+                            }
+                        } else {
+                            if (list.getRows() != null && list.getRows().size() > 0) {
+                                mCommentDatas.addAll(list.getRows());
+                                mAdapter.setData(mCommentDatas);
+                                mSrlContent.finishLoadMore();
+                                mSrlContent.setNoMoreData(false);
+                            } else {
+                                mSrlContent.setNoMoreData(true);
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        if (page == 1) {
+                            //TODO 第一次加载
+//                            refreshViewByState(ERROR);
+                        } else {
+                            mSrlContent.finishRefresh();
+                            mSrlContent.finishLoadMore();
+                        }
+                        ExceptionHandler.handleException(e);
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        mCommentPage = 1;
+        if (!TextUtils.isEmpty(UserLgUtils.getToken())) {
+            getCommentListByLogin(mCommentPage);
+        } else {
+            getCommentList(mCommentPage);
+        }
+    }
+
+    /**
+     * 显示评论dialog
+     */
+    private void showCommentDialog() {
+        if (mCommentView != null) {
+            mCommentView.show();
+        } else {
+            mCommentView = new ButtomDialogCommentView.DialogBuilder(mActivity)
+                    .setIsBackCancelable(true)
+                    .setIscancelable(true)
+                    .setIsShowPhoto(mIsCommentImg)
+                    .build();
+            mCommentView.addOnChoseListener(new ButtomDialogCommentView.OnChoseListener() {
+                @Override
+                public void chosePhoto() {
+                    showSelectPhoto(new AddPhotoBean());
+                }
+
+                @Override
+                public void choseGif() {
+
+                }
+
+                @Override
+                public void choseEmoji() {
+
+                }
+
+                @Override
+                public void loginOut() {
+
+                }
+
+                @Override
+                public void changePwd(String content) {
+                    publishComment(content);
+                }
+
+                @Override
+                public void removeImg() {
+
+                }
+
+                @Override
+                public void showImg(AddPhotoBean bean) {
+
+                }
+            });
+            mCommentView.show();
+        }
+
+    }
+
+    /**
+     * 评论
+     *
+     * @param content
+     */
+    private void publishComment(String content) {
+        CommentPublishBean bean = new CommentPublishBean();
+        if (mCurrentBean != null) {
+            bean.setCommentContentFile(mCurrentBean.getId());
+        }
+        if (!TextUtils.isEmpty(UserLgUtils.getLocationLat()) && !TextUtils.isEmpty(UserLgUtils.getLocationLng())) {
+            bean.setCommentLat(Double.parseDouble(UserLgUtils.getLocationLat()));
+            bean.setCommentLng(Double.parseDouble(UserLgUtils.getLocationLng()));
+            bean.setCommentAddress(UserLgUtils.getLocationDistrict());
+        } else {
+            bean.setCommentLat(0);
+            bean.setCommentLng(0);
+            bean.setCommentAddress("");
+        }
+        bean.setCommentContent(content);
+        bean.setNewsContentId(mNId);
+        Gson gson = new Gson();
+        String obj = gson.toJson(bean);
+        RequestBody body = RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), obj);
+        RetrofitManager.getInstance()
+                .create(HomeApi.class)
+                .doSaveComment(body, UserLgUtils.getToken())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<BaseUserBean>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+
+                    }
+
+                    @Override
+                    public void onNext(BaseUserBean successBean) {
+                        CommentListBean.RowsBean rowsBean = new CommentListBean.RowsBean();
+                        rowsBean.setNewsCommentId(successBean.getData());
+                        rowsBean.setNewsContentId(mNId);
+                        rowsBean.setCommentContent(content);
+                        rowsBean.setGmtCreate(TimeUtils.getNowString());
+                        rowsBean.setGmtCreateText("刚刚");
+                        rowsBean.setCommentUserName(UserLgUtils.getName());
+                        rowsBean.setCommentLikeCount(0);
+                        rowsBean.setCreator(UserLgUtils.getUserId());
+                        if (mCurrentBean != null) {
+                            rowsBean.setCommentContentFile(mCurrentBean.getId());
+                        }
+                        rowsBean.setCommentUserIcon(UserLgUtils.getAvatar());
+                        if (!TextUtils.isEmpty(UserLgUtils.getLocationAddress())) {
+                            rowsBean.setCommentAddress(UserLgUtils.getLocationDistrict());
+                        } else {
+                            rowsBean.setCommentAddress("");
+                        }
+                        mCommentDatas.add(0, rowsBean);
+                        mAdapter.setData(mCommentDatas);
+                        mCurrentBean = null;
+                        mCommentView.removePhotoBean();
+                        ToastUtils.showShort("评论成功");
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        ExceptionHandler.handleException(e);
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode == RESULT_OK) {
+            switch (requestCode) {
+                case BaseUrlApi.CAMERA_REQUEST://相机
+                    uploadImg(mPicPath, 1);
+                    break;
+                case BaseUrlApi.PHOTO_REQUEST://相册
+                    try {
+                        if (data == null) return;
+                        Uri uri = data.getData();
+                        String[] proj = {MediaStore.Images.Media.DATA};
+                        Cursor cursor = managedQuery(uri, proj, null, null, null);
+                        int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+                        cursor.moveToFirst();
+                        String srcPath = cursor.getString(column_index);
+                        showSoftKeyBoardDialog(mCommentView.mEtComment);
+                        uploadImg(srcPath, 2);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    break;
+                case BaseUrlApi.CAMERA_REQUEST_DIALOG:
+                    String picPath = mItemCommentDialog.getPicPath();
+                    uploadImg(picPath, 3);
+                    break;
+                case BaseUrlApi.PHOTO_REQUEST_DIALOG:
+                    try {
+                        if (data == null) return;
+                        Uri uri = data.getData();
+                        String[] proj = {MediaStore.Images.Media.DATA};
+                        Cursor cursor = managedQuery(uri, proj, null, null, null);
+                        int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+                        cursor.moveToFirst();
+                        String srcPath = cursor.getString(column_index);
+                        uploadImg(srcPath, 4);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    break;
+            }
+        }
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    /**
+     * 上传文件
+     *
+     * @param picPath
+     */
+    private void uploadImg(String picPath, int src) {
+        File file = new File(picPath);
+        if (!file.exists()) {
+            showToast("图片路径错误.");
+            return;
+        }
+        ProgressDialog progressDialog = UIUtil.initDialog(mActivity, "正在上传...");
+        progressDialog.show();
+        Luban.with(mActivity)
+                .load(picPath)
+                .ignoreBy(100)
+                .setTargetDir(PathConfig.CATCH_PATH)
+                .filter(path -> !(TextUtils.isEmpty(path) || path.toLowerCase().endsWith(".gif")))
+                .setCompressListener(new OnCompressListener() {
+                    @Override
+                    public void onStart() {
+
+                    }
+
+                    @Override
+                    public void onSuccess(File file) {
+                        RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
+                        MultipartBody.Part body = MultipartBody.Part.createFormData("image", file.getName(),
+                                requestFile);
+                        RetrofitManager.getInstance()
+                                .create(HomeApi.class)
+                                .uploadImage(body, UserLgUtils.getToken())
+                                .subscribeOn(Schedulers.io())
+                                .observeOn(AndroidSchedulers.mainThread())
+                                .subscribe(new Observer<BaseUserBean>() {
+                                    @Override
+                                    public void onSubscribe(Disposable d) {
+
+                                    }
+
+                                    @Override
+                                    public void onNext(BaseUserBean baseUserBean) {
+                                        if (progressDialog != null && progressDialog.isShowing()) {
+                                            progressDialog.dismiss();
+                                        }
+                                        ToastUtils.showShort("上传成功");
+                                        if (src == 2 || src == 1) {
+                                            mCurrentBean.setId(baseUserBean.getData());
+                                            mCommentView.setPhotoBean(mCurrentBean);
+                                        } else {
+                                            AddPhotoBean selePhotoBean = mItemCommentDialog.getSelePhotoBean();
+                                            selePhotoBean.setId(baseUserBean.getData());
+                                            mItemCommentDialog.refreshItemPhoto(selePhotoBean);
+                                        }
+                                    }
+
+                                    @Override
+                                    public void onError(Throwable e) {
+                                        if (progressDialog != null && progressDialog.isShowing()) {
+                                            progressDialog.dismiss();
+                                        }
+                                        ToastUtils.showShort("上传失败,请稍后重试.");
+                                        if (file.exists()) {
+                                            file.delete();
+                                        }
+                                    }
+
+                                    @Override
+                                    public void onComplete() {
+
+                                    }
+                                });
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        if (progressDialog.isShowing()) {
+                            progressDialog.dismiss();
+                        }
+                        ToastUtils.showShort("图片上传失败,请稍后重试");
+                    }
+                })
+                .launch();
+    }
+
+    /**
+     * 显示选择图片
+     *
+     * @param bean
+     */
+    private void showSelectPhoto(AddPhotoBean bean) {
+        ButtomDialogView buttomDialogView = new ButtomDialogView.DialogBuilder(mActivity)
+                .setIsBackCancelable(true)
+                .setIscancelable(true)
+                .setShowLocation(Gravity.BOTTOM)
+                .setIsShowFile(false)
+                .build();
+        buttomDialogView.addOnChoseListener(new ButtomDialogView.OnChoseListener() {
+            @Override
+            public void choseFile() {
+            }
+
+            @Override
+            public void choseAlbum() {
+                mCurrentBean = bean;
+                Intent intent = new Intent(Intent.ACTION_PICK, null);
+                intent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
+                        "image/*");
+                startActivityForResult(intent, BaseUrlApi.PHOTO_REQUEST);
+                buttomDialogView.dismiss();
+            }
+
+            @Override
+            public void choseShoot() {
+                mCurrentBean = bean;
+                mPicPath = PathConfig.CATCH_PATH + System.currentTimeMillis() + ".jpg";
+                File file = new File(mPicPath);
+                Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+                // 下面这句指定调用相机拍照后的照片存储的路径
+                Uri uri;
+                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
+                    uri = Uri.fromFile(file);
+                } else {
+                    uri = FileProvider.getUriForFile(mActivity, ProiderUtil.getFileProviderName(mActivity), file);
+                }
+                intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
+                startActivityForResult(intent, BaseUrlApi.CAMERA_REQUEST);
+                buttomDialogView.dismiss();
+            }
+
+            @Override
+            public void loginOut() {
+
+            }
+
+            @Override
+            public void changePwd() {
+
+            }
+        });
+        buttomDialogView.show();
+    }
+
+    @Override
+    protected void onDestroy() {
+        mContentView = null;
+        if (mBind != null) {
+            mBind.unbind();
+        }
+        super.onDestroy();
+    }
+}
\ No newline at end of file
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsMainActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsMainActivity.java
index 2186b5a..eb2a856 100755
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsMainActivity.java
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsMainActivity.java
@@ -48,6 +48,7 @@ public class NewsMainActivity extends BaseActivity {
     private Disposable mDisposable;
     private String mId;
     private String mTitle;
+    private String mPId;
 
 
     @Override
@@ -55,6 +56,7 @@ public class NewsMainActivity extends BaseActivity {
         mBind = ButterKnife.bind(this);
         mTitle = getIntent().getStringExtra("title");
         mId = getIntent().getStringExtra("id");
+        mPId = getIntent().getStringExtra("pId");
         refreshView(STATE_LOAD_LOADING);
         mTvBaseTitle.setText(mTitle);
         getNewsTabs();
@@ -79,10 +81,18 @@ public class NewsMainActivity extends BaseActivity {
                     public void onNext(List<NewsTabBean> newsTabBeans) {
                         if (mFragments != null) {
                             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;
                                 for (int i = 0; i < newsTabBeans.size(); i++) {
                                     Bundle bundle = new Bundle();
                                     bundle.putString("type", newsTabBeans.get(i).getNewsDirectoriesId());
+                                    bundle.putString("pId", "");
                                     BaseFragment fragment = null;
                                     //0 外部链接  1存在子集 2没有子集
                                     if ("0".equals(newsTabBeans.get(i).getDirectoriesView())) {
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java
index 9327ac3..b15e47b 100755
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/HomeFragment.java
@@ -250,7 +250,13 @@ public class HomeFragment extends BaseFragment {
 
                     @Override
                     public void onNext(List<NewsTabBean> newsTabBeans) {
-                        createNewsContent(newsTabBeans);
+                        if (newsTabBeans.size() > 0) {
+                            createNewsContent(newsTabBeans);
+                        } else {
+                            if (mNewsSkeleton != null) {
+                                mNewsSkeleton.hide();
+                            }
+                        }
                     }
 
                     @Override
@@ -287,6 +293,8 @@ public class HomeFragment extends BaseFragment {
                     public void onNext(List<NewsTabBean> newsTabBeans) {
                         if (newsTabBeans != null && newsTabBeans.size() > 0) {
                             buildMainFuncMenu(newsTabBeans);
+                        } else {
+
                         }
                     }
 
@@ -471,7 +479,8 @@ public class HomeFragment extends BaseFragment {
                 url = rowsBean.getTemplateRecordUrl();
             }
             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("url", url)
                     .withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论
@@ -488,7 +497,7 @@ public class HomeFragment extends BaseFragment {
     private void getBannerData() {
         RetrofitManager.getInstance()
                 .create(HomeApi.class)
-                .getMainNewsList(PathConfig.NEWS_BANNER_ID, "5", "1")
+                .getMainNewsList(PathConfig.NEWS_BANNER_ID, "", "5", "1")
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Observer<NewsItemBean>() {
@@ -668,7 +677,7 @@ public class HomeFragment extends BaseFragment {
     private void getNewsList(NewsTabBean newsTabBean, BaseRecyclerAdapter adapter, RecyclerView rlvContent, CustomStateView stateView) {
         RetrofitManager.getInstance()
                 .create(HomeApi.class)
-                .getNewsTabListByPid(newsTabBean.getNewsDirectoriesId(), "5", "1")
+                .getNewsTabListByPid("", newsTabBean.getNewsDirectoriesId(), "5", "1")
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Observer<NewsItemBean>() {
@@ -885,6 +894,7 @@ public class HomeFragment extends BaseFragment {
                 //列表
                 ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_LIST)
                         .withString("id", mainFuncBean.getNewsDirectoriesId())
+                        .withString("pId", mainFuncBean.getNewsDirectoriesId())
                         .withString("title", mainFuncBean.getDirectoriesName())
                         .navigation();
             } else if ("0".equals(mainFuncBean.getDirectoriesView())) {
@@ -897,6 +907,7 @@ public class HomeFragment extends BaseFragment {
                 ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_NEWS_MAIN)
                         .withString("title", mainFuncBean.getDirectoriesName())
                         .withString("id", mainFuncBean.getNewsDirectoriesId())
+                        .withString("pId", mainFuncBean.getNewsDirectoriesId())
                         .navigation();
             }
 //在线培训 文化旅游 文化动态 展览展示 数图资源
@@ -964,11 +975,11 @@ public class HomeFragment extends BaseFragment {
                 titleLayout.addView(ivLeft);
                 titleLayout.addView(titleView);
                 titleLayout.addView(ivRight);
-                titleLayout.setOnClickListener(v -> ARouter.getInstance()
-                        .build(PathConfig.PATH_MODULE_MAIN_NEWS_LIST)
-                        .withString("id", b.getNewsDirectoriesId())
-                        .withString("title", b.getDirectoriesName())
-                        .navigation());
+//                titleLayout.setOnClickListener(v -> ARouter.getInstance()
+//                        .build(PathConfig.PATH_MODULE_MAIN_NEWS_LIST)
+//                        .withString("id", b.getNewsDirectoriesId())
+//                        .withString("title", b.getDirectoriesName())
+//                        .navigation());
                 //分割线
                 View line = new View(mActivity);
                 LinearLayout.LayoutParams lineParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
@@ -1029,6 +1040,7 @@ public class HomeFragment extends BaseFragment {
         getBannerData();
         getMainCommendList();
         getLiveList();
+        mSrlView.finishRefresh();
     }
 
     @Override
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java
index 7e76bd6..29424bb 100755
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/fragment/NewsFragment.java
@@ -4,17 +4,19 @@ import android.graphics.Color;
 import android.text.TextUtils;
 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.ethanhua.skeleton.RecyclerViewSkeletonScreen;
 import com.ethanhua.skeleton.Skeleton;
-import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.sucstepsoft.cm_utils.constant.PathConfig;
 import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
 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.views.ItemSplitDivider;
 import com.sucstepsoft.cm_utils.utils.ExceptionHandler;
-import com.sucstepsoft.cm_utils.utils.LogUtils;
 import com.sucstepsoft.cm_utils.utils.UserLgUtils;
 import com.tengshisoft.mudulemain.R;
 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.net.HomeApi;
 
-import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
@@ -61,7 +59,8 @@ public class NewsFragment extends BaseFragment {
     private NewsAdapter mAdapter;
     private int mTotalPage = 0;
     private int mCurrentPage = 1;
-    private String mType;
+    private String mType;//newsId
+    private String mPid;//newsPid
     private RecyclerViewSkeletonScreen mNewsSkeleton;
     private Disposable mD1;
     private Disposable mD2;
@@ -73,6 +72,7 @@ public class NewsFragment extends BaseFragment {
         setStateView(STATE_SUCCESS);
         mAdapter = new NewsAdapter(mActivity, mNewsDatas);
         mType = getArguments().getString("type");
+        mPid = getArguments().getString("pId");
         mCurrentPage = 1;
         mTotalPage = 0;
         mNewsDatas.clear();
@@ -104,6 +104,7 @@ public class NewsFragment extends BaseFragment {
         ARouter.getInstance()
                 .build(PathConfig.PATH_MODULE_MAIN_NEWS_LIST)
                 .withString("id", newsTabBean.getNewsDirectoriesId())
+                .withString("pId", newsTabBean.getNewsDirectoriesId())
                 .withString("title", newsTabBean.getDirectoriesName())
                 .navigation();
     }
@@ -136,7 +137,8 @@ public class NewsFragment extends BaseFragment {
                 url = rowsBean.getTemplateRecordUrl();
             }
             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("url", url)
                     .withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论
@@ -152,7 +154,7 @@ public class NewsFragment extends BaseFragment {
     private void getNewsListByTypeToken(int page) {
         RetrofitManager.getInstance()
                 .create(HomeApi.class)
-                .getNewsListByToken(mType, page + "", UserLgUtils.getToken())
+                .getNewsListByToken(mType, "", page + "", UserLgUtils.getToken())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Observer<NewsItemBean>() {
@@ -260,7 +262,7 @@ public class NewsFragment extends BaseFragment {
     private void getNewsListByType(int page) {
         RetrofitManager.getInstance()
                 .create(HomeApi.class)
-                .getNewsList(mType, page + "")
+                .getNewsList(mType, "", page + "")
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Observer<NewsItemBean>() {
diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java
index c5c6004..6c8531a 100755
--- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java
+++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java
@@ -136,8 +136,8 @@ public interface HomeApi {
      */
     @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json", "need_area:true"})
     @GET("app/newscontent/listpagenewscontentrelease")
-    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("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
@@ -145,6 +145,7 @@ public interface HomeApi {
     @Headers({"base_url_name:news", "Content-Type:application/json", "Accept:application/json", "need_area:true"})
     @GET("app/newscontent/listpagenewscontentrelease")
     Observable<NewsItemBean> getNewsList(@Query("newsDirectoriesId") String newsDirectoriesId,
+                                         @Query("newsDirectoriesParentId") String pId,
                                          @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"})
     @GET("app/newscontent/listpagenewscontentrelease")
     Observable<NewsItemBean> getMainNewsList(@Query("newsDirectoriesId") String newsDirectoriesId,
+                                             @Query("newsDirectoriesParentId") String pId,
                                              @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"})
     @GET("app/newscontent/listpagenewscontent")
     Observable<NewsItemBean> getNewsListByToken(@Query("newsDirectoriesId") String newsDirectoriesId,
+                                                @Query("newsDirectoriesParentId") String pId,
                                                 @Query("page") String page, @Header("token") String token);
 
     /**
@@ -185,6 +188,21 @@ public interface HomeApi {
     @GET("app/newscontent/getnewscontentbyidrelease/{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);
 
     /**
      * 获取评论列表
diff --git a/modulemain/src/main/res/layout/activity_news_local_detail.xml b/modulemain/src/main/res/layout/activity_news_local_detail.xml
new file mode 100644
index 0000000..814c367
--- /dev/null
+++ b/modulemain/src/main/res/layout/activity_news_local_detail.xml
@@ -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>
\ No newline at end of file
diff --git a/modulemain/src/main/res/layout/item_skeleton_news_content_local.xml b/modulemain/src/main/res/layout/item_skeleton_news_content_local.xml
new file mode 100755
index 0000000..7ecf064
--- /dev/null
+++ b/modulemain/src/main/res/layout/item_skeleton_news_content_local.xml
@@ -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>
\ No newline at end of file
diff --git a/modulemine/src/main/res/layout/activity_new_mine_info_edit.xml b/modulemine/src/main/res/layout/activity_new_mine_info_edit.xml
index 0dfc5ea..6ea551a 100644
--- a/modulemine/src/main/res/layout/activity_new_mine_info_edit.xml
+++ b/modulemine/src/main/res/layout/activity_new_mine_info_edit.xml
@@ -29,6 +29,12 @@
                     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/item_hor_content">
 
@@ -42,6 +48,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -54,6 +67,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -66,6 +86,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -78,6 +105,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -90,6 +124,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -102,6 +143,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -114,6 +162,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -126,6 +181,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -138,6 +200,12 @@
                     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/item_hor_content">
 
@@ -151,6 +219,13 @@
                     android:hint="请输入QQ号" />
             </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">
 
                 <TextView
@@ -163,6 +238,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -175,6 +257,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -187,6 +276,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -199,6 +295,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -211,6 +314,12 @@
                     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/item_hor_content">
 
@@ -224,6 +333,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -236,6 +352,13 @@
                     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/item_ver_content">
 
                 <TextView
diff --git a/modulemine/src/main/res/layout/activity_new_mine_infor_detail.xml b/modulemine/src/main/res/layout/activity_new_mine_infor_detail.xml
index f7d3067..ee4b5b3 100644
--- a/modulemine/src/main/res/layout/activity_new_mine_infor_detail.xml
+++ b/modulemine/src/main/res/layout/activity_new_mine_infor_detail.xml
@@ -29,6 +29,13 @@
                     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/item_hor_content">
 
@@ -42,6 +49,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -54,6 +68,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -66,6 +87,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -78,6 +106,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -90,6 +125,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -102,6 +144,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -114,6 +163,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -126,6 +182,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -138,6 +201,12 @@
                     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/item_hor_content">
 
@@ -151,6 +220,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -163,6 +239,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -175,6 +258,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -187,6 +277,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -199,6 +296,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -211,6 +315,12 @@
                     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/item_hor_content">
 
@@ -224,6 +334,13 @@
                     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/item_hor_content">
 
                 <TextView
@@ -236,6 +353,13 @@
                     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/item_ver_content">
 
                 <TextView
@@ -251,7 +375,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginTop="5dp"
+                    android:layout_marginTop="8dp"
                     android:background="@drawable/shp_rectangle_gray_df"
                     android:gravity="left"
                     android:hint="未录入"
diff --git a/modulemine/src/main/res/layout/activity_setting.xml b/modulemine/src/main/res/layout/activity_setting.xml
index f94ed16..1a54b36 100755
--- a/modulemine/src/main/res/layout/activity_setting.xml
+++ b/modulemine/src/main/res/layout/activity_setting.xml
@@ -18,65 +18,65 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <androidx.cardview.widget.CardView
+            <LinearLayout
+                android:id="@+id/ll_change_phone"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
-                app:cardCornerRadius="5dp"
-                app:cardElevation="3dp">
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:padding="8dp">
 
-                <LinearLayout
-                    android:id="@+id/ll_change_phone"
+                <ImageView
+                    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_height="wrap_content"
-                    android:layout_margin="5dp"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal"
-                    android:padding="8dp">
+                    android:layout_marginLeft="5dp"
+                    android:drawableRight="@drawable/ic_arrow_cir"
+                    android:text="个人信息"
+                    android:textSize="15sp" />
+            </LinearLayout>
 
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/ic_user_couant" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:background="@color/gray_line_deep" />
 
-                    <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
-                        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
+            <LinearLayout
+                android:id="@+id/ll_reset_phone"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
-                app:cardCornerRadius="5dp"
-                app:cardElevation="3dp">
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:padding="8dp">
 
-                <LinearLayout
-                    android:id="@+id/ll_reset_phone"
+                <ImageView
+                    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_height="wrap_content"
-                    android:layout_margin="5dp"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal"
-                    android:padding="8dp">
+                    android:layout_marginLeft="5dp"
+                    android:drawableRight="@drawable/ic_arrow_cir"
+                    android:text="重新绑定手机"
+                    android:textSize="15sp" />
+            </LinearLayout>
 
-                    <ImageView
-                        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="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="5dp"
-                        android:text="重新绑定手机"
-                        android:textSize="15sp" />
-                </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:background="@color/gray_line_deep" />
 
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
@@ -110,86 +110,72 @@
             </androidx.cardview.widget.CardView>
 
 
-            <androidx.cardview.widget.CardView
+            <LinearLayout
+                android:id="@+id/ll_clear"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
-                android:visibility="gone"
-                app:cardCornerRadius="5dp"
-                app:cardElevation="3dp">
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:padding="8dp"
+                android:visibility="gone">
 
-                <LinearLayout
-                    android:id="@+id/ll_clear"
-                    android:layout_width="match_parent"
+                <ImageView
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal"
-                    android:padding="8dp">
+                    android:src="@drawable/ic_clear_cache" />
 
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/ic_clear_cache" />
+                <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:text="清除缓存"
+                    android:textSize="15sp" />
+            </LinearLayout>
 
-                    <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
-                        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
+            <RelativeLayout
+                android:id="@+id/ll_check_update"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
-                app:cardCornerRadius="5dp"
-                app:cardElevation="3dp">
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:padding="8dp">
 
-                <RelativeLayout
-                    android:id="@+id/ll_check_update"
-                    android:layout_width="match_parent"
+                <ImageView
+                    android:id="@+id/iv_ic"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal"
-                    android:padding="8dp">
+                    android:layout_centerVertical="true"
+                    android:src="@drawable/ic_check_update" />
 
-                    <ImageView
-                        android:id="@+id/iv_ic"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:src="@drawable/ic_check_update" />
+                <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="5dp"
+                    android:layout_toRightOf="@id/iv_ic"
+                    android:text="检查更新"
+                    android:textSize="15sp" />
 
-                    <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_marginLeft="5dp"
-                        android:layout_toRightOf="@id/iv_ic"
-                        android:text="检查更新"
-                        android:textSize="15sp" />
-
-                    <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
-                        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
+                    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>
 
             <com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
                 android:id="@+id/tv_login_out"
                 android:layout_width="match_parent"
                 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:clickable="true"
                 android:focusable="true"
diff --git a/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/OrderListActivity.java b/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/OrderListActivity.java
index c93a77d..064591a 100644
--- a/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/OrderListActivity.java
+++ b/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/OrderListActivity.java
@@ -29,7 +29,7 @@ import butterknife.Unbinder;
 import io.reactivex.disposables.Disposable;
 
 /**
- * 我的订单
+ * 我的商城订单
  */
 @Route(path = PathConfig.PATH_MODULE_SHOP_ACTIVITY_SHOP_MINE_ORDER)
 public class OrderListActivity extends BaseActivity {