提交 21a2083a authored 作者: yubingbing's avatar yubingbing

1.在污染物巡检里面加一个删除按钮 做删除功能。

2.在重点监管单位  监督里面  加个生成报表 按钮  做一个导出excel的功能。
3.需要把pc端的 发送消息功能  也在app里面加一个。
上级 16a46905
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<runningDeviceTargetSelectedWithDropDown>
<Target>
<type value="RUNNING_DEVICE_TARGET" />
<deviceKey>
<Key>
<type value="SERIAL_NUMBER" />
<value value="L203216F01228" />
</Key>
</deviceKey>
</Target>
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2022-11-16T06:14:44.929411Z" />
</component>
</project>
\ No newline at end of file
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
}
android {
......
......@@ -54,6 +54,10 @@
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:targetApi="31">
<activity
android:name=".ui.mine.activity.AddMassageActivity"
android:exported="false">
</activity>
<activity
android:name=".ui.mine.activity.MassageDetailActivity"
android:exported="false" />
......
......@@ -10,7 +10,6 @@ import java.util.List;
*/
public class MassageBean {
private List<RecordsBean> records;
private Integer total;
private Integer size;
......@@ -103,40 +102,35 @@ public class MassageBean {
}
public static class RecordsBean implements Serializable {
private Object busId;
private String readFlag;
private String anntId;
private Object pageSize;
private String priority_dictText;
private String msgType;
private String msgAbstract;
private Object priority;
private String userId;
private String sendTime;
private String delFlag;
private Object openType;
private String msgType_dictText;
private Object openPage;
private String titile;
private String msgContent;
private String sender;
private Object bizSource;
private Object pageNo;
private String updateBy;
private String sendStatus_dictText;
private Object userIds;
private String startTime;
private String id;
private String msgCategory;
private Object busType;
public Object getBusId() {
return busId;
}
public void setBusId(Object busId) {
this.busId = busId;
}
public String getReadFlag() {
return readFlag;
}
public void setReadFlag(String readFlag) {
this.readFlag = readFlag;
}
private Object dtTaskId;
private Object busId;
private String updateTime;
private String priority;
private String sendTime;
private String createBy;
private String msgContent;
private String sender;
private Object cancelTime;
private String createTime;
private String msgCategory_dictText;
private String sendStatus;
private String endTime;
private String anntId;
public String getAnntId() {
return anntId;
......@@ -146,44 +140,36 @@ public class MassageBean {
this.anntId = anntId;
}
public Object getPageSize() {
return pageSize;
public String getPriority_dictText() {
return priority_dictText;
}
public void setPageSize(Object pageSize) {
this.pageSize = pageSize;
}
public String getMsgAbstract() {
return msgAbstract;
}
public void setMsgAbstract(String msgAbstract) {
this.msgAbstract = msgAbstract;
public void setPriority_dictText(String priority_dictText) {
this.priority_dictText = priority_dictText;
}
public Object getPriority() {
return priority;
public String getMsgType() {
return msgType;
}
public void setPriority(Object priority) {
this.priority = priority;
public void setMsgType(String msgType) {
this.msgType = msgType;
}
public String getUserId() {
return userId;
public String getMsgAbstract() {
return msgAbstract;
}
public void setUserId(String userId) {
this.userId = userId;
public void setMsgAbstract(String msgAbstract) {
this.msgAbstract = msgAbstract;
}
public String getSendTime() {
return sendTime;
public String getDelFlag() {
return delFlag;
}
public void setSendTime(String sendTime) {
this.sendTime = sendTime;
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public Object getOpenType() {
......@@ -194,6 +180,14 @@ public class MassageBean {
this.openType = openType;
}
public String getMsgType_dictText() {
return msgType_dictText;
}
public void setMsgType_dictText(String msgType_dictText) {
this.msgType_dictText = msgType_dictText;
}
public Object getOpenPage() {
return openPage;
}
......@@ -210,36 +204,36 @@ public class MassageBean {
this.titile = titile;
}
public String getMsgContent() {
return msgContent;
public String getUpdateBy() {
return updateBy;
}
public void setMsgContent(String msgContent) {
this.msgContent = msgContent;
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
public String getSender() {
return sender;
public String getSendStatus_dictText() {
return sendStatus_dictText;
}
public void setSender(String sender) {
this.sender = sender;
public void setSendStatus_dictText(String sendStatus_dictText) {
this.sendStatus_dictText = sendStatus_dictText;
}
public Object getBizSource() {
return bizSource;
public Object getUserIds() {
return userIds;
}
public void setBizSource(Object bizSource) {
this.bizSource = bizSource;
public void setUserIds(Object userIds) {
this.userIds = userIds;
}
public Object getPageNo() {
return pageNo;
public String getStartTime() {
return startTime;
}
public void setPageNo(Object pageNo) {
this.pageNo = pageNo;
public void setStartTime(String startTime) {
this.startTime = startTime;
}
public String getId() {
......@@ -265,5 +259,109 @@ public class MassageBean {
public void setBusType(Object busType) {
this.busType = busType;
}
public Object getDtTaskId() {
return dtTaskId;
}
public void setDtTaskId(Object dtTaskId) {
this.dtTaskId = dtTaskId;
}
public Object getBusId() {
return busId;
}
public void setBusId(Object busId) {
this.busId = busId;
}
public String getUpdateTime() {
return updateTime;
}
public void setUpdateTime(String updateTime) {
this.updateTime = updateTime;
}
public String getPriority() {
return priority;
}
public void setPriority(String priority) {
this.priority = priority;
}
public String getSendTime() {
return sendTime;
}
public void setSendTime(String sendTime) {
this.sendTime = sendTime;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public String getMsgContent() {
return msgContent;
}
public void setMsgContent(String msgContent) {
this.msgContent = msgContent;
}
public String getSender() {
return sender;
}
public void setSender(String sender) {
this.sender = sender;
}
public Object getCancelTime() {
return cancelTime;
}
public void setCancelTime(Object cancelTime) {
this.cancelTime = cancelTime;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getMsgCategory_dictText() {
return msgCategory_dictText;
}
public void setMsgCategory_dictText(String msgCategory_dictText) {
this.msgCategory_dictText = msgCategory_dictText;
}
public String getSendStatus() {
return sendStatus;
}
public void setSendStatus(String sendStatus) {
this.sendStatus = sendStatus;
}
public String getEndTime() {
return endTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
}
}
......@@ -22,6 +22,7 @@ public class HttpApi {
public static final String EDIT_WSCLSS = "app/index/editWsclss";//污水处理设施分页查询-编辑
public static final String ZDJGDW_LIST = "app/index/zdjgdwPagelist";//重点监管单位列表
public static final String ZDJGDWJDXX_LIST = "app/index/zdjgdwJdxxList";//重点监管单位分页查询-监督信息-分页列表查询
public static final String ZDJGDWJDXX_EXOPORT = "/app/index/exportXlsJdxx";//重点监管单位分页查询-监督信息-生成报表
public static final String ZDJGDWJDXX_ADD = "app/index/zdjgdwJdxxAdd";//重点监管单位分页查询-监督信息-添加
public static final String ZDJGDWJDXX_EDIT = "app/index/zdjgdwJdxxEdit";//重点监管单位分页查询-监督信息-编辑
public static final String WRDL_LIST = "app/index/wrdkPagelist";//污染地块分页查询
......@@ -61,14 +62,17 @@ public class HttpApi {
public static final String WRWXJ_PAGE_LIST = "app/general/wrwxjPagelist";//污染物巡检-分页列表查询
public static final String ADD_WRWXJ = "app/general/addWrwxj";//污染物巡检-添加
public static final String EDIT_WRWXJ = "app/general/editWrwxj";//污染物巡检-编辑
public static final String DEL_WRWXJ = "app/general/delWrwxj";//污染物巡检-删除
//-------------------我的-------------------
public static final String LOGIN = "sys/mlogin";//商户登录
public static final String GET_APP_NAME = "sys/common/getAppName";//登录页APP名称
public static final String RANDOM_IMAGE = "sys/randomImage/";//验证码
// public static final String MESSAHGE = "sys/sysAnnouncementSend/findUserMessage";//用户消息列表
public static final String MESSAHGE = "sys/sysAnnouncementSend/getMyAnnouncementSend";//用户消息列表
public static final String MESSAHGE_PUSH = "sys/annountCement/list";//消息推送列表
public static final String MESSAHGE_PUBLISH = "sys/annountCement/doReleaseData";//发布
public static final String MESSAHGE_ADD = "sys/annountCement/add";//添加消息
public static final String MESSAHGE_EDIT = "sys/annountCement/edit";//编辑消息
public static final String MESSAHGE_READ = "sys/sysAnnouncementSend/editByAnntIdAndUserId";//更新用户消息阅读状态
......
......@@ -3,6 +3,7 @@ package com.zztrapp.zztrapp.http;
import static java.util.concurrent.TimeUnit.SECONDS;
import android.content.Context;
import android.text.TextUtils;
import com.google.gson.Gson;
import com.zztrapp.zztrapp.bean.BfjPageListBean;
......@@ -545,6 +546,13 @@ public class HttpMethods {
toSubscribe(observable, subscriber);
}
public void delWrwxj(ProgressSubscriber<HttpResult<String>> subscriber, HashMap<String, Object> mapNew) {
initCommonParameter();
RequestBody body = getBody(mapNew);
Observable observable = ZztrService.delWrwxj(authorization, body);
toSubscribe(observable, subscriber);
}
//-------------------我的-------------------
public void getAppName(ProgressSubscriber<HttpResult<GetAppNameBean>> subscriber) {
......@@ -574,6 +582,37 @@ public class HttpMethods {
toSubscribe(observable, subscriber);
}
public void messagePush(ProgressSubscriber<HttpResult<MassageBean>> subscriber, int pageNo, int pageSize, String titile, int readFlag) {
initCommonParameter();
map.put("pageNo", pageNo);
map.put("pageSize", pageSize);
if (!TextUtils.isEmpty(titile)) {
map.put("titile", titile);
}
Observable observable = ZztrService.messagePush(authorization, map);
toSubscribe(observable, subscriber);
}
public void messagePublish(ProgressSubscriber<HttpResult<String>> subscriber, HashMap<String, Object> mapNew) {
initCommonParameter();
Observable observable = ZztrService.messagePublish(authorization, mapNew);
toSubscribe(observable, subscriber);
}
public void messageAdd(ProgressSubscriber<HttpResult<String>> subscriber, HashMap<String, Object> mapNew) {
initCommonParameter();
RequestBody body = getBody(mapNew);
Observable observable = ZztrService.messageAdd(authorization, body);
toSubscribe(observable, subscriber);
}
public void messageEdit(ProgressSubscriber<HttpResult<String>> subscriber, HashMap<String, Object> mapNew) {
initCommonParameter();
RequestBody body = getBody(mapNew);
Observable observable = ZztrService.messageEdit(authorization, body);
toSubscribe(observable, subscriber);
}
public void messageRead(ProgressSubscriber<HttpResult<String>> subscriber, HashMap<String, Object> mapNew) {
initCommonParameter();
RequestBody body = getBody(mapNew);
......
......@@ -195,6 +195,9 @@ public interface ZztrService {
@POST(HttpApi.EDIT_WRWXJ)
Observable<HttpResult<String>> editWrwxj(@Header("X-Access-Token") String token, @Body RequestBody body);
@POST(HttpApi.DEL_WRWXJ)
Observable<HttpResult<String>> delWrwxj(@Header("X-Access-Token") String token, @Body RequestBody body);
//-------------------我的-------------------
@POST(HttpApi.LOGIN)
......@@ -203,6 +206,18 @@ public interface ZztrService {
@GET(HttpApi.MESSAHGE)
Observable<HttpResult<MassageBean>> findUserMessage(@Header("X-Access-Token") String token, @QueryMap Map<String, Object> map);
@GET(HttpApi.MESSAHGE_PUSH)
Observable<HttpResult<MassageBean>> messagePush(@Header("X-Access-Token") String token, @QueryMap Map<String, Object> map);
@GET(HttpApi.MESSAHGE_PUBLISH)
Observable<HttpResult<String>> messagePublish(@Header("X-Access-Token") String token, @QueryMap Map<String, Object> map);
@POST(HttpApi.MESSAHGE_ADD)
Observable<HttpResult<String>> messageAdd(@Header("X-Access-Token") String token, @Body RequestBody body);
@POST(HttpApi.MESSAHGE_EDIT)
Observable<HttpResult<String>> messageEdit(@Header("X-Access-Token") String token, @Body RequestBody body);
@POST(HttpApi.MESSAHGE_READ)
Observable<HttpResult<String>> messageRead(@Header("X-Access-Token") String token, @Body RequestBody body);
......
......@@ -33,6 +33,7 @@ import com.zztrapp.zztrapp.utilcode.mUtil.MyUtil;
import com.zztrapp.zztrapp.utilcode.util.ToastUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
/**
......@@ -147,7 +148,9 @@ public class WrwxcActivity extends BaseActivity {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
//todo
HashMap<String, Object> map = new HashMap<>();
map.put("id", id);
delWrwxj(map, position);
}
});
alertdialogbuilder.setNeutralButton("取消", new DialogInterface.OnClickListener() {
......@@ -244,10 +247,36 @@ public class WrwxcActivity extends BaseActivity {
HttpMethods.getInstance(this).wrwxjPagelist(httpResultProgressSubscriber, pageNo, Constant.PAGE_SIZE, searchName);
}
//删除
private void delWrwxj(HashMap<String, Object> map, int position) {
ISubscriberOnNextListener<HttpResult<String>> iSubscriberOnNextListener = new ISubscriberOnNextListener<HttpResult<String>>() {
@Override
public void onNext(HttpResult<String> httpResult) {
if (httpResult.getCode() == 200) {
list.remove(position);
adapter.setData(list);
} else {
ToastUtils.make().setGravity(Gravity.CENTER, 0, 0).show(httpResult.getMessage());
}
}
@Override
public void onError(int code, String message) {
ToastUtils.make().setGravity(Gravity.CENTER, 0, 0).show(message);
}
};
ProgressSubscriber<HttpResult<String>> httpResultProgressSubscriber = new ProgressSubscriber<>(iSubscriberOnNextListener, this, true);
RxApiManager.get().add("delWrwxj", httpResultProgressSubscriber);
HttpMethods.getInstance(this).delWrwxj(httpResultProgressSubscriber, map);
}
@Override
protected void onDestroy() {
super.onDestroy();
binding = null;
RxApiManager.get().cancel("wrwxjPagelist");
RxApiManager.get().cancel("delWrwxj");
}
}
\ No newline at end of file
package com.zztrapp.zztrapp.ui.index.activity;
import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.Gravity;
import android.view.View;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
......@@ -16,11 +19,15 @@ import com.scwang.smart.refresh.footer.ClassicsFooter;
import com.scwang.smart.refresh.header.ClassicsHeader;
import com.scwang.smart.refresh.layout.api.RefreshLayout;
import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
import com.zztrapp.zztrapp.R;
import com.zztrapp.zztrapp.base.BaseActivity;
import com.zztrapp.zztrapp.bean.HttpResult;
import com.zztrapp.zztrapp.bean.ZdjgdwJdxxBean;
import com.zztrapp.zztrapp.constant.Constant;
import com.zztrapp.zztrapp.databinding.ActivityZdjgdwJdxxBinding;
import com.zztrapp.zztrapp.download.TCallBackUtil;
import com.zztrapp.zztrapp.download.TOkhttpUtil;
import com.zztrapp.zztrapp.http.HttpApi;
import com.zztrapp.zztrapp.http.HttpMethods;
import com.zztrapp.zztrapp.http.ISubscriberOnNextListener;
import com.zztrapp.zztrapp.http.ProgressSubscriber;
......@@ -29,10 +36,14 @@ import com.zztrapp.zztrapp.ui.index.adapter.ZdjgdwJdxxAdapter;
import com.zztrapp.zztrapp.utilcode.mUtil.MyUtil;
import com.zztrapp.zztrapp.utilcode.util.ToastUtils;
import java.io.File;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import okhttp3.Call;
/**
* Describe 重点监管单位分页查询-监督信息-分页列表查询
* Created by Bby on 2022/8/2
......@@ -50,6 +61,7 @@ public class ZdjgdwJdxxActivity extends BaseActivity {
private boolean isRefresh = true;//true 刷新 false 加载
private List<ZdjgdwJdxxBean.RecordsBean> list = new ArrayList<>();
private ZdjgdwJdxxAdapter adapter;
private Dialog mDialogDownLoad;
@Override
public View getLayoutId() {
......@@ -72,6 +84,7 @@ public class ZdjgdwJdxxActivity extends BaseActivity {
@Override
protected void init() {
mDialogDownLoad = initProgressDialogDownLoad(this, "下载中...");
pid = getIntent().getStringExtra("id");
binding.navView.navTitle.setText("监管信息");
binding.navView.navBack.setOnClickListener(new View.OnClickListener() {
......@@ -133,6 +146,16 @@ public class ZdjgdwJdxxActivity extends BaseActivity {
}
});
binding.reportForms.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (list.size() > 0) {
upLoadFile("监督信息.xls");
} else {
ToastUtils.make().setGravity(Gravity.CENTER, 0, 0).show("暂无数据");
}
}
});
binding.add.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
......@@ -313,6 +336,58 @@ public class ZdjgdwJdxxActivity extends BaseActivity {
HttpMethods.getInstance(ZdjgdwJdxxActivity.this).zdjgdwJdxxList(httpResultProgressSubscriber, pageNo, Constant.PAGE_SIZE, pid, startTime, endTime);
}
public Dialog initProgressDialogDownLoad(Context context, String title) {
if (mDialogDownLoad == null) {
mDialogDownLoad = new Dialog(context, R.style.LoadingDialogStyle);
mDialogDownLoad.setContentView(R.layout.layout_dialog);
mDialogDownLoad.setCancelable(true);
mDialogDownLoad.setCanceledOnTouchOutside(false);
mDialogDownLoad.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
TextView msg = mDialogDownLoad.findViewById(R.id.id_tv_loadingmsg);
msg.setText(title);
msg.setVisibility(View.GONE);
mDialogDownLoad.setCancelable(false);
}
return mDialogDownLoad;
}
//下载-生成报表
private void upLoadFile(String fileName) {
String sTime = "";
String eTime = "";
if (!TextUtils.isEmpty(startTime) && !TextUtils.isEmpty(endTime)) {
sTime = startTime;
eTime = endTime;
}
HashMap<String, String> map = new HashMap<>();
map.put("trzdwryJgdwmlId", pid);
map.put("startTime", sTime);
map.put("endTime", eTime);
// String appPath = Environment.getExternalStorageDirectory().getAbsolutePath();//手机内存的根目录
String appPath = getApplicationContext().getFilesDir().getAbsolutePath();//此APP的files路径
TOkhttpUtil.okHttpDownloadFile(HttpApi.BASE_URL + HttpApi.ZDJGDWJDXX_EXOPORT, map, new TCallBackUtil.TCallBackFile(appPath, fileName) {
// TOkhttpUtil.okHttpDownloadFile(HttpApi.BASE_URL + filePath, map, new TCallBackUtil.TCallBackFile(appPath, fileName) {
@Override
public void onFailure(Call call, Exception e) {
if (mDialogDownLoad != null && mDialogDownLoad.isShowing()) {
mDialogDownLoad.dismiss();
}
ToastUtils.make().setGravity(Gravity.CENTER, 0, 0).show("打开失败,请稍后重试");
}
@Override
public void onResponse(File response) {
if (mDialogDownLoad != null && mDialogDownLoad.isShowing()) {
mDialogDownLoad.dismiss();
}
ToastUtils.make().setGravity(Gravity.CENTER, 0, 0).show("下载成功,已保存到手机");
}
});
}
@Override
protected void onDestroy() {
super.onDestroy();
......
......@@ -3,6 +3,7 @@ package com.zztrapp.zztrapp.ui.mine.adapter;
import android.annotation.SuppressLint;
import android.content.Context;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
......@@ -12,7 +13,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.google.android.flexbox.FlexboxLayoutManager;
import com.zztrapp.zztrapp.bean.MassageBean;
import com.zztrapp.zztrapp.databinding.ItemRvSpecialTasksBinding;
import com.zztrapp.zztrapp.databinding.ItemRvMessageBinding;
import com.zztrapp.zztrapp.ui.currency.adapter.FlexBoxItemAdapter;
import java.util.ArrayList;
......@@ -29,9 +30,14 @@ public class MassageAdapter extends RecyclerView.Adapter<MassageAdapter.ItemHold
private Context mContext;
private OnItemClickListener onItemClickListener;
private List<MassageBean.RecordsBean> list;
private int nav;
public interface OnItemClickListener {
void onLookDetailClick(String id, int position);
void onEditClick(String id, int position);
void onPublishClick(String id, int position);
}
public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
......@@ -42,23 +48,31 @@ public class MassageAdapter extends RecyclerView.Adapter<MassageAdapter.ItemHold
this.mContext = context;
}
public void setData(List<MassageBean.RecordsBean> list) {
public void setData(List<MassageBean.RecordsBean> list, int nav) {
this.list = list;
this.nav = nav;
notifyDataSetChanged();
}
@NonNull
@Override
public ItemHolder onCreateViewHolder(ViewGroup parent, int viewType) {
ItemRvSpecialTasksBinding binding = ItemRvSpecialTasksBinding.inflate(LayoutInflater.from(mContext), parent, false);
ItemRvMessageBinding binding = ItemRvMessageBinding.inflate(LayoutInflater.from(mContext), parent, false);
return new ItemHolder(binding);
}
@Override
public void onBindViewHolder(ItemHolder holder, @SuppressLint("RecyclerView") int position) {
holder.bindings.edit.setVisibility(View.GONE);
holder.bindings.lookDetail.setText("查看");
holder.bindings.taskName.setText("标题 " + list.get(position).getTitile());
holder.bindings.publish.setVisibility(View.GONE);
holder.bindings.lookDetail.setVisibility(View.VISIBLE);
//发布状态(0未发布,1已发布,2已撤销)
if (nav == 2 && list.get(position).getSendStatus().equals("0")) {
holder.bindings.edit.setVisibility(View.VISIBLE);
holder.bindings.publish.setVisibility(View.VISIBLE);
holder.bindings.lookDetail.setVisibility(View.GONE);
}
holder.bindings.title.setText("标题 " + list.get(position).getTitile());
List<String> arrayList = new ArrayList<>();
String msgType = "通知公告";//消息类型1:通知公告2:系统消息
switch (list.get(position).getMsgCategory()) {
......@@ -78,7 +92,11 @@ public class MassageAdapter extends RecyclerView.Adapter<MassageAdapter.ItemHold
} else if ("H".equals(list.get(position).getPriority())) {
arrayList.add("优先级:高");
} else {
arrayList.add("优先级:" + list.get(position).getPriority());
if (TextUtils.isEmpty(list.get(position).getPriority())) {
arrayList.add("优先级:");
} else {
arrayList.add("优先级:" + list.get(position).getPriority());
}
}
holder.bindings.rv.setLayoutManager(new FlexboxLayoutManager(mContext));
FlexBoxItemAdapter adapter = new FlexBoxItemAdapter(mContext);
......@@ -93,6 +111,22 @@ public class MassageAdapter extends RecyclerView.Adapter<MassageAdapter.ItemHold
}
}
});
holder.bindings.edit.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (onItemClickListener != null) {
onItemClickListener.onEditClick(list.get(position).getId(), position);
}
}
});
holder.bindings.publish.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (onItemClickListener != null) {
onItemClickListener.onPublishClick(list.get(position).getId(), position);
}
}
});
}
@Override
......@@ -101,9 +135,9 @@ public class MassageAdapter extends RecyclerView.Adapter<MassageAdapter.ItemHold
}
static class ItemHolder extends RecyclerView.ViewHolder {
private ItemRvSpecialTasksBinding bindings;
private ItemRvMessageBinding bindings;
public ItemHolder(ItemRvSpecialTasksBinding binding) {
public ItemHolder(ItemRvMessageBinding binding) {
super(binding.getRoot());
bindings = binding;
}
......
......@@ -126,6 +126,28 @@
android:background="@color/colorTransparent" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/nav2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="28pt">
<TextView
android:id="@+id/nav2_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="消息推送"
android:textColor="@color/color232323"
android:textSize="16pt" />
<View
android:id="@+id/line2"
android:layout_width="66pt"
android:layout_height="2pt"
android:layout_below="@id/nav2_name"
android:layout_marginTop="7pt"
android:background="@color/colorTransparent" />
</RelativeLayout>
</LinearLayout>
<com.scwang.smart.refresh.layout.SmartRefreshLayout
......@@ -141,5 +163,29 @@
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
<RelativeLayout
android:id="@+id/bottom_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginTop="2pt"
android:layout_marginBottom="19pt"
android:gravity="center_vertical"
android:paddingStart="15pt"
android:paddingEnd="15pt"
android:visibility="gone"
tools:viewBindingIgnore="true">
<TextView
android:id="@+id/add"
android:layout_width="match_parent"
android:layout_height="48pt"
android:layout_alignParentEnd="true"
android:background="@drawable/shape_2c86ff_7"
android:gravity="center"
android:text="@string/add"
android:textColor="@color/white"
android:textSize="16pt" />
</RelativeLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
......@@ -138,17 +138,38 @@
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
<TextView
android:id="@+id/add"
<RelativeLayout
android:id="@+id/bottom_view"
android:layout_width="match_parent"
android:layout_height="48pt"
android:layout_marginStart="17pt"
android:layout_height="wrap_content"
android:layout_marginTop="2pt"
android:layout_marginEnd="17pt"
android:layout_marginBottom="19pt"
android:background="@drawable/shape_007aff_7"
android:gravity="center"
android:text="@string/add"
android:textColor="@color/white"
android:textSize="16pt" />
android:layout_alignParentBottom="true"
android:gravity="center_vertical"
android:paddingStart="15pt"
android:paddingEnd="15pt"
tools:viewBindingIgnore="true">
<TextView
android:id="@+id/report_forms"
android:layout_width="200pt"
android:layout_height="48pt"
android:background="@drawable/shape_ffbf00_7"
android:gravity="center"
android:text="生成报表"
android:textColor="@color/white"
android:textSize="16pt" />
<TextView
android:id="@+id/add"
android:layout_width="130pt"
android:layout_height="48pt"
android:layout_alignParentEnd="true"
android:background="@drawable/shape_2c86ff_7"
android:gravity="center"
android:text="@string/add"
android:textColor="@color/white"
android:textSize="16pt" />
</RelativeLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
<?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="wrap_content"
android:layout_marginStart="15pt"
android:layout_marginEnd="15pt"
android:layout_marginBottom="10pt"
android:background="@drawable/shape_white_11"
android:orientation="vertical"
android:paddingStart="15pt"
android:paddingTop="20pt"
android:paddingEnd="15pt"
android:paddingBottom="13pt">
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="18pt"
android:textColor="@color/color333333"
android:textSize="16pt"
tools:text="标题 第三次巡检" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<View
android:layout_width="match_parent"
android:layout_height="1pt"
android:layout_marginBottom="9pt"
android:background="@color/colorEFF1F5" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end|center_vertical"
android:visibility="visible">
<TextView
android:id="@+id/edit"
android:layout_width="wrap_content"
android:layout_height="27pt"
android:layout_marginStart="10pt"
android:background="@drawable/shape_white_stroke_d7d7d7_6"
android:gravity="center"
android:minWidth="82pt"
android:paddingStart="20pt"
android:paddingEnd="20pt"
android:text="编辑"
android:textColor="@color/color232323"
android:textSize="13pt" />
<TextView
android:id="@+id/publish"
android:layout_width="wrap_content"
android:layout_height="27pt"
android:layout_marginStart="10pt"
android:background="@drawable/shape_white_stroke_d7d7d7_6"
android:gravity="center"
android:minWidth="82pt"
android:paddingStart="20pt"
android:paddingEnd="20pt"
android:text="发布"
android:textColor="@color/color232323"
android:textSize="13pt" />
<TextView
android:id="@+id/look_detail"
android:layout_width="wrap_content"
android:layout_height="27pt"
android:layout_marginStart="10pt"
android:background="@drawable/shape_e7f3ff_stroke_007aff_6"
android:gravity="center"
android:paddingStart="20pt"
android:paddingEnd="20pt"
android:text="查看"
android:textColor="@color/color007AFF"
android:textSize="13pt" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论