From c45468154a1cc2a2e90ec1d32317d80c1b55760a Mon Sep 17 00:00:00 2001
From: md <zmd1026@163.com>
Date: Wed, 8 Sep 2021 18:26:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B8=E6=9C=BA=E5=9C=B0?=
=?UTF-8?q?=E5=9B=BE=E5=88=87=E6=8D=A2=E9=97=AE=E9=A2=98=EF=BC=88=E5=AD=98?=
=?UTF-8?q?=E5=9C=A8bug=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../outdoor/activity/PicturesActivity.java | 39 ++++-
.../fragment/ChargingPileFragment.java | 3 +
.../navinfo/outdoor/fragment/PoiFragment.java | 150 +++++++++---------
.../navinfo/outdoor/http/HttpInterface.java | 4 +-
4 files changed, 120 insertions(+), 76 deletions(-)
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 9853094..51e8f8b 100644
--- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
+++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
@@ -155,7 +155,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
ivLocation = findViewById(R.id.iv_location);
ivLocation.setOnClickListener(this);
camera = findViewById(R.id.camera);
- camera.setOnClickListener(this);
capturePicture = findViewById(R.id.capture_picture);
if (type == 3) {
capturePicture.setText("拍摄");
@@ -212,10 +211,23 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
public void onMapClick(LatLng latLng) {
btnSwitch.setEnabled(false);
handler.sendEmptyMessageDelayed(0x102, 2000);// 利用handler延迟发送更改状态信息
- benSwitch();
+ DisplayMetrics dm = new DisplayMetrics();
+ getWindowManager().getDefaultDisplay().getMetrics(dm);
+ System.out.println("width-display :" + dm.widthPixels);
+ System.out.println("height-display :" + dm.heightPixels);
+ FrameLayout.LayoutParams layoutParamsMap = (FrameLayout.LayoutParams) ivMap.getLayoutParams();//地图的宽高
+ int heightMap = ivMap.getMeasuredHeight();
+ int widthMap = ivMap.getMeasuredWidth();
+ FrameLayout.LayoutParams layoutParamsCamera = (FrameLayout.LayoutParams) camera.getLayoutParams();//相机的宽高
+ int heightCamera = camera.getMeasuredHeight();
+ int widthCamera = camera.getMeasuredWidth();
+ if (heightMap<heightCamera){
+ benSwitch();
+ }
}
});
+
camera.addCameraListener(new CameraListener() {//相机预览监听
@Override
public void onPictureTaken(@NonNull @NotNull PictureResult result) {
@@ -280,6 +292,29 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
layoutParamsMap.height = dm.widthPixels / 3;
layoutParamsMap.width = dm.heightPixels / 3;
ivMap.setLayoutParams(layoutParamsMap);
+ //相机监听
+ camera.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ benSwitch();
+ Toast.makeText(PicturesActivity.this, "dianjile1", Toast.LENGTH_SHORT).show();
+// btnSwitch.setEnabled(false);
+// handler.sendEmptyMessageDelayed(0x102, 2000);// 利用handler延迟发送更改状态信息
+// DisplayMetrics dm = new DisplayMetrics();
+// getWindowManager().getDefaultDisplay().getMetrics(dm);
+// System.out.println("width-display :" + dm.widthPixels);
+// System.out.println("height-display :" + dm.heightPixels);
+// FrameLayout.LayoutParams layoutParamsMap = (FrameLayout.LayoutParams) ivMap.getLayoutParams();//地图的宽高
+// int heightMap = ivMap.getMeasuredHeight();
+// int widthMap = ivMap.getMeasuredWidth();
+// FrameLayout.LayoutParams layoutParamsCamera = (FrameLayout.LayoutParams) camera.getLayoutParams();//相机的宽高
+// int heightCamera = camera.getMeasuredHeight();
+// int widthCamera = camera.getMeasuredWidth();
+// if (heightMap>heightCamera){
+// benSwitch();
+// }
+ }
+ });
}
private void message(String content) {
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 6a242db..588ced8 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java
@@ -441,6 +441,9 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
}
private void onLongDelPic() {
+ if (ivAvailable.getTag()!=null){
+
+ }
rlAvailable.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
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 fc4468e..8d1c214 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
@@ -274,6 +274,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
break;
}
}
+
@Override
public void onNothingSelected(AdapterView<?> parent) {
}
@@ -286,76 +287,80 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
//拍照长按删除
private void onLongDel() {
- rlPanorama.setOnLongClickListener(new View.OnLongClickListener() {
- @Override
- public boolean onLongClick(View v) {
- DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
- MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
- @Override
- public boolean onClick(BaseDialog baseDialog, View v) {
- ivPanorama.setImageDrawable(null);
- return false;
- }
- });
- return false;
- }
- });
- rlName.setOnLongClickListener(new View.OnLongClickListener() {
- @Override
- public boolean onLongClick(View v) {
- DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
- MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
- @Override
- public boolean onClick(BaseDialog baseDialog, View v) {
- ivName.setImageDrawable(null);
- return false;
- }
- });
- return false;
- }
- });
- rlElse.setOnLongClickListener(new View.OnLongClickListener() {
- @Override
- public boolean onLongClick(View v) {
- DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
- MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
- @Override
- public boolean onClick(BaseDialog baseDialog, View v) {
- ivElse.setImageDrawable(null);
- return false;
- }
- });
- return false;
- }
- });
- rlInternalPhotos.setOnLongClickListener(new View.OnLongClickListener() {
- @Override
- public boolean onLongClick(View v) {
- DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
- MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
- @Override
- public boolean onClick(BaseDialog baseDialog, View v) {
- ivInternal.setImageDrawable(null);
- return false;
- }
- });
- return false;
- }
- });
- rlCard.setOnLongClickListener(new View.OnLongClickListener() {
- @Override
- public boolean onLongClick(View v) {
- DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
- MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
- @Override
- public boolean onClick(BaseDialog baseDialog, View v) {
- ivCard.setImageDrawable(null);
- return false;
- }
- });
- return false;
- }
- });
+ if (ivPanorama.getTag() != null || ivName.getTag() != null || ivElse.getTag() != null || ivInternal.getTag() != null || ivCard.getTag() != null) {
+ rlPanorama.setOnLongClickListener(new View.OnLongClickListener() {
+ @Override
+ public boolean onLongClick(View v) {
+ DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
+ MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
+ @Override
+ public boolean onClick(BaseDialog baseDialog, View v) {
+ ivPanorama.setImageDrawable(null);
+ return false;
+ }
+ });
+ return false;
+ }
+ });
+
+
+ rlName.setOnLongClickListener(new View.OnLongClickListener() {
+ @Override
+ public boolean onLongClick(View v) {
+ DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
+ MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
+ @Override
+ public boolean onClick(BaseDialog baseDialog, View v) {
+ ivName.setImageDrawable(null);
+ return false;
+ }
+ });
+ return false;
+ }
+ });
+ rlElse.setOnLongClickListener(new View.OnLongClickListener() {
+ @Override
+ public boolean onLongClick(View v) {
+ DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
+ MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
+ @Override
+ public boolean onClick(BaseDialog baseDialog, View v) {
+ ivElse.setImageDrawable(null);
+ return false;
+ }
+ });
+ return false;
+ }
+ });
+ rlInternalPhotos.setOnLongClickListener(new View.OnLongClickListener() {
+ @Override
+ public boolean onLongClick(View v) {
+ DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
+ MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
+ @Override
+ public boolean onClick(BaseDialog baseDialog, View v) {
+ ivInternal.setImageDrawable(null);
+ return false;
+ }
+ });
+ return false;
+ }
+ });
+ rlCard.setOnLongClickListener(new View.OnLongClickListener() {
+ @Override
+ public boolean onLongClick(View v) {
+ DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
+ MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
+ @Override
+ public boolean onClick(BaseDialog baseDialog, View v) {
+ ivCard.setImageDrawable(null);
+ return false;
+ }
+ });
+ return false;
+ }
+ });
+ }
}
private void initShowPoi() {
@@ -1051,13 +1056,14 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
super.onSaveInstanceState(outState);
initPoiSharePre();
}
+
@Override
public void onDestroyView() {
super.onDestroyView();
if (showPoiEntity != null) {
if (showPoiEntity.getTaskStatus() == 5) {
initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity);
- }else {
+ } else {
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
@@ -1077,7 +1083,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
}
}
- private void initEndReceiveTask(String url,PoiEntity poiEntity) {
+ private void initEndReceiveTask(String url, PoiEntity poiEntity) {
if (poiEntity.getTaskId() == 0) {
Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show();
return;
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 e674d0c..845f912 100644
--- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
+++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
@@ -3,9 +3,9 @@ package com.navinfo.outdoor.http;
import com.navinfo.outdoor.api.Constant;
public class HttpInterface {
- public static final String IP_TEST = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口
+ public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口
public static final String DATA_IP = "http://172.23.139.4:9999/m4";//接口
- public static final String IP = "http://dtxbmaps.navinfo.com/dtxb_test/m4";//测试接口
+ public static final String IP_TEST = "http://dtxbmaps.navinfo.com/dtxb_test/m4";//测试接口
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/";