commit
deca4550cf
@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
|
||||
android {
|
||||
compileSdkVersion 29
|
||||
buildToolsVersion '29.0.2'
|
||||
// ndkVersion '23.0.7123448'
|
||||
ndkVersion '23.0.7123448'
|
||||
|
||||
defaultConfig {
|
||||
applicationId "com.navinfo.outdoor"
|
||||
|
@ -21,6 +21,7 @@ import com.navinfo.outdoor.fragment.HasSubmitFragment;
|
||||
import com.navinfo.outdoor.fragment.IssueFragment;
|
||||
import com.navinfo.outdoor.fragment.IssueWebFragment;
|
||||
import com.navinfo.outdoor.fragment.MapDownloadFragment;
|
||||
import com.navinfo.outdoor.fragment.MessageFragment;
|
||||
import com.navinfo.outdoor.fragment.MineFragment;
|
||||
import com.navinfo.outdoor.fragment.OtherFragment;
|
||||
import com.navinfo.outdoor.fragment.PoiFragment;
|
||||
@ -88,6 +89,7 @@ public class FragmentManagement extends BaseActivity {
|
||||
private FilterFragment filterFragment;//寻宝-筛选界面 -32
|
||||
private OtherFragment otherFragment;//寻宝-上传-其他的fragment -33
|
||||
private ChargingPileFragment chargingPileFragment;//寻宝-上传-充电站-充电桩的fragment-34
|
||||
private MessageFragment messageFragment;//寻宝 -消息的fragment -35
|
||||
|
||||
@Override
|
||||
protected int getLayout() {
|
||||
@ -175,6 +177,9 @@ public class FragmentManagement extends BaseActivity {
|
||||
fragmentTransaction.hide(otherFragment);
|
||||
if (chargingPileFragment!=null)//寻宝-上传-充电站-充电桩的fragment-34
|
||||
fragmentTransaction.hide(chargingPileFragment);
|
||||
if (messageFragment!=null){//寻宝 -消息的Fragment -35
|
||||
fragmentTransaction.hide(messageFragment);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -457,6 +462,17 @@ public class FragmentManagement extends BaseActivity {
|
||||
}else {
|
||||
fragmentTransaction.show(chargingPileFragment);
|
||||
}
|
||||
break;
|
||||
case 35://寻宝-消息
|
||||
if (messageFragment == null) {
|
||||
messageFragment = MessageFragment.newInstance(new Bundle());
|
||||
fragmentTransaction.add(R.id.frame_layout, messageFragment);
|
||||
} else {
|
||||
fragmentTransaction.show(messageFragment);
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
}
|
||||
fragmentTransaction.commit();
|
||||
}
|
||||
|
@ -0,0 +1,66 @@
|
||||
package com.navinfo.outdoor.adapter;
|
||||
|
||||
import android.content.Context;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.navinfo.outdoor.R;
|
||||
import com.navinfo.outdoor.bean.TaskPrefectureBean;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class MessageAdapter extends RecyclerView.Adapter<MessageAdapter.ViewHolder> {
|
||||
private Context context;
|
||||
private List<TaskPrefectureBean.BodyBean.ListBean> messageList = new ArrayList<>();
|
||||
|
||||
public void setMessageList(List<TaskPrefectureBean.BodyBean.ListBean> messageList) {
|
||||
this.messageList.addAll(messageList);
|
||||
notifyDataSetChanged();
|
||||
}
|
||||
|
||||
public MessageAdapter(Context context) {
|
||||
this.context = context;
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@NotNull
|
||||
@Override
|
||||
public ViewHolder onCreateViewHolder(@NonNull @NotNull ViewGroup parent, int viewType) {
|
||||
View inflate = LayoutInflater.from(context).inflate(R.layout.message_item, parent, false);
|
||||
return new ViewHolder(inflate);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(@NonNull @NotNull ViewHolder holder, int position) {
|
||||
holder.tvMessageTitle.setText(messageList.get(position).getTitle());
|
||||
holder.tvMessageDest.setText(messageList.get(position).getSubtitle());
|
||||
holder.tvMessageTime.setText(messageList.get(position).getCreatetime());
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return messageList.size();
|
||||
}
|
||||
|
||||
public class ViewHolder extends RecyclerView.ViewHolder {
|
||||
|
||||
private TextView tvMessageTitle;
|
||||
private TextView tvMessageDest;
|
||||
private TextView tvMessageTime;
|
||||
|
||||
public ViewHolder(@NonNull @NotNull View itemView) {
|
||||
super(itemView);
|
||||
tvMessageTitle = itemView.findViewById(R.id.tv_message_title);
|
||||
tvMessageDest = itemView.findViewById(R.id.tv_message_dest);
|
||||
tvMessageTime = itemView.findViewById(R.id.tv_message_time);
|
||||
}
|
||||
}
|
||||
}
|
178
app/src/main/java/com/navinfo/outdoor/bean/CapacityBean.java
Normal file
178
app/src/main/java/com/navinfo/outdoor/bean/CapacityBean.java
Normal file
@ -0,0 +1,178 @@
|
||||
package com.navinfo.outdoor.bean;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class CapacityBean {
|
||||
|
||||
private Integer code;
|
||||
private String message;
|
||||
private BodyBean body;
|
||||
|
||||
public Integer getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public void setCode(Integer code) {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public BodyBean getBody() {
|
||||
return body;
|
||||
}
|
||||
|
||||
public void setBody(BodyBean body) {
|
||||
this.body = body;
|
||||
}
|
||||
|
||||
public static class BodyBean {
|
||||
private String title;
|
||||
private List<SingleChoiceBean> singleChoice;
|
||||
private List<MultiChoiceBean> multiChoice;
|
||||
|
||||
public String getTitle() {
|
||||
return title;
|
||||
}
|
||||
|
||||
public void setTitle(String title) {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
public List<SingleChoiceBean> getSingleChoice() {
|
||||
return singleChoice;
|
||||
}
|
||||
|
||||
public void setSingleChoice(List<SingleChoiceBean> singleChoice) {
|
||||
this.singleChoice = singleChoice;
|
||||
}
|
||||
|
||||
public List<MultiChoiceBean> getMultiChoice() {
|
||||
return multiChoice;
|
||||
}
|
||||
|
||||
public void setMultiChoice(List<MultiChoiceBean> multiChoice) {
|
||||
this.multiChoice = multiChoice;
|
||||
}
|
||||
|
||||
public static class SingleChoiceBean {
|
||||
private Integer id;
|
||||
private Integer questionId;
|
||||
private String question;
|
||||
private List<String> option;
|
||||
private Integer examId;
|
||||
private Object answer;
|
||||
|
||||
public Integer getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Integer id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Integer getQuestionId() {
|
||||
return questionId;
|
||||
}
|
||||
|
||||
public void setQuestionId(Integer questionId) {
|
||||
this.questionId = questionId;
|
||||
}
|
||||
|
||||
public String getQuestion() {
|
||||
return question;
|
||||
}
|
||||
|
||||
public void setQuestion(String question) {
|
||||
this.question = question;
|
||||
}
|
||||
|
||||
public List<String> getOption() {
|
||||
return option;
|
||||
}
|
||||
|
||||
public void setOption(List<String> option) {
|
||||
this.option = option;
|
||||
}
|
||||
|
||||
public Integer getExamId() {
|
||||
return examId;
|
||||
}
|
||||
|
||||
public void setExamId(Integer examId) {
|
||||
this.examId = examId;
|
||||
}
|
||||
|
||||
public Object getAnswer() {
|
||||
return answer;
|
||||
}
|
||||
|
||||
public void setAnswer(Object answer) {
|
||||
this.answer = answer;
|
||||
}
|
||||
}
|
||||
|
||||
public static class MultiChoiceBean {
|
||||
private Integer id;
|
||||
private Integer questionId;
|
||||
private String question;
|
||||
private List<String> option;
|
||||
private Integer examId;
|
||||
private Object answer;
|
||||
|
||||
public Integer getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Integer id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Integer getQuestionId() {
|
||||
return questionId;
|
||||
}
|
||||
|
||||
public void setQuestionId(Integer questionId) {
|
||||
this.questionId = questionId;
|
||||
}
|
||||
|
||||
public String getQuestion() {
|
||||
return question;
|
||||
}
|
||||
|
||||
public void setQuestion(String question) {
|
||||
this.question = question;
|
||||
}
|
||||
|
||||
public List<String> getOption() {
|
||||
return option;
|
||||
}
|
||||
|
||||
public void setOption(List<String> option) {
|
||||
this.option = option;
|
||||
}
|
||||
|
||||
public Integer getExamId() {
|
||||
return examId;
|
||||
}
|
||||
|
||||
public void setExamId(Integer examId) {
|
||||
this.examId = examId;
|
||||
}
|
||||
|
||||
public Object getAnswer() {
|
||||
return answer;
|
||||
}
|
||||
|
||||
public void setAnswer(Object answer) {
|
||||
this.answer = answer;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,20 +1,20 @@
|
||||
package com.navinfo.outdoor.bean;
|
||||
|
||||
public class ExamBean {
|
||||
private String id;
|
||||
private String examId;
|
||||
private String answer;
|
||||
|
||||
public ExamBean(String id, String answer) {
|
||||
this.id = id;
|
||||
public ExamBean(String examId, String answer) {
|
||||
this.examId = examId;
|
||||
this.answer = answer;
|
||||
}
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
public String getExamId() {
|
||||
return examId;
|
||||
}
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
public void setExamId(String examId) {
|
||||
this.examId = examId;
|
||||
}
|
||||
|
||||
public String getAnswer() {
|
||||
|
@ -1,62 +1,32 @@
|
||||
package com.navinfo.outdoor.bean;
|
||||
|
||||
public class ExamSubmitBean {
|
||||
/**
|
||||
* status :
|
||||
* msg :
|
||||
* body : {"grade":"0为不通过 1为通过 只有0和1"}
|
||||
*/
|
||||
|
||||
private String status;
|
||||
private String msg;
|
||||
private BodyBean body;
|
||||
private Integer code;
|
||||
private String message;
|
||||
private Integer body;
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
public Integer getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
public void setCode(Integer code) {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public BodyBean getBody() {
|
||||
public Integer getBody() {
|
||||
return body;
|
||||
}
|
||||
|
||||
public void setBody(BodyBean body) {
|
||||
public void setBody(Integer body) {
|
||||
this.body = body;
|
||||
}
|
||||
|
||||
public static class BodyBean {
|
||||
/**
|
||||
* grade : 0为不通过 1为通过 只有0和1
|
||||
*/
|
||||
|
||||
private String grade;
|
||||
|
||||
public String getGrade() {
|
||||
return grade;
|
||||
}
|
||||
|
||||
public void setGrade(String grade) {
|
||||
this.grade = grade;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ExamSubmitBean{" +
|
||||
"status='" + status + '\'' +
|
||||
", msg='" + msg + '\'' +
|
||||
", body=" + body +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
|
@ -11,6 +11,7 @@ import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.lzy.okgo.model.HttpParams;
|
||||
import com.navinfo.outdoor.R;
|
||||
import com.navinfo.outdoor.adapter.CapacityMeasureAdapter;
|
||||
import com.navinfo.outdoor.base.BaseFragment;
|
||||
@ -79,12 +80,14 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On
|
||||
}
|
||||
|
||||
private void initNetWorks(boolean b) {
|
||||
HttpParams httpParams = new HttpParams();
|
||||
httpParams.put("id", "11");
|
||||
OkGoBuilder.getInstance()
|
||||
.Builder(getActivity())
|
||||
.url(HttpInterface.EXAM_CONTENT)
|
||||
.method(OkGoBuilder.GET)
|
||||
.cls(MeasureBean.class)
|
||||
.json(new JSONObject())
|
||||
.params(httpParams)
|
||||
.callback(new Callback<MeasureBean>() {
|
||||
@Override
|
||||
public void onSuccess(MeasureBean response, int id) {
|
||||
@ -129,17 +132,17 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On
|
||||
break;
|
||||
case R.id.btn:
|
||||
try {
|
||||
if (bolbean!=null){
|
||||
Map<String , String> checkedMap = capacityMeasureAdapter.getCheckedMap();
|
||||
if (bolbean != null) {
|
||||
Map<String, String> checkedMap = capacityMeasureAdapter.getCheckedMap();
|
||||
for (int i = 0; i < bolbean.size(); i++) {
|
||||
final String id = bolbean.get(i).getId();
|
||||
if (!checkedMap.containsKey(id)||checkedMap.get(id)==null||("").equals(checkedMap.get(id))){
|
||||
if (!checkedMap.containsKey(id) || checkedMap.get(id) == null || ("").equals(checkedMap.get(id))) {
|
||||
Toast.makeText(getContext(), "有题目未填写答案,请仔细检查!", Toast.LENGTH_SHORT).show();
|
||||
return;
|
||||
}
|
||||
}
|
||||
for(Map.Entry<String , String> entry : checkedMap.entrySet()) {
|
||||
examBeans.add(new ExamBean(entry.getKey(),entry.getValue()));
|
||||
for (Map.Entry<String, String> entry : checkedMap.entrySet()) {
|
||||
examBeans.add(new ExamBean(entry.getKey(), entry.getValue()));
|
||||
}
|
||||
initExamSubmit();
|
||||
}
|
||||
@ -152,10 +155,9 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On
|
||||
|
||||
private void initExamSubmit() throws JSONException {
|
||||
JSONArray jsonArray = new JSONArray();
|
||||
|
||||
for (int i = 0; i < examBeans.size(); i++) {
|
||||
JSONObject json = new JSONObject();
|
||||
json.put("id", examBeans.get(i).getId());
|
||||
json.put("examId", examBeans.get(i).getExamId());
|
||||
json.put("answer", examBeans.get(i).getAnswer());
|
||||
jsonArray.put(json);
|
||||
}
|
||||
@ -173,17 +175,17 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On
|
||||
@Override
|
||||
public void onSuccess(ExamSubmitBean response, int id) {
|
||||
dismissLoadingDialog();
|
||||
Log.d("TAG", "onSuccess: " + response.toString()+ "sssssssssssss");
|
||||
if (response.getBody().getGrade().equals("0")){
|
||||
MessageDialog.show((AppCompatActivity) getActivity(),"提示","不通过","确定","取消").setOkButton(new OnDialogButtonClickListener() {
|
||||
Log.d("TAG", "onSuccess: " + response.toString() + "sssssssssssss");
|
||||
if (response.getBody().equals("0")) {
|
||||
MessageDialog.show((AppCompatActivity) getActivity(), "提示", "不通过", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
|
||||
@Override
|
||||
public boolean onClick(BaseDialog baseDialog, View v) {
|
||||
// Toast.makeText(getContext(), "点击了确定", Toast.LENGTH_SHORT).show();
|
||||
return false;
|
||||
}
|
||||
});
|
||||
}else {
|
||||
MessageDialog.show((AppCompatActivity) getActivity(),"提示","通过","确定","取消").setOkButton(new OnDialogButtonClickListener() {
|
||||
} else {
|
||||
MessageDialog.show((AppCompatActivity) getActivity(), "提示", "通过", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
|
||||
@Override
|
||||
public boolean onClick(BaseDialog baseDialog, View v) {
|
||||
// Toast.makeText(getContext(), "点击了确定", Toast.LENGTH_SHORT).show();
|
||||
|
@ -0,0 +1,113 @@
|
||||
package com.navinfo.outdoor.fragment;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
import android.widget.ImageView;
|
||||
|
||||
import androidx.recyclerview.widget.DividerItemDecoration;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
|
||||
import com.jcodecraeer.xrecyclerview.ProgressStyle;
|
||||
import com.jcodecraeer.xrecyclerview.XRecyclerView;
|
||||
import com.lzy.okgo.model.HttpParams;
|
||||
import com.navinfo.outdoor.R;
|
||||
import com.navinfo.outdoor.adapter.MessageAdapter;
|
||||
import com.navinfo.outdoor.adapter.TaskPrefectureAdapter;
|
||||
import com.navinfo.outdoor.base.BaseFragment;
|
||||
import com.navinfo.outdoor.bean.TaskPrefectureBean;
|
||||
import com.navinfo.outdoor.http.Callback;
|
||||
import com.navinfo.outdoor.http.HttpInterface;
|
||||
import com.navinfo.outdoor.http.OkGoBuilder;
|
||||
|
||||
/**
|
||||
* 寻宝-消息的Fragment
|
||||
*/
|
||||
public class MessageFragment extends BaseFragment implements View.OnClickListener {
|
||||
|
||||
private ImageView messageFinal;
|
||||
private XRecyclerView messageRecycler;
|
||||
private MessageAdapter messageAdapter;
|
||||
|
||||
public static MessageFragment newInstance(Bundle bundle) {
|
||||
MessageFragment fragment = new MessageFragment();
|
||||
fragment.setArguments(bundle);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getLayout() {
|
||||
return R.layout.fragment_message;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initView() {
|
||||
super.initView();
|
||||
messageFinal = (ImageView) findViewById(R.id.message_final);
|
||||
messageFinal.setOnClickListener(this::onClick);
|
||||
messageRecycler = (XRecyclerView) findViewById(R.id.message_recycler);
|
||||
messageRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
|
||||
|
||||
messageRecycler.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL));
|
||||
messageRecycler.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
|
||||
messageRecycler.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
|
||||
//取消上拉加载,刷新功能。
|
||||
messageRecycler.setPullRefreshEnabled(false);
|
||||
messageRecycler.setLoadingMoreEnabled(false);
|
||||
messageAdapter = new MessageAdapter(getContext());
|
||||
messageRecycler.setAdapter(messageAdapter);
|
||||
messageRecycler.getDefaultFootView().setNoMoreHint("已全部加载完毕");
|
||||
messageRecycler.setLoadingListener(new XRecyclerView.LoadingListener() {
|
||||
@Override
|
||||
public void onRefresh() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLoadMore() {
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
private void initNetwork() {
|
||||
HttpParams httpParams = new HttpParams();
|
||||
httpParams.put("fid", "1");
|
||||
httpParams.put("pageNum", "1");
|
||||
httpParams.put("pageSize", "2");
|
||||
OkGoBuilder.getInstance()
|
||||
.Builder(getActivity())
|
||||
.url(HttpInterface.listTask)
|
||||
.method(OkGoBuilder.GET)
|
||||
.cls(TaskPrefectureBean.class)
|
||||
.params(httpParams)
|
||||
.callback(new Callback<TaskPrefectureBean>() {
|
||||
@Override
|
||||
public void onSuccess(TaskPrefectureBean taskPrefectureBean, int id) {
|
||||
dismissLoadingDialog();
|
||||
messageAdapter.setMessageList(taskPrefectureBean.getBody().getList());
|
||||
Log.d("TAG", "onSuccess: " + taskPrefectureBean.getMessage() + "");
|
||||
//initTaskSpecification(taskSpecificationBean,start);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(Throwable e, int id) {
|
||||
dismissLoadingDialog();
|
||||
Log.d("TAG", "onError: " + e.getMessage());
|
||||
}
|
||||
}).build();
|
||||
}
|
||||
@Override
|
||||
protected void initData() {
|
||||
super.initData();
|
||||
initNetwork();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
switch (v.getId()) {
|
||||
case R.id.message_final:
|
||||
getActivity().finish();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
@ -1,5 +1,6 @@
|
||||
package com.navinfo.outdoor.fragment;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.BitmapFactory;
|
||||
import android.graphics.Matrix;
|
||||
@ -92,6 +93,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
private FrameLayout frameLayout;
|
||||
private GatherGetFragment gatherGetFragment;
|
||||
private LinearLayout dragView;
|
||||
private ImageView ivMessage;
|
||||
|
||||
public static TreasureFragment newInstance(Bundle bundle) {
|
||||
TreasureFragment fragment = new TreasureFragment();
|
||||
@ -120,6 +122,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
ivFilter.setOnClickListener(this::onClick);
|
||||
ivSubmit = findViewById(R.id.iv_submit);
|
||||
ivSubmit.setOnClickListener(this::onClick);
|
||||
ivMessage = findViewById(R.id.iv_message);
|
||||
ivMessage.setOnClickListener(this::onClick);
|
||||
treasureMap = (MapView) findViewById(R.id.treasure_map);
|
||||
tencentMap = treasureMap.getMap();
|
||||
cbMapType = (CheckBox) findViewById(R.id.cb_map_type);
|
||||
@ -469,6 +473,11 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
FilterFragment filterFragment = FilterFragment.newInstance(new Bundle());
|
||||
showSlidingFragment(filterFragment);
|
||||
break;
|
||||
case R.id.iv_message:
|
||||
Intent messageIntent = new Intent(getContext(), FragmentManagement.class);
|
||||
messageIntent.putExtra("tag",35);
|
||||
startActivity(messageIntent);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -4,6 +4,9 @@ public class HttpInterface {
|
||||
//http://172.21.91.160:8000/api/user/list
|
||||
//发现接口
|
||||
//http://172.23.139.4:8002/m4/findAndMessage/1/msg_list?fid=1&pageNum=1&pageSize=2
|
||||
//能力测评接口
|
||||
//http://172.23.139.4:8002/m4/findAndMessage/1/exam_content?id=11
|
||||
//http://172.23.139.4:8002/m4/findAndMessage/1/submitExam
|
||||
public static final String IP1 = "http://172.23.139.4:8002/m4/findAndMessage/1/";
|
||||
public static final String IPm4 = "https://mockapi.eolinker.com/m5LxPbRb58eec57f4943420b1eb3b4e95b93968619a2973/m4/1/";
|
||||
//发现:测试接口
|
||||
@ -12,8 +15,8 @@ public class HttpInterface {
|
||||
public static final String listTaskExplain = IP1 + "msg_list";//任务说明
|
||||
public static final String MSG_LISt = IP1 + "msg_list";//发现查询接口
|
||||
public static final String MSG_CONTENT = IPm4 + "msg_content";//发现 -富文本详情页请求
|
||||
public static final String EXAM_CONTENT = IPm4 + "exam_content";//发现 -能力测评获取试题接口
|
||||
public static final String EXAM_SUBMIT = IPm4 + "exam_submit";//发现 -能力测评提交试卷 post
|
||||
public static final String EXAM_CONTENT = IP1 + "exam_content";//发现 -能力测评获取试题接口
|
||||
public static final String EXAM_SUBMIT = IP1 + "submitExam";//发现 -能力测评提交试卷 post
|
||||
|
||||
|
||||
|
||||
|
BIN
app/src/main/res/drawable/fuwu.png
Normal file
BIN
app/src/main/res/drawable/fuwu.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 483 B |
10
app/src/main/res/drawable/ic_arrow_left.xml
Normal file
10
app/src/main/res/drawable/ic_arrow_left.xml
Normal file
@ -0,0 +1,10 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24"
|
||||
android:tint="?attr/colorControlNormal">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M15.41,16.59L10.83,12l4.58,-4.59L14,6l-6,6 6,6 1.41,-1.41z"/>
|
||||
</vector>
|
53
app/src/main/res/layout/fragment_message.xml
Normal file
53
app/src/main/res/layout/fragment_message.xml
Normal file
@ -0,0 +1,53 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout 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"
|
||||
tools:context=".fragment.MessageFragment">
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/rl_message"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="#fff"
|
||||
android:paddingTop="@dimen/top_pind_sp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/message_final"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="10dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:src="@drawable/ic_arrow_left" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_message"
|
||||
style="@style/text_style_toolbar_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:text="消息"
|
||||
|
||||
android:textColor="#000" />
|
||||
<TextView
|
||||
android:id="@+id/tv_read"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="全部已读"
|
||||
android:layout_marginTop="10dp"
|
||||
android:textColor="@color/black"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_marginRight="10dp"/>
|
||||
</RelativeLayout>
|
||||
<com.jcodecraeer.xrecyclerview.XRecyclerView
|
||||
android:id="@+id/message_recycler"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/rl_message" />
|
||||
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
@ -10,6 +10,9 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="15dp"
|
||||
android:text="1、以下哪种拍图做法正确?"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="18sp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
|
37
app/src/main/res/layout/message_item.xml
Normal file
37
app/src/main/res/layout/message_item.xml
Normal file
@ -0,0 +1,37 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="100dp"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<TextView
|
||||
android:id="@+id/tv_message_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/text_style_title"
|
||||
android:text="标题"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_message_dest"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="标题"
|
||||
style="@style/text_style"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
|
||||
app:layout_constraintStart_toStartOf="@+id/tv_message_title"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_message_title" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_message_time"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="少时诵诗书所所"
|
||||
android:layout_marginRight="15dp"
|
||||
style="@style/text_style_time"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tv_message_dest"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/tv_message_title" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
@ -3,20 +3,22 @@
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:sothree="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:gravity="bottom"
|
||||
android:id="@+id/sliding_layout"
|
||||
sothree:umanoPanelHeight="0dp"
|
||||
sothree:umanoShadowHeight="0dp"
|
||||
sothree:umanoScrollableView="@id/scroll_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="bottom"
|
||||
sothree:umanoDragView="@id/dragView"
|
||||
sothree:umanoOverlay="false"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
sothree:umanoPanelHeight="0dp"
|
||||
sothree:umanoScrollableView="@id/scroll_view"
|
||||
sothree:umanoShadowHeight="0dp">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center"
|
||||
>
|
||||
android:gravity="center">
|
||||
|
||||
|
||||
|
||||
<com.tencent.tencentmap.mapsdk.maps.MapView
|
||||
android:id="@+id/treasure_map"
|
||||
@ -33,13 +35,23 @@
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
</com.tencent.tencentmap.mapsdk.maps.MapView>
|
||||
<ImageView
|
||||
android:id="@+id/iv_message"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="60dp"
|
||||
android:layout_marginLeft="20dp"
|
||||
android:background="@drawable/fuwu"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
</ImageView>
|
||||
<FrameLayout
|
||||
android:id="@+id/frame_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="200dp"
|
||||
android:visibility="gone"
|
||||
android:background="@color/white"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
@ -66,24 +78,25 @@
|
||||
android:checked="false"
|
||||
app:layout_constraintRight_toRightOf="@id/cb_map_type"
|
||||
app:layout_constraintTop_toBottomOf="@id/cb_map_type" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_submit"
|
||||
android:layout_width="50dp"
|
||||
android:layout_height="50dp"
|
||||
android:src="@mipmap/submit"
|
||||
app:layout_constraintLeft_toLeftOf="@id/cb_foot_type"
|
||||
app:layout_constraintTop_toTopOf="@id/iv_zoom_del"
|
||||
app:layout_constraintBottom_toBottomOf="@id/iv_refrish"
|
||||
/>
|
||||
app:layout_constraintLeft_toLeftOf="@id/cb_foot_type"
|
||||
app:layout_constraintTop_toTopOf="@id/iv_zoom_del" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_filter"
|
||||
android:layout_width="50dp"
|
||||
android:layout_height="50dp"
|
||||
android:src="@mipmap/filter"
|
||||
android:layout_marginTop="15dp"
|
||||
android:src="@mipmap/filter"
|
||||
app:layout_constraintLeft_toLeftOf="@id/cb_foot_type"
|
||||
app:layout_constraintTop_toBottomOf="@id/iv_submit"
|
||||
/>
|
||||
app:layout_constraintTop_toBottomOf="@id/iv_submit" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_zoom_add"
|
||||
android:layout_width="40dp"
|
||||
@ -102,6 +115,7 @@
|
||||
android:src="@mipmap/zoom_del"
|
||||
app:layout_constraintLeft_toLeftOf="@id/iv_zoom_add"
|
||||
app:layout_constraintTop_toBottomOf="@id/iv_zoom_add" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_refrish"
|
||||
android:layout_width="40dp"
|
||||
@ -110,6 +124,7 @@
|
||||
android:src="@mipmap/refresh"
|
||||
app:layout_constraintLeft_toLeftOf="@id/iv_zoom_del"
|
||||
app:layout_constraintTop_toBottomOf="@id/iv_zoom_del" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_location"
|
||||
android:layout_width="40dp"
|
||||
@ -123,18 +138,20 @@
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:clickable="true"
|
||||
android:focusable="true">
|
||||
android:focusable="true"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/dragView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"></LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/scroll_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:id="@+id/scroll_view"></LinearLayout>
|
||||
android:orientation="vertical"></LinearLayout>
|
||||
</LinearLayout>
|
||||
</com.sothree.slidinguppanel.SlidingUpPanelLayout>
|
@ -36,7 +36,7 @@
|
||||
</style>
|
||||
<style name="text_style_toolbar_title">
|
||||
<item name="android:layout_height">45dp</item>
|
||||
<item name="android:layout_marginLeft">15dp</item>
|
||||
<item name="android:layout_marginLeft">35dp</item>
|
||||
<item name="android:gravity">center</item>
|
||||
<item name="android:textSize">17sp</item>
|
||||
<item name="android:textStyle">bold</item>
|
||||
|
Loading…
x
Reference in New Issue
Block a user