xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决界面问题，解决采集拍摄界面

Browse Source
This commit is contained in:
wangdongsheng
2021-09-14 18:49:28 +08:00
parent 27f41d98d6
commit 0dceef5ecc
24 changed files with 233 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
+11 -10
View File
@@ -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);
app/src/main/java/com/navinfo/outdoor/adapter/FilterAdapter.java
+9 -6
View File
@@ -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 {
app/src/main/java/com/navinfo/outdoor/adapter/MarkerAdapter.java
+1 -1
View File
@@ -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);
}
});
}
app/src/main/java/com/navinfo/outdoor/bean/JobSearchBean.java
+9
View File
@@ -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;
}
app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java
+10 -1
View File
@@ -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);
app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
+6 -1
View File
@@ -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);
app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java
+3 -3
View File
@@ -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();
}
}
}
app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java
+34 -1
View File
@@ -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;
app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
-1
View File
@@ -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());
app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
+12 -8
View File
@@ -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() {
app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java
+3 -3
View File
@@ -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();
}
}
app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java
+2 -2
View File
@@ -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;