diff --git a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
index a6caded..2ecac70 100644
--- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
+++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
@@ -311,7 +311,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
setResult(0x111, intent);
finish();
break;
- case R.id.camera:
+ /* case R.id.camera:
benSwitch();
if (!isPicture){
@@ -322,7 +322,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
if (isPicture){
benSwitch();
}
- break;
+ break;*/
case R.id.btn_switch:
v.setEnabled(false);
handler.sendEmptyMessageDelayed(0x102, 2000);// 利用handler延迟发送更改状态信息
@@ -384,10 +384,11 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
}
public void benSwitch() {
- DisplayMetrics dm = new DisplayMetrics();
- getWindowManager().getDefaultDisplay().getMetrics(dm);
- System.out.println("width-display :" + dm.widthPixels);
- System.out.println("height-display :" + dm.heightPixels);
+// DisplayMetrics dm = new DisplayMetrics();
+// getWindowManager().getDefaultDisplay().getMetrics(dm);
+// System.out.println("width-display :" + dm.widthPixels);
+// System.out.println("height-display :" + dm.heightPixels);
+ int tmpWidth, tmpHeight;
FrameLayout.LayoutParams layoutParamsMap = (FrameLayout.LayoutParams) ivMap.getLayoutParams();//地图的宽高
int heightMap = ivMap.getMeasuredHeight();
int widthMap = ivMap.getMeasuredWidth();
@@ -396,8 +397,8 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
int widthCamera = camera.getMeasuredWidth();
layerChange.removeAllViews();
if (widthMap > widthCamera) {
- layoutParamsCamera.width = dm.widthPixels;
- layoutParamsCamera.height = dm.heightPixels;
+ layoutParamsCamera.width = widthMap;
+ layoutParamsCamera.height = heightMap;
layoutParamsMap.height = heightCamera;
layoutParamsMap.width = widthCamera;
camera.setLayoutParams(layoutParamsCamera);
@@ -408,8 +409,8 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
ivPicImage.setVisibility(View.VISIBLE);
isPicture = true;
} else {
- layoutParamsMap.height = dm.heightPixels;
- layoutParamsMap.width = dm.widthPixels;
+ layoutParamsMap.height = heightCamera;
+ layoutParamsMap.width = widthCamera;
layoutParamsCamera.height = heightMap;
layoutParamsCamera.width = widthMap;
camera.setLayoutParams(layoutParamsCamera);
diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/FilterAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/FilterAdapter.java
index fa0e7db..ebfb1da 100644
--- a/app/src/main/java/com/navinfo/outdoor/adapter/FilterAdapter.java
+++ b/app/src/main/java/com/navinfo/outdoor/adapter/FilterAdapter.java
@@ -44,12 +44,11 @@ public class FilterAdapter extends RecyclerView.Adapter<FilterAdapter.ViewHolder
public void setAddFilter(boolean addFilter) {
for (int i = 0; i < allPoi.size(); i++) {
if (addFilter) {
- allPoi.get(i).setRecord_way(2);
+ allPoi.get(i).setIsLocalData(2);
} else {
- allPoi.get(i).setRecord_way(1);
-
+ allPoi.get(i).setIsLocalData(1);
}
- allPoi.get(i).setChecked(!addFilter);
+ allPoi.get(i).setChecked(false);
}
notifyDataSetChanged();
}
@@ -85,7 +84,11 @@ public class FilterAdapter extends RecyclerView.Adapter<FilterAdapter.ViewHolder
if (poiEntity.getTaskStatus() == 0) {//"未领取", "已领取", "未保存", "已保存"
holder.tvTaskStatus.setVisibility(View.GONE);
holder.tvTaskStatus.setText("未领取");
- holder.cbFilter.setEnabled(true);
+ if (poiEntity.getRecord_way() == 0) {//1是可领取 0是不可领取
+ holder.cbFilter.setEnabled(false);
+ } else if (poiEntity.getRecord_way() == 1) {
+ holder.cbFilter.setEnabled(true);
+ }
} else if (poiEntity.getTaskStatus() == 1) {
holder.tvTaskStatus.setVisibility(View.VISIBLE);
holder.tvTaskStatus.setText("已领取");
@@ -98,7 +101,7 @@ public class FilterAdapter extends RecyclerView.Adapter<FilterAdapter.ViewHolder
holder.tvTaskStatus.setTextColor(Color.parseColor("#1CEF7B"));
}
- if (poiEntity.getRecord_way() == 2) {
+ if (poiEntity.getIsLocalData() == 2) {
holder.cbFilter.setVisibility(View.VISIBLE);
holder.constraintLayout.setEnabled(false);
} else {
diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/MarkerAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/MarkerAdapter.java
index c67ba6a..4043d6f 100644
--- a/app/src/main/java/com/navinfo/outdoor/adapter/MarkerAdapter.java
+++ b/app/src/main/java/com/navinfo/outdoor/adapter/MarkerAdapter.java
@@ -86,7 +86,7 @@ public class MarkerAdapter extends RecyclerView.Adapter<MarkerAdapter.ViewHolder
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- onBankClick.onClick(poiEntities.get(position));
+ onBankClick.onClick(poiEntity);
}
});
}
diff --git a/app/src/main/java/com/navinfo/outdoor/bean/JobSearchBean.java b/app/src/main/java/com/navinfo/outdoor/bean/JobSearchBean.java
index cb8ed2d..cf8d106 100644
--- a/app/src/main/java/com/navinfo/outdoor/bean/JobSearchBean.java
+++ b/app/src/main/java/com/navinfo/outdoor/bean/JobSearchBean.java
@@ -127,11 +127,20 @@ public class JobSearchBean implements Serializable {
private String name;
private double dist;
private String endDate;
+ private int canReceived;
private int isExclusive;
private String address;
private String memo;
private String telephone;
+ public int getCanReceived() {
+ return canReceived;
+ }
+
+ public void setCanReceived(int canReceived) {
+ this.canReceived = canReceived;
+ }
+
public int getId() {
return id;
}
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java
index 7820b09..61e4180 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java
@@ -8,6 +8,7 @@ import android.view.View;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.CompoundButton;
+import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
@@ -149,6 +150,8 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
poiEntity.setPrecision(list.get(i).getPrice() + "");
poiEntity.setDist(list.get(i).getDist() + "");
poiEntity.setType(list.get(i).getType());
+ poiEntity.setRecord_way(list.get(i).getCanReceived());
+ poiEntity.setIsExclusive(list.get(i).getIsExclusive());
String gawk = list.get(i).getGeo();
String geo = Geohash.getInstance().decode(gawk);
Geometry geometry = GeometryTools.createGeometry(geo);
@@ -187,7 +190,6 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
clNumber.setOnClickListener(this);
tvNumber = findViewById(R.id.tv_number);
tvNumber.setText(Constant.NUMBER + "");
- checkOk = findViewById(R.id.check_ok);
ConstraintLayout clPhotograph = findViewById(R.id.cl_photograph);
clPhotograph.setOnClickListener(this);
tvPhotograph = findViewById(R.id.tv_photograph);
@@ -233,6 +235,13 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
}*/
Button btnFilter = findViewById(R.id.btn_filter);
btnFilter.setOnClickListener(this);
+ RelativeLayout rlDraw = findViewById(R.id.rl_draw);
+ if (Constant.LEVEL==1||Constant.LEVEL==2){
+ rlDraw.setVisibility(View.VISIBLE);
+ }else {
+ rlDraw.setVisibility(View.GONE);
+ }
+ checkOk = findViewById(R.id.check_ok);
Button btnDraw = findViewById(R.id.btn_draw);
btnDraw.setOnClickListener(this);
setSlidingUpPanelLayout(Constant.SLIDING_LAYOUT);
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
index 6363f22..0f7c172 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
@@ -144,6 +144,11 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
if (poiEntity.getDist() != null) {
tvDistance.setText("距离:" + format5(Double.valueOf(poiEntity.getDist()) / 1000) + "km");
}
+ if (poiEntity.getRecord_way()==0){//不可领取
+ btnGetTask.setEnabled(false);
+ }else if (poiEntity.getRecord_way()==1){//可领取
+ btnGetTask.setEnabled(true);
+ }
}
assert poiEntity != null;
int taskStatus = poiEntity.getTaskStatus();
@@ -401,7 +406,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
if (statusId==1||statusId==5){
InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), chargingStationEntity);
}
- getActivity().runOnUiThread(new Runnable() {
+ Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() {
@Override
public void run() {
initViewByTaskStatus(1);
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java
index 2d473b9..5c560a1 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java
@@ -237,18 +237,18 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
//银行卡识别
BankCardBean bankCardBean = new Gson().fromJson(BankCard.bankCard(), BankCardBean.class);
if (bankCardBean==null){
- Toast.makeText(getContext(), "请手动添加银行卡号", Toast.LENGTH_SHORT).show();
+ Toast.makeText(getContext(), "识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show();
}else {
if (bankCardBean.getResult()!=null&&bankCardBean.getResult().getBank_card_number()!=null){
String bank_card_number = bankCardBean.getResult().getBank_card_number();
if (StringUtils.isEmpty(bank_card_number)) {
- Toast.makeText(getActivity(), "无法识别银行卡号", Toast.LENGTH_SHORT).show();
+ Toast.makeText(getActivity(), "识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show();
return;
}
etBankNum.setText(bank_card_number);
String bankName = bankCardBean.getResult().getBank_name();
}else {
- Toast.makeText(getActivity(), "请拍银行卡照片", Toast.LENGTH_SHORT).show();
+ Toast.makeText(getActivity(), "识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show();
}
}
}
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java
index c8fde98..5212cab 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java
@@ -83,6 +83,10 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
private Spinner spinnerOther;
String[] others = new String[]{"门牌", "公交", "情报"};// //门牌:7 公交:8 情报:9 现在其他任务类型里就这三种
+ String[] spinner = new String[]{"存在", "不存在", "无法验证"};
+ private RelativeLayout linearExist;
+ private Spinner spinnerExist;
+ private int existence=0;
private EditText editTaskName, editOtherDescribe;
private RelativeLayout rlPicture;
private ImageView ivPicture;
@@ -240,6 +244,31 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
btnOtherLocal.setOnClickListener(this);
Button btnOtherUploading = findViewById(R.id.btn_other_uploading);
btnOtherUploading.setOnClickListener(this);
+ linearExist = findViewById(R.id.linear_exist);
+ spinnerExist = findViewById(R.id.spinner_exist);
+ ArrayAdapter<String> adapterExist = new ArrayAdapter<>(Objects.requireNonNull(getContext()), android.R.layout.simple_spinner_item, spinner);
+ adapterExist.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); //设置下拉列表框的下拉选项样式
+ spinnerExist.setAdapter(adapterExist);
+ spinnerExist.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+ @Override
+ public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+ switch (position) {
+ case 0:
+ existence = 0;
+ break;
+ case 1:
+ existence = 1;
+ break;
+ case 2:
+ existence = 2;
+ break;
+ }
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView<?> parent) {
+ }
+ });
//数据展示
initShowPoi();
//禁用所有操作控件
@@ -345,7 +374,10 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
moveLatlng(latLng, null);
}
}
-
+ if (showPoiEntity.getName() != null) {
+ linearExist.setVisibility(View.VISIBLE);
+ spinnerExist.setSelection(showPoiEntity.getExistence(), true);
+ }
String describe = showPoiEntity.getMemo();//任务描述
if (describe != null && !describe.equals("")) {
@@ -741,6 +773,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
calendar.setTimeInMillis(System.currentTimeMillis());
String format = formatter.format(calendar.getTime());
poiEntity.setCreateTime(format);
+ poiEntity.setExistence(existence);
poiEntity.setType(5);
poiEntity.setTaskStatus(2);
return poiEntity;
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
index 2997b32..34a805d 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
@@ -446,7 +446,6 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
}
private void poiVideoSave(PoiEntity poiEntity, boolean isLocal) {
-
HttpParams httpParams = new HttpParams();
httpParams.put("taskId", poiEntity.getTaskId());
httpParams.put("name", poiEntity.getName());
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
index c710385..b27507b 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
@@ -164,6 +164,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
private int messageType = 0;//0: 已读消息 1：新消息
private SharedPreferences.Editor sharedEdit;
private SharedPreferences sharedPreferences;
+ private AlertDialog.Builder builder;
public static TreasureFragment newInstance(Bundle bundle) {
@@ -310,6 +311,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
supportFragmentManager = Objects.requireNonNull(getActivity()).getSupportFragmentManager();
PoiDatabase poiDatabase = PoiDatabase.getInstance(getContext());
poiDao = poiDatabase.getPoiDao();
+ builder = new AlertDialog.Builder(Objects.requireNonNull(getActivity()));
+
sliding_layout = findViewById(R.id.sliding_layout);
LinearLayout dragView = findViewById(R.id.dragView);
frameLayout = findViewById(R.id.frame_layout);
@@ -1492,19 +1495,19 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
DialogSettings.style = DialogSettings.STYLE.STYLE_MIUI;
List<ShareDialog.Item> itemList = new ArrayList<>();
if (upload.contains(1)) {
- itemList.add(new ShareDialog.Item(Objects.requireNonNull(getContext()), R.drawable.push_poi, "POI"));
+ itemList.add(new ShareDialog.Item(Objects.requireNonNull(getContext()), R.drawable.marker_poi_bg1, "POI"));
}
if (upload.contains(2)) {
- itemList.add(new ShareDialog.Item(Objects.requireNonNull(getContext()), R.drawable.push_chongdianzhuang, "充电站"));
+ itemList.add(new ShareDialog.Item(Objects.requireNonNull(getContext()), R.drawable.marker_charge_bg1, "充电站"));
}
if (upload.contains(3)) {
- itemList.add(new ShareDialog.Item(Objects.requireNonNull(getContext()), R.drawable.poi_video, "POI录像"));
+ itemList.add(new ShareDialog.Item(Objects.requireNonNull(getContext()), R.drawable.marker_poi_video_bg1, "POI录像"));
}
if (upload.contains(4)) {
- itemList.add(new ShareDialog.Item(Objects.requireNonNull(getContext()), R.drawable.push_road, "道路"));
+ itemList.add(new ShareDialog.Item(Objects.requireNonNull(getContext()), R.drawable.marker_road_bg, "道路"));
}
if (upload.contains(5)) {
- itemList.add(new ShareDialog.Item(Objects.requireNonNull(getContext()), R.drawable.push_qingbao, "其他"));
+ itemList.add(new ShareDialog.Item(Objects.requireNonNull(getContext()), R.drawable.marker_other_bg1, "其他"));
}
Bundle bundle = new Bundle();
PoiEntity poiEntity = new PoiEntity();
@@ -1798,6 +1801,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
poiListEntity.setDescribe(listBean.getMemo());
poiListEntity.setCreateTime(listBean.getEndDate());
poiListEntity.setType(listBean.getType());
+ poiListEntity.setRecord_way(listBean.getCanReceived());
+ poiListEntity.setIsExclusive(listBean.getIsExclusive());
String beanGeo = listBean.getGeo();
String geo = Geohash.getInstance().decode(beanGeo);
Geometry geometry = GeometryTools.createGeometry(geo);
@@ -1861,8 +1866,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
* 自定义dialog
*/
public void customDialog(List<PoiEntity> list, Marker marker) {
- AlertDialog.Builder builder = new AlertDialog.Builder(Objects.requireNonNull(getActivity()));
- final AlertDialog dialog = builder.create();
+ AlertDialog dialog = builder.create();
View dialogView = View.inflate(getActivity(), R.layout.layout_marker_dialog, null);
dialog.setView(dialogView);
Window win = dialog.getWindow();
@@ -1878,7 +1882,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
RecyclerView recyclerView = dialogView.findViewById(R.id.rv_marker_view);
recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
- recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL));
+ recyclerView.addItemDecoration(new DividerItemDecoration(Objects.requireNonNull(getActivity()), DividerItemDecoration.VERTICAL));
MarkerAdapter markerAdapter = new MarkerAdapter(list, getActivity());
recyclerView.setAdapter(markerAdapter);
markerAdapter.setOnBankClick(new MarkerAdapter.OnBankClick() {
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java
index 1273da9..7b673fd 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java
@@ -353,17 +353,17 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
if (inward != null) {
IdCardNumberBean idCardNumberBean = new Gson().fromJson(inward, IdCardNumberBean.class);
if (idCardNumberBean == null) {
- Toast.makeText(getActivity(), "请手动添加身份证号", Toast.LENGTH_SHORT).show();
+ Toast.makeText(getActivity(), "识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show();
} else {
if (idCardNumberBean.getWords_result().get公民身份号码() != null) {
String words = idCardNumberBean.getWords_result().get公民身份号码().getWords();
etNamePhone.setText(words);
} else {
- Toast.makeText(getActivity(), "请拍身份证照片", Toast.LENGTH_SHORT).show();
+ Toast.makeText(getActivity(), "识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show();
}
}
} else {
- Toast.makeText(getActivity(), "请手动添加身份证号", Toast.LENGTH_SHORT).show();
+ Toast.makeText(getActivity(), "识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show();
}
}
diff --git a/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java b/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java
index c5651c9..110e7be 100644
--- a/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java
+++ b/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java
@@ -45,11 +45,11 @@ public class PoiEntity implements Serializable {
private int taskStatus;//任务状态 0.未领取 1.已领取，5 立即采集，2.未保存(保存到本地但未提交成功),3.已保存(保存到本地提交成功)，4已上传（结束采集）
private int type;//1 "POI"2 "充电站"3 "POI录像"4 "道路录像"5 "其他"6 "面状任务"
private int station_type;//1."充电站"2 "充换电站"3 "充电桩组"4 "换电站"5 "门牌", "公交:6 情报:7
- private int isLocalData;//是否是本地数据 0,服务 1,本地
+ private int isLocalData;//
private int isExclusive;//任务类型 0.普通任务，1.专属任务
private int bodyId;//保存本地的bodyId
private int work_type;//0."车行" 1."自行车" 2."步行"
- private int record_way; //1,录像，2，连拍
+ private int record_way; //等同于 canReceived : 1是可领取 0是不可领取
public int getRecord_way() {
return record_way;
diff --git a/app/src/main/res/drawable/baseline_radio.xml b/app/src/main/res/drawable/baseline_radio.xml
new file mode 100644
index 0000000..5815497
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_radio.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_baseline_radio_button_no" android:state_checked="false"/>
+ <item android:drawable="@drawable/ic_baseline_radio_button_yes" android:state_checked="true"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg.jpg b/app/src/main/res/drawable/bg.jpg
new file mode 100644
index 0000000..d5fe739
Binary files /dev/null and b/app/src/main/res/drawable/bg.jpg differ
diff --git a/app/src/main/res/drawable/bg.png b/app/src/main/res/drawable/bg.png
deleted file mode 100644
index 88c77c7..0000000
Binary files a/app/src/main/res/drawable/bg.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_baseline_radio_button_no.xml b/app/src/main/res/drawable/ic_baseline_radio_button_no.xml
new file mode 100644
index 0000000..c37282d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_radio_button_no.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.47" android:height="25dp"
+ android:tint="#333333" android:viewportHeight="24"
+ android:viewportWidth="24" android:width="25dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_radio_button_yes.xml b/app/src/main/res/drawable/ic_baseline_radio_button_yes.xml
new file mode 100644
index 0000000..b2df061
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_radio_button_yes.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.47" android:height="25dp"
+ android:tint="#333333" android:viewportHeight="24"
+ android:viewportWidth="24" android:width="25dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5 5,-2.24 5,-5 -2.24,-5 -5,-5zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_filter.xml b/app/src/main/res/layout/fragment_filter.xml
index 6f86956..1d9c42e 100644
--- a/app/src/main/res/layout/fragment_filter.xml
+++ b/app/src/main/res/layout/fragment_filter.xml
@@ -227,7 +227,16 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="10dp"
+ android:button="@null"
+ android:background="@drawable/baseline_radio"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_toEndOf="@id/check_ok"
android:text="批量领取"
+
/>
<Button
android:id="@+id/btn_draw"
diff --git a/app/src/main/res/layout/fragment_has_submit.xml b/app/src/main/res/layout/fragment_has_submit.xml
index b7ff7b5..7f2a7b2 100644
--- a/app/src/main/res/layout/fragment_has_submit.xml
+++ b/app/src/main/res/layout/fragment_has_submit.xml
@@ -21,7 +21,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_marginBottom="20dp"
- android:src="@drawable/poi_square"
+ android:background="@drawable/marker_poi_bg1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tv_poi"
app:layout_constraintLeft_toLeftOf="parent"
@@ -123,7 +123,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_marginBottom="20dp"
- android:src="@drawable/poi_square"
+ android:background="@drawable/marker_poi_video_bg1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tv_poiVideo"
app:layout_constraintLeft_toLeftOf="parent"
@@ -223,7 +223,7 @@
android:id="@+id/iv_road"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/road_square"
+ android:background="@drawable/marker_road_bg"
app:layout_constraintLeft_toLeftOf="@id/view4"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
@@ -320,7 +320,7 @@
android:id="@+id/iv_charging"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/charge_square"
+ android:background="@drawable/marker_charge_bg1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@id/view5"
app:layout_constraintTop_toTopOf="parent" />
@@ -417,7 +417,7 @@
android:id="@+id/iv_other"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/other_square"
+ android:background="@drawable/marker_other_bg1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@id/other_audit_view"
app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/fragment_other.xml b/app/src/main/res/layout/fragment_other.xml
index 387b252..5e55954 100644
--- a/app/src/main/res/layout/fragment_other.xml
+++ b/app/src/main/res/layout/fragment_other.xml
@@ -79,6 +79,50 @@
app:layout_constraintTop_toTopOf="parent"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
+ <RelativeLayout
+ android:id="@+id/linear_exist"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="10dp"
+ android:background="@drawable/underline"
+ android:padding="2dp"
+ android:visibility="gone"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_01">
+
+ <TextView
+ android:id="@+id/tv_exist"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="18dp"
+ android:layout_marginTop="10dp"
+ android:layout_marginBottom="10dp"
+ android:text="是否存在*"
+ android:textColor="#333" />
+
+ <Spinner
+ android:id="@+id/spinner_exist"
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="18dp"
+ android:layout_marginRight="10dp"
+ android:layout_toEndOf="@id/tv_exist"
+ android:layout_toRightOf="@id/tv_exist"
+ android:background="@color/white"
+ android:textColor="#333"
+ android:textSize="15sp" />
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:background="@drawable/ic_baseline_arrow_drop" />
+ </RelativeLayout>
</LinearLayout>
<LinearLayout
diff --git a/app/src/main/res/layout/poi_fragment.xml b/app/src/main/res/layout/poi_fragment.xml
index b878b77..51706ef 100644
--- a/app/src/main/res/layout/poi_fragment.xml
+++ b/app/src/main/res/layout/poi_fragment.xml
@@ -34,7 +34,50 @@
android:textColor="@color/black"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
+ <RelativeLayout
+ android:id="@+id/linear_exist"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="10dp"
+ android:background="@drawable/underline"
+ android:padding="2dp"
+ android:visibility="gone"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_01">
+ <TextView
+ android:id="@+id/tv_exist"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="18dp"
+ android:layout_marginTop="10dp"
+ android:layout_marginBottom="10dp"
+ android:text="是否存在*"
+ android:textColor="#333" />
+
+ <Spinner
+ android:id="@+id/spinner_exist"
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="18dp"
+ android:layout_marginRight="10dp"
+ android:layout_toEndOf="@id/tv_exist"
+ android:layout_toRightOf="@id/tv_exist"
+ android:background="@color/white"
+ android:textColor="#333"
+ android:textSize="15sp" />
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:background="@drawable/ic_baseline_arrow_drop" />
+ </RelativeLayout>
<RelativeLayout
android:id="@+id/linear_pot"
android:layout_width="match_parent"
@@ -45,7 +88,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tv_01">
+ app:layout_constraintTop_toBottomOf="@id/linear_exist">
<TextView
android:id="@+id/tv_pot"
@@ -200,50 +243,7 @@
android:orientation="vertical"></LinearLayout>
</RelativeLayout>
- <RelativeLayout
- android:id="@+id/linear_exist"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="10dp"
- android:background="@drawable/underline"
- android:padding="2dp"
- android:visibility="gone"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/linear_phone">
- <TextView
- android:id="@+id/tv_exist"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_centerVertical="true"
- android:layout_marginLeft="18dp"
- android:layout_marginTop="10dp"
- android:layout_marginBottom="10dp"
- android:text="是否存在*"
- android:textColor="#333" />
-
- <Spinner
- android:id="@+id/spinner_exist"
- android:layout_width="match_parent"
- android:layout_height="40dp"
- android:layout_centerVertical="true"
- android:layout_marginLeft="18dp"
- android:layout_marginRight="10dp"
- android:layout_toEndOf="@id/tv_exist"
- android:layout_toRightOf="@id/tv_exist"
- android:background="@color/white"
- android:textColor="#333"
- android:textSize="15sp" />
-
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:background="@drawable/ic_baseline_arrow_drop" />
- </RelativeLayout>
<TextView
android:id="@+id/tv_02"
@@ -253,7 +253,7 @@
android:text="02.拍照"
android:textColor="@color/black"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/linear_exist" />
+ app:layout_constraintTop_toBottomOf="@id/linear_phone" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/poi_video_fragment.xml b/app/src/main/res/layout/poi_video_fragment.xml
index ac4d2ba..7aa6f0e 100644
--- a/app/src/main/res/layout/poi_video_fragment.xml
+++ b/app/src/main/res/layout/poi_video_fragment.xml
@@ -145,50 +145,6 @@
app:layout_constraintLeft_toLeftOf="@id/fm_poi_video_picture"
app:layout_constraintTop_toBottomOf="@id/fm_poi_video_picture">
- <RelativeLayout
- android:id="@+id/linear_exist"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="10dp"
- android:background="@drawable/other_text"
- android:padding="2dp"
- android:visibility="gone"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/linear_phone">
-
- <TextView
- android:id="@+id/tv_exist"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentStart="true"
- android:layout_centerVertical="true"
- android:layout_marginStart="18dp"
- android:layout_marginTop="10dp"
- android:layout_marginBottom="10dp"
- android:text="是否存在*"
- android:textColor="#333" />
-
- <Spinner
- android:id="@+id/spinner_exist"
- android:layout_width="match_parent"
- android:layout_height="40dp"
- android:layout_centerVertical="true"
- android:layout_marginStart="18dp"
- android:layout_marginEnd="10dp"
- android:layout_toEndOf="@id/tv_exist"
- android:background="@color/white"
- android:textColor="#333"
- android:textSize="15sp" />
-
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:background="@drawable/ic_baseline_arrow_drop" />
- </RelativeLayout>
-
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/treasure_fragment.xml b/app/src/main/res/layout/treasure_fragment.xml
index c223c20..bdc37bd 100644
--- a/app/src/main/res/layout/treasure_fragment.xml
+++ b/app/src/main/res/layout/treasure_fragment.xml
@@ -54,7 +54,7 @@
<FrameLayout
android:id="@+id/frame_layout"
android:layout_width="match_parent"
- android:layout_height="200dp"
+ android:layout_height="250dp"
android:background="@color/white"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/withdraw_fragment.xml b/app/src/main/res/layout/withdraw_fragment.xml
index 5304e60..cab0a7a 100644
--- a/app/src/main/res/layout/withdraw_fragment.xml
+++ b/app/src/main/res/layout/withdraw_fragment.xml
@@ -249,7 +249,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="2dp"
- android:background="@drawable/poi_square" />
+ android:background="@drawable/marker_poi_bg1" />
<TextView
android:layout_width="wrap_content"
@@ -289,7 +289,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="2dp"
- android:background="@drawable/poi_square" />
+ android:background="@drawable/marker_poi_bg1" />
<TextView
android:layout_width="wrap_content"
@@ -328,7 +328,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="2dp"
- android:background="@drawable/poi_square" />
+ android:background="@drawable/marker_poi_video_bg1" />
<TextView
android:layout_width="wrap_content"
@@ -368,7 +368,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="2dp"
- android:background="@drawable/poi_square" />
+ android:background="@drawable/marker_poi_video_bg1" />
<TextView
android:layout_width="wrap_content"
@@ -407,7 +407,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="2dp"
- android:background="@drawable/road_square" />
+ android:background="@drawable/marker_road_bg" />
<TextView
android:layout_width="wrap_content"
@@ -445,7 +445,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="2dp"
- android:background="@drawable/road_square" />
+ android:background="@drawable/marker_road_bg" />
<TextView
android:layout_width="wrap_content"
@@ -483,7 +483,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="2dp"
- android:background="@drawable/charge_square" />
+ android:background="@drawable/marker_charge_bg1" />
<TextView
android:layout_width="wrap_content"
@@ -521,7 +521,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="2dp"
- android:background="@drawable/charge_square" />
+ android:background="@drawable/marker_charge_bg1" />
<TextView
android:layout_width="wrap_content"
@@ -555,11 +555,11 @@
android:gravity="center_vertical">
<ImageView
android:id="@+id/image_other"
- android:layout_width="40dp"
- android:layout_height="45dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="2dp"
- android:background="@drawable/push_qingbao" />
+ android:background="@drawable/marker_other_bg1" />
<TextView
android:layout_width="wrap_content"
@@ -593,11 +593,11 @@
android:gravity="center_vertical">
<ImageView
android:id="@+id/image_other_report"
- android:layout_width="40dp"
- android:layout_height="45dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="2dp"
- android:background="@drawable/push_qingbao" />
+ android:background="@drawable/marker_other_bg1" />
<TextView
android:layout_width="wrap_content"