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

修改相机地图切换问题（存在bug）

Browse Source
This commit is contained in:
md 2021-09-08 18:26:47 +08:00
parent 1eebd16086
commit c45468154a
4 changed files with 120 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
View File

@ -155,7 +155,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
ivLocation = findViewById(R.id.iv_location); ivLocation = findViewById(R.id.iv_location);
ivLocation.setOnClickListener(this); ivLocation.setOnClickListener(this);
camera = findViewById(R.id.camera); camera = findViewById(R.id.camera);
camera.setOnClickListener(this);
capturePicture = findViewById(R.id.capture_picture); capturePicture = findViewById(R.id.capture_picture);
if (type == 3) { if (type == 3) {
capturePicture.setText("拍摄"); capturePicture.setText("拍摄");
@ -212,10 +211,23 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
public void onMapClick(LatLng latLng) { public void onMapClick(LatLng latLng) {
btnSwitch.setEnabled(false); btnSwitch.setEnabled(false);
handler.sendEmptyMessageDelayed(0x102, 2000);// 利用handler延迟发送更改状态信息 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() {//相机预览监听 camera.addCameraListener(new CameraListener() {//相机预览监听
@Override @Override
public void onPictureTaken(@NonNull @NotNull PictureResult result) { 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.height = dm.widthPixels / 3;
layoutParamsMap.width = dm.heightPixels / 3; layoutParamsMap.width = dm.heightPixels / 3;
ivMap.setLayoutParams(layoutParamsMap); 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) { private void message(String content) {

3
app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java
View File

@ -441,6 +441,9 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
} }
private void onLongDelPic() { private void onLongDelPic() {
if (ivAvailable.getTag()!=null){
}
rlAvailable.setOnLongClickListener(new View.OnLongClickListener() { rlAvailable.setOnLongClickListener(new View.OnLongClickListener() {
@Override @Override
public boolean onLongClick(View v) { public boolean onLongClick(View v) {

150
app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
View File

@ -274,6 +274,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
break; break;
} }
} }
@Override @Override
public void onNothingSelected(AdapterView<?> parent) { public void onNothingSelected(AdapterView<?> parent) {
} }
@ -286,76 +287,80 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
//拍照长按删除 //拍照长按删除
private void onLongDel() { private void onLongDel() {
rlPanorama.setOnLongClickListener(new View.OnLongClickListener() { if (ivPanorama.getTag() != null || ivName.getTag() != null || ivElse.getTag() != null || ivInternal.getTag() != null || ivCard.getTag() != null) {
@Override rlPanorama.setOnLongClickListener(new View.OnLongClickListener() {
public boolean onLongClick(View v) { @Override
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE; public boolean onLongClick(View v) {
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
@Override MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
public boolean onClick(BaseDialog baseDialog, View v) { @Override
ivPanorama.setImageDrawable(null); public boolean onClick(BaseDialog baseDialog, View v) {
return false; ivPanorama.setImageDrawable(null);
} return false;
}); }
return false; });
} return false;
}); }
rlName.setOnLongClickListener(new View.OnLongClickListener() { });
@Override
public boolean onLongClick(View v) {
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE; rlName.setOnLongClickListener(new View.OnLongClickListener() {
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { @Override
@Override public boolean onLongClick(View v) {
public boolean onClick(BaseDialog baseDialog, View v) { DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
ivName.setImageDrawable(null); MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
return false; @Override
} public boolean onClick(BaseDialog baseDialog, View v) {
}); ivName.setImageDrawable(null);
return false; return false;
} }
}); });
rlElse.setOnLongClickListener(new View.OnLongClickListener() { return false;
@Override }
public boolean onLongClick(View v) { });
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE; rlElse.setOnLongClickListener(new View.OnLongClickListener() {
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { @Override
@Override public boolean onLongClick(View v) {
public boolean onClick(BaseDialog baseDialog, View v) { DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
ivElse.setImageDrawable(null); MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
return false; @Override
} public boolean onClick(BaseDialog baseDialog, View v) {
}); ivElse.setImageDrawable(null);
return false; return false;
} }
}); });
rlInternalPhotos.setOnLongClickListener(new View.OnLongClickListener() { return false;
@Override }
public boolean onLongClick(View v) { });
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE; rlInternalPhotos.setOnLongClickListener(new View.OnLongClickListener() {
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { @Override
@Override public boolean onLongClick(View v) {
public boolean onClick(BaseDialog baseDialog, View v) { DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
ivInternal.setImageDrawable(null); MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
return false; @Override
} public boolean onClick(BaseDialog baseDialog, View v) {
}); ivInternal.setImageDrawable(null);
return false; return false;
} }
}); });
rlCard.setOnLongClickListener(new View.OnLongClickListener() { return false;
@Override }
public boolean onLongClick(View v) { });
DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE; rlCard.setOnLongClickListener(new View.OnLongClickListener() {
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { @Override
@Override public boolean onLongClick(View v) {
public boolean onClick(BaseDialog baseDialog, View v) { DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
ivCard.setImageDrawable(null); MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
return false; @Override
} public boolean onClick(BaseDialog baseDialog, View v) {
}); ivCard.setImageDrawable(null);
return false; return false;
} }
}); });
return false;
}
});
}
} }
private void initShowPoi() { private void initShowPoi() {
@ -1051,13 +1056,14 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
initPoiSharePre(); initPoiSharePre();
} }
@Override @Override
public void onDestroyView() { public void onDestroyView() {
super.onDestroyView(); super.onDestroyView();
if (showPoiEntity != null) { if (showPoiEntity != null) {
if (showPoiEntity.getTaskStatus() == 5) { if (showPoiEntity.getTaskStatus() == 5) {
initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity); initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity);
}else { } else {
Message obtain = Message.obtain(); Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR; obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true; 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) { if (poiEntity.getTaskId() == 0) {
Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show();
return; return;

4
app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
View File

@ -3,9 +3,9 @@ package com.navinfo.outdoor.http;
import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.api.Constant;
public class HttpInterface { 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 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 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 APKIP = "http://172.23.139.4:8001/";