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

fix: 修改版本号，修改bug

Browse Source
This commit is contained in:
xiaoyan 2022-08-15 15:57:31 +08:00
parent 292863dcf7
commit 08a542f5ec
9 changed files with 77 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -9,8 +9,8 @@ android {
applicationId "com.navinfo.outdoor"
minSdkVersion 24
targetSdkVersion 30
versionCode 25
versionName "8.220812"
versionCode 26
versionName "8.220815"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
lintOptions {

2
app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java
View File

@ -1085,7 +1085,7 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic
}
private Bitmap getBitMap() {
Bitmap bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.location_north_fill);
Bitmap bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.locaiton_auto_pictures);
int width = bitmap.getWidth();
int height = bitmap.getHeight();
int newWidth = 55;

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

@ -235,10 +235,12 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
ivPicVideoImage.setVisibility(View.VISIBLE);
ivPicRoadImage.setVisibility(View.GONE);
radioPicture = 3;
} else if (type == 4) {//道路2秒
radioBtnAutoSec.setChecked(true);
} else if (type == 4) {//道路1秒2张
ivPicRoadImage.setVisibility(View.VISIBLE);
ivPicVideoImage.setVisibility(View.GONE);
radioPicture = 3;
radioPicture = 4;
radioBtnHalfSec.setChecked(true);
}
radioGroupPicture.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@Override
@ -282,7 +284,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
ivLocation.setOnClickListener(this);
camera = findViewById(R.id.camera);
CameraOptions cameraOptions = camera.getCameraOptions();
camera.setPreviewFrameRate(FRAMENESS);
camera.setSnapshotMaxWidth(1920);
camera.setSnapshotMaxHeight(1440);
camera.setOnClickListener(this);
@ -621,8 +622,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
break;
case R.id.btn_switch:
picturesBuilder.append(TimestampUtil.time()).append(",").append("onClick 点击了切换按钮 ,");
v.setEnabled(false);
handler.sendEmptyMessageDelayed(0x102, 2000);// 利用handler延迟发送更改状态信息
benSwitch();
break;
case R.id.iv_zoom_add://放大
@ -752,6 +751,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
super.onResume();
camera.open();
tvMapView.onResume();
camera.setPreviewFrameRate(FRAMENESS);
}
/**
@ -1110,9 +1110,9 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
// 设置当前界面亮度
private void setWindowBrightness(int brightness) {
Window window = getWindow();
WindowManager.LayoutParams lp = window.getAttributes();
lp.screenBrightness = brightness / 255.0f;
window.setAttributes(lp);
// Window window = getWindow();
// WindowManager.LayoutParams lp = window.getAttributes();
// lp.screenBrightness = brightness / 255.0f;
// window.setAttributes(lp);
}
}

2
app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
View File

@ -783,7 +783,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
if (getPhoneBean.getCode() == 200) {
String code = getPhoneBean.getBody().getCode();
Integer telLength = getPhoneBean.getBody().getTelLength();
if (!Constant.CODE.equals(code)) {
if (code!=null&&!Constant.CODE.equals(code)) {
DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "此地区区号为" + code + "，请手动修改", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override

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

@ -615,7 +615,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
if (getPhoneBean.getCode() == 200) {
String code = getPhoneBean.getBody().getCode();
Integer telLength = getPhoneBean.getBody().getTelLength();
if (!Constant.CODE.equals(code)) {
if (code!=null&&!Constant.CODE.equals(code)) {
DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "此地区区号为" + code + "，请手动修改", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override

79
app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
View File

@ -514,34 +514,52 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
}
// 设置亮度和摄像机刷新率
CustomDialog.show((AppCompatActivity) getActivity(), R.layout.camera_setting_pre, new CustomDialog.OnBindView() {
@Override
public void onBind(CustomDialog dialog, View v) {
SharedPreferences sharedPreferences = getActivity().getSharedPreferences("pic", Context.MODE_PRIVATE);
int brightness = sharedPreferences.getInt("brightness", 40);
EditText edtBrightness = v.findViewById(R.id.edt_camera_setting_brightness);
edtBrightness.setText(brightness+"");
int framness = sharedPreferences.getInt("framness", 30);
EditText edtFramness = v.findViewById(R.id.edt_camera_setting_framness);
edtFramness.setText(framness+"");
Button btnConfirm = v.findViewById(R.id.btn_camera_setting_confirm);
btnConfirm.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
SharedPreferences.Editor editor = getActivity().getSharedPreferences("pic", Context.MODE_PRIVATE).edit();
if (!edtBrightness.getText().toString().isEmpty()) {
int b = Integer.parseInt(edtBrightness.getText().toString());
editor.putInt("brightness", b);
}
if (!edtFramness.getText().toString().isEmpty()) {
int f = Integer.parseInt(edtFramness.getText().toString());
editor.putInt("framness", f);
}
editor.commit();
Toast.makeText(getActivity(), "设置完成", Toast.LENGTH_SHORT).show();
// CustomDialog.show((AppCompatActivity) getActivity(), R.layout.camera_setting_pre, new CustomDialog.OnBindView() {
// @Override
// public void onBind(CustomDialog dialog, View v) {
// SharedPreferences sharedPreferences = getActivity().getSharedPreferences("pic", Context.MODE_PRIVATE);
// int brightness = sharedPreferences.getInt("brightness", 40);
// EditText edtBrightness = v.findViewById(R.id.edt_camera_setting_brightness);
// edtBrightness.setText(brightness+"");
//
// int framness = sharedPreferences.getInt("framness", 30);
// EditText edtFramness = v.findViewById(R.id.edt_camera_setting_framness);
// edtFramness.setText(framness+"");
//
// Button btnConfirm = v.findViewById(R.id.btn_camera_setting_confirm);
// btnConfirm.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// SharedPreferences.Editor editor = getActivity().getSharedPreferences("pic", Context.MODE_PRIVATE).edit();
// if (!edtBrightness.getText().toString().isEmpty()) {
// int b = Integer.parseInt(edtBrightness.getText().toString());
// editor.putInt("brightness", b);
// }
// if (!edtFramness.getText().toString().isEmpty()) {
// int f = Integer.parseInt(edtFramness.getText().toString());
// editor.putInt("framness", f);
// }
// editor.commit();
// Toast.makeText(getActivity(), "设置完成", Toast.LENGTH_SHORT).show();
//
// Intent intent = new Intent(getContext(), PicturesActivity.class);
// File finalFile = AWMp4ParserHelper.getInstance().obtainWebpFilePath(new File(Constant.PICTURE_FOLDER, showPoiEntity.getId()).getAbsolutePath());
// intent.putExtra(Constant.INTENT_JPG_PATH, finalFile.getAbsolutePath());
// intent.putExtra(Constant.INTENT_TYPE, showPoiEntity.getType());
// intent.putExtra(Constant.INTENT_GEO_WKT, showPoiEntity.getGeoWkt());
// intent.putExtra(Constant.INTENT_DETAIL, showPoiEntity.getDetail());
// int gpsRssi = Constant.currentLocation.getGPSRssi();
// if (gpsRssi == 0) {
// intent.putExtra(Constant.INTENT_BOOLEAN, false);
// } else {
// intent.putExtra(Constant.INTENT_BOOLEAN, true);
// }
// startActivityForResult(intent, 0x101);
// dialog.doDismiss();
// }
// });
// }
// }).setFullScreen(true);
Intent intent = new Intent(getContext(), PicturesActivity.class);
File finalFile = AWMp4ParserHelper.getInstance().obtainWebpFilePath(new File(Constant.PICTURE_FOLDER, showPoiEntity.getId()).getAbsolutePath());
intent.putExtra(Constant.INTENT_JPG_PATH, finalFile.getAbsolutePath());
@ -555,11 +573,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
intent.putExtra(Constant.INTENT_BOOLEAN, true);
}
startActivityForResult(intent, 0x101);
dialog.doDismiss();
}
});
}
}).setFullScreen(true);
break;
case R.id.road_upload:
roadBuilder.append(TimestampUtil.time()).append(",").append("点击了上传的按钮 ,");

4
app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
View File

@ -302,8 +302,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
});
imgAutoMatchRoad = findViewById(R.id.iv_auto_match_road);
// 如果当前用户的level为1或2，自动采集功能才会开放
if (Constant.LEVEL == 1||Constant.LEVEL==2) {
// 如果当前用户的level为1或2、3，自动采集功能才会开放
if (Constant.LEVEL == 1||Constant.LEVEL==2||Constant.LEVEL==3) {
imgAutoMatchRoad.setVisibility(View.VISIBLE);
}
imgAutoMatchRoad.setOnClickListener(new View.OnClickListener() {

BIN
app/src/main/res/drawable-hdpi/locaiton_auto_pictures.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

3
app/src/main/res/layout/activity_pictures.xml
View File

@ -126,9 +126,10 @@
android:id="@+id/btn_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginTop="25dp"
android:layout_marginEnd="25dp"
android:text="切换"
android:padding="@dimen/default_widget_padding"
android:src="@mipmap/switcher"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />