diff --git a/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java b/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java index 38e1257..35d20ee 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java @@ -197,7 +197,7 @@ public class FragmentManagement extends BaseActivity { } else { fragmentTransaction.show(mineFragment); } -/* Bundle bundle1 = new Bundle(); + /*Bundle bundle1 = new Bundle(); bundle1.putString("grad", getIntent().getStringExtra("grad")); mineFragment.setArguments(bundle1);*/ break; @@ -273,7 +273,7 @@ public class FragmentManagement extends BaseActivity { fragmentTransaction.show(taskExplainFragment2); } break; - case 11://发现-能力测评fragment - + case 11://发现-能力测评fragment if (capacityEvaluationFragment == null) { capacityEvaluationFragment = CapacityEvaluationFragment.newInstance(new Bundle()); fragmentTransaction.add(R.id.frame_layout, capacityEvaluationFragment); @@ -281,7 +281,7 @@ public class FragmentManagement extends BaseActivity { fragmentTransaction.show(capacityEvaluationFragment); } break; - case 12://发现-能力测评2的fragment - + case 12://发现-能力测评2的fragment if (capacityEvaluationFragment2 == null) { capacityEvaluationFragment2 =CapacityEvaluationFragment2.newInstance(new Bundle()); fragmentTransaction.add(R.id.frame_layout, capacityEvaluationFragment2); @@ -499,7 +499,6 @@ public class FragmentManagement extends BaseActivity { fragmentTransaction.commit(); } - private void setZtlTextColor() { ImmersionBar.with(this) .statusBarDarkFont(true, 0.2f) diff --git a/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java index edab875..ccb5380 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java @@ -163,7 +163,7 @@ public class HomeActivity extends BaseActivity{ Toast.makeText(this, "双击退出程序", Toast.LENGTH_SHORT).show(); handler.sendEmptyMessageDelayed(0x100, 2000); } else { - this.finish(); + finish(); } } } diff --git a/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java index b796f27..54dbc4c 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java @@ -89,8 +89,8 @@ public class MainActivity extends BaseActivity { protected void initData() { super.initData(); //必须全局才可以改变样式 - DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; - DialogSettings.init();//初始化清空 BaseDialog 队列 + /* DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; + DialogSettings.init();//初始化清空 BaseDialog 队列*/ } private void initPermission() { diff --git a/app/src/main/java/com/navinfo/outdoor/activity/PhotographActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/PhotographActivity.java index 86f2f9b..8fc381c 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PhotographActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PhotographActivity.java @@ -158,12 +158,11 @@ public class PhotographActivity extends BaseActivity implements View.OnClickList photographBuilder.append("cameraView 用户横屏拍摄 ,"); } } - File file = new File(photo_path); - File destFolder = new File(file.getParentFile().getAbsolutePath()+"aaa"); + /* File destFolder = new File(file.getParentFile().getAbsolutePath()+"aaa"); if (!destFolder.exists()) { destFolder.mkdirs(); - } + }*/ result.toFile(file, new FileCallback() { @Override public void onFileReady(@Nullable File file) { @@ -173,24 +172,19 @@ public class PhotographActivity extends BaseActivity implements View.OnClickList setResult(0x104, intent); SystemTTS.getInstance(PhotographActivity.this).stopSpeak(); PhotographActivity.this.finish(); -/* - CompressImageTask.get().compressImage(ImageConfig.getDefaultConfig(file.getAbsolutePath(), file.getAbsolutePath()+"a.jpg"), new AsyncImageTask.OnImageResult(){ + /* CompressImageTask.get().compressImage(ImageConfig.getDefaultConfig(file.getAbsolutePath(), file.getAbsolutePath()), new AsyncImageTask.OnImageResult(){ @Override public void startCompress() { - } @Override public void resultError() { - } @Override public void resultFileSucceed(File file) { - } - }); -*/ + });*/ } }); 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 8fa1107..78d481d 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java @@ -182,6 +182,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen imageView.setOnClickListener(this); capturePicture = findViewById(R.id.capture_picture); if (poi_video_type == 2) { + isOration = true; capturePicture.setText("拍摄"); } else { capturePicture.setText("开始采集"); @@ -190,8 +191,8 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (isChecked) { - isOration = true; if (poi_video_type != 2) { + isOration = true; capturePicture.setText("暂停采集"); picturesBuilder.append("capturePicture 点击了开始采集 ,"); }else { @@ -199,8 +200,8 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen } startTimer(); } else { - isOration = false; if (poi_video_type != 2) { + isOration = false; capturePicture.setText("开始采集"); picturesBuilder.append("capturePicture 点击了暂停采集 ,"); } @@ -373,8 +374,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen break; case R.id.image_view: picturesBuilder.append("onClick 点击了切换的窗口 ,"); - benSwitch(); - break; + break; case R.id.btn_switch: picturesBuilder.append("onClick 点击了切换按钮 ,"); v.setEnabled(false); @@ -401,7 +401,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen 0)); //目标旋转角 0~360° (正北方为0) tencentMap.animateCamera(cameraSigma); } - break; } diff --git a/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java index fdc0b6a..6f324f7 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java @@ -100,8 +100,6 @@ public class WebActivity extends BaseActivity implements View.OnClickListener { } } - - // 监听 private static class MyWebViewClient extends WebViewClient { @Override diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/ChargingPileAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/ChargingPileAdapter.java index 7c5c64c..41c6450 100644 --- a/app/src/main/java/com/navinfo/outdoor/adapter/ChargingPileAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/ChargingPileAdapter.java @@ -47,7 +47,17 @@ public class ChargingPileAdapter extends RecyclerView.Adapter0){ + holder.rlItem.setBackgroundColor(Color.parseColor("#BDBDBD")); + }else { + holder.rlItem.setBackgroundColor(Color.parseColor("#4CEF6F")); + } + }else { + holder.rlItem.setBackgroundColor(Color.parseColor("#4CEF6F")); + } + + holder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { 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 79a1de8..1cfc12f 100644 --- a/app/src/main/java/com/navinfo/outdoor/adapter/MarkerAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/MarkerAdapter.java @@ -85,7 +85,9 @@ public class MarkerAdapter extends RecyclerView.Adapter position) { WithdrawalBean.BodyBean.ListBean listBean = dataBeans.get(position); - holder.tvTitle.setText(listBean.getExchangePrice()+""); + holder.tvTitle.setText(listBean.getExchangePrice()+"元"); holder.tvTime.setText(listBean.getCommitDate()); holder.tvDec.setText(listBean.getAdminConfirm() == 0 ? "未审核" : "已审核"); } diff --git a/app/src/main/java/com/navinfo/outdoor/api/Constant.java b/app/src/main/java/com/navinfo/outdoor/api/Constant.java index 45882d8..79ec4a6 100644 --- a/app/src/main/java/com/navinfo/outdoor/api/Constant.java +++ b/app/src/main/java/com/navinfo/outdoor/api/Constant.java @@ -183,7 +183,7 @@ public class Constant { public static SlidingUpPanelLayout SLIDING_LAYOUT = null;//設置 public static boolean IS_FILTER_LIST_ITEM = true;//poi页面的查重 public static TencentMap.OnMarkerClickListener markerClickListener = null; - public static final String NAVIN_FO = "10.15";//版本日期 + public static final String NAVIN_FO = "10.18";//版本日期 /* *联系我们的QQ群名称和QQ群号 */ diff --git a/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java b/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java index 529c308..4301b91 100644 --- a/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java +++ b/app/src/main/java/com/navinfo/outdoor/api/UserApplication.java @@ -37,16 +37,16 @@ public class UserApplication extends Application { UMConfigure.setLogEnabled(true); String e ="测试自定义异常代码是否运行！！！！！！"; UMCrash.generateCustomLog(e,"UmengException"); - initOkGo(); - - TalentLocationUtils.getInstance(this).startLocation(this); } public static UserApplication getUserApplication() { + return userApplication; + } + private void initOkGo() { OkHttpClient.Builder builder = new OkHttpClient.Builder(); //log相关 @@ -89,7 +89,5 @@ public class UserApplication extends Application { StrictMode.VmPolicy.Builder picBuilder = new StrictMode.VmPolicy.Builder(); StrictMode.setVmPolicy(picBuilder.build()); picBuilder.detectFileUriExposure(); - } - } diff --git a/app/src/main/java/com/navinfo/outdoor/bean/ReceivedPoiBean.java b/app/src/main/java/com/navinfo/outdoor/bean/ReceivedPoiBean.java index e88d8cb..e15e3bc 100644 --- a/app/src/main/java/com/navinfo/outdoor/bean/ReceivedPoiBean.java +++ b/app/src/main/java/com/navinfo/outdoor/bean/ReceivedPoiBean.java @@ -58,6 +58,15 @@ public class ReceivedPoiBean { private int isExclusive; private String memo; private String endDate; + private String telephone; + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } public String getMemo() { return memo; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java index 33c5f76..e2d1d6d 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java @@ -197,7 +197,7 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On message = "通过"; } DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; - MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", message, "确定").setOkButton(new OnDialogButtonClickListener() { + MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", message+"", "确定").setOkButton(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { return false; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java index 0bbdf6f..919120d 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java @@ -17,6 +17,7 @@ import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.EditText; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.Spinner; import android.widget.TextView; @@ -82,10 +83,12 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC private Spinner spinnerType, spinnerScutcheon, spinnerStake; String[] type = new String[]{"地上五层", "地上四层", "地上三层", "地上二层", "地上一层", "地下一层", "地下二层", "地下三层", "地下四层", "地下五层"}; String[] scutcheon = new String[]{"存在", "不存在"}; + String[] spanner = new String[]{"存在", "不存在"}; String[] stake = new String[]{"可以使用", "不可使用", "维修中", "建设中", "规划中"}; private RelativeLayout rlPanorama, rlCoding, rlEquipment, rlFacility, rlUsable, rlAvailable, rlParking, rlNumber, rlScutcheon, rlDevice; private ImageView ivPanorama, ivCoding, ivEquipment, ivFacility, ivUsable, ivAvailable, ivParking, ivNumber, ivScutcheon, ivDevice; private TextView tvPanorama, tvCoding, tvEquipment, tvFacility, tvUsable, tvAvailable, tvParking, tvNumber, tvScutcheon, tvDevice; + private int exist = 0; private int cp_floor = 1; private int sign_exist = 0; private int cp_availableState = 0; @@ -100,6 +103,14 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC private ChargingPileEntity chargingPileEntity; private File logFile; private StringBuilder chargingPileBuilder; + private Spinner spinnerExist; + private RelativeLayout relative_exist; + private TextView tvText; + private LinearLayout llCharging; + private RelativeLayout linearType; + private RelativeLayout linearScutcheon; + private RelativeLayout linearStake; + private RelativeLayout linearRelative; public static ChargingPileFragment newInstance(Bundle bundle) { ChargingPileFragment fragment = new ChargingPileFragment(); @@ -155,7 +166,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC startActivity(intent); } }); - moveLatlng(latLng,null); + moveLatlng(latLng, null); } @Override @@ -168,7 +179,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC checkBoxLife.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if(checkBoxLife.isChecked()){ + if (checkBoxLife.isChecked()) { moveLatlng(latLng, new TencentMap.CancelableCallback() { @Override public void onFinish() { @@ -193,7 +204,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC checkBoxLife.setChecked(false); } }); - }else { + } else { BitmapDescriptor pileDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_pile_show); markerPile.setIcon(pileDescriptor); checkBoxLife.setText("编辑"); @@ -272,6 +283,33 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC } } }); + relative_exist = findViewById(R.id.linear_exist); + spinnerExist = findViewById(R.id.spinner_exist); + ArrayAdapter adapterExist = new ArrayAdapter<>(Objects.requireNonNull(getContext()), android.R.layout.simple_spinner_item, spanner); + 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: + exist = 0;//存在 + pileDisables(View.VISIBLE); + break; + case 1: + exist = 1;//不存在 + pileDisables(View.GONE); + rlDevice.setVisibility(View.GONE); + rlScutcheon.setVisibility(View.GONE); + break; + } + } + + @Override + public void onNothingSelected(AdapterView parent) { + } + }); + spinnerType = findViewById(R.id.spinner_type); ArrayAdapter adapterType = new ArrayAdapter<>(Objects.requireNonNull(getContext()), android.R.layout.simple_spinner_item, type); adapterType.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); //设置下拉列表框的下拉选项样式 @@ -313,8 +351,10 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC break; } } + @Override - public void onNothingSelected(AdapterView parent) {} + public void onNothingSelected(AdapterView parent) { + } }); spinnerScutcheon = findViewById(R.id.spinner_scutcheon); ArrayAdapter adapterScutcheon = new ArrayAdapter<>(getContext(), android.R.layout.simple_spinner_item, scutcheon); @@ -332,8 +372,11 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC break; case 1: rlFacility.setBackgroundColor(Color.parseColor("#03A9F4")); - rlScutcheon.setVisibility(View.VISIBLE); - rlDevice.setVisibility(View.VISIBLE); + if (exist==0){ + rlScutcheon.setVisibility(View.VISIBLE); + rlDevice.setVisibility(View.VISIBLE); + } + sign_exist = 1; break; } @@ -380,6 +423,13 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC if (slidingPaneLayout != null) { slidingPaneLayout.setScrollableView(nestedScrollView); } + tvText = findViewById(R.id.text); + + llCharging = findViewById(R.id.ll_charging); + linearType = findViewById(R.id.linear_type); + linearScutcheon = findViewById(R.id.linear_scutcheon); + linearStake = findViewById(R.id.linear_stake); + linearRelative = findViewById(R.id.relative_linear); rlPanorama = findViewById(R.id.rl_panorama); rlPanorama.setOnClickListener(this); ivPanorama = findViewById(R.id.iv_panorama); @@ -429,7 +479,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC } private void onLongDelPic() { - if (ivAvailable.getTag()!=null){ + if (ivAvailable.getTag() != null) { } rlAvailable.setOnLongClickListener(new View.OnLongClickListener() { @@ -587,6 +637,18 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC String name = chargingPileEntity.getName();//名称 if (name != null) { tvNameContent.setText(name); + relative_exist.setVisibility(View.VISIBLE); + exist = chargingPileEntity.getExist(); + spinnerExist.setSelection(exist, true); + if (exist == 0) { + pileDisables(View.VISIBLE); + } else if (exist == 1) { + pileDisables(View.GONE); + rlDevice.setVisibility(View.GONE); + rlScutcheon.setVisibility(View.GONE); + } + } else { + relative_exist.setVisibility(View.GONE); } String p = chargingPileEntity.getP(); if (p != null) { @@ -594,7 +656,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC String decodeGeometry = Geohash.getInstance().decode(p); latLng = GeometryTools.createLatLng(decodeGeometry); BitmapDescriptor pileDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_pile_show); - markerPile = tencentMap.addMarker(new MarkerOptions(latLng).icon(pileDescriptor).anchor(0.5f,1.0f)); + markerPile = tencentMap.addMarker(new MarkerOptions(latLng).icon(pileDescriptor).anchor(0.5f, 1.0f)); markerPile.setZIndex(4); moveLatlng(latLng, null); } @@ -606,6 +668,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC if (fid != null) { pid = fid; } + int sign_exist = chargingPileEntity.getSign_exist(); spinnerScutcheon.setSelection(sign_exist, true); if (sign_exist == 0) { @@ -613,14 +676,21 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC rlScutcheon.setVisibility(View.GONE); rlDevice.setVisibility(View.GONE); } else if (sign_exist == 1) { - rlFacility.setBackgroundColor(Color.parseColor("#03A9F4")); - rlScutcheon.setVisibility(View.VISIBLE); - rlDevice.setVisibility(View.VISIBLE); + int exist = chargingPileEntity.getExist(); + if (exist == 0) { + rlFacility.setBackgroundColor(Color.parseColor("#03A9F4")); + rlScutcheon.setVisibility(View.VISIBLE); + rlDevice.setVisibility(View.VISIBLE); + } else { + rlScutcheon.setVisibility(View.GONE); + rlDevice.setVisibility(View.GONE); + } + } int cp_availableState = chargingPileEntity.getCp_availableState(); spinnerStake.setSelection(cp_availableState, true); String cp_openType = chargingPileEntity.getCp_openType(); - if (cp_openType!=null&&!cp_openType.equals("")){ + if (cp_openType != null && !cp_openType.equals("")) { String[] split = cp_openType.split(","); for (String s : split) { if (Integer.parseInt(s) == 1) { @@ -638,27 +708,27 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC } int cp_floor = chargingPileEntity.getCp_floor(); //"地上五层", "地上四层", "地上三层", "地上二层", "地上一层", "地下一层", "地下二层", "地下三层", "地下四层", "地下五层"}; - if (cp_floor==0){ + if (cp_floor == 0) { spinnerType.setSelection(4, true); - }else if (cp_floor==1){ + } else if (cp_floor == 1) { spinnerType.setSelection(4, true); - }else if (cp_floor==2){ + } else if (cp_floor == 2) { spinnerType.setSelection(3, true); - }else if (cp_floor==3){ + } else if (cp_floor == 3) { spinnerType.setSelection(2, true); - }else if (cp_floor==4){ + } else if (cp_floor == 4) { spinnerType.setSelection(1, true); - }else if (cp_floor==5){ + } else if (cp_floor == 5) { spinnerType.setSelection(0, true); - }else if (cp_floor==-1){ + } else if (cp_floor == -1) { spinnerType.setSelection(5, true); - }else if (cp_floor==-2){ + } else if (cp_floor == -2) { spinnerType.setSelection(6, true); - }else if (cp_floor==-3){ + } else if (cp_floor == -3) { spinnerType.setSelection(7, true); - }else if (cp_floor==-4){ + } else if (cp_floor == -4) { spinnerType.setSelection(8, true); - }else if (cp_floor==-5){ + } else if (cp_floor == -5) { spinnerType.setSelection(9, true); } if (chargingPileEntity.getPhotos() != null) { @@ -689,48 +759,48 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC } } - /* private void initPileMarker(LatLng latLng) { - BitmapDescriptor pileDescriptor = BitmapDescriptorFactory.fromResource(R.mipmap.icon_operation); - if (markerPile == null) { - markerPile = tencentMap.addMarker(new MarkerOptions(latLng).icon(pileDescriptor)); - markerPile.setZIndex(MARKER_BIG); - } + /* private void initPileMarker(LatLng latLng) { + BitmapDescriptor pileDescriptor = BitmapDescriptorFactory.fromResource(R.mipmap.icon_operation); + if (markerPile == null) { + markerPile = tencentMap.addMarker(new MarkerOptions(latLng).icon(pileDescriptor)); + markerPile.setZIndex(MARKER_BIG); + } - CameraUpdate cameraSigma = CameraUpdateFactory.newCameraPosition(new CameraPosition( - latLng, //中心点坐标，地图目标经纬度 - tencentMap.getCameraPosition().zoom, //目标缩放级别 - tencentMap.getCameraPosition().tilt, //目标倾斜角[0.0 ~ 45.0] (垂直地图时为0) - tencentMap.getCameraPosition().bearing)); //目标旋转角 0~360° (正北方为0) - tencentMap.animateCamera(cameraSigma, new TencentMap.CancelableCallback() { - @Override - public void onFinish() { - screenPilePositions = tencentMap.getProjection().toScreenLocation(latLng); - sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED); - //创建Marker对象之前，设置属性 - if (markerPile != null) { - markerPile.setFixingPoint(screenPosition.x, screenPosition.y); - } - } + CameraUpdate cameraSigma = CameraUpdateFactory.newCameraPosition(new CameraPosition( + latLng, //中心点坐标，地图目标经纬度 + tencentMap.getCameraPosition().zoom, //目标缩放级别 + tencentMap.getCameraPosition().tilt, //目标倾斜角[0.0 ~ 45.0] (垂直地图时为0) + tencentMap.getCameraPosition().bearing)); //目标旋转角 0~360° (正北方为0) + tencentMap.animateCamera(cameraSigma, new TencentMap.CancelableCallback() { + @Override + public void onFinish() { + screenPilePositions = tencentMap.getProjection().toScreenLocation(latLng); + sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED); + //创建Marker对象之前，设置属性 + if (markerPile != null) { + markerPile.setFixingPoint(screenPosition.x, screenPosition.y); + } + } - @Override - public void onCancel() { - } - }); - } + @Override + public void onCancel() { + } + }); + } - private void initCheckedPileMarker(int poiWord) { - if (screenPilePositions != null) { - sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED); - LatLng latLng = tencentMap.getProjection().fromScreenLocation(screenPilePositions); - markerPile.setPosition(latLng); - markerPile.setFixingPointEnable(false); - Constant.markerLatlng = latLng; - Message obtain = Message.obtain(); - obtain.what = poiWord; - obtain.obj = latLng; - EventBus.getDefault().post(obtain); - } - }*/ + private void initCheckedPileMarker(int poiWord) { + if (screenPilePositions != null) { + sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED); + LatLng latLng = tencentMap.getProjection().fromScreenLocation(screenPilePositions); + markerPile.setPosition(latLng); + markerPile.setFixingPointEnable(false); + Constant.markerLatlng = latLng; + Message obtain = Message.obtain(); + obtain.what = poiWord; + obtain.obj = latLng; + EventBus.getDefault().post(obtain); + } + }*/ public void setCList(ArrayList list) { switch (list.size()) { case 1: @@ -819,6 +889,34 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC btnSaveLocal.setEnabled(false);//保存 } + private void pileDisables(int aEnabled) { + tvText.setVisibility(aEnabled); + llCharging.setVisibility(aEnabled); + linearType.setVisibility(aEnabled); + linearScutcheon.setVisibility(aEnabled); + linearStake.setVisibility(aEnabled); + linearRelative.setVisibility(aEnabled); + checkButton1.setVisibility(aEnabled);//开放状态1 + checkButton2.setVisibility(aEnabled);//开放状态2 + checkButton3.setVisibility(aEnabled);//开放状态3 + checkButton4.setVisibility(aEnabled);//开放状态4 + checkButton5.setVisibility(aEnabled);//开放状态5 + spinnerType.setVisibility(aEnabled);//充电地面层 + spinnerScutcheon.setVisibility(aEnabled);//设备标牌下拉框 + rlEquipment.setVisibility(aEnabled);//(蓝色色)设备标牌 + rlFacility.setVisibility(aEnabled);//(白色)设备标牌 + spinnerStake.setVisibility(aEnabled);//桩可用状态 + rlUsable.setVisibility(aEnabled);//(蓝色)可用状态 + rlAvailable.setVisibility(aEnabled);//(白色)可用状态 + rlParking.setVisibility(aEnabled);//(蓝色)停车位编号 + rlNumber.setVisibility(aEnabled);//(白色)停车位编号 + if (aEnabled == View.VISIBLE) { + tvCoding.setText("*充电桩编码"); + } else if (aEnabled == View.GONE) { + tvCoding.setText("*全景照片"); + } + } + @Override protected void initData() { super.initData(); @@ -947,7 +1045,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC case R.id.rl_facility: chargingPileBuilder.append("点击了设备标牌进行拍照,"); Intent intentFacility = new Intent(getActivity(), PhotographActivity.class); - File facilityFile = PhotoUtils.showPhotoFile("c", latLng); + File facilityFile = PhotoUtils.showPhotoFile("c", latLng); intentFacility.putExtra(Constant.INTENT_VIDEO_OBLATION, 1); intentFacility.putExtra(Constant.INTENT_PHOTO_PATH, facilityFile.getPath()); startActivityForResult(intentFacility, 104); @@ -1004,56 +1102,56 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC } } -/* private void chargingPileByWork(ChargingPileEntity chargingPileEntity) { - showLoadingDialog(); - HttpParams httpParams = new HttpParams(); - httpParams.put("taskId", taskId); - httpParams.put("name", chargingPileEntity.getName()); - httpParams.put("existence", chargingPileEntity.getExist()); - httpParams.put("geo", chargingPileEntity.getP()); - httpParams.put("memo", chargingPileEntity.getMemo()); - httpParams.put("ffid", chargingPileEntity.getFid()); - HashMap hashMap = new HashMap<>(); - hashMap.put("cp_openType",chargingPileEntity.getCp_openType()); - hashMap.put("cp_floor",chargingPileEntity.getCp_floor()); - hashMap.put("cp_availableState",chargingPileEntity.getCp_availableState()); - hashMap.put("sign_exist",chargingPileEntity.getSign_exist()); - httpParams.put("detail", String.valueOf(hashMap)); - OkGoBuilder.getInstance() - .Builder(getActivity()) - .url(HttpInterface.SUBMIT_CSTASK) - .method(OkGoBuilder.GET) - .cls(ChargingPileSaveBean.class) - .params(httpParams) - .callback(new Callback() { - @Override - public void onSuccess(ChargingPileSaveBean chargingPileSaveBean, int id) { - dismissLoadingDialog(); - chargingPileBody = chargingPileSaveBean.getBody(); - Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onSuccess: " + chargingPileSaveBean.getBody()); - phoneList(); - Message obtain = Message.obtain(); - obtain.what = Constant.CHARGING_PILE_BODY; - obtain.obj = chargingPileBody; - EventBus.getDefault().post(obtain); + /* private void chargingPileByWork(ChargingPileEntity chargingPileEntity) { + showLoadingDialog(); + HttpParams httpParams = new HttpParams(); + httpParams.put("taskId", taskId); + httpParams.put("name", chargingPileEntity.getName()); + httpParams.put("existence", chargingPileEntity.getExist()); + httpParams.put("geo", chargingPileEntity.getP()); + httpParams.put("memo", chargingPileEntity.getMemo()); + httpParams.put("ffid", chargingPileEntity.getFid()); + HashMap hashMap = new HashMap<>(); + hashMap.put("cp_openType",chargingPileEntity.getCp_openType()); + hashMap.put("cp_floor",chargingPileEntity.getCp_floor()); + hashMap.put("cp_availableState",chargingPileEntity.getCp_availableState()); + hashMap.put("sign_exist",chargingPileEntity.getSign_exist()); + httpParams.put("detail", String.valueOf(hashMap)); + OkGoBuilder.getInstance() + .Builder(getActivity()) + .url(HttpInterface.SUBMIT_CSTASK) + .method(OkGoBuilder.GET) + .cls(ChargingPileSaveBean.class) + .params(httpParams) + .callback(new Callback() { + @Override + public void onSuccess(ChargingPileSaveBean chargingPileSaveBean, int id) { + dismissLoadingDialog(); + chargingPileBody = chargingPileSaveBean.getBody(); + Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); + Log.d("TAG", "onSuccess: " + chargingPileSaveBean.getBody()); + phoneList(); + Message obtain = Message.obtain(); + obtain.what = Constant.CHARGING_PILE_BODY; + obtain.obj = chargingPileBody; + EventBus.getDefault().post(obtain); - Message obtain1 = Message.obtain(); - obtain1.what = Constant.CHARGING_PILE_PHOTO; - obtain1.obj = phoneLists; - EventBus.getDefault().post(obtain1); - getActivity().onBackPressed(); + Message obtain1 = Message.obtain(); + obtain1.what = Constant.CHARGING_PILE_PHOTO; + obtain1.obj = phoneLists; + EventBus.getDefault().post(obtain1); + getActivity().onBackPressed(); - } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage()); - } - }).build(); - }*/ + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); + Log.d("TAG", "onError: " + e.getMessage()); + } + }).build(); + }*/ @Override public void onSaveInstanceState(@NonNull Bundle outState) { super.onSaveInstanceState(outState); @@ -1087,98 +1185,98 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC @Override public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (resultCode==0x104){ - if (requestCode==101){ - assert data != null; - String file = data.getStringExtra("file"); - assert file != null; - File videoFile = new File(file); - if (videoFile.exists()) { - String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivPanorama); - tvPanorama.setTag(andGetPath); - } - } else if (requestCode==102){ - assert data != null; - String file = data.getStringExtra("file"); - assert file != null; - File videoFile = new File(file); - if (videoFile.exists()) { - String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivCoding); - tvCoding.setTag(andGetPath); - } - }else if (requestCode==103){ - assert data != null; - String file = data.getStringExtra("file"); - assert file != null; - File videoFile = new File(file); - if (videoFile.exists()) { - String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivEquipment); - tvEquipment.setTag(andGetPath); - } - }else if (requestCode==104){ - assert data != null; - String file = data.getStringExtra("file"); - assert file != null; - File videoFile = new File(file); - if (videoFile.exists()) { - String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivFacility); - tvFacility.setTag(andGetPath); - } - }else if (requestCode==105){ - assert data != null; - String file = data.getStringExtra("file"); - assert file != null; - File videoFile = new File(file); - if (videoFile.exists()) { - String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivScutcheon); - tvScutcheon.setTag(andGetPath); - } - }else if (requestCode==106){ - assert data != null; - String file = data.getStringExtra("file"); - assert file != null; - File videoFile = new File(file); - if (videoFile.exists()) { - String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivDevice); - tvDevice.setTag(andGetPath); - } - }else if (requestCode==107){ - assert data != null; - String file = data.getStringExtra("file"); - assert file != null; - File videoFile = new File(file); - if (videoFile.exists()) { - String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivUsable); - tvUsable.setTag(andGetPath); - } - }else if (requestCode==108){ - assert data != null; - String file = data.getStringExtra("file"); - assert file != null; - File videoFile = new File(file); - if (videoFile.exists()) { - String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivAvailable); - tvAvailable.setTag(andGetPath); - } - }else if (requestCode==109){ - assert data != null; - String file = data.getStringExtra("file"); - assert file != null; - File videoFile = new File(file); - if (videoFile.exists()) { - String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivParking); - tvParking.setTag(andGetPath); - } - }else if (requestCode==110){ - assert data != null; - String file = data.getStringExtra("file"); - assert file != null; - File videoFile = new File(file); - if (videoFile.exists()) { - String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivNumber); - tvNumber.setTag(andGetPath); - } - } + if (resultCode == 0x104) { + if (requestCode == 101) { + assert data != null; + String file = data.getStringExtra("file"); + assert file != null; + File videoFile = new File(file); + if (videoFile.exists()) { + String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivPanorama); + tvPanorama.setTag(andGetPath); + } + } else if (requestCode == 102) { + assert data != null; + String file = data.getStringExtra("file"); + assert file != null; + File videoFile = new File(file); + if (videoFile.exists()) { + String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivCoding); + tvCoding.setTag(andGetPath); + } + } else if (requestCode == 103) { + assert data != null; + String file = data.getStringExtra("file"); + assert file != null; + File videoFile = new File(file); + if (videoFile.exists()) { + String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivEquipment); + tvEquipment.setTag(andGetPath); + } + } else if (requestCode == 104) { + assert data != null; + String file = data.getStringExtra("file"); + assert file != null; + File videoFile = new File(file); + if (videoFile.exists()) { + String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivFacility); + tvFacility.setTag(andGetPath); + } + } else if (requestCode == 105) { + assert data != null; + String file = data.getStringExtra("file"); + assert file != null; + File videoFile = new File(file); + if (videoFile.exists()) { + String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivScutcheon); + tvScutcheon.setTag(andGetPath); + } + } else if (requestCode == 106) { + assert data != null; + String file = data.getStringExtra("file"); + assert file != null; + File videoFile = new File(file); + if (videoFile.exists()) { + String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivDevice); + tvDevice.setTag(andGetPath); + } + } else if (requestCode == 107) { + assert data != null; + String file = data.getStringExtra("file"); + assert file != null; + File videoFile = new File(file); + if (videoFile.exists()) { + String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivUsable); + tvUsable.setTag(andGetPath); + } + } else if (requestCode == 108) { + assert data != null; + String file = data.getStringExtra("file"); + assert file != null; + File videoFile = new File(file); + if (videoFile.exists()) { + String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivAvailable); + tvAvailable.setTag(andGetPath); + } + } else if (requestCode == 109) { + assert data != null; + String file = data.getStringExtra("file"); + assert file != null; + File videoFile = new File(file); + if (videoFile.exists()) { + String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivParking); + tvParking.setTag(andGetPath); + } + } else if (requestCode == 110) { + assert data != null; + String file = data.getStringExtra("file"); + assert file != null; + File videoFile = new File(file); + if (videoFile.exists()) { + String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivNumber); + tvNumber.setTag(andGetPath); + } + } } } @@ -1199,7 +1297,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC if (EventBus.getDefault().isRegistered(this))//加上判断 EventBus.getDefault().unregister(this); super.onDestroy(); - if (markerPile!=null){ + if (markerPile != null) { markerPile.remove(); } chargingPileBuilder.append("onDestroy ,"); @@ -1222,6 +1320,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC if (cp_floor != 0) { chargingPileEntity.setCp_floor(cp_floor); } + String tagPanorama = (String) tvPanorama.getTag(); if (tagPanorama != null && !tagPanorama.equals("")) { photo.add(tagPanorama); @@ -1264,6 +1363,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC } chargingPileEntity.setPhotos(photo); chargingPileEntity.setSign_exist(sign_exist); + chargingPileEntity.setExist(exist); chargingPileEntity.setCp_availableState(cp_availableState); String describe = editDescribe.getText().toString().trim(); if (!describe.equals("")) { @@ -1303,11 +1403,6 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC poiCheckResult.setMsg("请输入 名称"); return poiCheckResult; } - if (entity.getCp_openType() == null) { - poiCheckResult.setCode(1); - poiCheckResult.setMsg("开放状态未勾选"); - return poiCheckResult; - } if (tvPanorama.getTag() == null) { poiCheckResult.setCode(1); poiCheckResult.setMsg("请拍照 全景图"); @@ -1318,40 +1413,49 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC poiCheckResult.setMsg("请拍照 充电桩编码"); return poiCheckResult; } - if (tvEquipment.getTag() == null) { - poiCheckResult.setCode(1); - poiCheckResult.setMsg("请拍照 设备标牌"); - return poiCheckResult; - } - if (sign_exist != 0) { - if (tvFacility.getTag() == null) { + if (exist == 0) { + if (entity.getCp_openType() == null) { + poiCheckResult.setCode(1); + poiCheckResult.setMsg("开放状态未勾选"); + return poiCheckResult; + } + + if (tvEquipment.getTag() == null) { poiCheckResult.setCode(1); poiCheckResult.setMsg("请拍照 设备标牌"); return poiCheckResult; } - } - if (sign_exist == 1) { - if (tvScutcheon.getTag() == null) { + if (sign_exist != 0) { + if (tvFacility.getTag() == null) { + poiCheckResult.setCode(1); + poiCheckResult.setMsg("请拍照 设备标牌"); + return poiCheckResult; + } + } + if (sign_exist == 1) { + if (tvScutcheon.getTag() == null) { + poiCheckResult.setCode(1); + poiCheckResult.setMsg("请拍照 设备标牌"); + return poiCheckResult; + } + if (tvDevice.getTag() == null) { + poiCheckResult.setCode(1); + poiCheckResult.setMsg("请拍照 设备标牌"); + return poiCheckResult; + } + } + if (tvUsable.getTag() == null) { poiCheckResult.setCode(1); - poiCheckResult.setMsg("请拍照 设备标牌"); + poiCheckResult.setMsg("请拍照 可用状态"); return poiCheckResult; } - if (tvDevice.getTag() == null) { + if (tvParking.getTag() == null) { poiCheckResult.setCode(1); - poiCheckResult.setMsg("请拍照 设备标牌"); + poiCheckResult.setMsg("请拍照 停车位编号"); return poiCheckResult; } } - if (tvUsable.getTag() == null) { - poiCheckResult.setCode(1); - poiCheckResult.setMsg("请拍照 可用状态"); - return poiCheckResult; - } - if (tvParking.getTag() == null) { - poiCheckResult.setCode(1); - poiCheckResult.setMsg("请拍照 停车位编号"); - return poiCheckResult; - } + return poiCheckResult; } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java index d564af3..6f8830d 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java @@ -1,5 +1,4 @@ package com.navinfo.outdoor.fragment; - import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; @@ -94,7 +93,6 @@ import java.util.List; import java.util.Objects; import okhttp3.Response; - /** * 充电站的Fragment * 2021-5-25 @@ -125,7 +123,6 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. private ContactView contactView; private ArrayList chargingStationList; String str = ""; - //private ArrayList fileList; private NestedScrollView nestedScrollView; private Marker markerStation; private Point screenStationPositions; @@ -249,13 +246,11 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. tvInternal = findViewById(R.id.tv_internal); tvNamePic = findViewById(R.id.tv_name_pic); tvScutcheon = findViewById(R.id.tv_scutcheon); - /* recyclerPhone = findViewById(R.id.recycler_phone); recyclerPhone.setLayoutManager(new LinearLayoutManager(getContext())); recyclerPhone.addItemDecoration(new DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL)); poiRecycleAdapter = new PoiRecycleAdapter(getContext()); recyclerPhone.setAdapter(poiRecycleAdapter);*/ - RecyclerView recyclerStation = findViewById(R.id.recycler_station); recyclerStation.setLayoutManager(new GridLayoutManager(getContext(), 3)); chargingPileAdapter = new ChargingPileAdapter(getContext()); @@ -1057,6 +1052,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } }); */ + private void initRoadSaveLocal(boolean isLocal) { XXPermissions.with(this) //读写权限 @@ -1090,7 +1086,6 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. Toast.makeText(getActivity(), "没有申请权限，请手动申请", Toast.LENGTH_SHORT).show(); } } - @Override public void onDenied(List permissions, boolean never) { if (never) { @@ -1237,7 +1232,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. btnSaveLocal.setEnabled(true); btnUploading.setEnabled(true); List body = taskNameBean.getBody(); - if (body != null) { + if (body != null) { for (int i = 0; i < body.size(); i++) { str += body.get(i) + ","; } @@ -1405,26 +1400,32 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. new Thread(new Runnable() { @Override public void run() { - if (showPoiEntity.getId() != null) { - List chargingPileEntityList = PoiDatabase.getInstance(getActivity()).getChargingPileDao().getChargingPileByStationId(showPoiEntity.getId()); - if (chargingPileEntityList != null && !chargingPileEntityList.isEmpty()) { - for (ChargingPileEntity chargingPileEntity : chargingPileEntityList) { - List chargingPileFileList = new ArrayList<>(); - if (chargingPileEntity.getPhotos() != null && !chargingPileEntity.getPhotos().isEmpty()) { - for (String photoPath : chargingPileEntity.getPhotos()) { - chargingPileFileList.add(new File(photoPath)); + if (showPoiEntity != null) { + if (showPoiEntity.getId()!=null){ + List chargingPileEntityList = PoiDatabase.getInstance(getActivity()).getChargingPileDao().getChargingPileByStationId(showPoiEntity.getId()); + if (chargingPileEntityList != null && !chargingPileEntityList.isEmpty()) { + for (ChargingPileEntity chargingPileEntity : chargingPileEntityList) { + List chargingPileFileList = new ArrayList<>(); + if (chargingPileEntity.getPhotos() != null && !chargingPileEntity.getPhotos().isEmpty()) { + for (String photoPath : chargingPileEntity.getPhotos()) { + chargingPileFileList.add(new File(photoPath)); + } + } + PoiDatabase.getInstance(getActivity()).getChargingPileDao().deleteChargingPileEntity(chargingPileEntity); + for (int i = 0; i < chargingPileFileList.size(); i++) { + chargingPileFileList.get(i).delete(); } - } - PoiDatabase.getInstance(getActivity()).getChargingPileDao().deleteChargingPileEntity(chargingPileEntity); - for (int i = 0; i < chargingPileFileList.size(); i++) { - chargingPileFileList.get(i).delete(); } } } - chargingPileDao.deleteChargingFidPileEntity(showPoiEntity.getId()); + } } }).start(); + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_WORD_MONITOR; + obtain.obj = true; + EventBus.getDefault().post(obtain); } else { Message obtain = Message.obtain(); obtain.what = Constant.JOB_WORD_MONITOR; @@ -1515,23 +1516,24 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. new Thread(new Runnable() { @Override public void run() { - List chargingPileEntityList = PoiDatabase.getInstance(getActivity()).getChargingPileDao().getChargingPileByStationId(showPoiEntity.getId()); - if (chargingPileEntityList != null && !chargingPileEntityList.isEmpty()) { - for (ChargingPileEntity chargingPileEntity : chargingPileEntityList) { - List chargingPileFileList = new ArrayList<>(); - if (chargingPileEntity.getPhotos() != null && !chargingPileEntity.getPhotos().isEmpty()) { - for (String photoPath : chargingPileEntity.getPhotos()) { - chargingPileFileList.add(new File(photoPath)); + if (showPoiEntity!=null){ + List chargingPileEntityList = PoiDatabase.getInstance(getActivity()).getChargingPileDao().getChargingPileByStationId(showPoiEntity.getId()); + if (chargingPileEntityList != null && !chargingPileEntityList.isEmpty()) { + for (ChargingPileEntity chargingPileEntity : chargingPileEntityList) { + List chargingPileFileList = new ArrayList<>(); + if (chargingPileEntity.getPhotos() != null && !chargingPileEntity.getPhotos().isEmpty()) { + for (String photoPath : chargingPileEntity.getPhotos()) { + chargingPileFileList.add(new File(photoPath)); + } + } + PoiDatabase.getInstance(getActivity()).getChargingPileDao().deleteChargingPileEntity(chargingPileEntity); + for (int i = 0; i < chargingPileFileList.size(); i++) { + chargingPileFileList.get(i).delete(); } - } - PoiDatabase.getInstance(getActivity()).getChargingPileDao().deleteChargingPileEntity(chargingPileEntity); - for (int i = 0; i < chargingPileFileList.size(); i++) { - chargingPileFileList.get(i).delete(); } } } poiDao.deletePoiEntity(poiEntity); - chargingPileDao.deleteChargingFidPileEntity(poiEntity.getId()); } }).start(); initList(); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/FindFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/FindFragment.java index 40876f1..cb520cf 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/FindFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/FindFragment.java @@ -7,6 +7,7 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.view.View; import android.widget.LinearLayout; +import android.widget.Toast; import com.github.lazylibrary.util.FileUtils; @@ -35,7 +36,9 @@ public class FindFragment extends BaseFragment implements View.OnClickListener{ FindFragment fragment = new FindFragment(); fragment.setArguments(bundle); return fragment; - } @Override + } + + @Override protected int getLayout() { return R.layout.find_fragment; } @@ -104,10 +107,11 @@ public class FindFragment extends BaseFragment implements View.OnClickListener{ startActivity(eventIntent); break; case R.id.linear_end: - findBuilder.append("点击了帮助中心：能力测评 跳转 ,"); - Intent endIntent = new Intent(getActivity(), FragmentManagement.class); + findBuilder.append("点击了帮助中心：能力测评 ,"); + Toast.makeText(getContext(), "该功能以后上新，敬请期待", Toast.LENGTH_SHORT).show(); + /*Intent endIntent = new Intent(getActivity(), FragmentManagement.class); endIntent.putExtra("tag", 11); - startActivity(endIntent); + startActivity(endIntent);*/ break; } @@ -132,4 +136,5 @@ public class FindFragment extends BaseFragment implements View.OnClickListener{ findBuilder.append("\r\n"); FileUtils.writeFile(logFile.getAbsolutePath(), findBuilder.toString(), true); } + } 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 000e794..1e752ac 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java @@ -282,8 +282,9 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe LatLng endLatLng = new LatLng(Double.parseDouble(poiEntity.getY()), Double.parseDouble(poiEntity.getX())); double geometry = GeometryTools.distanceToDouble(startLatLng, endLatLng); if (geometry > 5000) { + initGather(); Toast.makeText(getActivity(), "作业不在领取范围内,无法领取", Toast.LENGTH_SHORT).show(); - return; + // return; }else { if (geometry>50){ // Voice.sprat("注意在附近50米范围内进行采集",0); @@ -763,6 +764,14 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe poiListEntity.setAddress(listBean.getAddress()); poiListEntity.setType(listBean.getType()); poiListEntity.setIsExclusive(listBean.getIsExclusive()); + if (listBean.getType()==1){ + if(listBean.getTelephone()==null||listBean.getTelephone().equals("")||listBean.getTelephone().equals("null")){ + poiListEntity.setTelPhone(null); + }else { + poiListEntity.setTelPhone(listBean.getTelephone()); + } + } + poiListEntity.setTaskStatus(statusId); poiListEntity.setGeoWkt(listBean.getGeo()); String encodeStr = listBean.getGeo(); 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 230357e..9d3ba97 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java @@ -23,6 +23,8 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; + +import com.github.lazylibrary.util.FileUtils; import com.github.lazylibrary.util.StringUtils; import com.google.gson.Gson; import com.kongzue.dialog.interfaces.OnDialogButtonClickListener; @@ -46,7 +48,10 @@ import com.navinfo.outdoor.util.GetJsonDataUtil; import com.navinfo.outdoor.util.PhotoUtils; import org.json.JSONArray; import java.io.File; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.Objects; /*收款信息 @@ -58,6 +63,8 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe private ArrayList jsonBean; private String value; private SharedPreferences.Editor navInfoEditor; + private File logFile; + private StringBuilder gatheringBuilder; public static GatheringFragment newInstance(Bundle bundle) { GatheringFragment fragment = new GatheringFragment(); @@ -109,17 +116,43 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe @Override protected void initData() { super.initData(); + SharedPreferences sharedPreferences = Objects.requireNonNull(getActivity()).getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE); + SharedPreferences.Editor sharedEdit = sharedPreferences.edit(); + @SuppressLint("SimpleDateFormat") + DateFormat formatter = new SimpleDateFormat("yyyyMMdd"); + String newFormat = formatter.format(new Date(System.currentTimeMillis())); + String pictures_time = sharedPreferences.getString("pictures_time", null); + if (pictures_time==null){ + sharedEdit.putString("pictures_time",newFormat); + sharedEdit.apply(); + logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt"); + }else { + if (pictures_time.equals(newFormat)){ + logFile = new File(Constant.LOG_FOLDER + "/" + pictures_time + ".txt"); + }else { + logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt"); + } + } + + gatheringBuilder = new StringBuilder(); + gatheringBuilder.append("GatheringFragment-onCreate-initData ,"); + if (Constant.USHERED!=null){ + gatheringBuilder.append("userId:").append(Constant.USHERED).append(","); + } } @Override public void onClick(View v) { switch (v.getId()) { case R.id.iv_gathering: + gatheringBuilder.append("点击返回的按钮 ,"); Objects.requireNonNull(getActivity()).finish(); break; case R.id.et_bank_num: + gatheringBuilder.append("输入银行卡号 ,"); break; case R.id.iv_bank: + gatheringBuilder.append("点击弹窗 ,"); String bankJson = new GetJsonDataUtil().getJson(Objects.requireNonNull(getContext()), "bank.json");//获取assets目录下的json文件数据 //用Gabon 转成实体 jsonBean = parseData(bankJson); @@ -186,6 +219,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe dialog.show(); break; case R.id.btn_bank: + gatheringBuilder.append("点击绑定银行卡 ,"); if (etBankNum.getText().toString().equals("")) { Toast.makeText(getActivity(), "银行卡号不能为空", Toast.LENGTH_SHORT).show(); Log.e("TAG", "onClick: " + etBankNum); @@ -194,6 +228,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe gatheringNetWork(); break; case R.id.gathering_camera: + gatheringBuilder.append("点击拍照 ,"); Intent gatheringNumberIntent = new Intent(getActivity(), PhotographActivity.class); File file = PhotoUtils.showPhotoFile("a", null); gatheringNumberIntent.putExtra(Constant.INTENT_PHOTO_PATH, file.getPath()); @@ -249,6 +284,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "绑定成功", "确定").setOkButton(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { + gatheringBuilder.append("绑定成功 ,"); Constant.BACKGROUND = value; Constant.BACKGROUND_NAME = bank; Constant.ID_NUMBER = etBankAccount; @@ -311,7 +347,6 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe //所属银行解析 public ArrayList parseData(String result) {//Gao 解析 ArrayList detail = new ArrayList<>(); - try { JSONArray data = new JSONArray(result); Gson gson = new Gson(); @@ -322,8 +357,27 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe } catch (Exception e) { e.printStackTrace(); } - return detail; } + @Override + public void onPause() { + super.onPause(); + gatheringBuilder.append("onPause ,"); + } + + + @Override + public void onStop() { + super.onStop(); + gatheringBuilder.append("onStop ,"); + } + + @Override + public void onDestroy() { + super.onDestroy(); + gatheringBuilder.append("onDestroy ,"); + gatheringBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), gatheringBuilder.toString(), true); + } } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GradeFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GradeFragment.java index 0d51e50..331db0a 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GradeFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GradeFragment.java @@ -30,7 +30,6 @@ public class GradeFragment extends BaseFragment implements View.OnClickListener{ @Override protected void initView() { - ImageView ivGrade = findViewById(R.id.iv_grade); super.initView(); ivGrade.setOnClickListener(this); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java index ac7d368..25356f2 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java @@ -84,7 +84,6 @@ public class MessageFragment extends BaseFragment implements View.OnClickListen } }); messageRecycler.getDefaultFootView().setNoMoreHint("已全部加载完毕"); - messageRecycler.setLoadingListener(new XRecyclerView.LoadingListener() { @Override public void onRefresh() { } @@ -97,7 +96,7 @@ public class MessageFragment extends BaseFragment implements View.OnClickListen showLoadingDialog(); HttpParams httpParams = new HttpParams(); httpParams.put("fid", "5"); - httpParams.put("pageNum", messagePage); + httpParams.put("pageNum", messagePage+""); httpParams.put("pageSize", "10"); OkGoBuilder.getInstance() .Builder(getActivity()) @@ -130,7 +129,6 @@ public class MessageFragment extends BaseFragment implements View.OnClickListen protected void initData() { super.initData(); initNetwork(); - SharedPreferences sharedPreferences = Objects.requireNonNull(getActivity()).getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE); SharedPreferences.Editor sharedEdit = sharedPreferences.edit(); @SuppressLint("SimpleDateFormat") diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java index c43304d..31ef218 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java @@ -29,12 +29,15 @@ import com.navinfo.outdoor.bean.GetPriceBean; import com.navinfo.outdoor.http.Callback; import com.navinfo.outdoor.http.HttpInterface; import com.navinfo.outdoor.http.OkGoBuilder; +import com.navinfo.outdoor.util.DoubleUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import java.io.File; +import java.math.RoundingMode; import java.text.DateFormat; +import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Objects; @@ -63,7 +66,6 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { } } - @Override protected int getLayout() { return R.layout.mine_fragment; @@ -136,7 +138,8 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { GetPriceBean.BodyBean body = response.getBody(); if (body != null) { Double userPrice = body.getUserPrice(); - tvMoney.setText(userPrice + ""); + /*String format2 = DoubleUtil.format2(userPrice);*/ + tvMoney.setText(userPrice+""); } } else { Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); @@ -264,4 +267,5 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { FileUtils.writeFile(logFile.getAbsolutePath(), mainBuilder.toString(), true); } + } 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 f4005bc..cb1588f 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java @@ -703,6 +703,10 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity); } else if (showPoiEntity.getTaskStatus() == 0 || showPoiEntity.getTaskStatus() == 1) { initList(); + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_WORD_MONITOR; + obtain.obj = true; + EventBus.getDefault().post(obtain); } else { Message obtain = Message.obtain(); obtain.what = Constant.JOB_WORD_MONITOR; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java index 79f0092..aca0bf4 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -1003,6 +1003,10 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity); } else if (showPoiEntity.getTaskStatus() == 0 | showPoiEntity.getTaskStatus() == 1) { initList(); + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_WORD_MONITOR; + obtain.obj = true; + EventBus.getDefault().post(obtain); } else { Message obtain = Message.obtain(); obtain.what = Constant.JOB_WORD_MONITOR; 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 cff820c..62ac081 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -587,10 +587,18 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick if (showPoiEntity.getTaskStatus() == 5) { initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity);//结束领取 } else if (showPoiEntity.getTaskStatus() == 0 || showPoiEntity.getTaskStatus() == 1) { - List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId()); - for (int i = 0; i < fileListByUUID.size(); i++) { - fileListByUUID.get(i).delete(); + if (showPoiEntity.getId()!=null){ + List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId()); + for (int i = 0; i < fileListByUUID.size(); i++) { + fileListByUUID.get(i).delete(); + } + File filePath = AWMp4ParserHelper.getInstance().getFilePath(showPoiEntity.getId()); + filePath.delete(); } + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_WORD_MONITOR; + obtain.obj = true; + EventBus.getDefault().post(obtain); } else { Message obtain = Message.obtain(); obtain.what = Constant.JOB_WORD_MONITOR; @@ -656,6 +664,8 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick for (int i = 0; i < fileListByUUID.size(); i++) { fileListByUUID.get(i).delete(); } + File filePath = AWMp4ParserHelper.getInstance().getFilePath(poiEntity.getId()); + filePath.delete(); } Message obtain = Message.obtain(); obtain.what = Constant.JOB_WORD_MONITOR; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java index 2e5a594..c8779ac 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -183,7 +183,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList btnRoadSave.setOnClickListener(this); Button roadUpload = findViewById(R.id.road_upload); roadUpload.setOnClickListener(this); - //数据展示 initShowPoi(); //禁用可操作性控件 @@ -594,10 +593,18 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList if (showPoiEntity.getTaskStatus() == 5) { initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity); } else if (showPoiEntity.getTaskStatus() == 0 || showPoiEntity.getTaskStatus() == 1) { - List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId()); - for (int i = 0; i < fileListByUUID.size(); i++) { - fileListByUUID.get(i).delete(); + if (showPoiEntity.getId()!=null){ + List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId()); + for (int i = 0; i < fileListByUUID.size(); i++) { + fileListByUUID.get(i).delete(); + } + File filePath = AWMp4ParserHelper.getInstance().getFilePath(showPoiEntity.getId()); + filePath.delete(); } + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_WORD_MONITOR; + obtain.obj = true; + EventBus.getDefault().post(obtain); } else { Message obtain = Message.obtain(); obtain.what = Constant.JOB_WORD_MONITOR; @@ -657,13 +664,14 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList poiDao.deletePoiEntity(poiEntity); } }).start(); - if (poiEntity.getId() != null) { + if (poiEntity.getId()!=null){ List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(poiEntity.getId()); for (int i = 0; i < fileListByUUID.size(); i++) { fileListByUUID.get(i).delete(); } + File filePath = AWMp4ParserHelper.getInstance().getFilePath(poiEntity.getId()); + filePath.delete(); } - Message obtain = Message.obtain(); obtain.what = Constant.JOB_WORD_MONITOR; obtain.obj = true; @@ -754,11 +762,13 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList @Override protected ChargingPileEntity initChargingPileEntityByUI(ChargingPileEntity entity) { + return null; } @Override protected PoiCheckResult checkChargingPileEntity(ChargingPileEntity entity) { + return null; } } \ No newline at end of file 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 0481cdd..37b33cb 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -155,6 +155,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen private AlertDialog.Builder builder; private File logFile; private StringBuilder treasureBuilder; + private Marker gatherMarker; public static TreasureFragment newInstance(Bundle bundle) { TreasureFragment fragment = new TreasureFragment(); @@ -1189,6 +1190,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen if (bigMarker != null) { bigMarker.setVisible(false); } + if (gatherMarker!=null){ + gatherMarker.setVisible(false); + } PoiEntity poiEntity = (PoiEntity) data.obj; Bundle bundle = new Bundle(); bundle.putSerializable("poiEntity", poiEntity); @@ -1377,7 +1381,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } private Bitmap getBitMap() { - Bitmap bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.location); + Bitmap bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.location_north_fill); int width = bitmap.getWidth(); int height = bitmap.getHeight(); int newWidth = 55; @@ -1763,7 +1767,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen case 1: case 2: case 5: - marker.remove(); + gatherMarker = marker; break; case 3: case 4: @@ -1778,31 +1782,31 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen initMarker(poiEntity, false); PoiFragment poiFragment = PoiFragment.newInstance(bundle); showSlidingFragment(poiFragment); - marker.remove(); + marker.setVisible(false); break; case 2: initMarker(poiEntity, false); ChargingStationFragment chargingStationFragment = ChargingStationFragment.newInstance(bundle); showSlidingFragment(chargingStationFragment); - marker.remove(); + marker.setVisible(false); break; case 3: initMarker(poiEntity, false); PoiVideoFragment poiVideoFragment = PoiVideoFragment.newInstance(bundle); showSlidingFragment(poiVideoFragment); - marker.remove(); + marker.setVisible(false); break; case 4: initMarker(poiEntity, false); RoadFragment roadFragment = RoadFragment.newInstance(bundle); showSlidingFragment(roadFragment); - marker.remove(); + marker.setVisible(false); break; case 5: initMarker(poiEntity, false); OtherFragment otherFragment = OtherFragment.newInstance(bundle); showSlidingFragment(otherFragment); - marker.remove(); + marker.setVisible(false); break; case 6: initMarker(poiEntity, true); @@ -1848,11 +1852,11 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } if (isBack) { initMarker(poiListEntity, true); - switch (listBean.getType()) { + switch (poiListEntity.getType()) { case 1: case 2: case 5: - marker.remove(); + gatherMarker = marker; break; case 3: case 4: @@ -1894,7 +1898,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen win.setAttributes(lp); dialog.show(); RecyclerView recyclerView = dialogView.findViewById(R.id.rv_marker_view); - recyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); recyclerView.addItemDecoration(new DividerItemDecoration(Objects.requireNonNull(getActivity()), DividerItemDecoration.VERTICAL)); MarkerAdapter markerAdapter = new MarkerAdapter(list, getActivity()); @@ -1910,7 +1913,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen case 1: case 2: case 5: - marker.remove(); + gatherMarker = marker; break; case 3: case 4: @@ -1935,7 +1938,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen case 1: case 2: case 5: - marker.remove(); + gatherMarker = marker; break; case 3: case 4: @@ -1950,31 +1953,31 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen initMarker(poiEntity, false); PoiFragment poiFragment = PoiFragment.newInstance(bundle); showSlidingFragment(poiFragment); - marker.remove(); + marker.setVisible(false); break; case 2: initMarker(poiEntity, false); ChargingStationFragment chargingStationFragment = ChargingStationFragment.newInstance(bundle); showSlidingFragment(chargingStationFragment); - marker.remove(); + marker.setVisible(false); break; case 3: initMarker(poiEntity, false); PoiVideoFragment poiVideoFragment = PoiVideoFragment.newInstance(bundle); showSlidingFragment(poiVideoFragment); - marker.remove(); + marker.setVisible(false); break; case 4: initMarker(poiEntity, false); RoadFragment roadFragment = RoadFragment.newInstance(bundle); showSlidingFragment(roadFragment); - marker.remove(); + marker.setVisible(false); break; case 5: initMarker(poiEntity, false); OtherFragment otherFragment = OtherFragment.newInstance(bundle); showSlidingFragment(otherFragment); - marker.remove(); + marker.setVisible(false); break; case 6: initMarker(poiEntity, true); 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 dd51bbc..efaa33b 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java @@ -1,6 +1,9 @@ package com.navinfo.outdoor.fragment; +import android.annotation.SuppressLint; +import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.net.Uri; import android.os.Bundle; import android.provider.MediaStore; @@ -16,6 +19,7 @@ import android.widget.Toast; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; +import com.github.lazylibrary.util.FileUtils; import com.google.gson.Gson; import com.kongzue.dialog.interfaces.OnDialogButtonClickListener; import com.kongzue.dialog.util.BaseDialog; @@ -35,7 +39,10 @@ import com.navinfo.outdoor.http.OkGoBuilder; import com.navinfo.outdoor.util.PhotoUtils; import java.io.File; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -63,6 +70,8 @@ public class UserAttestationFragment extends BaseFragment implements View.OnC private LinearLayout linearLayout; private View userAttestView;*/ private ImageView useCamera; + private File logFile; + private StringBuilder userAttestationBuilder; public static UserAttestationFragment newInstance(Bundle bundle) { @@ -80,7 +89,29 @@ public class UserAttestationFragment extends BaseFragment implements View.OnC @Override protected void initData() { super.initData(); - ArrayList authenticationBeans = new ArrayList<>(); + SharedPreferences sharedPreferences = Objects.requireNonNull(getActivity()).getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE); + SharedPreferences.Editor sharedEdit = sharedPreferences.edit(); + @SuppressLint("SimpleDateFormat") + DateFormat formatter = new SimpleDateFormat("yyyyMMdd"); + String newFormat = formatter.format(new Date(System.currentTimeMillis())); + String pictures_time = sharedPreferences.getString("pictures_time", null); + if (pictures_time==null){ + sharedEdit.putString("pictures_time",newFormat); + sharedEdit.apply(); + logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt"); + }else { + if (pictures_time.equals(newFormat)){ + logFile = new File(Constant.LOG_FOLDER + "/" + pictures_time + ".txt"); + }else { + logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt"); + } + } + + userAttestationBuilder = new StringBuilder(); + userAttestationBuilder.append("UserAttestationFragment-onCreate-initData ,"); + if (Constant.USHERED!=null){ + userAttestationBuilder.append("userId:").append(Constant.USHERED).append(","); + } } @@ -154,9 +185,11 @@ public class UserAttestationFragment extends BaseFragment implements View.OnC public void onClick(View v) { switch (v.getId()) { case R.id.iv_attestation: + userAttestationBuilder.append("点击了进行返回 ,"); Objects.requireNonNull(getActivity()).finish(); break; case R.id.iv_attestation1: + userAttestationBuilder.append("点击身份证人像面 进行拍照 ,"); Intent ivAttestationIntent1 = new Intent(getActivity(), PhotographActivity.class); File attestationFile1 = PhotoUtils.showPhotoFile("a", null); ivAttestationIntent1.putExtra(Constant.INTENT_VIDEO_OBLATION, 1); @@ -164,6 +197,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnC startActivityForResult(ivAttestationIntent1, 121); break; case R.id.iv_attestation2: + userAttestationBuilder.append("点击身份证国徽面 进行拍照 ,"); Intent ivAttestationIntent2 = new Intent(getActivity(), PhotographActivity.class); File attestationFile2 = PhotoUtils.showPhotoFile("b", null); ivAttestationIntent2.putExtra(Constant.INTENT_VIDEO_OBLATION, 1); @@ -171,6 +205,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnC startActivityForResult(ivAttestationIntent2, 122); break; case R.id.iv_attestation3: + userAttestationBuilder.append("点击手持身份证 进行拍照 ,"); Intent ivAttestationIntent3 = new Intent(getActivity(), PhotographActivity.class); File attestationFile3 = PhotoUtils.showPhotoFile("c", null); ivAttestationIntent3.putExtra(Constant.INTENT_VIDEO_OBLATION, 1); @@ -193,6 +228,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnC nameAuthentication(); break; case R.id.user_attestation_camera: + userAttestationBuilder.append("点击认证按钮 ,"); Intent userCameraIntent = new Intent(getActivity(), PhotographActivity.class); File file = PhotoUtils.showPhotoFile("d", null); userCameraIntent.putExtra(Constant.INTENT_VIDEO_OBLATION, 1); @@ -280,6 +316,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnC MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "提交成功", "确定").setOkButton(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { + userAttestationBuilder.append("提交成功 ,"); Constant.NAME = attestationName; Constant.ID_NUM = namePhone; Constant.AUDIOTAPES = -1; @@ -351,16 +388,20 @@ public class UserAttestationFragment extends BaseFragment implements View.OnC if (inward != null) { IdCardNumberBean idCardNumberBean = new Gson().fromJson(inward, IdCardNumberBean.class); if (idCardNumberBean == null) { + userAttestationBuilder.append("识别失败，可以重新识别或则进行手动输入 ,"); Toast.makeText(getActivity(), "识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show(); } else { if (idCardNumberBean.getWords_result().get公民身份号码() != null) { String words = idCardNumberBean.getWords_result().get公民身份号码().getWords(); etNamePhone.setText(words); + userAttestationBuilder.append("识别成功 ,"); } else { Toast.makeText(getActivity(), "识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show(); + userAttestationBuilder.append("识别失败，可以重新识别或则进行手动输入 ,"); } } } else { + userAttestationBuilder.append("识别失败，可以重新识别或则进行手动输入 ,"); Toast.makeText(getActivity(), "识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show(); } @@ -371,4 +412,24 @@ public class UserAttestationFragment extends BaseFragment implements View.OnC } } + + @Override + public void onPause() { + super.onPause(); + userAttestationBuilder.append("onPause ,"); + } + + @Override + public void onStop() { + super.onStop(); + userAttestationBuilder.append("onStop ,"); + } + + @Override + public void onDestroy() { + super.onDestroy(); + userAttestationBuilder.append("onDestroy ,"); + userAttestationBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), userAttestationBuilder.toString(), true); + } } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java index 2f3e1a8..95ec137 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java @@ -98,7 +98,6 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen if (Constant.USHERED != null) { withdrawBuilder.append("userId:").append(Constant.USHERED).append(","); } - } @Override @@ -163,13 +162,13 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen tvTotal.setText(userPrice + ""); canExchangePrice = response.getBody().getCanExchangePrice(); tvUnit.setText(canExchangePrice + ""); - tvAlready.setText(response.getBody().getHaveExchangePrice() + ""); - poiPushMoney.setText(response.getBody().getPoiPushPrice() + "元"); - poiReportMoney.setText(response.getBody().getPoiNonepushPrice() + "元"); - poiVideoPushMoney.setText(response.getBody().getPoivideoPushPrice() + "元"); - poiVideoReportMoney.setText(response.getBody().getPoivideoNonepushPrice() + "元"); - roadPushMoney.setText(response.getBody().getRoadPushPrice() + "元"); - roadReportMoney.setText(response.getBody().getRoadNonepushPrice() + "元"); + tvAlready.setText(response.getBody().getHaveExchangePrice()+""); + poiPushMoney.setText(response.getBody().getPoiPushPrice()+"元"); + poiReportMoney.setText(response.getBody().getPoiNonepushPrice()+"元"); + poiVideoPushMoney.setText(response.getBody().getPoivideoPushPrice()+"元"); + poiVideoReportMoney.setText(response.getBody().getPoivideoNonepushPrice()+"元"); + roadPushMoney.setText(response.getBody().getRoadPushPrice()+"元"); + roadReportMoney.setText(response.getBody().getRoadNonepushPrice()+"元"); chargingPushMoney.setText(response.getBody().getCsPushPrice() + "元"); chargingReportMoney.setText(response.getBody().getCsNonepushPrice() + "元"); otherPushMoney.setText(response.getBody().getOtherPushPrice() + "元"); @@ -258,8 +257,16 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen public void onSuccess(UserPriceExchangeBean response, int id) { dismissLoadingDialog(); if (response.getCode() == 200) { - initNetWork(); - withdrawBuilder.append("提现了成功 ，"); + DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; + DialogSettings.cancelable=false; + MessageDialog.show((AppCompatActivity) getContext(), "提示", "该提现申请已提交", "确定").setOnOkButtonClickListener(new OnDialogButtonClickListener() { + @Override + public boolean onClick(BaseDialog baseDialog, View v) { + withdrawBuilder.append("提现了成功 ，"); + initNetWork(); + return false; + } + }); } else { Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); withdrawBuilder.append("提现了失败 ，"); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java index 5f441e7..fc4b0d9 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java @@ -87,7 +87,8 @@ public class WithdrawalRecordFragment extends BaseFragment implements View.OnCli private void initNetwork() { showLoadingDialog(); HttpParams httpParams = new HttpParams(); - httpParams.put("pageNum",withPage); + httpParams.put("pageNum", withPage); + OkGoBuilder.getInstance() .Builder(getActivity()) .url(HttpInterface.PRICE_EXCHANGE) diff --git a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java index bac28d7..b1d8624 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -3,8 +3,9 @@ package com.navinfo.outdoor.http; import com.navinfo.outdoor.api.Constant; public class HttpInterface { - public static final String IP_ = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 - public static final String IP= "http://dtxbmaps.navinfo.com/dtxb_test/m4";//测试接口 + public static final String IP= "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 + + public static final String IP_= "http://dtxbmaps.navinfo.com/dtxb_test/m4";//测试接口 public static final String USER_PATH ="/user/";//我的 public static final String MSG_LIST_PATH ="/msgList/";//发现 @@ -13,7 +14,7 @@ public class HttpInterface { public static final String TASK_PATH ="/task/";//任务 /* public static final String TEST_GUIDANCE_IP = "http://172.21.98.90:9999/m4";//引导页完成接口 - public static final String APKIP = "http://172.23.139.4:8001/"; + public static final String APK_IP = "http://172.23.139.4:8001/"; public static String IP1 = "http://dtxbmaps.navinfo.com/dtxb/msg/"; public static final String DATA_IP = "http://172.23.139.4:9999/m4";//接口 */ @@ -113,7 +114,7 @@ public class HttpInterface { public static String ROAD_TASK_SUBMIT;//道路录像-保存本地 //172.23.139.4:8003/roadtask/1/uploadpic public static String ROAD_TASK_UPLOAD_PIC;//道路录像—上传 - //http://172.23.139.4:8003/m4/task/1/getPhone?geo=1rn7exd5uhxy + //172.23.139.4:8003/m4/task/1/getPhone?geo=1rn7exd5uhxy public static String GET_PHONES;//电话区号和电话位数 //172.23.139.4:8003/cstask/1/uploadpic public static String CS_TASK_UP_LOAD_PIC;//充电桩-上传 @@ -393,7 +394,4 @@ public class HttpInterface { * public static String COMPLETE = IPm6 + "polygonTask/1/complete";//任务采集 * public static String SUBMIT_POLYGON_TASK = IPm6 + "polygonTask/1/submitPolygontask";//结束采集 */ - - - } diff --git a/app/src/main/java/com/navinfo/outdoor/util/AWMp4ParserHelper.java b/app/src/main/java/com/navinfo/outdoor/util/AWMp4ParserHelper.java index ed53f2b..d3d3630 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/AWMp4ParserHelper.java +++ b/app/src/main/java/com/navinfo/outdoor/util/AWMp4ParserHelper.java @@ -310,6 +310,10 @@ public class AWMp4ParserHelper { } return fileList; } + public File getFilePath(String uuid){ + File folderFile = new File(Constant.PICTURE_FOLDER+"/"+uuid+"/"); + return folderFile; + } public String getVideoFileListStr(List videoFileList) { StringBuilder resultStrBuilder = new StringBuilder(""); diff --git a/app/src/main/java/com/navinfo/outdoor/util/DoubleUtil.java b/app/src/main/java/com/navinfo/outdoor/util/DoubleUtil.java new file mode 100644 index 0000000..11cca24 --- /dev/null +++ b/app/src/main/java/com/navinfo/outdoor/util/DoubleUtil.java @@ -0,0 +1,38 @@ +package com.navinfo.outdoor.util; + +import java.math.RoundingMode; +import java.text.DecimalFormat; +import java.text.NumberFormat; + +/** + * double 保存小数点后两位 + */ +public class DoubleUtil { + public static String format2(double value) { + DecimalFormat df = new DecimalFormat("0.00"); + df.setRoundingMode(RoundingMode.HALF_UP); + return df.format(value); + + } + public static String format3(double value) { + NumberFormat nf = NumberFormat.getNumberInstance(); + nf.setMaximumFractionDigits(2); + /*setMinimumFractionDigits设置成2 + * 如果不这么做，那么当value的值是100.00的时候返回100 + * 而不是100.00 + */ + nf.setMinimumFractionDigits(2); + nf.setRoundingMode(RoundingMode.HALF_UP); + /* + 如果想输出的格式用逗号隔开，可以设置成true + */ + nf.setGroupingUsed(false); + return nf.format(value); + + } + + public static String format5(double value) { + return String.format("%.2f", value).toString(); + + } +} diff --git a/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java b/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java index ab5f64c..ba77af4 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java @@ -266,11 +266,13 @@ public class PoiSaveUtils { } } } - List videoFileList = AWMp4ParserHelper.getInstance().getFileListByUUID(poiEntity.getId()); - if (videoFileList != null && !videoFileList.isEmpty()) { - File fileZip = new File(Constant.PICTURE_FOLDER, "files" + ".zip"); - ZipUtil.zipFiles(videoFileList, fileZip, null); - photoFile.add(fileZip); + if (poiEntity.getType()==3||poiEntity.getType()==4){ + List videoFileList = AWMp4ParserHelper.getInstance().getFileListByUUID(poiEntity.getId()); + if (videoFileList != null && !videoFileList.isEmpty()) { + File fileZip = new File(Constant.PICTURE_FOLDER, "files" + ".zip"); + ZipUtil.zipFiles(videoFileList, fileZip, null); + photoFile.add(fileZip); + } } String url = null; //1 "POI"2 "充电站"3 "POI录像"4 "道路录像"5 "其他"6 "面状任务" @@ -312,9 +314,15 @@ public class PoiSaveUtils { for (int i = 0; i < photoFile.size(); i++) { photoFile.get(i).delete(); } - if (videoFileList!=null){ - File file = new File(Objects.requireNonNull(videoFileList.get(0).getParentFile()).getAbsoluteFile() + ""); - file.delete(); + if (poiEntity.getType()==3||poiEntity.getType()==4) { + if (poiEntity.getId() != null) { + List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(poiEntity.getId()); + for (int i = 0; i < fileListByUUID.size(); i++) { + fileListByUUID.get(i).delete(); + } + File filePath = AWMp4ParserHelper.getInstance().getFilePath(poiEntity.getId()); + filePath.delete(); + } } Log.d("TAGss", "uploadPoiNet: 成功" + anInt); anInt++; @@ -495,7 +503,6 @@ public class PoiSaveUtils { Gson gson = new Gson(); PoiUploadBean uploadBeanResult = gson.fromJson(pileUpLoadResultStr, PoiUploadBean.class); if (uploadBeanResult.getCode() == 200) { - Log.d("TAGss", "chargingPileUploadNetWork" + 200); PoiDatabase.getInstance(mContext).getChargingPileDao().deleteChargingPileEntity(chargingPileEntity); for (int i = 0; i < chargingPileFileList.size(); i++) { chargingPileFileList.get(i).delete(); diff --git a/app/src/main/java/com/navinfo/outdoor/util/UploadUtils.java b/app/src/main/java/com/navinfo/outdoor/util/UploadUtils.java index 069eb8b..46f73aa 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/UploadUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/UploadUtils.java @@ -32,6 +32,7 @@ public class UploadUtils { /** * road + * * @param mContext * @param showPoiEntity * @param fileZip @@ -52,13 +53,13 @@ public class UploadUtils { public void run() { PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId()); poiDao.deletePoiEntity(poiDaoPoiEntity); - List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId()); - for (int i = 0; i < fileListByUUID.size(); i++) { - fileListByUUID.get(i).delete(); - } - if (fileListByUUID.size()>0){ - File file = new File(Objects.requireNonNull(fileListByUUID.get(0).getParentFile()).getAbsoluteFile() + ""); - file.delete(); + if (showPoiEntity.getId()!=null){ + List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId()); + for (int i = 0; i < fileListByUUID.size(); i++) { + fileListByUUID.get(i).delete(); + } + File filePath = AWMp4ParserHelper.getInstance().getFilePath(showPoiEntity.getId()); + filePath.delete(); } fileZip.delete(); Objects.requireNonNull(mContext).runOnUiThread(new Runnable() { @@ -90,8 +91,10 @@ public class UploadUtils { } }; } + /** * poi + * * @param mContext * @param showPoiEntity * @param poiPicList @@ -105,7 +108,7 @@ public class UploadUtils { if (response.getCode() == 200) { Message obtain1 = Message.obtain(); obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "Poi："+showPoiEntity.getName()+" 上传成功"; + obtain1.obj = "Poi：" + showPoiEntity.getName() + " 上传成功"; EventBus.getDefault().post(obtain1); new Thread(new Runnable() { @Override @@ -129,7 +132,7 @@ public class UploadUtils { } else { Message obtain1 = Message.obtain(); obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "Poi："+showPoiEntity.getName()+" 上传失败"; + obtain1.obj = "Poi：" + showPoiEntity.getName() + " 上传失败"; EventBus.getDefault().post(obtain1); } @@ -139,7 +142,7 @@ public class UploadUtils { public void onError(Throwable e, int id) { Message obtain1 = Message.obtain(); obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "Poi："+showPoiEntity.getName()+" 上传失败"; + obtain1.obj = "Poi：" + showPoiEntity.getName() + " 上传失败"; EventBus.getDefault().post(obtain1); } }; @@ -147,6 +150,7 @@ public class UploadUtils { /** * PoiVideo + * * @param mContext * @param showPoiEntity * @param fileZip @@ -160,20 +164,20 @@ public class UploadUtils { if (response.getCode() == 200) { Message obtain1 = Message.obtain(); obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "poi录像："+showPoiEntity.getName()+" 上传成功"; + obtain1.obj = "poi录像：" + showPoiEntity.getName() + " 上传成功"; EventBus.getDefault().post(obtain1); new Thread(new Runnable() { @Override public void run() { PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId()); poiDao.deletePoiEntity(poiDaoPoiEntity); - List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId()); - for (int i = 0; i < fileListByUUID.size(); i++) { - fileListByUUID.get(i).delete(); - } - if (fileListByUUID.size()>0){ - File file = new File(Objects.requireNonNull(fileListByUUID.get(0).getParentFile()).getAbsoluteFile() + ""); - file.delete(); + if (showPoiEntity.getId() != null) { + List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId()); + for (int i = 0; i < fileListByUUID.size(); i++) { + fileListByUUID.get(i).delete(); + } + File filePath = AWMp4ParserHelper.getInstance().getFilePath(showPoiEntity.getId()); + filePath.delete(); } fileZip.delete(); Objects.requireNonNull(mContext).runOnUiThread(new Runnable() { @@ -190,7 +194,7 @@ public class UploadUtils { } else { Message obtain1 = Message.obtain(); obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "poi录像："+showPoiEntity.getName()+" 上传失败"; + obtain1.obj = "poi录像：" + showPoiEntity.getName() + " 上传失败"; EventBus.getDefault().post(obtain1); } } @@ -199,7 +203,7 @@ public class UploadUtils { public void onError(Throwable e, int id) { Message obtain1 = Message.obtain(); obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "poi录像："+showPoiEntity.getName()+" 上传失败"; + obtain1.obj = "poi录像：" + showPoiEntity.getName() + " 上传失败"; EventBus.getDefault().post(obtain1); Log.d("TAG", "onError: " + e.getMessage() + ""); } @@ -208,6 +212,7 @@ public class UploadUtils { /** * other + * * @param mContext * @param showPoiEntity * @param otherUploadList @@ -221,7 +226,7 @@ public class UploadUtils { if (response.getCode() == 200) { Message obtain1 = Message.obtain(); obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "其他："+showPoiEntity.getName()+" 上传成功"; + obtain1.obj = "其他：" + showPoiEntity.getName() + " 上传成功"; EventBus.getDefault().post(obtain1); new Thread(new Runnable() { @Override @@ -245,7 +250,7 @@ public class UploadUtils { } else { Message obtain1 = Message.obtain(); obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "其他："+showPoiEntity.getName()+" 上传失败"; + obtain1.obj = "其他：" + showPoiEntity.getName() + " 上传失败"; EventBus.getDefault().post(obtain1); } @@ -255,7 +260,7 @@ public class UploadUtils { public void onError(Throwable e, int id) { Message obtain1 = Message.obtain(); obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "其他："+showPoiEntity.getName()+" 上传失败"; + obtain1.obj = "其他：" + showPoiEntity.getName() + " 上传失败"; EventBus.getDefault().post(obtain1); Log.d("TAG", "onError: " + e.getMessage() + ""); } @@ -264,6 +269,7 @@ public class UploadUtils { /** * charging + * * @param mContext * @param showPoiEntity * @param chargingStationList @@ -277,7 +283,7 @@ public class UploadUtils { if (response.getCode() == 200) { Message obtain1 = Message.obtain(); obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "充电站："+showPoiEntity.getName()+" 上传成功"; + obtain1.obj = "充电站：" + showPoiEntity.getName() + " 上传成功"; EventBus.getDefault().post(obtain1); new Thread(new Runnable() { @Override @@ -301,7 +307,7 @@ public class UploadUtils { } else { Message obtain1 = Message.obtain(); obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "充电站："+showPoiEntity.getName()+" 上传失败"; + obtain1.obj = "充电站：" + showPoiEntity.getName() + " 上传失败"; EventBus.getDefault().post(obtain1); } } @@ -310,9 +316,9 @@ public class UploadUtils { public void onError(Throwable e, int id) { Message obtain1 = Message.obtain(); obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "充电站："+showPoiEntity.getName()+" 上传失败"; + obtain1.obj = "充电站：" + showPoiEntity.getName() + " 上传失败"; EventBus.getDefault().post(obtain1); - Log.d("TAG", "onError: " +e.getMessage() + ""); + Log.d("TAG", "onError: " + e.getMessage() + ""); } }; } diff --git a/app/src/main/res/drawable-hdpi/delete.png b/app/src/main/res/drawable-hdpi/delete.png new file mode 100644 index 0000000..af62ddb Binary files /dev/null and b/app/src/main/res/drawable-hdpi/delete.png differ diff --git a/app/src/main/res/drawable-hdpi/location_north_fill.png b/app/src/main/res/drawable-hdpi/location_north_fill.png new file mode 100644 index 0000000..388ad64 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/location_north_fill.png differ diff --git a/app/src/main/res/layout/activity_pictures.xml b/app/src/main/res/layout/activity_pictures.xml index 7e00d9e..f5fc91b 100644 --- a/app/src/main/res/layout/activity_pictures.xml +++ b/app/src/main/res/layout/activity_pictures.xml @@ -52,6 +52,7 @@ android:id="@+id/image_view" android:layout_width="300dp" android:layout_height="157dp" + android:visibility="gone" app:layout_constraintHeight_default="percent" app:layout_constraintHeight_percent="0.4" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/charging_pile_fragment.xml b/app/src/main/res/layout/charging_pile_fragment.xml index 7e91047..5b4781a 100644 --- a/app/src/main/res/layout/charging_pile_fragment.xml +++ b/app/src/main/res/layout/charging_pile_fragment.xml @@ -37,6 +37,50 @@ android:layout_margin="10dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"/> + + + + + + + + + app:layout_constraintTop_toBottomOf="@id/linear_exist"> - - - - + + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_gather_get.xml b/app/src/main/res/layout/fragment_gather_get.xml index 115b9fb..534a67f 100644 --- a/app/src/main/res/layout/fragment_gather_get.xml +++ b/app/src/main/res/layout/fragment_gather_get.xml @@ -8,12 +8,12 @@