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

1.修改拍摄的语音提醒 2.修改log日志 3.修改数据库更新操作

Browse Source
This commit is contained in:
wangdongsheng 2021-11-17 18:34:08 +08:00
parent 61915b4ead
commit f46d12a77e
34 changed files with 505 additions and 421 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java
View File

@ -157,14 +157,37 @@ public class HomeActivity extends BaseActivity {
if (!dataString.equals("")) {
Constant.isPresent = true;
DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
MessageDialog.show(this, "提示", dataString, "确定");
DialogSettings.cancelable = false;
MessageDialog.show(this, "提示", dataString, "确定").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
Message obtain1 = Message.obtain();
obtain1.what = Constant.EVENT_STAY_REFRESH;
EventBus.getDefault().post(obtain1);
return false;
}
});
}
} else if (data.what == Constant.NEST_WORD_REGISTER) {
String dataString = (String) data.obj;
if (!dataString.equals("")) {
DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
MessageDialog.show(this, "提示", dataString, "确定");
DialogSettings.cancelable = false;
MessageDialog.show(this, "提示", dataString, "确定").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
return false;
}
});
}
}else if (data.what==Constant.EVENT_MESSAGE){

23
app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java
View File

@ -33,6 +33,7 @@ import com.navinfo.outdoor.util.Base64;
import com.navinfo.outdoor.util.Md5Util;
import com.navinfo.outdoor.util.SpeakMode;
import com.navinfo.outdoor.util.SystemTTS;
import com.navinfo.outdoor.util.TimestampUtil;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@ -99,7 +100,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
}
}
loginBuilder = new StringBuilder();
loginBuilder.append("LoginActivity-initData ,");
loginBuilder.append(TimestampUtil.time()).append("LoginActivity-initData ,");
}
@Subscribe
@ -145,19 +146,19 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
public void onClick(View v) {
switch (v.getId()) {
case R.id.tv_register:
loginBuilder.append("点击注册 ,");
loginBuilder.append(TimestampUtil.time()).append("点击注册 ,");
Intent register = new Intent(this, FragmentManagement.class);
register.putExtra("tag", 5);
startActivity(register);
break;
case R.id.tv_forget_paw:
loginBuilder.append("点击忘记密码 ,");
loginBuilder.append(TimestampUtil.time()).append("点击忘记密码 ,");
Intent forgetPaw = new Intent(this, FragmentManagement.class);
forgetPaw.putExtra("tag", 6);
startActivity(forgetPaw);
break;
case R.id.btn_login:
loginBuilder.append("点击登录 , ");
loginBuilder.append(TimestampUtil.time()).append("点击登录 , ");
btnLogin.setEnabled(false);
Message message = new Message();
message.what = 0x103;
@ -180,7 +181,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
}
break;
case R.id.tv_statement:
loginBuilder.append("点击了用户协议 ,");
loginBuilder.append(TimestampUtil.time()).append("点击了用户协议 ,");
Intent stateIntent = new Intent(this, StatementActivity.class);
startActivity(stateIntent);
break;
@ -223,7 +224,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
Constant.REFRESH_TOKEN = body.getRefresh_token();
Constant.USHERED = body.getUserId();
Constant.PASS_WORD = paw;
loginBuilder.append("登录获取token ,");
loginBuilder.append(TimestampUtil.time()).append("登录获取token ,");
initGetUserInfo();//获取用户信息
}else {
Toast.makeText(LoginActivity.this, "获取id 失败", Toast.LENGTH_SHORT).show();
@ -301,11 +302,11 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
navInfoEditor.commit();
int needGuide = body.getNeedGuide();//0不需要 1需要
if (needGuide == 1) {
loginBuilder.append("进入介绍页 ,");
loginBuilder.append(TimestampUtil.time()).append("进入介绍页 ,");
Intent intent = new Intent(LoginActivity.this, GuidanceActivity.class);
startActivity(intent);
} else {
loginBuilder.append("登录成功 ,");
loginBuilder.append(TimestampUtil.time()).append("登录成功 ,");
Toast.makeText(LoginActivity.this, "登录成功", Toast.LENGTH_SHORT).show();
Intent intent = new Intent(LoginActivity.this, HomeActivity.class);
startActivity(intent);
@ -340,19 +341,19 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
@Override
protected void onPause() {
super.onPause();
loginBuilder.append("onPause ,");
loginBuilder.append(TimestampUtil.time()).append("onPause ,");
}
@Override
protected void onStop() {
super.onStop();
loginBuilder.append("onStop ,");
loginBuilder.append(TimestampUtil.time()).append("onStop ,");
}
@Override
public void onDestroy() {
super.onDestroy();
loginBuilder.append("onDestroy");
loginBuilder.append(TimestampUtil.time()).append("onDestroy");
loginBuilder.append("\r\n");
FileUtils.writeFile(logFile.getAbsolutePath(), loginBuilder.toString(), true);
if (EventBus.getDefault().isRegistered(this)) {//加上判断

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

@ -44,6 +44,7 @@ import com.navinfo.outdoor.util.Geohash;
import com.navinfo.outdoor.util.GeometryTools;
import com.navinfo.outdoor.util.MyTecentLocationSource;
import com.navinfo.outdoor.util.SystemTTS;
import com.navinfo.outdoor.util.TimestampUtil;
import com.navinfo.outdoor.util.ToastUtil;
import com.otaliastudios.cameraview.CameraListener;
import com.otaliastudios.cameraview.CameraLogger;
@ -100,7 +101,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
private ViewGroup layerChange; // 切换地图和相机的父控件
private CheckBox capturePicture, cbMapType; //拍照
private boolean isMapSlide = false;
private boolean isOration = false;
private boolean isOration = true;
private boolean isTerminus = false;
private boolean isBack = true;
private int type = 0;
@ -175,10 +176,10 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
if (type == 3) {//poiVideo 1秒
ivPicVideoImage.setVisibility(View.VISIBLE);
ivPicRoadImage.setVisibility(View.GONE);
radioPicture = 2;
radioBtnAuto.setTextColor(Color.parseColor("#FFEB3B"));
radioPicture = 3;
radioBtnAutoSec.setTextColor(Color.parseColor("#FFEB3B"));
radioBtnHand.setTextColor(Color.WHITE);
radioBtnAutoSec.setTextColor(Color.WHITE);
radioBtnAuto.setTextColor(Color.WHITE);
} else if (type == 4) {//道路2秒
ivPicRoadImage.setVisibility(View.VISIBLE);
ivPicVideoImage.setVisibility(View.GONE);
@ -193,7 +194,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
switch (checkedId) {
case R.id.radio_btn_hand://手动
radioPicture = 1;
isOration = true;
isOration = false;
capturePicture.setText("拍摄");
capturePicture.setChecked(false);
radioBtnHand.setTextColor(Color.parseColor("#FFEB3B"));
@ -247,18 +248,16 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
}
if (isChecked) {
if (radioPicture != 1) {
isOration = true;
capturePicture.setText("暂停采集");
picturesBuilder.append("capturePicture 点击了开始采集 ,");
picturesBuilder.append(TimestampUtil.time()).append("capturePicture 点击了开始采集 ,");
} else {
picturesBuilder.append("capturePicture 点击了拍摄 ,");
picturesBuilder.append(TimestampUtil.time()).append("capturePicture 点击了拍摄 ,");
}
startTimer();
} else {
if (radioPicture != 1) {
isOration = false;
capturePicture.setText("开始采集");
picturesBuilder.append("capturePicture 点击了暂停采集 ,");
picturesBuilder.append(TimestampUtil.time()).append("capturePicture 点击了暂停采集 ,");
}
stopTimer();
}
@ -285,6 +284,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
// 如果当前手机是竖向，则不
if (isOration) {
if (Objects.requireNonNull(camera.getPictureSize()).getWidth() < camera.getPictureSize().getHeight()) {
isOration = true;
Toast.makeText(PicturesActivity.this, "不允许竖向拍摄...", Toast.LENGTH_SHORT).show();
picturesBuilder.append("camera 用户竖屏拍照 ,");
stopTimer();
@ -320,7 +320,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
message.what = 0x103;
handler.sendMessage(message);
}*/
if (file.exists() && file != null) {
if (file.exists() && file!= null) {
WebPNative webPNative = new WebPNative();
new Thread(new Runnable() {
@Override
@ -467,7 +467,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
}
}
picturesBuilder = new StringBuilder();
picturesBuilder.append("PicturesActivity-onCreate-initData ,");
picturesBuilder.append(TimestampUtil.time()).append("PicturesActivity-onCreate-initData ,");
if (Constant.USHERED != null) {
picturesBuilder.append("userId:").append(Constant.USHERED).append(",");
}
@ -481,7 +481,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
if (isOration) {
stopTimer();
}
picturesBuilder.append("onClick 点击了结束采集 ,");
picturesBuilder.append(TimestampUtil.time()).append("onClick 点击了结束采集 ,");
Intent intent = new Intent();
finalVideoPath = Objects.requireNonNull(paperFile.getParentFile()).getAbsolutePath() + "/" + videoIndex + ".webp";
intent.putExtra(Constant.INTENT_PICTURES_PATH, finalVideoPath);
@ -489,29 +489,29 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
this.finish();
break;
case R.id.image_view:
picturesBuilder.append("onClick 点击了切换的窗口 ,");
picturesBuilder.append(TimestampUtil.time()).append("onClick 点击了切换的窗口 ,");
v.setEnabled(false);
benSwitch();
handler.sendEmptyMessageDelayed(0x102, 2000);// 利用handler延迟发送更改状态信息
break;
case R.id.btn_switch:
picturesBuilder.append("onClick 点击了切换按钮 ,");
picturesBuilder.append(TimestampUtil.time()).append("onClick 点击了切换按钮 ,");
v.setEnabled(false);
handler.sendEmptyMessageDelayed(0x102, 2000);// 利用handler延迟发送更改状态信息
benSwitch();
break;
case R.id.iv_zoom_add://放大
picturesBuilder.append("onClick 点击了放大 ,");
picturesBuilder.append(TimestampUtil.time()).append("onClick 点击了放大 ,");
CameraUpdate cameraUpdateIn = CameraUpdateFactory.zoomIn();
tencentMap.animateCamera(cameraUpdateIn);
break;
case R.id.iv_zoom_del://缩小
picturesBuilder.append("onClick 点击了缩小 ,");
picturesBuilder.append(TimestampUtil.time()).append("onClick 点击了缩小 ,");
CameraUpdate cameraUpdateOut = CameraUpdateFactory.zoomOut();
tencentMap.animateCamera(cameraUpdateOut);
break;
case R.id.iv_location://定位:
picturesBuilder.append("onClick 点击了定位 ,");
picturesBuilder.append(TimestampUtil.time()).append("onClick 点击了定位 ,");
if (Constant.currentLocation != null) {
CameraUpdate cameraSigma = CameraUpdateFactory
.newCameraPosition(new CameraPosition(new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude()), //中心点坐标，地图目标经纬度
@ -649,7 +649,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
@Override
protected void onPause() {
super.onPause();
picturesBuilder.append("onPause ,");
picturesBuilder.append(TimestampUtil.time()).append("onPause ,");
tvMapView.onPause();
camera.close();
stopTimer();
@ -658,7 +658,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
@Override
protected void onStop() {
super.onStop();
picturesBuilder.append("onStop ,");
picturesBuilder.append(TimestampUtil.time()).append("onStop ,");
tvMapView.onStop();
}
@ -676,7 +676,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
removables.get(i).remove();
}
removables.clear();
picturesBuilder.append("onDestroy");
picturesBuilder.append(TimestampUtil.time()).append("onDestroy");
picturesBuilder.append("\r\n");
FileUtils.writeFile(logFile.getAbsolutePath(), picturesBuilder.toString(), true);
if (EventBus.getDefault().isRegistered(this)) {
@ -720,7 +720,8 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
sb.append("\r\n");
if (isBack) {
FileUtils.writeFile(paperFile.getAbsolutePath(), sb.toString(), true);
// initSpeed();
//公里限速提醒
initSpeed();
//快到终点的语音播报
initTerminus();
}
@ -761,12 +762,12 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
float speed = Constant.currentLocation.getSpeed();//米/秒
if (speed != 0) {
float a = (speed * 3600 / 1000);//km/h
if (radioPicture == 2) {
if (a > 25) {//25千米/h
if (type == 3) {
if (a > 40) {//40千米/h
systemTTS.playText("您已超速");
}
} else if (radioPicture == 3) {
if (a > 70) {//70千米/h
} else if (type == 4) {
if (a > 80) {//80千米/h
systemTTS.playText("您已超速");
}
}
@ -775,15 +776,29 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
LatLng startLatLng = new LatLng(oldCurrentLocation.getLatitude(), oldCurrentLocation.getLongitude());//旧的坐标
LatLng endLatLng = new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude());//新的坐标
double geometry = GeometryTools.distanceToDouble(startLatLng, endLatLng);//米
if (radioPicture == 2) {
double speeds = ((geometry / 2) * 3600 / 1000);
if (speeds > 25) {//25千米/h
systemTTS.playText("您已超速");
if (type == 3) {
if (radioPicture==2){
double speeds = ((geometry / 1) * 3600 / 1000);
if (speeds > 40) {//40千米/h
systemTTS.playText("您已超速");
}
}else if (radioPicture==3){
double speeds = ((geometry / 2) * 3600 / 1000);
if (speeds > 40) {//40千米/h
systemTTS.playText("您已超速");
}
}
} else if (radioPicture == 3) {
double speeds = ((geometry / 1.5) * 3600 / 1000);
if (speeds > 70) {//70千米/h
systemTTS.playText("您已超速");
} else if (type == 4) {
if (radioPicture==2){
double speeds = ((geometry / 1) * 3600 / 1000);
if (speeds > 80) {//80千米/h
systemTTS.playText("您已超速");
}
}else if (radioPicture==3){
double speeds = ((geometry / 2) * 3600 / 1000);
if (speeds > 80) {//80千米/h
systemTTS.playText("您已超速");
}
}
}
}
@ -807,7 +822,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
MessageDialog.show(this, "提示", message, "是", "否").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
picturesBuilder.append("onClick 点击了结束采集 ,");
picturesBuilder.append(TimestampUtil.time()).append("onClick 点击了结束采集 ,");
Intent intent = new Intent();
finalVideoPath = Objects.requireNonNull(paperFile.getParentFile()).getAbsolutePath() + "/" + videoIndex + ".webp";
intent.putExtra(Constant.INTENT_PICTURES_PATH, finalVideoPath);

6
app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java
View File

@ -395,19 +395,19 @@ public class UserActivity extends BaseActivity implements View.OnClickListener {
@Override
protected void onPause() {
super.onPause();
userBuilder.append("onPause ,");
userBuilder.append(TimestampUtil.time()).append("onPause ,");
}
@Override
protected void onStop() {
super.onStop();
userBuilder.append("onStop ,");
userBuilder.append(TimestampUtil.time()).append("onStop ,");
}
@Override
protected void onDestroy() {
super.onDestroy();
userBuilder.append("onDestroy");
userBuilder.append(TimestampUtil.time()).append("onDestroy");
userBuilder.append("\r\n");
FileUtils.writeFile(logFile.getAbsolutePath(), userBuilder.toString(), true);
}

3
app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java
View File

@ -63,7 +63,8 @@ public class StaySubmitAdapter extends RecyclerView.Adapter<StaySubmitAdapter.Vi
PoiEntity poiEntity = (PoiEntity) iterator.next();
if (poiEntity.isChecked()) {
PoiEntityDeleteUtil.getInstance().deleteUtil(context,poiEntity);
PoiDatabase.getInstance(context).getPoiDao().deletePoiEntity(poiEntity);
poiEntity.setTaskStatus(100);
PoiDatabase.getInstance(context).getPoiDao().updatePoiEntity(poiEntity);
iterator.remove();
}
}

2
app/src/main/java/com/navinfo/outdoor/api/Constant.java
View File

@ -166,7 +166,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 = "11.16";//版本日期
public static final String NAVIN_FO = "11.17";//版本日期
//marker
public static final BitmapDescriptor MARKER_POI_SHOW = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_show);

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

@ -51,6 +51,7 @@ import com.navinfo.outdoor.room.PoiEntity;
import com.navinfo.outdoor.util.Geohash;
import com.navinfo.outdoor.util.GeometryTools;
import com.navinfo.outdoor.util.PhotoUtils;
import com.navinfo.outdoor.util.TimestampUtil;
import com.navinfo.outdoor.util.ToastUtil;
import com.tencent.tencentmap.mapsdk.maps.TencentMap;
import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptor;
@ -185,6 +186,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
checkBoxLife.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
chargingPileBuilder.append(TimestampUtil.time()).append("点击了checkBox 的按钮,");
if (checkBoxLife.isChecked()) {
moveLatlng(latLng, new TencentMap.CancelableCallback() {
@Override
@ -230,6 +232,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
checkButton1.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
chargingPileBuilder.append(TimestampUtil.time()).append("点击了checkButton1 的按钮,");
if (isChecked) {
buffer1 = "1,";
buffer2 = "";
@ -249,6 +252,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
checkButton2.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
chargingPileBuilder.append(TimestampUtil.time()).append("点击了checkButton2 的按钮,");
if (isChecked) {
buffer2 = "2,";
checkButton1.setChecked(false);
@ -261,6 +265,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
checkButton3.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
chargingPileBuilder.append(TimestampUtil.time()).append("点击了checkButton3 的按钮,");
if (isChecked) {
buffer3 = "3,";
checkButton1.setChecked(false);
@ -273,6 +278,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
checkButton4.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
chargingPileBuilder.append(TimestampUtil.time()).append("点击了checkButton4 的按钮,");
if (isChecked) {
buffer4 = "4,";
checkButton1.setChecked(false);
@ -285,6 +291,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
checkButton5.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
chargingPileBuilder.append(TimestampUtil.time()).append("点击了checkButton5 的按钮,");
if (isChecked) {
buffer5 = "5,";
checkButton1.setChecked(false);
@ -303,10 +310,12 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
chargingPileBuilder.append(TimestampUtil.time()).append("点击了下拉框 存在,");
exist = 0;//存在
pileDisables(View.VISIBLE);
break;
case 1:
chargingPileBuilder.append(TimestampUtil.time()).append("点击了下拉框 不存在,");
exist = 1;//不存在
pileDisables(View.GONE);
rlDevice.setVisibility(View.GONE);
@ -329,33 +338,43 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
chargingPileBuilder.append(TimestampUtil.time()).append("点击了下拉框 地上五层,");
cp_floor = 5;
break;
case 1:
chargingPileBuilder.append(TimestampUtil.time()).append("点击了下拉框 地上四层,");
cp_floor = 4;
break;
case 2:
chargingPileBuilder.append(TimestampUtil.time()).append("点击了下拉框 地上三层,");
cp_floor = 3;
break;
case 3:
chargingPileBuilder.append(TimestampUtil.time()).append("点击了下拉框 地上二层,");
cp_floor = 2;
break;
case 4:
chargingPileBuilder.append(TimestampUtil.time()).append("点击了下拉框 地上一层,");
cp_floor = 1;
break;
case 5:
chargingPileBuilder.append(TimestampUtil.time()).append("点击了下拉框 地下一层,");
cp_floor = -1;
break;
case 6:
chargingPileBuilder.append(TimestampUtil.time()).append("点击了下拉框 地下二层,");
cp_floor = -2;
break;
case 7:
chargingPileBuilder.append(TimestampUtil.time()).append("点击了下拉框 地下三层,");
cp_floor = -3;
break;
case 8:
chargingPileBuilder.append(TimestampUtil.time()).append("点击了下拉框 地下四层,");
cp_floor = -4;
break;
case 9:
chargingPileBuilder.append(TimestampUtil.time()).append("点击了下拉框 地下五层,");
cp_floor = -5;
break;
}
@ -373,12 +392,14 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
chargingPileBuilder.append(TimestampUtil.time()).append("点击了下拉框 存在,");
rlFacility.setBackgroundResource(R.drawable.selector_hui_bg);
rlScutcheon.setVisibility(View.GONE);
rlDevice.setVisibility(View.GONE);
sign_exist = 0;
break;
case 1:
chargingPileBuilder.append(TimestampUtil.time()).append("点击了下拉框 不存在,");
rlFacility.setBackgroundColor(Color.parseColor("#03A9F4"));
if (exist==0){
rlScutcheon.setVisibility(View.VISIBLE);
@ -404,18 +425,23 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
chargingPileBuilder.append(TimestampUtil.time()).append("点击了下拉框 可以使用,");
cp_availableState = 0;
break;
case 1:
chargingPileBuilder.append(TimestampUtil.time()).append("点击了下拉框 不可使用,");
cp_availableState = 1;
break;
case 2:
chargingPileBuilder.append(TimestampUtil.time()).append("点击了下拉框 维修中,");
cp_availableState = 2;
break;
case 3:
chargingPileBuilder.append(TimestampUtil.time()).append("点击了下拉框 建设中,");
cp_availableState = 3;
break;
case 4:
chargingPileBuilder.append(TimestampUtil.time()).append("点击了下拉框 规划中,");
cp_availableState = 4;
break;
}
@ -489,6 +515,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
rlAvailable.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
chargingPileBuilder.append(TimestampUtil.time()).append("点击长按删除 确定按钮,");
DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
@ -508,6 +535,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
rlUsable.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
chargingPileBuilder.append(TimestampUtil.time()).append("点击长按删除 确定按钮,");
DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
@ -527,6 +555,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
rlScutcheon.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
chargingPileBuilder.append(TimestampUtil.time()).append("点击长按删除 确定按钮,");
DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
@ -547,6 +576,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
rlParking.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
chargingPileBuilder.append(TimestampUtil.time()).append("点击长按删除 确定按钮,");
DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
@ -566,6 +596,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
rlPanorama.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
chargingPileBuilder.append(TimestampUtil.time()).append("点击长按删除 确定按钮,");
DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
@ -585,6 +616,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
rlNumber.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
chargingPileBuilder.append(TimestampUtil.time()).append("点击长按删除 确定按钮,");
DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
@ -605,6 +637,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
rlFacility.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
chargingPileBuilder.append(TimestampUtil.time()).append("点击长按删除 确定按钮,");
DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
@ -624,6 +657,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
rlEquipment.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
chargingPileBuilder.append(TimestampUtil.time()).append("点击长按删除 确定按钮,");
DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
@ -643,6 +677,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
rlDevice.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
chargingPileBuilder.append(TimestampUtil.time()).append("点击长按删除 确定按钮,");
DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
@ -662,6 +697,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
rlCoding.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
chargingPileBuilder.append(TimestampUtil.time()).append("点击长按删除 确定按钮,");
DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override

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

@ -51,6 +51,7 @@ import com.navinfo.outdoor.api.Constant;
import com.navinfo.outdoor.base.BaseDrawerFragment;
import com.navinfo.outdoor.util.FlushTokenUtil;
import com.navinfo.outdoor.util.PreserveUtils;
import com.navinfo.outdoor.util.TimestampUtil;
import com.navinfo.outdoor.util.UploadUtils;
import com.navinfo.outdoor.bean.ChargingPileSaveBean;
import com.navinfo.outdoor.bean.ChargingStationBean;
@ -346,7 +347,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
checkBoxLife.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
chargingStationBuilder.append("点击了编辑的按钮 ,");
chargingStationBuilder.append(TimestampUtil.time()).append("点击了编辑的按钮 ,");
if (checkBoxLife.isChecked()) {
moveLatlng(latLng, new TencentMap.CancelableCallback() {
@Override
@ -396,15 +397,19 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
chargingStationBuilder.append(TimestampUtil.time()).append("下拉框选择 充电站,");
station_type = 1;
break;
case 1:
chargingStationBuilder.append(TimestampUtil.time()).append("下拉框选择 充换电站,");
station_type = 2;
break;
case 2:
chargingStationBuilder.append(TimestampUtil.time()).append("下拉框选择 充电桩组,");
station_type = 3;
break;
case 3:
chargingStationBuilder.append(TimestampUtil.time()).append("下拉框选择 换电站,");
station_type = 4;
break;
}
@ -424,6 +429,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
chargingStationBuilder.append(TimestampUtil.time()).append("下拉框选择 存在,");
rlInternalPhotos.setVisibility(View.VISIBLE);
rlElse.setVisibility(View.VISIBLE);
rlScutcheon.setVisibility(View.VISIBLE);
@ -431,6 +437,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
existence = 0;
break;
case 1:
chargingStationBuilder.append(TimestampUtil.time()).append("下拉框选择 不存在,");
rlInternalPhotos.setVisibility(View.GONE);
rlElse.setVisibility(View.GONE);
rlScutcheon.setVisibility(View.GONE);
@ -438,6 +445,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
existence = 1;
break;
case 2:
chargingStationBuilder.append(TimestampUtil.time()).append("下拉框选择 无法验证,");
rlInternalPhotos.setVisibility(View.GONE);
rlElse.setVisibility(View.GONE);
rlScutcheon.setVisibility(View.GONE);
@ -464,6 +472,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
chargingStationBuilder.append(TimestampUtil.time()).append("点击了长按删除图片确定 按钮,");
ivElse.setImageDrawable(null);
if (tvElse.getTag() != null) {
File file = new File((String) tvElse.getTag());
@ -483,6 +492,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
chargingStationBuilder.append(TimestampUtil.time()).append("点击了长按删除图片确定 按钮,");
ivScutcheon.setImageDrawable(null);
if (tvScutcheon.getTag() != null) {
File file = new File((String) tvScutcheon.getTag());
@ -502,6 +512,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
chargingStationBuilder.append(TimestampUtil.time()).append("点击了长按删除图片确定 按钮,");
ivPanorama.setImageDrawable(null);
if (tvPanorama.getTag() != null) {
File file = new File((String) tvPanorama.getTag());
@ -521,6 +532,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
chargingStationBuilder.append(TimestampUtil.time()).append("点击了长按删除图片确定 按钮,");
ivName.setImageDrawable(null);
if (tvNamePic.getTag() != null) {
File file = new File((String) tvNamePic.getTag());
@ -540,6 +552,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
chargingStationBuilder.append(TimestampUtil.time()).append("点击了长按删除图片确定 按钮,");
ivInternal.setImageDrawable(null);
if (tvInternal.getTag() != null) {
File file = new File((String) tvInternal.getTag());
@ -877,7 +890,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
}
}
chargingStationBuilder = new StringBuilder();
chargingStationBuilder.append("ChargingStationActivity-onCreate-initData ,");
chargingStationBuilder.append(TimestampUtil.time()).append("ChargingStationActivity-onCreate-initData ,");
if (Constant.USHERED != null) {
chargingStationBuilder.append("userId:").append(Constant.USHERED).append(",");
}
@ -936,11 +949,11 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
public void onClick(View v) {
switch (v.getId()) {
case R.id.btn_save_local:
chargingStationBuilder.append("点击了保存本地的按钮 ,");
chargingStationBuilder.append(TimestampUtil.time()).append("点击了保存本地的按钮 ,");
initRoadSaveLocal(false);
break;
case R.id.btn_uploading:
chargingStationBuilder.append("点击了上传的按钮 ,");
chargingStationBuilder.append(TimestampUtil.time()).append("点击了上传的按钮 ,");
Message obtain = Message.obtain();
obtain.what = Constant.TREASURE_FRAGMENT;
obtain.obj = false;
@ -1022,11 +1035,11 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
}
break;
case R.id.tv_station_examine:
chargingStationBuilder.append("点击了查重的按钮 ,");
chargingStationBuilder.append(TimestampUtil.time()).append("点击了查重的按钮 ,");
findingDuplicateByWork();
break;
case R.id.rl_panorama:
chargingStationBuilder.append("点击了全景照片进行拍照 ,");
chargingStationBuilder.append(TimestampUtil.time()).append("点击了全景照片进行拍照 ,");
findingDuplicateByWork();
Intent intentPanorama = new Intent(getActivity(), PhotographActivity.class);
File PanoramaFile = PhotoUtils.showPhotoFile("a", latLng);
@ -1034,35 +1047,35 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
startActivityForResult(intentPanorama, 101);
break;
case R.id.rl_name:
chargingStationBuilder.append("点击了名称照片进行拍照 ,");
chargingStationBuilder.append(TimestampUtil.time()).append("点击了名称照片进行拍照 ,");
Intent intentName = new Intent(getActivity(), PhotographActivity.class);
File nameFile = PhotoUtils.showPhotoFile("b", latLng);
intentName.putExtra(Constant.INTENT_PHOTO_PATH, nameFile.getPath());
startActivityForResult(intentName, 102);
break;
case R.id.rl_internal_photos:
chargingStationBuilder.append("点击了服务说明进行拍照 ,");
chargingStationBuilder.append(TimestampUtil.time()).append("点击了服务说明进行拍照 ,");
Intent intentInternal = new Intent(getActivity(), PhotographActivity.class);
File internalFile = PhotoUtils.showPhotoFile("c", latLng);
intentInternal.putExtra(Constant.INTENT_PHOTO_PATH, internalFile.getPath());
startActivityForResult(intentInternal, 103);
break;
case R.id.rl_else:
chargingStationBuilder.append("点击了充电站指引牌进行拍照 ,");
chargingStationBuilder.append(TimestampUtil.time()).append("点击了充电站指引牌进行拍照 ,");
Intent intentElse = new Intent(getActivity(), PhotographActivity.class);
File elseFile = PhotoUtils.showPhotoFile("d", latLng);
intentElse.putExtra(Constant.INTENT_PHOTO_PATH, elseFile.getPath());
startActivityForResult(intentElse, 104);
break;
case R.id.rl_scutcheon:
chargingStationBuilder.append("点击了停车收费标牌进行拍照 ,");
chargingStationBuilder.append(TimestampUtil.time()).append("点击了停车收费标牌进行拍照 ,");
Intent intentScutcheon = new Intent(getActivity(), PhotographActivity.class);
File scutcheonFile = PhotoUtils.showPhotoFile("e", latLng);
intentScutcheon.putExtra(Constant.INTENT_PHOTO_PATH, scutcheonFile.getPath());
startActivityForResult(intentScutcheon, 105);
break;
case R.id.linear_charging_pile:
chargingStationBuilder.append("查看了recyclerView ,");
chargingStationBuilder.append(TimestampUtil.time()).append("查看了recyclerView ,");
initChargingPile();
break;
}
@ -1216,10 +1229,6 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退
WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台保存中，请稍候...");
WaitDialog.dismiss(1000);
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
}
private void stationUploadByNetWork(PoiEntity poiEntity, ArrayList<File> chargingStationList) {
@ -1640,13 +1649,13 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
@Override
public void onPause() {
super.onPause();
chargingStationBuilder.append("onPause ,");
chargingStationBuilder.append(TimestampUtil.time()).append("onPause ,");
}
@Override
public void onStop() {
super.onStop();
chargingStationBuilder.append("onStop ,");
chargingStationBuilder.append(TimestampUtil.time()).append("onStop ,");
}
@Override
@ -1662,7 +1671,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
}
removablesLocality.clear();
chargingStationBuilder.append("onDestroy");
chargingStationBuilder.append(TimestampUtil.time()).append("onDestroy");
chargingStationBuilder.append("\r\n");
FileUtils.writeFile(logFile.getAbsolutePath(), chargingStationBuilder.toString(), true);
}
@ -1707,7 +1716,8 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
}
}
}
poiDao.deletePoiEntity(poiEntity);
poiEntity.setTaskStatus(100);
poiDao.updatePoiEntity(poiEntity);
}
}).start();
initList();

29
app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java
View File

@ -352,7 +352,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
filterAdapter.setItemCLick(new FilterAdapter.ItemCLick() {
@Override
public void item(PoiEntity poiEntity) {
filterBuilder.append(TimestampUtil.time()).append("点击了item ,");
filterBuilder.append(TimestampUtil.time()).append("点击了条目item ,");
//查看详情
Message obtains = Message.obtain();
obtains.what = Constant.FILTER_LIST_ITEM;
@ -363,7 +363,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
filterAdapter.setItemOnCLick(new FilterAdapter.ItemOnCLick() {
@Override
public void item(PoiEntity poiEntity, boolean isChockBox) {
filterBuilder.append(TimestampUtil.time()).append("点击了item ,");
filterBuilder.append(TimestampUtil.time()).append("点击了条目中的checkBox 按钮 ,");
if (isChockBox) {
btnChock.add(poiEntity);
} else {
@ -421,12 +421,15 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
tvNumber.setText(text);
switch (index) {
case 0:
filterBuilder.append(TimestampUtil.time()).append("点击了任务个数 200 ,");
Constant.NUMBER = 200;
break;
case 1:
filterBuilder.append(TimestampUtil.time()).append("点击了任务个数 500 ,");
Constant.NUMBER = 500;
break;
case 2:
filterBuilder.append(TimestampUtil.time()).append("点击了任务个数 1000 ,");
Constant.NUMBER = 1000;
break;
}
@ -445,18 +448,23 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
tvPhotograph.setText(text);
switch (index) {
case 0:
filterBuilder.append(TimestampUtil.time()).append("点击了权限类型 全部 ,");
Constant.LIMIT_TYPE = -1;
break;
case 1:
filterBuilder.append(TimestampUtil.time()).append("点击了权限类型 普通任务 ,");
Constant.LIMIT_TYPE = 0;
break;
case 2:
filterBuilder.append(TimestampUtil.time()).append("点击了权限类型 专属任务 ,");
Constant.LIMIT_TYPE = 1;
break;
case 3:
filterBuilder.append(TimestampUtil.time()).append("点击了权限类型 挑战任务 ,");
Constant.LIMIT_TYPE = 2;
break;
case 4:
filterBuilder.append(TimestampUtil.time()).append("点击了权限类型 奖励任务 ,");
Constant.LIMIT_TYPE = 3;
break;
}
@ -483,24 +491,31 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
tvExclusive.setText(text);
switch (index) {
case 0:
filterBuilder.append(TimestampUtil.time()).append("点击了任务类型 全部 ,");
Constant.TASK_TYPE = -1;
break;
case 1:
filterBuilder.append(TimestampUtil.time()).append("点击了任务类型 POI ,");
Constant.TASK_TYPE = 1;
break;
case 2:
filterBuilder.append(TimestampUtil.time()).append("点击了任务类型 充电站 ,");
Constant.TASK_TYPE = 2;
break;
case 3:
filterBuilder.append(TimestampUtil.time()).append("点击了任务类型 POI录像 ,");
Constant.TASK_TYPE = 3;
break;
case 4:
filterBuilder.append(TimestampUtil.time()).append("点击了任务类型 道路录像 ,");
Constant.TASK_TYPE = 4;
break;
case 5:
filterBuilder.append(TimestampUtil.time()).append("点击了任务类型 其他 ,");
Constant.TASK_TYPE = 5;
break;
case 6:
filterBuilder.append(TimestampUtil.time()).append("点击了任务类型 面状任务 ,");
Constant.TASK_TYPE = 6;
break;
}
@ -519,15 +534,19 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
tvType.setText(text);
switch (index) {
case 0:
filterBuilder.append(TimestampUtil.time()).append("点击了任务状态 全部 ,");
Constant.TASK_STARTUP = -1;
break;
case 1:
filterBuilder.append(TimestampUtil.time()).append("点击了任务状态 未领取 ,");
Constant.TASK_STARTUP = 0;
break;
case 2:
filterBuilder.append(TimestampUtil.time()).append("点击了任务状态 已领取 ,");
Constant.TASK_STARTUP = 1;
break;
case 3:
filterBuilder.append(TimestampUtil.time()).append("点击了任务状态 已领取（网络） ,");
Constant.TASK_STARTUP = 2;
break;
}
@ -729,13 +748,13 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
@Override
public void onPause() {
super.onPause();
filterBuilder.append("onPause ,");
filterBuilder.append(TimestampUtil.time()).append("onPause ,");
}
@Override
public void onStop() {
super.onStop();
filterBuilder.append("onStop ,");
filterBuilder.append(TimestampUtil.time()).append("onStop ,");
}
@Override
@ -743,7 +762,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
if (EventBus.getDefault().isRegistered(this))//加上判断
EventBus.getDefault().unregister(this);
super.onDestroy();
filterBuilder.append("onDestroy");
filterBuilder.append(TimestampUtil.time()).append("onDestroy");
filterBuilder.append("\r\n");
FileUtils.writeFile(logFile.getAbsolutePath(), filterBuilder.toString(), true);
}

15
app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java
View File

@ -28,6 +28,7 @@ import com.navinfo.outdoor.http.HttpInterface;
import com.navinfo.outdoor.http.OkGoBuilder;
import com.navinfo.outdoor.util.Base64;
import com.navinfo.outdoor.util.RegexUtil;
import com.navinfo.outdoor.util.TimestampUtil;
import org.greenrobot.eventbus.EventBus;
@ -80,7 +81,7 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
}
}
forgetPawBuilder = new StringBuilder();
forgetPawBuilder.append("ForgetPawFragment-onViewCreated-initData,");
forgetPawBuilder.append(TimestampUtil.time()).append("ForgetPawFragment-onViewCreated-initData,");
if (Constant.USHERED!=null){
forgetPawBuilder.append("userId:").append(Constant.USHERED).append(",");
}
@ -105,11 +106,11 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
public void onClick(View v) {
switch (v.getId()) {
case R.id.iv_forgePaw_finish:
forgetPawBuilder.append("点击了忘记密码的返回,");
forgetPawBuilder.append(TimestampUtil.time()).append("点击了忘记密码的返回,");
Objects.requireNonNull(getActivity()).finish();
break;
case R.id.forgetPaw_get_note:
forgetPawBuilder.append("点击了获取短信验证码,");
forgetPawBuilder.append(TimestampUtil.time()).append("点击了获取短信验证码,");
if (!RegexUtil.isPhone(etForgetPawPhone.getText().toString())) {
Toast.makeText(getActivity(), "手机号错误，请重新输入", Toast.LENGTH_SHORT).show();
return;
@ -118,7 +119,7 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
break;
case R.id.btn_forgetPaw:
forgetPawBuilder.append("点击了提交,");
forgetPawBuilder.append(TimestampUtil.time()).append("点击了提交,");
initForgetPaw();
break;
}
@ -280,19 +281,19 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
@Override
public void onPause() {
super.onPause();
forgetPawBuilder.append("onPause,");
forgetPawBuilder.append(TimestampUtil.time()).append("onPause,");
}
@Override
public void onStop() {
super.onStop();
forgetPawBuilder.append("onStop,");
forgetPawBuilder.append(TimestampUtil.time()).append("onStop,");
}
@Override
public void onDestroy() {
super.onDestroy();
forgetPawBuilder.append("onDestroy");
forgetPawBuilder.append(TimestampUtil.time()).append("onDestroy");
forgetPawBuilder.append("\r\n");
FileUtils.writeFile(logFile.getAbsolutePath(), forgetPawBuilder.toString(), true);
}

9
app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java
View File

@ -312,7 +312,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
new Thread(new Runnable() {
@Override
public void run() {
poiDao.deletePoiEntity(poiEntity);
poiEntity.setTaskStatus(100);
poiDao.updatePoiEntity(poiEntity);
Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() {
@Override
public void run() {
@ -625,7 +626,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
new Thread(new Runnable() {
@Override
public void run() {
poiDao.deletePoiEntity(poiEntity);
poiEntity.setTaskStatus(100);
poiDao.updatePoiEntity(poiEntity);
if (poiEntity.getType() == 2) {
chargingPileDao.deleteChargingFidPileEntity(poiEntity.getId());
}
@ -768,7 +770,8 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
new Thread(new Runnable() {
@Override
public void run() {
poiDao.deletePoiEntity(poiEntity);
poiEntity.setTaskStatus(100);
poiDao.updatePoiEntity(poiEntity);
}
}).start();
} else if (response.getCode() == 230) {

13
app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java
View File

@ -48,6 +48,7 @@ import com.navinfo.outdoor.http.OkGoBuilder;
import com.navinfo.outdoor.util.FlushTokenUtil;
import com.navinfo.outdoor.util.GetJsonDataUtil;
import com.navinfo.outdoor.util.PhotoUtils;
import com.navinfo.outdoor.util.TimestampUtil;
import org.json.JSONArray;
@ -148,14 +149,14 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
public void onClick(View v) {
switch (v.getId()) {
case R.id.iv_gathering:
gatheringBuilder.append("点击返回的按钮 ,");
gatheringBuilder.append(TimestampUtil.time()).append("点击返回的按钮 ,");
Objects.requireNonNull(getActivity()).finish();
break;
case R.id.et_bank_num:
gatheringBuilder.append("输入银行卡号 ,");
gatheringBuilder.append(TimestampUtil.time()).append("输入银行卡号 ,");
break;
case R.id.iv_bank:
gatheringBuilder.append("点击弹窗 ,");
gatheringBuilder.append(TimestampUtil.time()).append("点击弹窗 ,");
String bankJson = new GetJsonDataUtil().getJson(Objects.requireNonNull(getContext()), "bank.json");//获取assets目录下的json文件数据
//用Gabon 转成实体
jsonBean = parseData(bankJson);
@ -221,7 +222,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
dialog.show();
break;
case R.id.btn_bank:
gatheringBuilder.append("点击绑定银行卡 ,");
gatheringBuilder.append(TimestampUtil.time()).append("点击绑定银行卡 ,");
if (etBankNum.getText().toString().equals("")) {
Toast.makeText(getActivity(), "银行卡号不能为空", Toast.LENGTH_SHORT).show();
Log.e("TAG", "onClick: " + etBankNum);
@ -230,7 +231,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
gatheringNetWork();
break;
case R.id.gathering_camera:
gatheringBuilder.append("点击拍照 ,");
gatheringBuilder.append(TimestampUtil.time()).append("点击拍照 ,");
Intent gatheringNumberIntent = new Intent(getActivity(), PhotographActivity.class);
File file = PhotoUtils.showPhotoFile("a", null);
gatheringNumberIntent.putExtra(Constant.INTENT_PHOTO_PATH, file.getPath());
@ -285,7 +286,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("绑定成功 ,");
gatheringBuilder.append(TimestampUtil.time()).append("绑定成功 ,");
Constant.BACKGROUND_NAME = bank;
Constant.BACKGROUND = etBankAccount;
navInfoEditor.putString("bankAccount", etBankAccount);

13
app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java
View File

@ -29,6 +29,7 @@ import com.navinfo.outdoor.http.Callback;
import com.navinfo.outdoor.http.HttpInterface;
import com.navinfo.outdoor.http.OkGoBuilder;
import com.navinfo.outdoor.util.FlushTokenUtil;
import com.navinfo.outdoor.util.TimestampUtil;
import java.io.File;
import java.text.DateFormat;
@ -77,7 +78,7 @@ public class MessageFragment extends BaseFragment implements View.OnClickListene
@Override
public void item(int id) {
messageBuilder.append("点击item ,");
messageBuilder.append(TimestampUtil.time()).append("点击item ,");
HashMap<String, String> paramMap = new HashMap<>();
paramMap.put("id", id + "");
intint2WebActivity(HttpInterface.MSG_CONTENT, paramMap);
@ -161,7 +162,7 @@ public class MessageFragment extends BaseFragment implements View.OnClickListene
}
}
messageBuilder = new StringBuilder();
messageBuilder.append("MessageFragment-onCreate-initData ,");
messageBuilder.append(TimestampUtil.time()).append("MessageFragment-onCreate-initData ,");
if (Constant.USHERED != null) {
messageBuilder.append("userId:").append(Constant.USHERED).append(",");
}
@ -170,7 +171,7 @@ public class MessageFragment extends BaseFragment implements View.OnClickListene
@Override
public void onClick(View v) {
if (v.getId() == R.id.message_final) {
messageBuilder.append("点击返回,");
messageBuilder.append(TimestampUtil.time()).append("点击返回,");
Objects.requireNonNull(getActivity()).finish();
}
}
@ -178,19 +179,19 @@ public class MessageFragment extends BaseFragment implements View.OnClickListene
@Override
public void onPause() {
super.onPause();
messageBuilder.append("onPause ,");
messageBuilder.append(TimestampUtil.time()).append("onPause ,");
}
@Override
public void onStop() {
super.onStop();
messageBuilder.append("onStop ,");
messageBuilder.append(TimestampUtil.time()).append("onStop ,");
}
@Override
public void onDestroy() {
super.onDestroy();
messageBuilder.append("onDestroy");
messageBuilder.append(TimestampUtil.time()).append("onDestroy");
messageBuilder.append("\r\n");
FileUtils.writeFile(logFile.getAbsolutePath(), messageBuilder.toString(), true);
}

10
app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java
View File

@ -223,7 +223,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
}
}
mainBuilder = new StringBuilder();
mainBuilder.append(TimestampUtil.time()).append("MineFragment-onCreate-initData ,");
mainBuilder.append(TimestampUtil.time()).append(TimestampUtil.time()).append("MineFragment-onCreate-initData ,");
if (Constant.USHERED != null) {
mainBuilder.append("userId:").append(Constant.USHERED).append(",");
}
@ -257,7 +257,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
Toast.makeText(getActivity(), "该功能以后上新，敬请期待", Toast.LENGTH_SHORT).show();
break;
case R.id.btn_withdraw://提现页面
mainBuilder.append(TimestampUtil.time()).append("点击了item 跳转到提现页面 ,");
mainBuilder.append(TimestampUtil.time()).append("点击了去提现的按钮 ,");
Intent intentWithdraw = new Intent(getActivity(), FragmentManagement.class);
intentWithdraw.putExtra("tag", 15);
startActivity(intentWithdraw);
@ -295,13 +295,13 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
@Override
public void onPause() {
super.onPause();
mainBuilder.append("onPause ,");
mainBuilder.append(TimestampUtil.time()).append("onPause ,");
}
@Override
public void onStop() {
super.onStop();
mainBuilder.append("onStop ,");
mainBuilder.append(TimestampUtil.time()).append("onStop ,");
}
@Override
@ -309,7 +309,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
if (EventBus.getDefault().isRegistered(this))//加上判断
EventBus.getDefault().unregister(this);
super.onDestroy();
mainBuilder.append("onDestroy");
mainBuilder.append(TimestampUtil.time()).append("onDestroy");
mainBuilder.append("\r\n");
FileUtils.writeFile(logFile.getAbsolutePath(), mainBuilder.toString(), true);
}

35
app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java
View File

@ -45,6 +45,7 @@ import com.navinfo.outdoor.api.Constant;
import com.navinfo.outdoor.base.BaseDrawerFragment;
import com.navinfo.outdoor.util.FlushTokenUtil;
import com.navinfo.outdoor.util.PreserveUtils;
import com.navinfo.outdoor.util.TimestampUtil;
import com.navinfo.outdoor.util.UploadUtils;
import com.navinfo.outdoor.bean.Info;
import com.navinfo.outdoor.bean.PoiSaveBean;
@ -162,6 +163,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
otherBuilder.append(TimestampUtil.time()).append("点击了返回当前页面的 确定 按钮,");
if (showPoiEntity != null) {
if (showPoiEntity.getTaskStatus() == 5) {
initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity);
@ -204,6 +206,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
}).setOnCancelButtonClickListener(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
otherBuilder.append(TimestampUtil.time()).append("点击了返回当前页面的 取消 按钮,");
return false;
}
});
@ -223,12 +226,15 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
otherBuilder.append(TimestampUtil.time()).append("下拉框选择 门牌 ,");
station_type = 7;
break;
case 1:
otherBuilder.append(TimestampUtil.time()).append("下拉框选择 公交 ,");
station_type = 8;
break;
case 2:
otherBuilder.append(TimestampUtil.time()).append("下拉框选择 情报 ,");
station_type = 9;
break;
}
@ -242,6 +248,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
checkPot.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
otherBuilder.append(TimestampUtil.time()).append("点击了点位编辑,");
if (checkPot.isChecked()) {
moveLatlng(latLng, new TencentMap.CancelableCallback() {
@Override
@ -307,12 +314,15 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
otherBuilder.append(TimestampUtil.time()).append("下拉框选择 存在 ,");
existence = 0;
break;
case 1:
otherBuilder.append(TimestampUtil.time()).append("下拉框选择 不存在 ,");
existence = 1;
break;
case 2:
otherBuilder.append(TimestampUtil.time()).append("下拉框选择 无法验证 ,");
existence = 2;
break;
}
@ -336,6 +346,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
otherBuilder.append(TimestampUtil.time()).append("长按删除图片 点击了确定按钮 ,");
ivPicture.setImageDrawable(null);
if (tvPicture.getTag() != null) {
File file = new File((String) tvPicture.getTag());
@ -356,6 +367,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
otherBuilder.append(TimestampUtil.time()).append("长按删除图片 点击了确定按钮 ,");
ivPictures.setImageDrawable(null);
if (tvPictures.getTag() != null) {
File file = new File((String) tvPictures.getTag());
@ -413,7 +425,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
}
}
otherBuilder = new StringBuilder();
otherBuilder.append("OtherActivity-onCreate-initData ,");
otherBuilder.append(TimestampUtil.time()).append("OtherActivity-onCreate-initData ,");
if (Constant.USHERED != null) {
otherBuilder.append("userId:").append(Constant.USHERED).append(",");
}
@ -501,25 +513,25 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
public void onClick(View v) {
switch (v.getId()) {
case R.id.rl_picture:
otherBuilder.append("点击了第一个照片进行拍照 ,");
otherBuilder.append(TimestampUtil.time()).append("点击了第一个照片进行拍照 ,");
Intent intentPicture = new Intent(getActivity(), PhotographActivity.class);
File file = PhotoUtils.showPhotoFile("a", latLng);
intentPicture.putExtra(Constant.INTENT_PHOTO_PATH, file.getPath());
startActivityForResult(intentPicture, 101);
break;
case R.id.rl_pictures:
otherBuilder.append("点击了第二个照片进行拍照 ,");
otherBuilder.append(TimestampUtil.time()).append("点击了第二个照片进行拍照 ,");
Intent intentPictures = new Intent(getActivity(), PhotographActivity.class);
File files = PhotoUtils.showPhotoFile("b", latLng);
intentPictures.putExtra(Constant.INTENT_PHOTO_PATH, files.getPath());
startActivityForResult(intentPictures, 102);
break;
case R.id.btn_other_local:
otherBuilder.append("点击了保存本地的按钮,");
otherBuilder.append(TimestampUtil.time()).append("点击了保存本地的按钮,");
initPoiSaveLocal(false);
break;
case R.id.btn_other_uploading:
otherBuilder.append("点击了上传的按钮,");
otherBuilder.append(TimestampUtil.time()).append("点击了上传的按钮,");
if (otherUploadList != null) {
otherUploadList.clear();
}
@ -631,10 +643,6 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退
WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台保存中，请稍候...");
WaitDialog.dismiss(1000);
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
}
private void otherUploadByNet(int body, List<File> otherUploadList) {
@ -836,13 +844,13 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
@Override
public void onPause() {
super.onPause();
otherBuilder.append("onPause ,");
otherBuilder.append(TimestampUtil.time()).append("onPause ,");
}
@Override
public void onStop() {
super.onStop();
otherBuilder.append("onStop ,");
otherBuilder.append(TimestampUtil.time()).append("onStop ,");
}
@Override
@ -853,7 +861,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
if (markerOther != null) {
markerOther.remove();
}
otherBuilder.append("onDestroy");
otherBuilder.append(TimestampUtil.time()).append("onDestroy");
otherBuilder.append("\r\n");
FileUtils.writeFile(logFile.getAbsolutePath(), otherBuilder.toString(), true);
}
@ -882,7 +890,8 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
new Thread(new Runnable() {
@Override
public void run() {
poiDao.deletePoiEntity(poiEntity);
poiEntity.setTaskStatus(100);
poiDao.updatePoiEntity(poiEntity);
}
}).start();
initList();

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

@ -173,6 +173,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
poiBuilder.append(TimestampUtil.time()).append("点击了返回当前页面的 确定 按钮,");
if (showPoiEntity != null) {
if (showPoiEntity.getTaskStatus() == 5) {
initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity);
@ -215,6 +216,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
}).setOnCancelButtonClickListener(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
poiBuilder.append(TimestampUtil.time()).append("点击了返回当前页面的 取消 按钮,");
return false;
}
});
@ -315,12 +317,15 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
poiBuilder.append(TimestampUtil.time()).append("下拉框选择 存在 ,");
existence = 0;
break;
case 1:
poiBuilder.append(TimestampUtil.time()).append("下拉框选择 不存在 ,");
existence = 1;
break;
case 2:
poiBuilder.append(TimestampUtil.time()).append("下拉框选择 无法验证 ,");
existence = 2;
break;
}
@ -346,6 +351,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
poiBuilder.append(TimestampUtil.time()).append("点击了长按删除图片确定 按钮,");
ivPanorama.setImageDrawable(null);
if (tvPanorama.getTag() != null) {
File file = new File((String) tvPanorama.getTag());
@ -365,6 +371,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
poiBuilder.append(TimestampUtil.time()).append("点击了长按删除图片确定 按钮,");
ivName.setImageDrawable(null);
if (tvPoiNamePic.getTag() != null) {
File file = new File((String) tvPoiNamePic.getTag());
@ -384,6 +391,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
poiBuilder.append(TimestampUtil.time()).append("点击了长按删除图片确定 按钮,");
ivElse.setImageDrawable(null);
if (tvElse.getTag() != null) {
File file = new File((String) tvElse.getTag());
@ -403,6 +411,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
poiBuilder.append(TimestampUtil.time()).append("点击了长按删除图片确定 按钮,");
ivInternal.setImageDrawable(null);
if (tvInternal.getTag() != null) {
File file = new File((String) tvInternal.getTag());
@ -423,6 +432,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
poiBuilder.append(TimestampUtil.time()).append("点击了长按删除图片确定 按钮,");
ivCard.setImageDrawable(null);
if (tvCard.getTag() != null) {
File file = new File((String) tvCard.getTag());
@ -989,10 +999,6 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退
WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台保存中，请稍候...");
WaitDialog.dismiss(1000);
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
}
private void poiUploadByNetWork(int body, ArrayList<File> poiPicList) {
@ -1247,13 +1253,13 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
@Override
public void onPause() {
super.onPause();
poiBuilder.append("onPause,");
poiBuilder.append(TimestampUtil.time()).append("onPause,");
}
@Override
public void onStop() {
super.onStop();
poiBuilder.append("onStop,");
poiBuilder.append(TimestampUtil.time()).append("onStop,");
}
@Override
@ -1264,7 +1270,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
if (markerPoi != null) {
markerPoi.remove();
}
poiBuilder.append("onDestroy ");
poiBuilder.append(TimestampUtil.time()).append("onDestroy ");
poiBuilder.append("\r\n");
FileUtils.writeFile(logFile.getAbsolutePath(), poiBuilder.toString(), true);
}
@ -1293,7 +1299,8 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
new Thread(new Runnable() {
@Override
public void run() {
poiDao.deletePoiEntity(poiEntity);
poiEntity.setTaskStatus(100);
poiDao.updatePoiEntity(poiEntity);
}
}).start();
initList();

43
app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
View File

@ -56,6 +56,7 @@ import com.navinfo.outdoor.util.FlushTokenUtil;
import com.navinfo.outdoor.util.Geohash;
import com.navinfo.outdoor.util.GeometryTools;
import com.navinfo.outdoor.util.PreserveUtils;
import com.navinfo.outdoor.util.TimestampUtil;
import com.navinfo.outdoor.util.UploadUtils;
import com.navinfo.outdoor.util.ZipUtils;
import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptor;
@ -147,6 +148,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
poiVideoBuilder.append(TimestampUtil.time()).append("点击了返回当前页面的 确定 按钮,");
if (showPoiEntity != null) {
if (showPoiEntity.getTaskStatus() == 5) {
initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity);
@ -196,6 +198,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
}).setOnCancelButtonClickListener(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
poiVideoBuilder.append(TimestampUtil.time()).append("点击了返回当前页面的 取消 按钮,");
return false;
}
});
@ -270,7 +273,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
}
}
poiVideoBuilder = new StringBuilder();
poiVideoBuilder.append("PoiVideoActivity-onCreate-initData ,");
poiVideoBuilder.append(TimestampUtil.time()).append("PoiVideoActivity-onCreate-initData ,");
if (Constant.USHERED != null) {
poiVideoBuilder.append("userId:").append(Constant.USHERED).append(",");
}
@ -413,22 +416,23 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
public void onClick(View v) {
switch (v.getId()) {
case R.id.fm_poi_video_picture:
poiVideoBuilder.append("点击了图片查看列表 ,");
if (fmPoiVideoPic.getTag() == null) {
Toast.makeText(getContext(), "还没有拍摄", Toast.LENGTH_SHORT).show();
return;
poiVideoBuilder.append(TimestampUtil.time()).append("点击了图片查看列表 ,");
List<File> fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId());
if (fileListByUUID.size()>1){
Intent photoAlbumIntent = new Intent(getActivity(), FragmentManagement.class);
photoAlbumIntent.putExtra("tag", 36);
photoAlbumIntent.putExtra("showPoiEntity", showPoiEntity);
startActivity(photoAlbumIntent);
}else {
Toast.makeText(getContext(), "请拍摄", Toast.LENGTH_SHORT).show();
}
Intent photoAlbumIntent = new Intent(getActivity(), FragmentManagement.class);
photoAlbumIntent.putExtra("tag", 36);
photoAlbumIntent.putExtra("showPoiEntity", showPoiEntity);
startActivity(photoAlbumIntent);
break;
case R.id.btn_poi_video_save:
poiVideoBuilder.append("点击了保存本地的按钮 ,");
poiVideoBuilder.append(TimestampUtil.time()).append("点击了保存本地的按钮 ,");
initPoiSaveLocal(false);
break;
case R.id.tv_short://点击拍摄
poiVideoBuilder.append("点击了拍摄的按钮 ,");
poiVideoBuilder.append(TimestampUtil.time()).append("点击了拍摄的按钮 ,");
double latitude = Constant.currentLocation.getLatitude();
double longitude = Constant.currentLocation.getLongitude();
LatLng startLatLng = new LatLng(latitude, longitude); //用户当前位置
@ -454,7 +458,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
startActivityForResult(intents, 0x102);
break;
case R.id.tv_combo://自动连拍:
poiVideoBuilder.append("点击了自动连拍的按钮 ,");
poiVideoBuilder.append(TimestampUtil.time()).append("点击了自动连拍的按钮 ,");
LatLng startLng = new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude()); //用户当前位置
double geom = GeometryTools.distanceToDouble(startLng, latLng);
double rearGeom = GeometryTools.distanceToDouble(startLng, rearLatLng);
@ -478,7 +482,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
startActivityForResult(intent, 0x101);
break;
case R.id.btn_poi_video_upload:
poiVideoBuilder.append("点击了上传的按钮 ,");
poiVideoBuilder.append(TimestampUtil.time()).append("点击了上传的按钮 ,");
if (Constant.isPresent) {
if (fmPoiVideoPic.getTag() != null) {
List<File> videoFileList = (List<File>) fmPoiVideoPic.getTag();
@ -597,10 +601,6 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退
WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台保存中，请稍候...");
WaitDialog.dismiss(1000);
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
}
private void poiVideoUpload(int poiVideoBody, File fileZip) {
@ -775,13 +775,13 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
@Override
public void onPause() {
super.onPause();
poiVideoBuilder.append("onPause ,");
poiVideoBuilder.append(TimestampUtil.time()).append("onPause ,");
}
@Override
public void onStop() {
super.onStop();
poiVideoBuilder.append("onStop ,");
poiVideoBuilder.append(TimestampUtil.time()).append("onStop ,");
}
@Override
@ -792,7 +792,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
if (markerPoiVideo != null) {
markerPoiVideo.remove();
}
poiVideoBuilder.append("onDestroy ");
poiVideoBuilder.append(TimestampUtil.time()).append("onDestroy ");
poiVideoBuilder.append("\r\n");
FileUtils.writeFile(logFile.getAbsolutePath(), poiVideoBuilder.toString(), true);
}
@ -820,7 +820,8 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
new Thread(new Runnable() {
@Override
public void run() {
poiDao.deletePoiEntity(poiEntity);
poiEntity.setTaskStatus(100);
poiDao.updatePoiEntity(poiEntity);
}
}).start();
if (poiEntity.getId() != null) {

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

@ -142,6 +142,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
.setOnOkButtonClickListener(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
roadBuilder.append(TimestampUtil.time()).append("点击了返回当前页面的 确认 按钮,");
if (showPoiEntity != null) {
if (showPoiEntity.getTaskStatus() == 5) {
initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity);
@ -192,6 +193,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
.setOnCancelButtonClickListener(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
roadBuilder.append(TimestampUtil.time()).append("点击了返回当前页面的 取消 按钮,");
return false;
}
});
@ -227,6 +229,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
roadBuilder.append(TimestampUtil.time()).append("点击长按删除 确定按钮,");
List<File> fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId());
for (int i = 0; i < fileListByUUID.size(); i++) {
fileListByUUID.get(i).delete();
@ -433,20 +436,21 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
break;
case R.id.fm_road_picture:
roadBuilder.append(TimestampUtil.time()).append("点击了图片查看列表 ,");
if (fmRoadPic.getTag() == null) {
Toast.makeText(getContext(), "还没有拍摄", Toast.LENGTH_SHORT).show();
return;
List<File> fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId());
if (fileListByUUID.size()>1){
Intent photoAlbumIntent = new Intent(getActivity(), FragmentManagement.class);
photoAlbumIntent.putExtra("tag", 36);
photoAlbumIntent.putExtra("showPoiEntity", showPoiEntity);
startActivity(photoAlbumIntent);
}else {
Toast.makeText(getContext(), "请拍摄", Toast.LENGTH_SHORT).show();
}
Intent photoAlbumIntent = new Intent(getActivity(), FragmentManagement.class);
photoAlbumIntent.putExtra("tag", 36);
photoAlbumIntent.putExtra("showPoiEntity", showPoiEntity);
startActivity(photoAlbumIntent);
break;
case R.id.tv_pictures:
roadBuilder.append(TimestampUtil.time()).append("点击了自动拍照的按钮 ,");
double latitude = Constant.currentLocation.getLatitude();
double longitude = Constant.currentLocation.getLongitude();
LatLng startLatLng = new LatLng(latitude, longitude); //用户当前位置
LatLng startLatLng = new LatLng(latitude, longitude);//用户当前位置
double geometry = GeometryTools.distanceToDouble(startLatLng, latLng);
double rearGeometry = GeometryTools.distanceToDouble(startLatLng, rearLatLng);
if (geometry > rearGeometry) {//用戶在终点开始作业
@ -587,10 +591,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退
WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台保存中，请稍候...");
WaitDialog.dismiss(1000);
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
}
@ -804,7 +804,8 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
new Thread(new Runnable() {
@Override
public void run() {
poiDao.deletePoiEntity(poiEntity);
poiEntity.setTaskStatus(100);
poiDao.updatePoiEntity(poiEntity);
}
}).start();
if (poiEntity.getId() != null) {

23
app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java
View File

@ -41,6 +41,7 @@ import com.navinfo.outdoor.room.PoiDatabase;
import com.navinfo.outdoor.room.PoiEntity;
import com.navinfo.outdoor.util.FlushTokenUtil;
import com.navinfo.outdoor.util.PoiSaveUtils;
import com.navinfo.outdoor.util.TimestampUtil;
import com.umeng.umcrash.UMCrash;
import org.greenrobot.eventbus.EventBus;
@ -108,7 +109,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
staySubmitAdapter.setOnClickItem(new StaySubmitAdapter.onClickItem() {
@Override
public void item(int position, PoiEntity poiEntity) {
staySubmitBuilder.append("点击了条目item 进行跳转 ,");
staySubmitBuilder.append(TimestampUtil.time()).append("点击了条目item 进行跳转 ,");
Message subObtain = Message.obtain();
subObtain.what = Constant.EVENT_WORK_HOME;
subObtain.obj = true;
@ -123,11 +124,17 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
cbSelect.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
staySubmitBuilder.append("点击了全选进行勾选 ,");
staySubmitBuilder.append(TimestampUtil.time()).append("点击了全选进行勾选 ,");
staySubmitAdapter.setAllDataChecked(isChecked);
staySubmitAdapter.notifyDataSetChanged();
}
});
}
@Override
public void onResume() {
super.onResume();
if (Constant.currentLocation != null) {
if (Constant.USHERED != null) {
cbSelect.setChecked(false);
@ -157,7 +164,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
}
}
staySubmitBuilder = new StringBuilder();
staySubmitBuilder.append("StaySubmitFragment-onCreate-initData ,");
staySubmitBuilder.append(TimestampUtil.time()).append("StaySubmitFragment-onCreate-initData ,");
if (Constant.USHERED != null) {
staySubmitBuilder.append("userId:").append(Constant.USHERED).append(",");
}
@ -192,7 +199,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
public void onStop() {
super.onStop();
dismissLoadingDialog();
staySubmitBuilder.append("onStop ,");
staySubmitBuilder.append(TimestampUtil.time()).append("onStop ,");
}
public List<PoiEntity> initRoadWord(int type) {
@ -214,7 +221,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
public void onClick(View v) {
switch (v.getId()) {
case R.id.cl_stay_type://1 "POI"2 "充电站"3 "POI录像"4 "道路录像"5 "其他"6 "面状任务"
staySubmitBuilder.append("点击了待提交的类型 ,");
staySubmitBuilder.append(TimestampUtil.time()).append("点击了待提交的类型 ,");
BottomMenu.show((AppCompatActivity) Objects.requireNonNull(getContext()), new String[]{"全部", "poi", "充电站", "poi录像", "道路录像", "其他"}, new OnMenuItemClickListener() {
@Override
public void onClick(String text, int index) {
@ -250,7 +257,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
break;
case R.id.tv_delete:
staySubmitBuilder.append("点击了删除按钮 ,");
staySubmitBuilder.append(TimestampUtil.time()).append("点击了删除按钮 ,");
if (Constant.isPresent) {
DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@ -265,7 +272,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
}
break;
case R.id.btn_stay_submit://提交
staySubmitBuilder.append("点击了提交的按钮 ,");
staySubmitBuilder.append(TimestampUtil.time()).append("点击了提交的按钮 ,");
if (Constant.isPresent) {
if (poiEntities == null) {
poiEntities = new ArrayList<>();
@ -423,7 +430,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
@Override
public void onPause() {
super.onPause();
staySubmitBuilder.append("onPause ,");
staySubmitBuilder.append(TimestampUtil.time()).append("onPause ,");
}
@Override

13
app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java
View File

@ -29,6 +29,7 @@ import com.navinfo.outdoor.http.OkGoBuilder;
import com.jcodecraeer.xrecyclerview.ProgressStyle;
import com.jcodecraeer.xrecyclerview.XRecyclerView;
import com.navinfo.outdoor.util.FlushTokenUtil;
import com.navinfo.outdoor.util.TimestampUtil;
import org.json.JSONObject;
@ -99,7 +100,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis
taskExplainAdapter.setOnItemClick(new TaskExplainAdapter.OnItemClick() {
@Override
public void onClick(int pos) {
taskExplainBuilder.append("点击了item ,");
taskExplainBuilder.append(TimestampUtil.time()).append("点击了item ,");
Intent itemIntent = new Intent(getActivity(), FragmentManagement.class);
itemIntent.putExtra("tag", 10);
itemIntent.putExtra("id", pos + "");
@ -131,7 +132,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis
}
}
taskExplainBuilder = new StringBuilder();
taskExplainBuilder.append("TaskExplainFragment-onCreate-initData ,");
taskExplainBuilder.append(TimestampUtil.time()).append("TaskExplainFragment-onCreate-initData ,");
if (Constant.USHERED != null) {
taskExplainBuilder.append("userId:").append(Constant.USHERED).append(",");
}
@ -213,26 +214,26 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis
public void onClick(View v) {
if (v.getId() == R.id.iv_find_task_explain) {
Objects.requireNonNull(getActivity()).finish();
taskExplainBuilder.append("点击了返回的按钮 ,");
taskExplainBuilder.append(TimestampUtil.time()).append("点击了返回的按钮 ,");
}
}
@Override
public void onPause() {
super.onPause();
taskExplainBuilder.append("onPause ,");
taskExplainBuilder.append(TimestampUtil.time()).append("onPause ,");
}
@Override
public void onStop() {
super.onStop();
taskExplainBuilder.append("onStop ,");
taskExplainBuilder.append(TimestampUtil.time()).append("onStop ,");
}
@Override
public void onDestroy() {
super.onDestroy();
taskExplainBuilder.append("onDestroy");
taskExplainBuilder.append(TimestampUtil.time()).append("onDestroy");
taskExplainBuilder.append("\r\n");
FileUtils.writeFile(logFile.getAbsolutePath(), taskExplainBuilder.toString(), true);
}

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

@ -73,6 +73,7 @@ import com.navinfo.outdoor.util.GeometryTools;
import com.navinfo.outdoor.util.MapManager;
import com.navinfo.outdoor.util.MyTecentLocationSource;
import com.navinfo.outdoor.util.NetWorkUtils;
import com.navinfo.outdoor.util.TimestampUtil;
import com.navinfo.outdoor.util.ToastUtil;
import com.sothree.slidinguppanel.ScrollableViewHelper;
import com.sothree.slidinguppanel.SlidingUpPanelLayout;
@ -154,47 +155,17 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
private File logFile;
private StringBuilder treasureBuilder;
private Marker gatherMarker;
/*private boolean isHandler = false;
private Handler handler = new Handler(new Handler.Callback() {
@Override
public boolean handleMessage(@NonNull Message msg) {
if (msg.what == 0x101) {
if (!isHandler) {
dismissLoadingDialog();
OkGo.getInstance().cancelTag(this);
Constant.isPresent = true;
DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "寻宝删选接口请求失败", "重新请求", "退出程序")
.setOnOkButtonClickListener(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
treasureBuilder.append("onFinish-获取到当前位置,");
PoiDatabase poiDatabase = PoiDatabase.getInstance(getContext());
poiDao = poiDatabase.getPoiDao();
refreshFilterData();
//上传用户位置金纬度
iniUserLocation();
//确定手机号
initPhone();
//检查是否有没有填完的页面
initSharePre();
return false;
}
}).setOnCancelButtonClickListener(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
getActivity().finish();
return false;
}
});
}else {
Toast.makeText(getActivity(), "寻宝删选接口请求成功", Toast.LENGTH_SHORT).show();
if (ivFilter != null) {
ivFilter.setEnabled(true);
}
}
return false;
}
});*/
});
public static TreasureFragment newInstance(Bundle bundle) {
TreasureFragment fragment = new TreasureFragment();
fragment.setArguments(bundle);
@ -291,7 +262,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
dismissLoadingDialog();
PoiDatabase poiDatabase = PoiDatabase.getInstance(getContext());
poiDao = poiDatabase.getPoiDao();
treasureBuilder.append("onFinish-获取到当前位置,");
treasureBuilder.append(TimestampUtil.time()).append("onFinish-获取到当前位置,");
refreshFilterData();
//上传用户位置金纬度
iniUserLocation();
@ -355,11 +326,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
initThread(); // 刷新筛选的本地数据
}
if (Constant.currentLocation != null) {
/* //延时60秒
Message message = new Message();
message.what = 0x101;
handler.sendMessageDelayed(message, 60000);
isHandler = false;*/
initList(Constant.currentLocation); // 刷新筛选的网络数据
} else {
Toast.makeText(getActivity(), "未开启定位服务", Toast.LENGTH_SHORT).show();
@ -1593,7 +1559,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
}
}
treasureBuilder = new StringBuilder();
treasureBuilder.append("TreasureFragment-onViewCreated-initData,");
treasureBuilder.append(TimestampUtil.time()).append("TreasureFragment-onViewCreated-initData,");
if (Constant.USHERED != null) {
treasureBuilder.append("userId:").append(Constant.USHERED).append(",");
}
@ -1616,7 +1582,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "你poi页面还有未提交完的数据，之前的成果已保存，点击确定可继续作业", "确定").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
treasureBuilder.append("initSharePre-点击了poi，");
treasureBuilder.append(TimestampUtil.time()).append("未提交完的数据-点击了poi，");
Bundle bundle = new Bundle();
bundle.putSerializable("poiEntity", poiEntity);
PoiFragment poiFragment = PoiFragment.newInstance(bundle);
@ -1632,7 +1598,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "你充电站页面还有未提交完的数据，之前的成果已保存，点击确定可继续作业", "确定").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
treasureBuilder.append("initSharePre-点击了充电站，");
treasureBuilder.append(TimestampUtil.time()).append("未提交完的数据-点击了充电站，");
Bundle bundle = new Bundle();
bundle.putSerializable("poiEntity", poiEntity);
ChargingStationFragment chargingStationFragment = ChargingStationFragment.newInstance(bundle);
@ -1648,7 +1614,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "你poi录像页面还有未提交完的数据，之前的成果已保存，点击确定可继续作业", "确定").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
treasureBuilder.append("initSharePre-点击了poi录像，");
treasureBuilder.append(TimestampUtil.time()).append("未提交完的数据-点击了poi录像，");
Bundle bundle = new Bundle();
bundle.putSerializable("poiEntity", poiEntity);
PoiVideoFragment poiVideoFragment = PoiVideoFragment.newInstance(bundle);
@ -1664,7 +1630,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "你道路页面还有未提交完的数据，之前的成果已保存，点击确定可继续作业", "确定").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
treasureBuilder.append("initSharePre-点击了道路，");
treasureBuilder.append(TimestampUtil.time()).append("未提交完的数据-点击了道路，");
Bundle bundle = new Bundle();
bundle.putSerializable("poiEntity", poiEntity);
RoadFragment roadFragment = RoadFragment.newInstance(bundle);
@ -1680,7 +1646,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "你其他页面还有未提交完的数据，之前的成果已保存，点击确定可继续作业", "确定").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
treasureBuilder.append("initSharePre-点击了其他，");
treasureBuilder.append(TimestampUtil.time()).append("未提交完的数据-点击了其他，");
Bundle bundle = new Bundle();
bundle.putSerializable("poiEntity", poiEntity);
OtherFragment otherFragment = OtherFragment.newInstance(bundle);
@ -1731,14 +1697,14 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
public void onPause() {
super.onPause();
mapView.onPause();
treasureBuilder.append("onPause,");
treasureBuilder.append(TimestampUtil.time()).append("onPause,");
}
@Override
public void onStop() {
super.onStop();
mapView.onStop();
treasureBuilder.append("onStop,");
treasureBuilder.append(TimestampUtil.time()).append("onStop,");
}
@Override
@ -1748,7 +1714,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
}
super.onDestroy();
mapView.onDestroy();
treasureBuilder.append("onDestroy");
treasureBuilder.append(TimestampUtil.time()).append("onDestroy");
treasureBuilder.append("\r\n");
FileUtils.writeFile(logFile.getAbsolutePath(), treasureBuilder.toString(), true);
@ -1765,21 +1731,21 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
public void onClick(View v) {
switch (v.getId()) {
case R.id.iv_zoom_add://放大
treasureBuilder.append("点击了放大的按钮,");
treasureBuilder.append(TimestampUtil.time()).append("点击了放大的按钮,");
CameraUpdate cameraUpdateIn = CameraUpdateFactory.zoomIn();
tencentMap.animateCamera(cameraUpdateIn);
break;
case R.id.iv_zoom_del://缩小:
treasureBuilder.append("点击了缩小的按钮,");
treasureBuilder.append(TimestampUtil.time()).append("点击了缩小的按钮,");
CameraUpdate cameraUpdateOut = CameraUpdateFactory.zoomOut();
tencentMap.animateCamera(cameraUpdateOut);
break;
case R.id.iv_refrish://刷新:
treasureBuilder.append("点击了刷新的按钮,");
treasureBuilder.append(TimestampUtil.time()).append("点击了刷新的按钮,");
refreshFilterData();
break;
case R.id.iv_location://定位:
treasureBuilder.append("点击了定位的按钮,");
treasureBuilder.append(TimestampUtil.time()).append("点击了定位的按钮,");
if (Constant.currentLocation != null) {
CameraUpdate cameraSigma =
CameraUpdateFactory.newCameraPosition(new CameraPosition(
@ -1794,18 +1760,20 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
}
break;
case R.id.iv_submit://弹窗
treasureBuilder.append("点击了弹窗 上报的按钮,");
treasureBuilder.append(TimestampUtil.time()).append("点击了弹窗 上报的按钮,");
initSubmit();
break;
case R.id.iv_filter:
treasureBuilder.append("点击了删选的按钮,");
treasureBuilder.append(TimestampUtil.time()).append("点击了删选的按钮,");
debounce(ivFilter);
FilterFragment filterFragment = FilterFragment.newInstance(new Bundle());
showSlidingFragment(filterFragment);
refreshFilterData();
v.setEnabled(false);
handler.sendEmptyMessageDelayed(0x101, 2000);
break;
case R.id.iv_message:
treasureBuilder.append("点击了消息的按钮,");
treasureBuilder.append(TimestampUtil.time()).append("点击了消息的按钮,");
Intent messageIntent = new Intent(getContext(), FragmentManagement.class);
messageIntent.putExtra("tag", 35);
startActivity(messageIntent);
@ -1869,25 +1837,25 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
if (item.getText().equals("POI")) {
PoiFragment poiFragment = PoiFragment.newInstance(bundle);
showSlidingFragment(poiFragment);
treasureBuilder.append("点击弹窗上的poi,");
treasureBuilder.append(TimestampUtil.time()).append("点击弹窗上的poi,");
} else if (item.getText().equals("充电站")) {
ChargingStationFragment chargingStationFragment = ChargingStationFragment.newInstance(bundle);
showSlidingFragment(chargingStationFragment);
treasureBuilder.append("点击弹窗上的充电站,");
treasureBuilder.append(TimestampUtil.time()).append("点击弹窗上的充电站,");
} else if (item.getText().equals("POI录像")) {
poiEntity.setWork_type(1);
bundle.putSerializable("poiEntity", poiEntity);
PoiVideoFragment poiVideoFragment = PoiVideoFragment.newInstance(bundle);
showSlidingFragment(poiVideoFragment);
treasureBuilder.append("点击弹窗上的poi录像,");
treasureBuilder.append(TimestampUtil.time()).append("点击弹窗上的poi录像,");
} else if (item.getText().equals("道路")) {
RoadFragment roadFragment = RoadFragment.newInstance(bundle);
showSlidingFragment(roadFragment);
treasureBuilder.append("点击弹窗上的道路,");
treasureBuilder.append(TimestampUtil.time()).append("点击弹窗上的道路,");
} else if (item.getText().equals("其他")) {
OtherFragment otherFragment = OtherFragment.newInstance(bundle);
showSlidingFragment(otherFragment);
treasureBuilder.append("点击弹窗上的其他,");
treasureBuilder.append(TimestampUtil.time()).append("点击弹窗上的其他,");
}
return false;
}
@ -2069,7 +2037,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
TencentMap.OnMarkerClickListener markerClickListener = new TencentMap.OnMarkerClickListener() {
@Override
public boolean onMarkerClick(Marker marker) {
treasureBuilder.append("TencentMap.OnMarkerClickListener-点击了Marker,");
treasureBuilder.append(TimestampUtil.time()).append("TencentMap.OnMarkerClickListener-点击了Marker,");
LatLng latLng = marker.getPosition();
ArrayList<LatLng> lngArrayList = new ArrayList<>();//存储的是内部的屏幕点坐标
Projection projection = tencentMap.getProjection();
@ -2261,7 +2229,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
*/
public void customDialog(List<PoiEntity> list, Marker marker) {
AlertDialog dialog = builder.create();
treasureBuilder.append("customDialog-打开了自定义的dialog,");
treasureBuilder.append(TimestampUtil.time()).append("customDialog-打开了自定义的dialog,");
View dialogView = View.inflate(getActivity(), R.layout.layout_marker_dialog, null);
dialog.setView(dialogView);
Window win = dialog.getWindow();
@ -2282,7 +2250,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
markerAdapter.setOnBankClick(new MarkerAdapter.OnBankClick() {
@Override
public void onClick(PoiEntity poiEntity) {
treasureBuilder.append("customDialog-点击了item,");
treasureBuilder.append(TimestampUtil.time()).append("customDialog-点击了item,");
FragmentTransaction fragmentTransaction = supportFragmentManager.beginTransaction();
if (poiEntity.getTaskStatus() == 0) {//网络未领取，
initMarker(poiEntity, true);

37
app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java
View File

@ -38,6 +38,7 @@ import com.navinfo.outdoor.http.HttpInterface;
import com.navinfo.outdoor.http.OkGoBuilder;
import com.navinfo.outdoor.util.FlushTokenUtil;
import com.navinfo.outdoor.util.PhotoUtils;
import com.navinfo.outdoor.util.TimestampUtil;
import java.io.File;
import java.text.DateFormat;
@ -107,7 +108,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
}
}
userAttestationBuilder = new StringBuilder();
userAttestationBuilder.append("UserAttestationFragment-onCreate-initData ,");
userAttestationBuilder.append(TimestampUtil.time()).append("UserAttestationFragment-onCreate-initData ,");
if (Constant.USHERED != null) {
userAttestationBuilder.append("userId:").append(Constant.USHERED).append(",");
}
@ -200,25 +201,25 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
public void onClick(View v) {
switch (v.getId()) {
case R.id.iv_attestation:
userAttestationBuilder.append("点击了进行返回 ,");
userAttestationBuilder.append(TimestampUtil.time()).append("点击了进行返回 ,");
Objects.requireNonNull(getActivity()).finish();
break;
case R.id.iv_attestation1:
userAttestationBuilder.append("点击身份证人像面 进行拍照 ,");
userAttestationBuilder.append(TimestampUtil.time()).append("点击身份证人像面 进行拍照 ,");
Intent ivAttestationIntent1 = new Intent(getActivity(), PhotographActivity.class);
File attestationFile1 = PhotoUtils.showPhotoFile("a", null);
ivAttestationIntent1.putExtra(Constant.INTENT_PHOTO_PATH, attestationFile1.getPath());
startActivityForResult(ivAttestationIntent1, 121);
break;
case R.id.iv_attestation2:
userAttestationBuilder.append("点击身份证国徽面 进行拍照 ,");
userAttestationBuilder.append(TimestampUtil.time()).append("点击身份证国徽面 进行拍照 ,");
Intent ivAttestationIntent2 = new Intent(getActivity(), PhotographActivity.class);
File attestationFile2 = PhotoUtils.showPhotoFile("b", null);
ivAttestationIntent2.putExtra(Constant.INTENT_PHOTO_PATH, attestationFile2.getPath());
startActivityForResult(ivAttestationIntent2, 122);
break;
case R.id.iv_attestation3:
userAttestationBuilder.append("点击手持身份证 进行拍照 ,");
userAttestationBuilder.append(TimestampUtil.time()).append("点击手持身份证 进行拍照 ,");
Intent ivAttestationIntent3 = new Intent(getActivity(), PhotographActivity.class);
File attestationFile3 = PhotoUtils.showPhotoFile("c", null);
ivAttestationIntent3.putExtra(Constant.INTENT_PHOTO_PATH, attestationFile3.getPath());
@ -240,7 +241,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
nameAuthentication();
break;
case R.id.user_attestation_camera:
userAttestationBuilder.append("点击认证按钮 ,");
userAttestationBuilder.append(TimestampUtil.time()).append("点击认证按钮 ,");
Intent userCameraIntent = new Intent(getActivity(), PhotographActivity.class);
File file = PhotoUtils.showPhotoFile("d", null);
userCameraIntent.putExtra(Constant.INTENT_PHOTO_PATH, file.getPath());
@ -260,9 +261,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
}
/*
* 中文姓名效验
*/
/*中文姓名效验*/
static boolean chineseNameTest(String name) {
if (!name.matches("[\u4e00-\u9fa5]{2,4}")) {
System.out.println("只能输入2到4个汉字");
@ -324,7 +323,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "提交成功", "确定").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
userAttestationBuilder.append("提交成功 ,");
userAttestationBuilder.append(TimestampUtil.time()).append("提交成功 ,");
Constant.NAME = attestationName;
Constant.ID_NUM = namePhone;
Constant.AUDIOTAPES = -1;
@ -426,28 +425,28 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
if (inward != null) {
IdCardNumberBean idCardNumberBean = new Gson().fromJson(inward, IdCardNumberBean.class);
if (idCardNumberBean == null) {
userAttestationBuilder.append("识别失败，可以重新识别或则进行手动输入 ,");
userAttestationBuilder.append(TimestampUtil.time()).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("身份号识别成功 ,");
userAttestationBuilder.append(TimestampUtil.time()).append("身份号识别成功 ,");
} else {
Toast.makeText(getActivity(), "身份号识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show();
userAttestationBuilder.append("身份号识别失败，可以重新识别或则进行手动输入 ,");
userAttestationBuilder.append(TimestampUtil.time()).append("身份号识别失败，可以重新识别或则进行手动输入 ,");
}
if (idCardNumberBean.getWords_result().get姓名() != null) {
String words = idCardNumberBean.getWords_result().get姓名().getWords();
etAttestationName.setText(words);
userAttestationBuilder.append("姓名识别成功 ,");
userAttestationBuilder.append(TimestampUtil.time()).append("姓名识别成功 ,");
} else {
Toast.makeText(getActivity(), "姓名识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show();
userAttestationBuilder.append("姓名识别失败，可以重新识别或则进行手动输入 ,");
userAttestationBuilder.append(TimestampUtil.time()).append("姓名识别失败，可以重新识别或则进行手动输入 ,");
}
}
} else {
userAttestationBuilder.append("识别失败，可以重新识别或则进行手动输入 ,");
userAttestationBuilder.append(TimestampUtil.time()).append("识别失败，可以重新识别或则进行手动输入 ,");
Toast.makeText(getActivity(), "识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show();
}
@ -461,19 +460,19 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
@Override
public void onPause() {
super.onPause();
userAttestationBuilder.append("onPause ,");
userAttestationBuilder.append(TimestampUtil.time()).append("onPause ,");
}
@Override
public void onStop() {
super.onStop();
userAttestationBuilder.append("onStop ,");
userAttestationBuilder.append(TimestampUtil.time()).append("onStop ,");
}
@Override
public void onDestroy() {
super.onDestroy();
userAttestationBuilder.append("onDestroy");
userAttestationBuilder.append(TimestampUtil.time()).append("onDestroy");
userAttestationBuilder.append("\r\n");
FileUtils.writeFile(logFile.getAbsolutePath(), userAttestationBuilder.toString(), true);
}

27
app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java
View File

@ -33,6 +33,7 @@ import com.navinfo.outdoor.http.Callback;
import com.navinfo.outdoor.http.HttpInterface;
import com.navinfo.outdoor.http.OkGoBuilder;
import com.navinfo.outdoor.util.FlushTokenUtil;
import com.navinfo.outdoor.util.TimestampUtil;
import java.io.File;
import java.text.DateFormat;
@ -83,7 +84,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
}
}
withdrawBuilder = new StringBuilder();
withdrawBuilder.append("WithdrawFragment-onViewCreated-initData,");
withdrawBuilder.append(TimestampUtil.time()).append("WithdrawFragment-onViewCreated-initData,");
if (Constant.USHERED != null) {
withdrawBuilder.append("userId:").append(Constant.USHERED).append(",");
}
@ -110,10 +111,10 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
if (Constant.BACKGROUND == null) {
Toast.makeText(getActivity(), "没有绑定银行卡，请先绑定银行卡", Toast.LENGTH_SHORT).show();
checkBox.setChecked(false);
withdrawBuilder.append("点击了银行卡的勾选,");
withdrawBuilder.append(TimestampUtil.time()).append("点击了银行卡的勾选,");
} else {
checkBox.setChecked(true);
withdrawBuilder.append("取消了银行卡的勾选,");
withdrawBuilder.append(TimestampUtil.time()).append("取消了银行卡的勾选,");
}
}
}
@ -194,22 +195,21 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
});
}
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.iv_withdraw:
withdrawBuilder.append("点击了财务信息的返回 ,");
withdrawBuilder.append(TimestampUtil.time()).append("点击了财务信息的返回 ,");
Objects.requireNonNull(getActivity()).finish();
break;
case R.id.tv_text:
withdrawBuilder.append("点击了提现记录 ,");
withdrawBuilder.append(TimestampUtil.time()).append("点击了提现记录 ,");
Intent intentText = new Intent(getActivity(), FragmentManagement.class);
intentText.putExtra("tag", 26);
startActivity(intentText);
break;
case R.id.button:
withdrawBuilder.append("点击了立即提现 ,");
withdrawBuilder.append(TimestampUtil.time()).append("点击了立即提现 ,");
String price = etAllPrice.getText().toString().trim();
if (!price.equals("")) {
double aDouble = Double.parseDouble(price);
@ -230,6 +230,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否提取到" + Constant.BACKGROUND.substring(Constant.BACKGROUND.length() - 4) + "的银行卡", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
withdrawBuilder.append(TimestampUtil.time()).append("点击了提取到银行卡的确定按钮 ,");
immediatelyPrice();
return false;
}
@ -240,7 +241,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
}
break;
case R.id.tv_all:
withdrawBuilder.append("点击了全部 ,");
withdrawBuilder.append(TimestampUtil.time()).append("点击了全部 ,");
if (canExchangePrice != 0) {
etAllPrice.setText(canExchangePrice + "");
}
@ -271,7 +272,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "该提现申请已提交", "确定").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
@Override
public boolean onClick(BaseDialog baseDialog, View v) {
withdrawBuilder.append("提现了成功 ，");
withdrawBuilder.append(TimestampUtil.time()).append("提现了成功 ，");
initNetWork();
return false;
}
@ -279,7 +280,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
} else if (response.getCode() == 230) {
FlushTokenUtil.flushToken(getActivity());
} else {
withdrawBuilder.append("提现了失败 ，");
withdrawBuilder.append(TimestampUtil.time()).append("提现了失败 ，");
Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show();
}
etAllPrice.getText().clear();
@ -304,19 +305,19 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
@Override
public void onPause() {
super.onPause();
withdrawBuilder.append("onPause,");
withdrawBuilder.append(TimestampUtil.time()).append("onPause,");
}
@Override
public void onStop() {
super.onStop();
withdrawBuilder.append("onStop,");
withdrawBuilder.append(TimestampUtil.time()).append("onStop,");
}
@Override
public void onDestroy() {
super.onDestroy();
withdrawBuilder.append("onDestroy");
withdrawBuilder.append(TimestampUtil.time()).append("onDestroy");
withdrawBuilder.append("\r\n");
FileUtils.writeFile(logFile.getAbsolutePath(), withdrawBuilder.toString(), true);
}

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

@ -1,8 +1,8 @@
package com.navinfo.outdoor.http;
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/";//发现
public static final String USER_LOGIN_PATH ="/userlogin/";//登录

5
app/src/main/java/com/navinfo/outdoor/room/PoiDao.java
View File

@ -20,7 +20,7 @@ public interface PoiDao {
@Query("SELECT * FROM poi")
List<PoiEntity> getAllPoi();
@Query("SELECT * FROM poi where taskStatus > 1 and type!=6")
@Query("SELECT * FROM poi where taskStatus > 1 and taskStatus!=100 and type!=6 ")
List<PoiEntity> getAllPoiByRecoded();
@Query("SELECT * FROM poi where type=:type")
@ -29,7 +29,7 @@ public interface PoiDao {
@Query("SELECT * FROM poi where taskStatus =5")
List<PoiEntity> getAllPoiStatus();
@Query("SELECT * FROM poi WHERE (:taskStatus =-1 or taskStatus=:taskStatus1) and (:type=-1 or type=:type1) and (:isExclusive=-1 or isExclusive=:isExclusive1) ")
@Query("SELECT * FROM poi WHERE (:taskStatus =-1 or taskStatus=:taskStatus1) and (:type=-1 or type=:type1) and (:isExclusive=-1 or isExclusive=:isExclusive1) and taskStatus !=100")
// @Query("SELECT * FROM poi WHERE taskStatus=:taskStatus and type=:type and (:isExclusive=-1 or isExclusive=:isExclusive) ")
List<PoiEntity> getAllTaskStatus(int taskStatus, int taskStatus1, int type, int type1, int isExclusive, int isExclusive1);
@ -39,6 +39,7 @@ public interface PoiDao {
@Query("SELECT * FROM poi where taskId=:taskId")
PoiEntity getTaskIdPoiEntity(int taskId);
/**
* 添加
*/

2
app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java
View File

@ -42,7 +42,7 @@ public class PoiEntity implements Serializable {
private String y;//纬度
private String detail;//需要保存的数据的wkt
private String dist;//距离用户位置
private int taskStatus;//任务状态 0.未领取 1.已领取，5 立即采集，2.未保存(保存到本地但未提交成功),3.已保存(保存到本地提交成功)，4已上传（结束采集）
private int taskStatus;//任务状态 0.未领取 1.已领取，5 立即采集，2.未保存(保存到本地但未提交成功),3.已保存(保存到本地提交成功)，4已上传（结束采集）,100 上传成功
private int type;//1 "POI"2 "充电站"3 "POI录像"4 "道路录像"5 "其他"6 "面状任务"
private int station_type;//1."充电站"2 "充换电站"3 "充电桩组"4 "换电站"5 "门牌", "公交:6 情报:7
private int isLocalData;//是否是本地数据 0,服务 1,本地

3
app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java
View File

@ -352,7 +352,8 @@ public class PoiSaveUtils {
Gson gson = new Gson();
OtherUploadPicBean otherUploadPicBean = gson.fromJson(bodyStr, OtherUploadPicBean.class);
if (otherUploadPicBean.getCode() == 200) {
PoiDatabase.getInstance(mContext).getPoiDao().deletePoiEntity(poiEntity);
poiEntity.setTaskStatus(100);
PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(poiEntity);
for (int i = 0; i < list.size(); i++) {
list.get(i).delete();
}

25
app/src/main/java/com/navinfo/outdoor/util/PreserveUtils.java
View File

@ -66,11 +66,6 @@ public class PreserveUtils {
obtain1.what = Constant.NEST_WORD_SUBMIT;
obtain1.obj = "道路：" + poiEntity.getName() + " 保存成功";
EventBus.getDefault().post(obtain1);
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
}
});
}
@ -126,11 +121,6 @@ public class PreserveUtils {
obtain1.what = Constant.NEST_WORD_SUBMIT;
obtain1.obj = "Poi：" + poiEntity.getName() + " 保存成功";
EventBus.getDefault().post(obtain1);
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
}
});
}
@ -188,11 +178,6 @@ public class PreserveUtils {
obtain1.what = Constant.NEST_WORD_SUBMIT;
obtain1.obj = "Poi录像：" + poiEntity.getName() + " 保存成功";
EventBus.getDefault().post(obtain1);
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
}
});
}
@ -249,11 +234,6 @@ public class PreserveUtils {
obtain1.what = Constant.NEST_WORD_SUBMIT;
obtain1.obj = "其他：" + poiEntity.getName() + " 保存成功";
EventBus.getDefault().post(obtain1);
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
}
});
}
@ -311,11 +291,6 @@ public class PreserveUtils {
obtain1.what = Constant.NEST_WORD_SUBMIT;
obtain1.obj = "充电站：" + poiEntity.getName() + " 保存成功";
EventBus.getDefault().post(obtain1);
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
}
});
}

75
app/src/main/java/com/navinfo/outdoor/util/UploadUtils.java
View File

@ -43,14 +43,11 @@ public class UploadUtils {
@Override
public void onSuccess(OtherUploadPicBean response, int id) {
if (response.getCode() == 200) {
Message obtain1 = Message.obtain();
obtain1.what = Constant.NEST_WORD_SUBMIT;
obtain1.obj = "道路：" + showPoiEntity.getName() + " 上传成功";
EventBus.getDefault().post(obtain1);
new Thread(new Runnable() {
@Override
public void run() {
poiDao.deletePoiEntity(showPoiEntity);
showPoiEntity.setTaskStatus(100);
poiDao.updatePoiEntity(showPoiEntity);
if (showPoiEntity.getId()!=null){
List<File> fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId());
for (int i = 0; i < fileListByUUID.size(); i++) {
@ -63,10 +60,10 @@ public class UploadUtils {
Objects.requireNonNull(mContext).runOnUiThread(new Runnable() {
@Override
public void run() {
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
Message obtain1 = Message.obtain();
obtain1.what = Constant.NEST_WORD_SUBMIT;
obtain1.obj = "道路：" + showPoiEntity.getName() + " 上传成功";
EventBus.getDefault().post(obtain1);
}
});
}
@ -106,24 +103,21 @@ public class UploadUtils {
@Override
public void onSuccess(OtherUploadPicBean response, int id) {
if (response.getCode() == 200) {
Message obtain1 = Message.obtain();
obtain1.what = Constant.NEST_WORD_SUBMIT;
obtain1.obj = "Poi：" + showPoiEntity.getName() + " 上传成功";
EventBus.getDefault().post(obtain1);
new Thread(new Runnable() {
@Override
public void run() {
poiDao.deletePoiEntity(showPoiEntity);
showPoiEntity.setTaskStatus(100);
poiDao.updatePoiEntity(showPoiEntity);
for (int i = 0; i < poiPicList.size(); i++) {
poiPicList.get(i).delete();
}
Objects.requireNonNull(mContext).runOnUiThread(new Runnable() {
@Override
public void run() {
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
Message obtain1 = Message.obtain();
obtain1.what = Constant.NEST_WORD_SUBMIT;
obtain1.obj = "Poi：" + showPoiEntity.getName() + " 上传成功";
EventBus.getDefault().post(obtain1);
}
});
}
@ -163,14 +157,11 @@ public class UploadUtils {
@Override
public void onSuccess(OtherUploadPicBean response, int id) {
if (response.getCode() == 200) {
Message obtain1 = Message.obtain();
obtain1.what = Constant.NEST_WORD_SUBMIT;
obtain1.obj = "poi录像：" + showPoiEntity.getName() + " 上传成功";
EventBus.getDefault().post(obtain1);
new Thread(new Runnable() {
@Override
public void run() {
poiDao.deletePoiEntity(showPoiEntity);
showPoiEntity.setTaskStatus(100);
poiDao.updatePoiEntity(showPoiEntity);
if (showPoiEntity.getId() != null) {
List<File> fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId());
for (int i = 0; i < fileListByUUID.size(); i++) {
@ -183,10 +174,10 @@ public class UploadUtils {
Objects.requireNonNull(mContext).runOnUiThread(new Runnable() {
@Override
public void run() {
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
Message obtain1 = Message.obtain();
obtain1.what = Constant.NEST_WORD_SUBMIT;
obtain1.obj = "poi录像：" + showPoiEntity.getName() + " 上传成功";
EventBus.getDefault().post(obtain1);
}
});
}
@ -226,24 +217,21 @@ public class UploadUtils {
@Override
public void onSuccess(PoiUploadBean response, int id) {
if (response.getCode() == 200) {
Message obtain1 = Message.obtain();
obtain1.what = Constant.NEST_WORD_SUBMIT;
obtain1.obj = "其他：" + showPoiEntity.getName() + " 上传成功";
EventBus.getDefault().post(obtain1);
new Thread(new Runnable() {
@Override
public void run() {
poiDao.deletePoiEntity(showPoiEntity);
showPoiEntity.setTaskStatus(100);
poiDao.updatePoiEntity(showPoiEntity);
for (int i = 0; i < otherUploadList.size(); i++) {
otherUploadList.get(i).delete();
}
Objects.requireNonNull(mContext).runOnUiThread(new Runnable() {
@Override
public void run() {
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
Message obtain1 = Message.obtain();
obtain1.what = Constant.NEST_WORD_SUBMIT;
obtain1.obj = "其他：" + showPoiEntity.getName() + " 上传成功";
EventBus.getDefault().post(obtain1);
}
});
}
@ -284,24 +272,21 @@ public class UploadUtils {
@Override
public void onSuccess(PoiUploadBean response, int id) {
if (response.getCode() == 200) {
Message obtain1 = Message.obtain();
obtain1.what = Constant.NEST_WORD_SUBMIT;
obtain1.obj = "充电站：" + showPoiEntity.getName() + " 上传成功";
EventBus.getDefault().post(obtain1);
new Thread(new Runnable() {
@Override
public void run() {
poiDao.deletePoiEntity(showPoiEntity);
showPoiEntity.setTaskStatus(100);
poiDao.updatePoiEntity(showPoiEntity);
for (int i = 0; i < chargingStationList.size(); i++) {
chargingStationList.get(i).delete();
}
mContext.runOnUiThread(new Runnable() {
@Override
public void run() {
Message obtain = Message.obtain();
obtain.what = Constant.JOB_WORD_MONITOR;
obtain.obj = true;
EventBus.getDefault().post(obtain);
Message obtain1 = Message.obtain();
obtain1.what = Constant.NEST_WORD_SUBMIT;
obtain1.obj = "充电站：" + showPoiEntity.getName() + " 上传成功";
EventBus.getDefault().post(obtain1);
}
});
}

124
app/src/main/res/layout/fragment_gather_get.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@ -10,78 +9,97 @@
android:id="@+id/btn_delete"
android:layout_width="25dp"
android:layout_height="25dp"
android:padding="5dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="20dp"
android:background="@drawable/delete"
android:padding="5dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_title"
android:layout_width="270dp"
<LinearLayout
android:id="@+id/linear_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="15dp"
android:text="众包录像 测试3"
android:ellipsize="end"
android:lines="2"
android:textColor="#333"
android:textSize="18sp"
android:orientation="horizontal"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/btn_delete" />
app:layout_constraintTop_toBottomOf="@+id/btn_delete">
<TextView
android:id="@+id/tv_money"
android:layout_width="wrap_content"
<TextView
android:id="@+id/tv_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_weight="1"
android:ellipsize="end"
android:lines="2"
android:text="众包录像 测试3"
android:textColor="#333"
android:textSize="18sp" />
<TextView
android:id="@+id/tv_money"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="15dp"
android:text="3.5元"
android:textColor="#F44336"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/tv_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_title" />
</LinearLayout>
<RelativeLayout
android:id="@+id/relative_linear"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="3.5元"
android:textColor="#F44336"
android:textSize="20sp"
android:textStyle="bold"
android:layout_margin="15dp"
app:layout_constraintBottom_toBottomOf="@+id/tv_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_title" />
<TextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="到期时间："
android:textSize="15sp"
app:layout_constraintStart_toStartOf="@+id/tv_title"
app:layout_constraintTop_toBottomOf="@+id/tv_title" />
android:layout_marginTop="10dp"
app:layout_constraintStart_toStartOf="@+id/linear_layout"
app:layout_constraintTop_toBottomOf="@+id/linear_layout">
<TextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:text="到期时间："
android:textSize="15sp" />
<TextView
android:id="@+id/tv_distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginEnd="20dp"
android:maxLength="10"
android:text="距离："
android:textSize="15sp" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#BFB8B8"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
app:layout_constraintBottom_toBottomOf="@+id/tv_time"
app:layout_constraintTop_toTopOf="@+id/tv_describe" />
<TextView
android:id="@+id/tv_distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_marginEnd="20dp"
android:maxLength="10"
android:text="距离："
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="@+id/tv_time"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_time" />
app:layout_constraintBottom_toTopOf="@+id/tv_describe"
app:layout_constraintTop_toBottomOf="@+id/relative_linear"
tools:layout_editor_absoluteX="20dp" />
<TextView
android:id="@+id/tv_describe"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="20dp"
android:text="任务描述："
android:textSize="15sp"
android:layout_marginTop="20dp"
app:layout_constraintStart_toStartOf="@+id/tv_time"
app:layout_constraintTop_toBottomOf="@+id/tv_time" />
app:layout_constraintStart_toStartOf="@+id/relative_linear"
app:layout_constraintTop_toBottomOf="@+id/relative_linear" />
<LinearLayout
android:layout_width="match_parent"

16
app/src/main/res/layout/fragment_road.xml
View File

@ -16,15 +16,16 @@
app:layout_constraintTop_toTopOf="parent">
</include>
<androidx.core.widget.NestedScrollView
android:id="@+id/nested_scroll_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
>
android:layout_height="match_parent">
<TextView
android:id="@+id/tv_message"
android:layout_width="wrap_content"
@ -102,16 +103,15 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
app:layout_constraintLeft_toLeftOf="@id/ll_pictures"
app:layout_constraintTop_toBottomOf="@id/ll_pictures">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="点击拍摄成果可查看，长按可删除"
android:textSize="16sp"
android:layout_marginStart="10dp"
/>
android:textSize="16sp" />
<ImageView
android:id="@+id/iv_road_picture"
android:layout_width="200dp"

21
app/src/main/res/layout/gathering_fragment.xml
View File

@ -132,7 +132,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="100dp"
android:layout_marginRight="50dp"
android:layout_marginRight="30dp"
android:background="@null"
android:hint="银行卡号"
android:digits="1234567890"
@ -142,16 +142,15 @@
app:layout_constraintLeft_toRightOf="@+id/tv_creditNumbers"
/>
<ImageView
android:id="@+id/gathering_camera"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginBottom="10dp"
android:src="@drawable/ic_baseline_camera"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/et_bank_num"
app:layout_constraintTop_toTopOf="parent"
/>
<ImageView
android:id="@+id/gathering_camera"
android:layout_width="30dp"
android:layout_height="30dp"
android:src="@drawable/ic_baseline_camera"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintLeft_toRightOf="@+id/et_bank_num"
app:layout_constraintTop_toTopOf="parent" />

2
app/src/main/res/layout/poi_video_fragment.xml
View File

@ -128,7 +128,7 @@
android:layout_height="wrap_content"
android:text="点击拍摄成果可查看，长按可删除"
android:textSize="16sp"
android:layout_marginStart="10dp"/>
/>
<ImageView
android:id="@+id/iv_poi_video_picture"
android:layout_width="200dp"

8
app/src/main/res/layout/user_attestation_fragment.xml
View File

@ -140,22 +140,22 @@
android:background="@null"
android:textColorHint="@color/colorRed"
android:layout_marginLeft="100dp"
android:layout_marginRight="50dp"
android:layout_marginRight="30dp"
android:hint="点击拍照自动识别"
android:textSize="16sp"
app:layout_constraintLeft_toRightOf="@+id/tv_card"
app:layout_constraintTop_toTopOf="@+id/tv_card"
/>
<ImageView
android:id="@+id/user_attestation_camera"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginBottom="10dp"
android:src="@drawable/ic_baseline_camera"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintLeft_toRightOf="@+id/et_namePhone"
app:layout_constraintTop_toTopOf="parent"
/>
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<View