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

修改拍照模式

Browse Source
This commit is contained in:
wangdongsheng
2021-11-16 15:05:02 +08:00
parent 48ed8dd67a
commit 4f4c8e551d
12 changed files with 755 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ import android.widget.CheckBox;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.RadioButton;
import android.widget.RadioGroup; import android.widget.RadioGroup;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
@@ -164,16 +165,28 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
tvMapView.setOnClickListener(this); tvMapView.setOnClickListener(this);
ivPicRoadImage = findViewById(R.id.iv_pic); ivPicRoadImage = findViewById(R.id.iv_pic);
ivPicVideoImage = findViewById(R.id.iv_pic_video); ivPicVideoImage = findViewById(R.id.iv_pic_video);
if (type == 3) {
ivPicVideoImage.setVisibility(View.VISIBLE);
ivPicRoadImage.setVisibility(View.GONE);
} else if (type == 4) {
ivPicRoadImage.setVisibility(View.VISIBLE);
ivPicVideoImage.setVisibility(View.GONE);
}
Button btnSwitch = findViewById(R.id.btn_switch); Button btnSwitch = findViewById(R.id.btn_switch);
btnSwitch.setOnClickListener(this); btnSwitch.setOnClickListener(this);
RadioGroup radioGroupPicture = findViewById(R.id.radio_group_picture); RadioGroup radioGroupPicture = findViewById(R.id.radio_group_picture);
RadioButton radioBtnHand = findViewById(R.id.radio_btn_hand);
RadioButton radioBtnAuto = findViewById(R.id.radio_btn_auto);
RadioButton radioBtnAutoSec = findViewById(R.id.radio_btn_auto_sec);
if (type == 3) {//poiVideo 1秒
ivPicVideoImage.setVisibility(View.VISIBLE);
ivPicRoadImage.setVisibility(View.GONE);
radioPicture = 2;
radioBtnAuto.setTextColor(Color.parseColor("#FFEB3B"));
radioBtnHand.setTextColor(Color.WHITE);
radioBtnAutoSec.setTextColor(Color.WHITE);
} else if (type == 4) {//道路2秒
ivPicRoadImage.setVisibility(View.VISIBLE);
ivPicVideoImage.setVisibility(View.GONE);
radioPicture = 3;
radioBtnAutoSec.setTextColor(Color.parseColor("#FFEB3B"));
radioBtnAuto.setTextColor(Color.WHITE);
radioBtnHand.setTextColor(Color.WHITE);
}
radioGroupPicture.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { radioGroupPicture.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(RadioGroup group, int checkedId) { public void onCheckedChanged(RadioGroup group, int checkedId) {
@@ -182,14 +195,29 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
radioPicture = 1; radioPicture = 1;
isOration = true; isOration = true;
capturePicture.setText("拍摄"); capturePicture.setText("拍摄");
capturePicture.setChecked(false);
radioBtnHand.setTextColor(Color.parseColor("#FFEB3B"));
radioBtnAuto.setTextColor(Color.WHITE);
radioBtnAutoSec.setTextColor(Color.WHITE);
stopTimer();
break; break;
case R.id.radio_btn_auto://自动1秒: case R.id.radio_btn_auto://自动1秒:
radioPicture = 2; radioPicture = 2;
capturePicture.setText("开始采集"); capturePicture.setText("开始采集");
capturePicture.setChecked(false);
radioBtnAuto.setTextColor(Color.parseColor("#FFEB3B"));
radioBtnHand.setTextColor(Color.WHITE);
radioBtnAutoSec.setTextColor(Color.WHITE);
stopTimer();
break; break;
case R.id.radio_btn_auto_sec://自动2 秒 case R.id.radio_btn_auto_sec://自动2 秒
radioPicture = 3; radioPicture = 3;
capturePicture.setText("开始采集"); capturePicture.setText("开始采集");
capturePicture.setChecked(false);
radioBtnAutoSec.setTextColor(Color.parseColor("#FFEB3B"));
radioBtnAuto.setTextColor(Color.WHITE);
radioBtnHand.setTextColor(Color.WHITE);
stopTimer();
break; break;
} }
} }
@@ -264,7 +292,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
if (radioPicture != 1) { if (radioPicture != 1) {
capturePicture.setText("开始采集"); capturePicture.setText("开始采集");
capturePicture.setChecked(false); capturePicture.setChecked(false);
} }
return; return;
} else { } else {
@@ -293,7 +320,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
message.what = 0x103; message.what = 0x103;
handler.sendMessage(message); handler.sendMessage(message);
}*/ }*/
if (file.exists()) { if (file.exists() && file != null) {
WebPNative webPNative = new WebPNative(); WebPNative webPNative = new WebPNative();
new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override
@@ -338,9 +365,11 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
}); });
} else { } else {
isBack = false; isBack = false;
Message message = new Message(); if (radioPicture != 1) {
message.what = 0x103; capturePicture.setText("开始采集");
handler.sendMessage(message); }
capturePicture.setChecked(false);
stopTimer();
} }
} }
}); });
@@ -584,6 +613,12 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
setLocMarkerStyle(LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER); setLocMarkerStyle(LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER);
} }
@Override
protected void onStart() {
super.onStart();
tvMapView.onStart();
}
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
@@ -687,7 +722,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
FileUtils.writeFile(paperFile.getAbsolutePath(), sb.toString(), true); FileUtils.writeFile(paperFile.getAbsolutePath(), sb.toString(), true);
// initSpeed(); // initSpeed();
//快到终点的语音播报 //快到终点的语音播报
//initTerminus(); initTerminus();
} }
} catch (Exception e) { } catch (Exception e) {
UMCrash.generateCustomLog(e, "自定义"); UMCrash.generateCustomLog(e, "自定义");

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

@@ -7,6 +7,7 @@ import android.content.SharedPreferences;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Point; import android.graphics.Point;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
@@ -779,8 +780,15 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
} else if (getPhoneBean.getCode() == 203) { } else if (getPhoneBean.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), getPhoneBean.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), getPhoneBean.getMessage(), Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
@Override @Override
@@ -789,10 +797,24 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
}
});
}
} else { } else {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
}); });
} }
@@ -1217,7 +1239,9 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
} }
} }
} }
Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
HttpParams httpParams = new HttpParams(); HttpParams httpParams = new HttpParams();
@@ -1236,6 +1260,8 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
WaitDialog.dismiss(3000); WaitDialog.dismiss(3000);
} }
}); });
}
} }
}).start(); }).start();
} }
@@ -1288,12 +1314,26 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
} }
}).start(); }).start();
} else { } else {
Toast.makeText(getActivity(), "" + chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show(); if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show();
}
});
}
} }
} else if (chargingStationBean.getCode() == 203) { } else if (chargingStationBean.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
Toast.makeText(getActivity(), "" + chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show(); if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show();
}
});
}
} }
} }
@@ -1302,11 +1342,25 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
dismissLoadingDialog(); dismissLoadingDialog();
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout")) { if (message.equals("timeout")|| message.equals("Read time out")) {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
}
});
}
} else { } else {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
} }
});
}
}
Log.d("TAG", "onError: " + e.getMessage()); Log.d("TAG", "onError: " + e.getMessage());
} }
}); });
@@ -1383,10 +1437,20 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
}
});
} else { } else {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
} }
});
}
Log.d("TAG", "onError: " + e.getMessage()); Log.d("TAG", "onError: " + e.getMessage());
} }
}); });
@@ -1654,8 +1718,15 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
} else if (response.getCode() == 203) { } else if (response.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
@Override @Override
@@ -1664,10 +1735,26 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
}
});
}
} else { } else {
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
} }
});
}
}
Log.d("TAG", "onError: " + e.getMessage()); Log.d("TAG", "onError: " + e.getMessage());
} }
}); });

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

@@ -475,7 +475,12 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
} else if (response.getCode() == 203) { } else if (response.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show(); getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show();
}
});
} }
} }
@@ -568,8 +573,13 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
} else if (response.getCode() == 203) { } else if (response.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show();
} }
});
}
} }
@Override @Override
@@ -637,8 +647,13 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
} else if (response.getCode() == 203) { } else if (response.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show();
} }
});
}
} }
@Override @Override
@@ -704,7 +719,12 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
} else if (response.getCode() == 203) { } else if (response.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show();
}
});
} }
} }
@@ -754,8 +774,13 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
} else if (response.getCode() == 203) { } else if (response.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show();
} }
});
}
} }
@Override @Override
@@ -887,8 +912,13 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
} else if (response.getCode() == 203) { } else if (response.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show();
} }
});
}
} }
@Override @Override
@@ -1018,8 +1048,14 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe
} else if (response.getCode() == 203) { } else if (response.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show();
} }
});
}
} }
@Override @Override

119
app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java
View File

@@ -173,8 +173,15 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
} else if (hasSubmitBean.getCode() == 203) { } else if (hasSubmitBean.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
@Override @Override
@@ -183,10 +190,26 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
}
});
}
} else { } else {
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
}); });
} }
@@ -225,8 +248,16 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
} else if (hasSubmitBean.getCode() == 203) { } else if (hasSubmitBean.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
@Override @Override
@@ -235,10 +266,27 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
}
});
}
} else { } else {
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
}); });
} }
@@ -277,8 +325,16 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
} else if (hasSubmitBean.getCode() == 203) { } else if (hasSubmitBean.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
@Override @Override
@@ -287,10 +343,26 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
}
});
}
} else { } else {
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
}); });
} }
@@ -329,8 +401,16 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
} else if (hasSubmitBean.getCode() == 203) { } else if (hasSubmitBean.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
@Override @Override
@@ -339,10 +419,25 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
}
});
}
} else { } else {
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
}); });
} }
@@ -383,8 +478,16 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
} else if (hasSubmitBean.getCode() == 203) { } else if (hasSubmitBean.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
@Override @Override
@@ -393,10 +496,26 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
}
});
}
} else { } else {
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
}); });
} }

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

@@ -160,7 +160,14 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
} else if (response.getCode() == 203) { } else if (response.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show();
}
});
}
} }
Log.d("TAG", "onSuccess: " + response.toString()); Log.d("TAG", "onSuccess: " + response.toString());
} }
@@ -171,10 +178,24 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout")||message.equals("Read time out")){ if (message.equals("timeout")||message.equals("Read time out")){
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
}
});
}
}else { }else {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
} }
});
}
}
Log.d("TAG", "onError: " + e.getMessage()); Log.d("TAG", "onError: " + e.getMessage());
} }
}); });

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

@@ -701,12 +701,26 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
} }
}).start(); }).start();
} else { } else {
Toast.makeText(getActivity(), "" + poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
}
});
}
} }
} else if (poiSaveBean.getCode() == 203) { } else if (poiSaveBean.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
Toast.makeText(getActivity(), poiSaveBean.getMessage() + "", Toast.LENGTH_SHORT).show(); if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
}
});
}
} }
} }
@@ -716,10 +730,23 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
}
});}
} else { } else {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
}); });
} }
@@ -865,7 +892,14 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
} else if (response.getCode() == 203) { } else if (response.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show();
}
});
}
} }
} }
@@ -875,9 +909,23 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
}
});
}
} else { } else {
Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "" + message, Toast.LENGTH_SHORT).show();
}
});
}
} }
} }
}); });

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

@@ -224,8 +224,8 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
super.initView(); super.initView();
PoiDatabase poiDatabase = PoiDatabase.getInstance(getContext()); PoiDatabase poiDatabase = PoiDatabase.getInstance(getContext());
poiDao = poiDatabase.getPoiDao(); poiDao = poiDatabase.getPoiDao();
checkBoxLife = findViewById(R.id.check_pot_life);
CheckBox checkBoxRight = findViewById(R.id.check_pot_right); CheckBox checkBoxRight = findViewById(R.id.check_pot_right);
checkBoxLife = findViewById(R.id.check_pot_life);
checkBoxLife.setOnClickListener(new View.OnClickListener() { checkBoxLife.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@@ -327,6 +327,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
@Override @Override
public void onNothingSelected(AdapterView<?> parent) { public void onNothingSelected(AdapterView<?> parent) {
} }
}); });
//数据展示 //数据展示
@@ -615,8 +616,16 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
} else if (getPhoneBean.getCode() == 203) { } else if (getPhoneBean.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), getPhoneBean.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), getPhoneBean.getMessage(), Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
@Override @Override
@@ -625,10 +634,25 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
}
});
}
} else { } else {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
}); });
} }
@@ -871,10 +895,25 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
}
});
}
} else { } else {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
}); });
} }
@@ -1018,12 +1057,26 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
} }
}).start(); }).start();
} else { } else {
Toast.makeText(getActivity(), "" + poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
}
});
}
} }
} else if (poiSaveBean.getCode() == 203) { } else if (poiSaveBean.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
Toast.makeText(getActivity(), "" + poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
}
});
}
} }
} }
@@ -1033,10 +1086,24 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "请求超时",Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求超时",Toast.LENGTH_SHORT).show();
}
});
}
} else { } else {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
} }
});
}
}
Log.d("TAG", "onError: " + e.getMessage()); Log.d("TAG", "onError: " + e.getMessage());
} }
}); });
@@ -1236,8 +1303,15 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
} else if (response.getCode() == 203) { } else if (response.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
@Override @Override
@@ -1246,9 +1320,23 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
}
});
}
} else { } else {
Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "" + message, Toast.LENGTH_SHORT).show();
}
});
}
} }
Log.d("TAG", "onError: " + e.getMessage()); Log.d("TAG", "onError: " + e.getMessage());
} }

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

@@ -669,13 +669,29 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
} }
}).start(); }).start();
} else { } else {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getContext(), "" + poiVideoBean.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), "" + poiVideoBean.getMessage(), Toast.LENGTH_SHORT).show();
} }
});
}
}
} else if (poiVideoBean.getCode() == 203) { } else if (poiVideoBean.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getContext(), poiVideoBean.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), poiVideoBean.getMessage(), Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
@Override @Override
@@ -684,10 +700,26 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
}
});
}
} else { } else {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
} }
});
}
}
Log.d("TAG", "onError: " + e.getMessage()); Log.d("TAG", "onError: " + e.getMessage());
} }
}); });
@@ -806,8 +838,16 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
} else if (response.getCode() == 203) { } else if (response.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
@Override @Override
@@ -816,10 +856,23 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
}
});
}
} else { } else {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
} }
});}
}
} }
}); });
} }

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

@@ -660,12 +660,24 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
} }
}).start(); }).start();
} else { } else {
Toast.makeText(getActivity(), "" + roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(),roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
}
});}
} }
} else if (roadSaveBean.getCode() == 203) { } else if (roadSaveBean.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
Toast.makeText(getActivity(), "" + roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(),roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show();
}
});}
} }
} }
@@ -675,10 +687,22 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(),"请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(),"请求超时", Toast.LENGTH_SHORT).show();
}
});}
} else { } else {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(),message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(),message, Toast.LENGTH_SHORT).show();
} }
});}
}
} }
}); });
} }
@@ -796,7 +820,13 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
} else if (response.getCode() == 203) { } else if (response.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(),response.getMessage(), Toast.LENGTH_SHORT).show();
}
});}
} }
} }
@@ -806,10 +836,23 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(),"请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(),"请求超时", Toast.LENGTH_SHORT).show();
}
});}
} else { } else {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(),message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(),message, Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
}); });
} }

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

@@ -154,6 +154,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
private File logFile; private File logFile;
private StringBuilder treasureBuilder; private StringBuilder treasureBuilder;
private Marker gatherMarker; private Marker gatherMarker;
/*private boolean isHandler = false; /*private boolean isHandler = false;
private Handler handler = new Handler(new Handler.Callback() { private Handler handler = new Handler(new Handler.Callback() {
@Override @Override
@@ -432,7 +433,14 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
} else if (messageNoticeBean.getCode() == 203) { } else if (messageNoticeBean.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
Toast.makeText(getActivity(), messageNoticeBean.getMessage() + "", Toast.LENGTH_SHORT).show(); if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), messageNoticeBean.getMessage(), Toast.LENGTH_SHORT).show();
}
});
}
} }
} }
@@ -442,10 +450,24 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
}
});
}
} else { } else {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
} }
});
}
}
Log.d("TAG", "onError: " + e.getMessage()); Log.d("TAG", "onError: " + e.getMessage());
} }
}); });
@@ -480,13 +502,25 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
if (getPhoneBean.getCode() == 200) { if (getPhoneBean.getCode() == 200) {
String code = getPhoneBean.getBody().getCode(); String code = getPhoneBean.getBody().getCode();
Integer telLength = getPhoneBean.getBody().getTelLength(); Integer telLength = getPhoneBean.getBody().getTelLength();
if (code != null) {
Constant.CODE = code; Constant.CODE = code;
}
if (telLength != null) {
Constant.TelLength = telLength; Constant.TelLength = telLength;
}
} else if (getPhoneBean.getCode() == 203) { } else if (getPhoneBean.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), getPhoneBean.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), getPhoneBean.getMessage(), Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
@Override @Override
@@ -495,10 +529,24 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(),"请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(),"请求超时", Toast.LENGTH_SHORT).show();
}
});
}
} else { } else {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(),message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(),message, Toast.LENGTH_SHORT).show();
} }
});
}
}
Log.d("TAG", "onError: " + e.getMessage()); Log.d("TAG", "onError: " + e.getMessage());
} }
}); });
@@ -556,11 +604,25 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
public void onSuccess(UserBean response, int id) { public void onSuccess(UserBean response, int id) {
dismissLoadingDialog(); dismissLoadingDialog();
if (response.getCode() == 200) {//上传用户位置金纬度 寻宝删选接口请求成功 if (response.getCode() == 200) {//上传用户位置金纬度 寻宝删选接口请求成功
Toast.makeText(getActivity(), response.getMessage()+"", Toast.LENGTH_SHORT).show(); if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(),response.getMessage(), Toast.LENGTH_SHORT).show();
}
});
}
} else if (response.getCode() == 203) { } else if (response.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(),response.getMessage(), Toast.LENGTH_SHORT).show();
}
});
}
} }
} }
@@ -570,10 +632,24 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(),"请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(),"请求超时", Toast.LENGTH_SHORT).show();
}
});
}
} else { } else {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
}); });
} }
@@ -835,7 +911,14 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
} else if (response.getCode() == 203) { } else if (response.getCode() == 203) {
FlushTokenUtil.flushToken(getActivity()); FlushTokenUtil.flushToken(getActivity());
} else { } else {
Toast.makeText(getActivity(), "任务搜索接口：" + response.getMessage(), Toast.LENGTH_SHORT).show(); if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show();
}
});
}
} }
} }
@@ -845,10 +928,25 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
String message = e.getMessage(); String message = e.getMessage();
assert message != null; assert message != null;
if (message.equals("timeout") || message.equals("Read time out")) { if (message.equals("timeout") || message.equals("Read time out")) {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show();
}
});
}
} else { } else {
if (getActivity()!=null){
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show();
} }
});
}
}
} }
}); });
} }
@@ -1027,10 +1125,10 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
public void run() { public void run() {
List<PoiEntity> allTaskStatus = poiDao.getAllTaskStatus(taskStatus, taskStatus, type, type, limit, limit); List<PoiEntity> allTaskStatus = poiDao.getAllTaskStatus(taskStatus, taskStatus, type, type, limit, limit);
//List<PoiEntity> allTaskStatus = poiDao.getAllPoi(); //List<PoiEntity> allTaskStatus = poiDao.getAllPoi();
List<PoiEntity> allPoiStatus = poiDao.getAllPoiStatus(); /*List<PoiEntity> allPoiStatus = poiDao.getAllPoiStatus();
if (allPoiStatus != null) { if (allPoiStatus != null) {
poiDao.deleteAll(allPoiStatus); poiDao.deleteAll(allPoiStatus);
} }*/
if (getActivity() != null) { if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(new Runnable() {
@Override @Override

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

@@ -129,7 +129,7 @@
android:id="@+id/radio_group_picture" android:id="@+id/radio_group_picture"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="25dp" android:layout_marginStart="35dp"
android:orientation="vertical" android:orientation="vertical"
android:visibility="visible" android:visibility="visible"
app:layout_constraintBottom_toTopOf="@+id/capture_picture" app:layout_constraintBottom_toTopOf="@+id/capture_picture"
@@ -142,6 +142,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:layout_marginBottom="15dp" android:layout_marginBottom="15dp"
android:button="@null"
android:text="手动" android:text="手动"
android:textColor="@color/white" /> android:textColor="@color/white" />
@@ -151,6 +152,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:layout_marginBottom="15dp" android:layout_marginBottom="15dp"
android:button="@null"
android:text="自动1秒" android:text="自动1秒"
android:textColor="@color/white" /> android:textColor="@color/white" />
@@ -160,6 +162,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:layout_marginBottom="15dp" android:layout_marginBottom="15dp"
android:button="@null"
android:text="自动2秒" android:text="自动2秒"
android:textColor="@color/white" /> android:textColor="@color/white" />

1
app/src/main/res/values/colors.xml
View File

@@ -18,7 +18,6 @@
<color name="colorRed">#F44236</color> <color name="colorRed">#F44236</color>
<color name="colorText">#87CDF6</color> <color name="colorText">#87CDF6</color>
<color name="colorRead">#ED1931</color> <color name="colorRead">#ED1931</color>
<color name="colorGrays">#BDBDBD</color> <color name="colorGrays">#BDBDBD</color>
</resources> </resources>