县一级页面接口调整

This commit is contained in:
itgaojian 2023-03-10 11:21:25 +08:00
parent 1f2617ac04
commit dbb19590d3
40 changed files with 4432 additions and 226 deletions

View File

@ -96,6 +96,7 @@ public class PathConfig {
public static final String PATH_MODULE_MAIN_PLAN = "/modulemain/activity/planMap";
public static final String PATH_MODULE_MAIN_LOGIN = "/modulemain/activity/login";//登录
public static final String PATH_MODULE_MAIN_NEWS_DETAIL = "/modulemain/activity/news/detail";//详情页面
public static final String PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE = "/modulemain/activity/newsInterface";//新闻详情页面-接口方式
public static final String PATH_MODULE_MAIN_FRAGMENT_MAIN = "/modulemain/fragment/main";//首页fragment
public static final String PATH_MODULE_MAIN_NEWS_LIST = "/modulemain/activity/newslist";
@ -110,6 +111,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_SEARCH = "/modulemain/activity/newsSearch";//新闻收搜
//======================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 +253,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 +275,6 @@ 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";//新增收货地
}

View File

@ -59,6 +59,7 @@ public class BaseUrlApi {
public static final String BASE_LEGACY_IP = BASE_SYSTEM_IP;//非遗数据库
public static final String BASE_NEWS_IP = BASE_SYSTEM_IP;//新闻
public static final String BASE_SHOP_IP = IP_URL + "xzshop";//商城
public static final String BASE_BIG_DATA = IP_URL + "module/";//大数据接口
// public static final String BASE_PLACE_IP = TEMP_IP + "venuebooking/";/* 场馆 */
public static final String BASE_PLACE_IMG_IP = BASE_PLACE_IP + "route/file/download/true/";/* 场馆 */
public static final String BASE_CULTURAL_IP = BASE_SYSTEM_IP + "culturalactivity/";/* 文化URL */

View File

@ -34,6 +34,7 @@ import retrofit2.http.PUT;
import retrofit2.http.Part;
import retrofit2.http.PartMap;
import retrofit2.http.Path;
import retrofit2.http.Query;
import retrofit2.http.Url;
/**
@ -312,4 +313,17 @@ public interface BaseApiService {
@Headers({"Content-Type:application/json", "Accept:application/json"})
@GET("app/area/getrelease/{areaId}")
Observable<AreaBean> getAreaDetail(@Path("areaId") String pId);
/**
* 大数据-浏览量
* 详情浏览量 (网页|安卓|小程序)[a-zA-Z0-9-]{36}(新闻|活动|非遗|场馆|直播|志愿) 我后台正则是这样的
* 搜索词 安卓QUERY要搜索的内容END
*
* @return
*/
@Headers({"base_url_name:bigdata", "Content-Type:application/json", "Accept:application/json"})
@GET("app/contentcensusrelease/log")
Observable<BaseSuccessBean> bigDataRead(@Query("requestUrl") String id);
}

View File

@ -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;
}

View File

@ -0,0 +1,54 @@
package com.sucstepsoft.cm_utils.core.widget.base;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.sucstepsoft.cm_utils.R;
import com.sucstepsoft.cm_utils.core.beans.BaseImageBean;
import com.sucstepsoft.cm_utils.utils.ConvertUtils;
import com.youth.banner.adapter.BannerAdapter;
import java.util.List;
/**
* 作者: adam
* 日期: 2020/6/10 - 5:51 PM
* 邮箱: itgaojian@163.com
* 描述:
*/
public class BannerImageTextAllAdapter extends BannerAdapter<BaseImageBean, BannerTextAllHolder> {
public BannerImageTextAllAdapter(List<BaseImageBean> datas) {
super(datas);
}
@Override
public BannerTextAllHolder onCreateHolder(ViewGroup parent, int viewType) {
View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_banner_text_all, parent, false);
return new BannerTextAllHolder(itemView);
}
@Override
public void onBindView(BannerTextAllHolder 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.setContent(data.getName());
}
}

View File

@ -0,0 +1,28 @@
package com.sucstepsoft.cm_utils.core.widget.base;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.sucstepsoft.cm_utils.R;
import com.sucstepsoft.cm_utils.core.widget.views.expandabletextview.ExpandableTextView;
/**
* 作者: adam
* 日期: 2020/6/10 - 5:52 PM
* 邮箱: itgaojian@163.com
* 描述:
*/
public class BannerTextAllHolder extends RecyclerView.ViewHolder {
public ExpandableTextView mTvName;
public ImageView mIvCover;
public BannerTextAllHolder(@NonNull View itemView) {
super(itemView);
mTvName = itemView.findViewById(R.id.tv_name);
mIvCover = itemView.findViewById(R.id.iv_cover);
}
}

View File

@ -36,7 +36,10 @@ import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.sucstepsoft.cm_utils.R;
import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.core.beans.BaseSuccessBean;
import com.sucstepsoft.cm_utils.core.beans.UserLoginBean;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
import com.sucstepsoft.cm_utils.core.retrofit_net.api.BaseApiService;
import com.sucstepsoft.cm_utils.core.widget.views.BaseAreaListDialog;
import com.sucstepsoft.cm_utils.core.widget.views.DoubleAndOneClicklistener;
import com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView;
@ -51,6 +54,11 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
/**
* 作者 : Adam on 2018/10/15.
* 邮箱 : itgaojian@163.com
@ -122,6 +130,42 @@ public abstract class BaseActivity extends AppCompatActivity {
mRlNotify.setVisibility(View.GONE);
}
/**
* 大数据-详情浏览
*
* @param params
*/
protected void bigDataRead(String params) {
RetrofitManager.getInstance()
.create(BaseApiService.class)
.bigDataRead(params)
.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() {
}
});
}
public void setEditTextInhibitInputSpeChat(EditText editText) {
InputFilter inputFilter = new InputFilter() {
Pattern emoji = Pattern.compile("[\ud83c\udc00-\ud83c\udfff]|[\ud83d\udc00-\ud83d\udfff]|[\u2600-\u27ff]",

View File

@ -0,0 +1,14 @@
package com.sucstepsoft.cm_utils.core.widget.views.expandabletextview;
/**
* @date: on 2018/9/20
* @author: cretin
* @email: mxnzp_life@163.com
* @desc: 为ExpandableTextView添加展开和收回状态的记录
*/
public interface ExpandableStatusFix {
void setStatus(StatusType status);
StatusType getStatus();
}

View File

@ -0,0 +1,102 @@
package com.sucstepsoft.cm_utils.core.widget.views.expandabletextview;
import java.util.List;
/**
* 记录可以点击的内容 位置
*/
public class FormatData {
private String formatedContent;
private List<PositionData> positionDatas;
public String getFormatedContent() {
return formatedContent;
}
public void setFormatedContent(String formatedContent) {
this.formatedContent = formatedContent;
}
public List<PositionData> getPositionDatas() {
return positionDatas;
}
public void setPositionDatas(List<PositionData> positionDatas) {
this.positionDatas = positionDatas;
}
public static class PositionData {
private int start;
private int end;
private String url;
private LinkType type;
//自定义法规则的aim
private String selfAim;
//自定义规则的内容
private String selfContent;
public String getSelfAim() {
return selfAim;
}
public void setSelfAim(String selfAim) {
this.selfAim = selfAim;
}
public String getSelfContent() {
return selfContent;
}
public void setSelfContent(String selfContent) {
this.selfContent = selfContent;
}
public LinkType getType() {
return type;
}
public void setType(LinkType type) {
this.type = type;
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public PositionData(int start, int end, String url, LinkType type) {
this.start = start;
this.end = end;
this.url = url;
this.type = type;
}
public PositionData(int start, int end, String selfAim,String selfContent, LinkType type) {
this.start = start;
this.end = end;
this.selfAim = selfAim;
this.selfContent = selfContent;
this.type = type;
}
public int getStart() {
return start;
}
public void setStart(int start) {
this.start = start;
}
public int getEnd() {
return end;
}
public void setEnd(int end) {
this.end = end;
}
}
}

View File

@ -0,0 +1,11 @@
package com.sucstepsoft.cm_utils.core.widget.views.expandabletextview;
//定义类型的枚举类型
public enum LinkType {
//普通链接
LINK_TYPE,
//@用户
MENTION_TYPE,
//自定义规则
SELF
}

View File

@ -0,0 +1,14 @@
package com.sucstepsoft.cm_utils.core.widget.views.expandabletextview;
/**
* @date: on 2018/9/20
* @author: cretin
* @email: mxnzp_life@163.com
* @desc: 添加描述
*/
public enum StatusType {
//展开
STATUS_EXPAND,
//收起
STATUS_CONTRACT
}

View File

@ -0,0 +1,35 @@
package com.sucstepsoft.cm_utils.core.widget.views.expandabletextview;
import java.util.UUID;
public class UUIDUtils {
/**
* 生成一个32位的不带-的不唯一的uuid
*
* @return
*/
public static String getUuid() {
return UUID.randomUUID().toString().replaceAll("-", "");
}
public static String[] chars = new String[]{"a", "b", "c", "d", "e", "f",
"g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s",
"t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5",
"6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I",
"J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V",
"W", "X", "Y", "Z"};
/**
* 生成一个32位的不带-的不唯一的uuid
*
* @return
*/
public static String getUuid(int length) {
StringBuilder stringBuilder = new StringBuilder(UUID.randomUUID().toString());
while (stringBuilder.length() < length) {
stringBuilder.append(UUID.randomUUID().toString());
}
return stringBuilder.substring(0,length);
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 921 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -0,0 +1,52 @@
<?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/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" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="220dp"
android:layout_alignParentBottom="true">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end">
<com.sucstepsoft.cm_utils.core.widget.views.expandabletextview.ExpandableTextView
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"
app:ep_contract_color="@color/app_title_9f_no"
app:ep_expand_color="@color/app_title_9f_no"
app:ep_max_line="3"
app:ep_need_contract="true"
tools:text="新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题新闻标题" />
</RelativeLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
</RelativeLayout>

View File

@ -0,0 +1,52 @@
<?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="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="8dp">
<ImageView
android:id="@+id/iv_search_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_back_black" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_gray"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="8dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_search_icon" />
<EditText
android:id="@+id/et_search_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_weight="1"
android:background="@null"
android:hint="请输入关键字"
android:imeOptions="actionSearch"
android:padding="5dp"
android:singleLine="true"
android:textSize="@dimen/text_14" />
</LinearLayout>
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:id="@+id/tv_search_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:clickable="true"
android:focusable="true"
android:text="搜索" />
</LinearLayout>

View File

@ -96,6 +96,43 @@
<attr name="h_textsize" format="dimension" />
<attr name="h_pro_step" format="integer" />
</declare-styleable>
<declare-styleable name="ExpandableTextView">
<!--保留的行数-->
<attr name="ep_max_line" format="integer" />
<!--是否需要展开-->
<attr name="ep_need_expand" format="boolean" />
<!--是否需要收起 这个是建立在开启展开的基础上的-->
<attr name="ep_need_contract" format="boolean" />
<!--是否需要@用户 -->
<attr name="ep_need_mention" format="boolean" />
<!--是否需要对链接进行处理 -->
<attr name="ep_need_link" format="boolean" />
<!--是否需要动画-->
<attr name="ep_need_animation" format="boolean" />
<!--是否需要永远将展开或者收回放置在最后边-->
<attr name="ep_need_always_showright" format="boolean" />
<!--是否需要将连接转换成网页链接显示 默认为true-->
<attr name="ep_need_convert_url" format="boolean" />
<!--是否需要自定义规则-->
<attr name="ep_need_self" format="boolean" />
<!--收起的文案-->
<attr name="ep_contract_text" format="string" />
<!--展开的文案-->
<attr name="ep_expand_text" format="string" />
<!--展开的文字的颜色-->
<attr name="ep_expand_color" format="color" />
<!--收起的文字的颜色-->
<attr name="ep_contract_color" format="color" />
<!--在收回和展开前面添加的内容的字体颜色-->
<attr name="ep_end_color" format="color" />
<!--链接的文字的颜色-->
<attr name="ep_link_color" format="color" />
<!--@用户的文字的颜色-->
<attr name="ep_mention_color" format="color" />
<!--自定义规则的文字的颜色-->
<attr name="ep_self_color" format="color" />
<!--链接的图标-->
<attr name="ep_link_res" format="reference" />
</declare-styleable>
</resources>

View File

@ -30,4 +30,8 @@
<string name="android_auto_update_download_progress">正在下载:%1$d%%</string>
<string name="android_auto_update_dialog_checking">正在检查版本</string>
<string name="big_data_str">安卓%1$s%2$s%3$s</string>
<string name="social_contract">收起</string>
<string name="social_expend">展开</string>
<string name="social_text_target">网页链接</string>
</resources>

View File

@ -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'

View File

@ -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,44 @@
<application
android:maxAspectRatio="2.4"
android:resizeableActivity="true">
<activity
android:name=".cultural.activitys.news.NewsSearchActivity"
android:configChanges="keyboardHidden|orientation|screenSize|screenLayout"
android:exported="false"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<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 +90,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 +100,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 +115,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" />

View File

@ -2,12 +2,14 @@ package com.tengshisoft.mudulemain.cultural.activitys.news;
import android.graphics.Color;
import android.text.TextUtils;
import android.view.View;
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.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
@ -88,6 +90,15 @@ public class NewsListActivity extends BaseActivity {
getNewsListByType(mCurrentPage);
}
});
mLlImg.setVisibility(View.VISIBLE);
Glide.with(mActivity)
.load(R.drawable.ic_search_icon_white)
.into(mIvInto);
mIvInto.setOnClickListener(v -> ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_SEARCH)
.withString("id", mType)
.withBoolean("isTab", false)
.navigation());
mAdapter.addOnItemClickByType(this::showNewsDetail);
if (!TextUtils.isEmpty(UserLgUtils.getToken())) {
getNewsListByTypeToken(mCurrentPage);
@ -100,7 +111,7 @@ public class NewsListActivity extends BaseActivity {
private void getNewsListByType(int page) {
RetrofitManager.getInstance()
.create(HomeApi.class)
.getNewsList("", mPId,page + "")
.getNewsList("", mPId, page + "")
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<NewsItemBean>() {

View File

@ -12,6 +12,8 @@ import androidx.viewpager2.adapter.FragmentStateAdapter;
import androidx.viewpager2.widget.ViewPager2;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.bumptech.glide.Glide;
import com.google.android.material.tabs.TabLayout;
import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
@ -59,6 +61,16 @@ public class NewsMainActivity extends BaseActivity {
mPId = getIntent().getStringExtra("pId");
refreshView(STATE_LOAD_LOADING);
mTvBaseTitle.setText(mTitle);
mLlImg.setVisibility(View.VISIBLE);
Glide.with(mActivity)
.load(R.drawable.ic_search_icon_white)
.into(mIvInto);
mIvInto.setOnClickListener(v -> ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_SEARCH)
.withString("id", mId)
.withBoolean("isTab", true)
.navigation());
getNewsTabs();
}
@ -83,8 +95,8 @@ public class NewsMainActivity extends BaseActivity {
if (newsTabBeans != null && newsTabBeans.size() > 0) {
NewsTabBean allBean = new NewsTabBean();
allBean.setDirectoriesName("全部");
allBean.setNewsDirectoriesId("");
allBean.setDirectoriesParentId(mPId);
allBean.setNewsDirectoriesId(mId);
allBean.setDirectoriesParentId(mId);
allBean.setDirectoriesView("2");
newsTabBeans.add(0, allBean);
mTabs = newsTabBeans;
@ -92,6 +104,7 @@ public class NewsMainActivity extends BaseActivity {
Bundle bundle = new Bundle();
bundle.putString("type", newsTabBeans.get(i).getNewsDirectoriesId());
bundle.putString("pId", "");
bundle.putBoolean("isAll", "全部".equals(newsTabBeans.get(i).getDirectoriesName()));
BaseFragment fragment = null;
//0 外部链接 1存在子集 2没有子集
if ("0".equals(newsTabBeans.get(i).getDirectoriesView())) {

View File

@ -0,0 +1,316 @@
package com.tengshisoft.mudulemain.cultural.activitys.news;
import android.text.TextUtils;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
import android.widget.ImageView;
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.gyf.immersionbar.ImmersionBar;
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.BaseActivity;
import com.sucstepsoft.cm_utils.core.widget.views.CustomStateView;
import com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView;
import com.sucstepsoft.cm_utils.utils.toast.ToastUtils;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.R2;
import com.tengshisoft.mudulemain.cultural.adapter.NewsAdapter;
import com.tengshisoft.mudulemain.cultural.adapter.NewsTabAdapter;
import com.tengshisoft.mudulemain.cultural.beans.NewsItemBean;
import com.tengshisoft.mudulemain.cultural.beans.NewsTabBean;
import com.tengshisoft.mudulemain.cultural.net.HomeApi;
import com.tengshisoft.mudulemain.cultural.utils.ExceptionHandler;
import java.util.ArrayList;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
/**
* 搜索新闻
*/
@Route(path = PathConfig.PATH_MODULE_MAIN_NEWS_SEARCH)
public class NewsSearchActivity extends BaseActivity {
@BindView(R2.id.iv_search_back)
ImageView mIvSearchBack;
@BindView(R2.id.et_search_content)
EditText mEtSearchContent;
@BindView(R2.id.tv_search_btn)
TypeFaceTextView mTvSearchBtn;
@BindView(R2.id.srl_content)
SmartRefreshLayout mSrlContent;
@BindView(R2.id.rlv_content)
RecyclerView mRlvContent;
@BindView(R2.id.csv_state)
CustomStateView mCsvState;
@BindView(R2.id.rlv_tab)
RecyclerView mRlvTab;
private String mId;//新闻类型ID;
private String mKeywords = "";//搜索的关键字
private int mCurrentPage = 1;
private List<NewsItemBean.RowsBean> mDatas = new ArrayList<>();
private NewsAdapter mAdapter;
private boolean mIsTab;
private NewsTabAdapter mTabAdapter;
private List<NewsTabBean> mTabs = new ArrayList<>();
private int mSearchCount = 1;
private NewsTabBean mCurrentTab;
@Override
protected int setLayoutId() {
return R.layout.activity_news_search;
}
@Override
public void initData() {
ButterKnife.bind(this);
mRlTitleBar.setVisibility(View.GONE);
mRlTitleBar1.setVisibility(View.GONE);
ImmersionBar.with(this)
.transparentStatusBar()
.statusBarDarkFont(true)
.fullScreen(true)
.init();
refreshView(STATE_LOAD_SUCCESS);
mTvSearchBtn.setVisibility(View.GONE);
mId = getIntent().getStringExtra("id");
//是否有下级目录
mIsTab = getIntent().getBooleanExtra("isTab", false);
mIvSearchBack.setOnClickListener(v -> finish());
mCsvState.setState(CustomStateView.STATE_SEARCH);
mEtSearchContent.setOnEditorActionListener((v, actionId, event) -> {
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
mKeywords = mEtSearchContent.getText().toString().trim();
hideSoftKeyboard();
if (TextUtils.isEmpty(mKeywords)) {
ToastUtils.show("请输入要查询的内容");
} else {
doSaveKeywords();
if (mIsTab && mSearchCount == 1) {
mSearchCount = 2;
getNewsTab();
} else {
doRefreshList(1);
}
return true;
}
}
return false;
});
mAdapter = new NewsAdapter(mActivity, mDatas);
mRlvContent.setLayoutManager(new LinearLayoutManager(mActivity));
mRlvContent.setAdapter(mAdapter);
mAdapter.addOnItemClickByType(this::showNewsDetail);
mTabAdapter = new NewsTabAdapter(mActivity, mTabs);
mRlvTab.setLayoutManager(new LinearLayoutManager(mActivity, LinearLayoutManager.HORIZONTAL, false));
mRlvTab.setAdapter(mTabAdapter);
mTabAdapter.addOnItemClickListener(newsTabBean -> {
mCurrentTab = newsTabBean;
for (int i = 0; i < mTabs.size(); i++) {
NewsTabBean tabBean = mTabs.get(i);
if (tabBean.getDirectoriesName().equals(newsTabBean.getDirectoriesName())) {
tabBean.setCheck(true);
} else {
tabBean.setCheck(false);
}
}
mTabAdapter.setData(mTabs);
doSaveKeywords();
doRefreshList(1);
});
mSrlContent.setOnRefreshListener(refreshLayout -> doRefreshList(2));
mSrlContent.setOnLoadMoreListener(refreshLayout -> doLoadMore());
}
/**
* 显示新闻详情
*
* @param rowsBean
* @param type
*/
private void showNewsDetail(NewsItemBean.RowsBean rowsBean, int type) {
String url = "";
if ("6".equals(rowsBean.getNewsContentType())) {
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
.withString("title", rowsBean.getNewsContentTitle())
.withString("url", rowsBean.getNewsContentContent())
.navigation();
} else {
int newsType = 0;
if (type == 1) {
//1自定义列表
//3列表详情
if ("1".equals(rowsBean.getNewsConfigWebSwitch())) {
//列表
url = rowsBean.getTemplateRecordUrl();
newsType = 0;
} else {
//内容
url = rowsBean.getNewsConfigDescriptionText();
newsType = 1;
}
} else {
newsType = 0;
url = rowsBean.getTemplateRecordUrl();
}
ARouter.getInstance()
.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())//是否可以评论
.withString("isCommentImg", rowsBean.getNewsConfigCommentImage())//评论是否可以上传图片
.withString("isCollect", rowsBean.getNewsContentCollectStatus())
.withString("photo",
BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId())
.withString("title", rowsBean.getNewsContentTitle())
.withInt("type", newsType)
.navigation();
}
}
/**
* 获取二级目录
*/
private void getNewsTab() {
RetrofitManager.getInstance()
.create(HomeApi.class)
.getNewsTabListByPid(mId)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<List<NewsTabBean>>() {
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onNext(List<NewsTabBean> newsTabBeans) {
if (newsTabBeans != null && newsTabBeans.size() > 0) {
NewsTabBean b = new NewsTabBean();
b.setDirectoriesName("全部");
b.setCheck(true);
mCurrentTab = b;
mTabs.add(b);
mTabs.addAll(newsTabBeans);
mTabAdapter.setData(mTabs);
doRefreshList(1);
}
}
@Override
public void onError(Throwable e) {
doRefreshList(1);
}
@Override
public void onComplete() {
}
});
}
/**
* 保存查询的关键字
*/
private void doSaveKeywords() {
String params = String.format(getResources().getString(R.string.big_data_str), "QUERY", mKeywords, "END");
bigDataRead(params);
}
/**
* 刷新列表
*/
private void doRefreshList(int i) {
mCurrentPage = 1;
mDatas.clear();
if (i == 1) {
mCsvState.setState(CustomStateView.STATE_LOAD);
}
mAdapter.setData(mDatas);
if (mIsTab) {
if ("全部".equals(mCurrentTab.getDirectoriesName())) {
getNewsList("", mId);
} else {
getNewsList(mCurrentTab.getNewsDirectoriesId(), "");
}
} else {
getNewsList("", mId);
}
}
/**
* 加载更多
*/
private void doLoadMore() {
++mCurrentPage;
if (mIsTab) {
if ("全部".equals(mCurrentTab.getDirectoriesName())) {
getNewsList("", mId);
} else {
getNewsList(mCurrentTab.getNewsDirectoriesId(), "");
}
} else {
getNewsList("", mId);
}
}
private void getNewsList(String id, String pId) {
RetrofitManager.getInstance()
.create(HomeApi.class)
.getNewsList(id, pId, mCurrentPage + "", "10", mKeywords)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<NewsItemBean>() {
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onNext(NewsItemBean newsItemBean) {
mDatas.addAll(newsItemBean.getRows());
mAdapter.setData(mDatas);
mSrlContent.finishRefresh();
mSrlContent.finishLoadMore();
if (newsItemBean.getRows().size() > 0) {
mCsvState.setState(CustomStateView.STATE_SUCCESS);
} else {
if (mCurrentPage == 1) {
mCsvState.setState(CustomStateView.STATE_EMPTY);
}
mSrlContent.setNoMoreData(true);
}
}
@Override
public void onError(Throwable e) {
ExceptionHandler.handleException(e);
mCsvState.setState(CustomStateView.STATE_ERROR);
mSrlContent.finishLoadMore();
mSrlContent.finishRefresh();
}
@Override
public void onComplete() {
}
});
}
}

View File

@ -0,0 +1,51 @@
package com.tengshisoft.mudulemain.cultural.adapter;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.cultural.beans.NewsTabBean;
import com.tengshisoft.mudulemain.cultural.holder.NewsTabHolder;
import java.util.List;
/**
* 作者: adam
* 日期: 2020/5/15 - 10:00 AM
* 邮箱: itgaojian@163.com
* 描述:
*/
public class NewsTabAdapter extends BaseRecyclerAdapter<NewsTabBean, NewsTabHolder> {
public NewsTabAdapter(Context ctx, List<NewsTabBean> list) {
super(ctx, list);
}
@Override
public long getItemId(int position) {
return position;
}
@Override
public NewsTabHolder createHolder(ViewGroup parent, int viewType) {
View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_tab, parent, false);
return new NewsTabHolder(itemView);
}
@Override
public void bindHolder(NewsTabHolder funcHolder, int i) {
NewsTabBean tab = mData.get(i);
if (tab.isCheck()) {
funcHolder.mVLine.setVisibility(View.VISIBLE);
} else {
funcHolder.mVLine.setVisibility(View.INVISIBLE);
}
funcHolder.mTvName.setText(tab.getDirectoriesName());
}
}

View File

@ -41,6 +41,16 @@ public class NewsTabBean {
private String directoriesTarget3;
private String directoriesView;
private String newsDirectoriesId;
private boolean isCheck;
public boolean isCheck() {
return isCheck;
}
public void setCheck(boolean check) {
isCheck = check;
}
@Override
public String toString() {

View File

@ -213,7 +213,7 @@ public class HomeFragment extends BaseFragment {
} else {
if (!TextUtils.isEmpty(bean.getId())) {
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)
.withString("id", bean.getId())
.withString("url", bean.getUrl())
.withString("isComment", bean.getIsComment())//是否可以评论
@ -450,44 +450,45 @@ public class HomeFragment extends BaseFragment {
* @param type
*/
private void showNewsDetail(NewsItemBean.RowsBean rowsBean, int type) {
String url = "";
if ("6".equals(rowsBean.getNewsContentType())) {
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
.withString("title", rowsBean.getNewsContentTitle())
.withString("url", rowsBean.getNewsContentContent())
.navigation();
} else {
int newsType = 0;
if (type == 1) {
//1自定义列表
//3列表详情
if ("1".equals(rowsBean.getNewsConfigWebSwitch())) {
//列表
url = rowsBean.getTemplateRecordUrl();
newsType = 0;
} else {
//内容
url = rowsBean.getNewsConfigDescriptionText();
newsType = 1;
}
} else {
newsType = 0;
url = rowsBean.getTemplateRecordUrl();
}
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)
.withString("id", rowsBean.getNewsContentId())
.withString("url", url)
.withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论
.withString("isCommentImg", rowsBean.getNewsConfigCommentImage())//评论是否可以上传图片
.withString("isCollect", rowsBean.getNewsContentCollectStatus())
.withString("photo",
BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId())
.withString("title", rowsBean.getNewsContentTitle())
.withInt("type", newsType)
.navigation();
}
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)
.withString("id", rowsBean.getNewsContentId())
.withString("url", "")
.withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论
.withString("isCommentImg", rowsBean.getNewsConfigCommentImage())//评论是否可以上传图片
.withString("isCollect", rowsBean.getNewsContentCollectStatus())
.withString("photo",
BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId())
.withString("title", rowsBean.getNewsContentTitle())
.withInt("type", -1)
.navigation();
// String url = "";
// if ("6".equals(rowsBean.getNewsContentType())) {
// ARouter.getInstance()
// .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
// .withString("title", rowsBean.getNewsContentTitle())
// .withString("url", rowsBean.getNewsContentContent())
// .navigation();
// } else {
// int newsType = 0;
// if (type == 1) {
// //1自定义列表
// //3列表详情
// if ("1".equals(rowsBean.getNewsConfigWebSwitch())) {
// //列表
// url = rowsBean.getTemplateRecordUrl();
// newsType = 0;
// } else {
// //内容
// url = rowsBean.getNewsConfigDescriptionText();
// newsType = 1;
// }
// } else {
// newsType = 0;
// url = rowsBean.getTemplateRecordUrl();
// }
//
// }
}
private void getBannerData() {
@ -566,7 +567,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>() {
@ -878,7 +879,6 @@ public class HomeFragment extends BaseFragment {
NewsAdapter adapter = new NewsAdapter(mActivity, tempList);
adapter.addOnItemClickByType(this::showNewsDetail);
RelativeLayout rlvLayout = new RelativeLayout(mActivity);
rlvLayout.setBackgroundColor(Color.parseColor("#000000"));
RelativeLayout.LayoutParams rlvParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
rlvParams.addRule(RelativeLayout.CENTER_IN_PARENT, RelativeLayout.TRUE);
rlvLayout.setLayoutParams(rlvParams);

View File

@ -110,44 +110,45 @@ public class NewsFragment extends BaseFragment {
}
private void showNewsDetail(NewsItemBean.RowsBean rowsBean, int type) {
String url = "";
if ("6".equals(rowsBean.getNewsContentType())) {
//链接新闻
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
.withString("url", rowsBean.getNewsContentContent())
.withString("title", rowsBean.getNewsContentTitle())
.navigation();
} else {
int newsType = 0;
if (type == 1) {
//1自定义列表
//3列表详情
if ("1".equals(rowsBean.getNewsConfigWebSwitch())) {
//列表
url = rowsBean.getTemplateRecordUrl();
newsType = 0;
} else {
//内容
url = rowsBean.getNewsConfigDescriptionText();
newsType = 1;
}
} else {
newsType = 0;
url = rowsBean.getTemplateRecordUrl();
}
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL)
.withString("id", rowsBean.getNewsContentId())
.withString("url", url)
.withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论
.withString("isCommentImg", rowsBean.getNewsConfigCommentImage())//评论是否可以上传图片
.withString("isCollect", rowsBean.getNewsContentCollectStatus())
.withString("photo", BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId())
.withString("title", rowsBean.getNewsContentTitle())
.withInt("type", newsType)
.navigation();
}
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_MAIN_NEWS_DETAIL_INTERFACE)
.withString("id", rowsBean.getNewsContentId())
.withString("url", "")
.withString("isComment", rowsBean.getNewsConfigComment())//是否可以评论
.withString("isCommentImg", rowsBean.getNewsConfigCommentImage())//评论是否可以上传图片
.withString("isCollect", rowsBean.getNewsContentCollectStatus())
.withString("photo", BaseUrlApi.BASE_NEWS_IMG_URL + rowsBean.getNewsContentCoverList().get(0).getContentCoverId())
.withString("title", rowsBean.getNewsContentTitle())
.withInt("type", -1)
.navigation();
// String url = "";
// if ("6".equals(rowsBean.getNewsContentType())) {
// //链接新闻
// ARouter.getInstance()
// .build(PathConfig.PATH_MODULE_MAIN_NEWS_WEB)
// .withString("url", rowsBean.getNewsContentContent())
// .withString("title", rowsBean.getNewsContentTitle())
// .navigation();
// } else {
// int newsType = 0;
// if (type == 1) {
// //1自定义列表
// //3列表详情
// if ("1".equals(rowsBean.getNewsConfigWebSwitch())) {
// //列表
// url = rowsBean.getTemplateRecordUrl();
// newsType = 0;
// } else {
// //内容
// url = rowsBean.getNewsConfigDescriptionText();
// newsType = 1;
// }
// } else {
// newsType = 0;
// url = rowsBean.getTemplateRecordUrl();
// }
//
// }
}
private void getNewsListByTypeToken(int page) {

View File

@ -0,0 +1,21 @@
package com.tengshisoft.mudulemain.cultural.holder;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView;
import com.tengshisoft.mudulemain.R;
public class NewsTabHolder extends RecyclerView.ViewHolder {
public View mVLine;
public TypeFaceTextView mTvName;
public NewsTabHolder(@NonNull View itemView) {
super(itemView);
mVLine = itemView.findViewById(R.id.v_line);
mTvName = itemView.findViewById(R.id.tv_name);
}
}

View File

@ -136,7 +136,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> getNewsTabListByPid(@Query("newsDirectoriesId") String pid, @Query("newsDirectoriesParentId") String pId, @Query("rows") String rows, @Query("page") String page);
Observable<NewsItemBean> getNewsTabListByPid(@Query("newsDirectoriesId") String id, @Query("newsDirectoriesParentId") 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);
/**
@ -144,7 +144,18 @@ 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);
Observable<NewsItemBean> getNewsList(@Query("newsDirectoriesId") String newsDirectoriesId, @Query("newsDirectoriesParentId") String pId, @Query("page") String page);
/**
* 获取新闻列表-不需要token
*/
@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,
@Query("rows") String rows,
@Query("keywords") String keywords);
/**
* 获取新闻评论数量,多个新闻ID用下划线隔开(id_id_id)
@ -158,14 +169,16 @@ 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);
Observable<NewsItemBean> getMainNewsList(@Query("newsDirectoriesId") String newsDirectoriesId, @Query("newsDirectoriesParentId") String pId, @Query("rows") String rows,
@Query("page") String page);
/**
* 获取新闻列表-需要token
*/
@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);
Observable<NewsItemBean> getNewsListByToken(@Query("newsDirectoriesId") String newsDirectoriesId, @Query("newsDirectoriesParentId") String pId, @Query("page") String page,
@Header("token") String token);
/**
* 获取新闻列表-需要token

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

View File

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

View File

@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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:orientation="vertical"
android:paddingTop="30dp"
tools:context=".cultural.activitys.news.NewsSearchActivity">
<include layout="@layout/layout_search" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_tab"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
tools:orientation="horizontal" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:padding="10dp">
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/srl_content"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_content"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
<com.sucstepsoft.cm_utils.core.widget.views.CustomStateView
android:id="@+id/csv_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true" />
</RelativeLayout>
</LinearLayout>

View File

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

View File

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="vertical">
<com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dp"
android:textSize="@dimen/text_14"
tools:text="全部" />
<View
android:id="@+id/v_line"
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="10dp"
android:layout_marginTop="2dp"
android:layout_marginRight="10dp"
android:background="@color/app_title_9f_no" />
</LinearLayout>

View File

@ -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,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">
@ -151,6 +220,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 +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

View File

@ -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

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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="wrap_content"
@ -18,172 +17,151 @@
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="20dp"
android:layout_marginRight="20dp"
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" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
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_change_pwd"
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_change_pwd"
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_change_pwd" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_change_pwd" />
<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>
<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
<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"