添加日志,修改poi 电话。纪录的修改。
This commit is contained in:
@@ -5,6 +5,7 @@ import android.content.Context;
|
|||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.content.res.Configuration;
|
import android.content.res.Configuration;
|
||||||
|
import android.os.Bundle;
|
||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
import android.os.Message;
|
import android.os.Message;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
@@ -15,7 +16,9 @@ import android.widget.TextView;
|
|||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.annotation.Nullable;
|
||||||
|
|
||||||
|
import com.github.lazylibrary.util.FileUtils;
|
||||||
import com.lzy.okgo.model.HttpParams;
|
import com.lzy.okgo.model.HttpParams;
|
||||||
import com.navinfo.outdoor.R;
|
import com.navinfo.outdoor.R;
|
||||||
import com.navinfo.outdoor.api.Constant;
|
import com.navinfo.outdoor.api.Constant;
|
||||||
@@ -33,6 +36,8 @@ import com.navinfo.outdoor.util.SystemTTS;
|
|||||||
import org.greenrobot.eventbus.EventBus;
|
import org.greenrobot.eventbus.EventBus;
|
||||||
import org.greenrobot.eventbus.Subscribe;
|
import org.greenrobot.eventbus.Subscribe;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.text.DateFormat;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.Calendar;
|
import java.util.Calendar;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
@@ -57,6 +62,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
private Button btnLogin;
|
private Button btnLogin;
|
||||||
|
private File logFile;
|
||||||
|
private StringBuilder loginBuilder;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onStart() {
|
public void onStart() {
|
||||||
@@ -74,6 +81,25 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
|
|||||||
@Override
|
@Override
|
||||||
protected void initData() {
|
protected void initData() {
|
||||||
super.initData();
|
super.initData();
|
||||||
|
SharedPreferences sharedPreferences = this.getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE);
|
||||||
|
SharedPreferences.Editor sharedEdit = sharedPreferences.edit();
|
||||||
|
@SuppressLint("SimpleDateFormat")
|
||||||
|
DateFormat formatter = new SimpleDateFormat("yyyyMMdd");
|
||||||
|
String newFormat = formatter.format(new Date(System.currentTimeMillis()));
|
||||||
|
String pictures_time = sharedPreferences.getString("pictures_time", null);
|
||||||
|
if (pictures_time == null) {
|
||||||
|
sharedEdit.putString("pictures_time", newFormat);
|
||||||
|
sharedEdit.apply();
|
||||||
|
logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt");
|
||||||
|
} else {
|
||||||
|
if (pictures_time.equals(newFormat)) {
|
||||||
|
logFile = new File(Constant.LOG_FOLDER + "/" + pictures_time + ".txt");
|
||||||
|
} else {
|
||||||
|
logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
loginBuilder = new StringBuilder();
|
||||||
|
loginBuilder.append("LoginActivity-initData ,");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Subscribe
|
@Subscribe
|
||||||
@@ -119,16 +145,19 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
|
|||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
switch (v.getId()) {
|
switch (v.getId()) {
|
||||||
case R.id.tv_register:
|
case R.id.tv_register:
|
||||||
|
loginBuilder.append("点击注册,");
|
||||||
Intent register = new Intent(this, FragmentManagement.class);
|
Intent register = new Intent(this, FragmentManagement.class);
|
||||||
register.putExtra("tag", 5);
|
register.putExtra("tag", 5);
|
||||||
startActivity(register);
|
startActivity(register);
|
||||||
break;
|
break;
|
||||||
case R.id.tv_forget_paw:
|
case R.id.tv_forget_paw:
|
||||||
|
loginBuilder.append("点击忘记密码,");
|
||||||
Intent forgetPaw = new Intent(this, FragmentManagement.class);
|
Intent forgetPaw = new Intent(this, FragmentManagement.class);
|
||||||
forgetPaw.putExtra("tag", 6);
|
forgetPaw.putExtra("tag", 6);
|
||||||
startActivity(forgetPaw);
|
startActivity(forgetPaw);
|
||||||
break;
|
break;
|
||||||
case R.id.btn_login:
|
case R.id.btn_login:
|
||||||
|
loginBuilder.append("点击登录,");
|
||||||
btnLogin.setEnabled(false);
|
btnLogin.setEnabled(false);
|
||||||
Message message = new Message();
|
Message message = new Message();
|
||||||
message.what = 0x103;
|
message.what = 0x103;
|
||||||
@@ -151,6 +180,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case R.id.tv_statement:
|
case R.id.tv_statement:
|
||||||
|
loginBuilder.append("点击了用户协议,");
|
||||||
Intent stateIntent = new Intent(this, StatementActivity.class);
|
Intent stateIntent = new Intent(this, StatementActivity.class);
|
||||||
startActivity(stateIntent);
|
startActivity(stateIntent);
|
||||||
break;
|
break;
|
||||||
@@ -180,6 +210,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
|
|||||||
if (body.getUserId() != null && !body.getUserId().equals("")) {
|
if (body.getUserId() != null && !body.getUserId().equals("")) {
|
||||||
Constant.initRootFolder(body.getUserId());
|
Constant.initRootFolder(body.getUserId());
|
||||||
HttpInterface.initHttpInter(body.getUserId());
|
HttpInterface.initHttpInter(body.getUserId());
|
||||||
|
loginBuilder.append("userId:").append(body.getUserId()).append(",");
|
||||||
}
|
}
|
||||||
navInfoEditor.putString("access_token", body.getAccess_token());
|
navInfoEditor.putString("access_token", body.getAccess_token());
|
||||||
navInfoEditor.putString("refresh_token", body.getRefresh_token());
|
navInfoEditor.putString("refresh_token", body.getRefresh_token());
|
||||||
@@ -196,6 +227,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
|
|||||||
Toast.makeText(LoginActivity.this, response.getMessage(), Toast.LENGTH_SHORT).show();
|
Toast.makeText(LoginActivity.this, response.getMessage(), Toast.LENGTH_SHORT).show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onError(Throwable e, int id) {
|
public void onError(Throwable e, int id) {
|
||||||
dismissLoadingDialog();
|
dismissLoadingDialog();
|
||||||
@@ -268,6 +300,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
|
|||||||
Toast.makeText(LoginActivity.this, response.getMessage() + "", Toast.LENGTH_SHORT).show();
|
Toast.makeText(LoginActivity.this, response.getMessage() + "", Toast.LENGTH_SHORT).show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onError(Throwable e, int id) {
|
public void onError(Throwable e, int id) {
|
||||||
dismissLoadingDialog();
|
dismissLoadingDialog();
|
||||||
@@ -281,10 +314,26 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
|
|||||||
super.onConfigurationChanged(newConfig);
|
super.onConfigurationChanged(newConfig);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onPause() {
|
||||||
|
super.onPause();
|
||||||
|
loginBuilder.append("onPause,");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onStop() {
|
||||||
|
super.onStop();
|
||||||
|
loginBuilder.append("onStop,");
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDestroy() {
|
public void onDestroy() {
|
||||||
if (EventBus.getDefault().isRegistered(this))//加上判断
|
|
||||||
EventBus.getDefault().unregister(this);
|
|
||||||
super.onDestroy();
|
super.onDestroy();
|
||||||
|
loginBuilder.append("onDestroy");
|
||||||
|
loginBuilder.append("\r\n");
|
||||||
|
FileUtils.writeFile(logFile.getAbsolutePath(), loginBuilder.toString(), true);
|
||||||
|
if (EventBus.getDefault().isRegistered(this)) {//加上判断
|
||||||
|
EventBus.getDefault().unregister(this);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -86,28 +86,6 @@ public class PhotographActivity extends BaseActivity implements View.OnClickList
|
|||||||
private File logFile;
|
private File logFile;
|
||||||
private StringBuilder photographBuilder;
|
private StringBuilder photographBuilder;
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
SharedPreferences sharedPreferences = this.getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE);
|
|
||||||
SharedPreferences.Editor sharedEdit = sharedPreferences.edit();
|
|
||||||
DateFormat formatter = new SimpleDateFormat("yyyyMMdd");
|
|
||||||
String newFormat = formatter.format(new Date(System.currentTimeMillis()));
|
|
||||||
String pictures_time = sharedPreferences.getString("pictures_time", null);
|
|
||||||
if (pictures_time==null){
|
|
||||||
sharedEdit.putString("pictures_time",newFormat);
|
|
||||||
sharedEdit.commit();
|
|
||||||
logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt");
|
|
||||||
}else {
|
|
||||||
if (pictures_time.equals(newFormat)){
|
|
||||||
logFile = new File(Constant.LOG_FOLDER + "/" + pictures_time + ".txt");
|
|
||||||
}else {
|
|
||||||
logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
photographBuilder = new StringBuilder();
|
|
||||||
photographBuilder.append("PhotographActivity-onCreate ,");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
@@ -126,7 +104,28 @@ public class PhotographActivity extends BaseActivity implements View.OnClickList
|
|||||||
@Override
|
@Override
|
||||||
protected void initData() {
|
protected void initData() {
|
||||||
super.initData();
|
super.initData();
|
||||||
photographBuilder.append("initData, ");
|
SharedPreferences sharedPreferences = this.getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE);
|
||||||
|
SharedPreferences.Editor sharedEdit = sharedPreferences.edit();
|
||||||
|
@SuppressLint("SimpleDateFormat")
|
||||||
|
DateFormat formatter = new SimpleDateFormat("yyyyMMdd");
|
||||||
|
String newFormat = formatter.format(new Date(System.currentTimeMillis()));
|
||||||
|
String pictures_time = sharedPreferences.getString("pictures_time", null);
|
||||||
|
if (pictures_time==null){
|
||||||
|
sharedEdit.putString("pictures_time",newFormat);
|
||||||
|
sharedEdit.apply();
|
||||||
|
logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt");
|
||||||
|
}else {
|
||||||
|
if (pictures_time.equals(newFormat)){
|
||||||
|
logFile = new File(Constant.LOG_FOLDER + "/" + pictures_time + ".txt");
|
||||||
|
}else {
|
||||||
|
logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
photographBuilder = new StringBuilder();
|
||||||
|
photographBuilder.append("PhotographActivity-onCreate-initData ,");
|
||||||
|
if (Constant.USHERED!=null){
|
||||||
|
photographBuilder.append("userId:").append(Constant.USHERED).append(",");
|
||||||
|
}
|
||||||
cameraView.setMode(Mode.PICTURE);
|
cameraView.setMode(Mode.PICTURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -132,31 +132,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
|
|||||||
private File logFile;
|
private File logFile;
|
||||||
private StringBuilder picturesBuilder;
|
private StringBuilder picturesBuilder;
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
SharedPreferences sharedPreferences = this.getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE);
|
|
||||||
SharedPreferences.Editor sharedEdit = sharedPreferences.edit();
|
|
||||||
@SuppressLint("SimpleDateFormat")
|
|
||||||
DateFormat formatter = new SimpleDateFormat("yyyyMMdd");
|
|
||||||
String newFormat = formatter.format(new Date(System.currentTimeMillis()));
|
|
||||||
String pictures_time = sharedPreferences.getString("pictures_time", null);
|
|
||||||
if (pictures_time==null){
|
|
||||||
sharedEdit.putString("pictures_time",newFormat);
|
|
||||||
sharedEdit.apply();
|
|
||||||
logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt");
|
|
||||||
}else {
|
|
||||||
if (pictures_time.equals(newFormat)){
|
|
||||||
logFile = new File(Constant.LOG_FOLDER + "/" + pictures_time + ".txt");
|
|
||||||
}else {
|
|
||||||
logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
picturesBuilder = new StringBuilder();
|
|
||||||
picturesBuilder.append("PicturesActivity-onCreate ,");
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected int getLayout() {
|
protected int getLayout() {
|
||||||
@@ -362,6 +337,28 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
|
|||||||
@Override
|
@Override
|
||||||
protected void initData() {
|
protected void initData() {
|
||||||
super.initData();
|
super.initData();
|
||||||
|
SharedPreferences sharedPreferences = this.getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE);
|
||||||
|
SharedPreferences.Editor sharedEdit = sharedPreferences.edit();
|
||||||
|
@SuppressLint("SimpleDateFormat")
|
||||||
|
DateFormat formatter = new SimpleDateFormat("yyyyMMdd");
|
||||||
|
String newFormat = formatter.format(new Date(System.currentTimeMillis()));
|
||||||
|
String pictures_time = sharedPreferences.getString("pictures_time", null);
|
||||||
|
if (pictures_time==null){
|
||||||
|
sharedEdit.putString("pictures_time",newFormat);
|
||||||
|
sharedEdit.apply();
|
||||||
|
logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt");
|
||||||
|
}else {
|
||||||
|
if (pictures_time.equals(newFormat)){
|
||||||
|
logFile = new File(Constant.LOG_FOLDER + "/" + pictures_time + ".txt");
|
||||||
|
}else {
|
||||||
|
logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
picturesBuilder = new StringBuilder();
|
||||||
|
picturesBuilder.append("PicturesActivity-onCreate-initData ,");
|
||||||
|
if (Constant.USHERED!=null){
|
||||||
|
picturesBuilder.append("userId:").append(Constant.USHERED).append(",");
|
||||||
|
}
|
||||||
camera.setMode(Mode.PICTURE);
|
camera.setMode(Mode.PICTURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -535,10 +532,17 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
|
|||||||
@Override
|
@Override
|
||||||
protected void onPause() {
|
protected void onPause() {
|
||||||
super.onPause();
|
super.onPause();
|
||||||
|
picturesBuilder.append("onPause, ");
|
||||||
camera.close();
|
camera.close();
|
||||||
stopTimer();
|
stopTimer();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onStop() {
|
||||||
|
super.onStop();
|
||||||
|
picturesBuilder.append("onStop, ");
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onDestroy() {
|
protected void onDestroy() {
|
||||||
super.onDestroy();
|
super.onDestroy();
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import com.navinfo.outdoor.base.BaseActivity;
|
|||||||
|
|
||||||
public class StatementActivity extends BaseActivity {
|
public class StatementActivity extends BaseActivity {
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected int getLayout() {
|
protected int getLayout() {
|
||||||
return R.layout.activity_statement;
|
return R.layout.activity_statement;
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ public class TestActivity extends BaseActivity {
|
|||||||
private final int MARKER_FACE = 1;
|
private final int MARKER_FACE = 1;
|
||||||
private ClusterManager<MarkerClusterItem> clusterItemClusterManager;
|
private ClusterManager<MarkerClusterItem> clusterItemClusterManager;
|
||||||
private HashMap<String, List<Marker>> stringListHashMap;
|
private HashMap<String, List<Marker>> stringListHashMap;
|
||||||
private ArrayList<LatLng> listLatlng;
|
private ArrayList<LatLng> listLatLng;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected int getLayout() {
|
protected int getLayout() {
|
||||||
@@ -88,8 +88,8 @@ public class TestActivity extends BaseActivity {
|
|||||||
super.initData();
|
super.initData();
|
||||||
removables = new ArrayList<>();//存储网络数据的marker数据(线,面,点)
|
removables = new ArrayList<>();//存储网络数据的marker数据(线,面,点)
|
||||||
stringListHashMap = new HashMap<>();//key :wkt,value :存储的数据类型
|
stringListHashMap = new HashMap<>();//key :wkt,value :存储的数据类型
|
||||||
//存储的多点latlng
|
//存储的多点latLng
|
||||||
listLatlng = new ArrayList<>();
|
listLatLng = new ArrayList<>();
|
||||||
initList(Constant.currentLocation);
|
initList(Constant.currentLocation);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -288,15 +288,15 @@ public class TestActivity extends BaseActivity {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
listLatlng.clear();
|
listLatLng.clear();
|
||||||
for (Map.Entry<String, List<Marker>> entry : stringListHashMap.entrySet()) {
|
for (Map.Entry<String, List<Marker>> entry : stringListHashMap.entrySet()) {
|
||||||
String key = entry.getKey();
|
String key = entry.getKey();
|
||||||
List<Marker> markerList = stringListHashMap.get(key);
|
List<Marker> markerList = stringListHashMap.get(key);
|
||||||
assert markerList != null;
|
assert markerList != null;
|
||||||
Log.d("TAG", "onSuenccess: "+markerList.toString());
|
Log.d("TAG", ": "+markerList.toString());
|
||||||
Log.d("TAG", "onSuenccess: "+entry.getValue()+"sssssssssssssssssssssssssssssss"+entry.getKey());
|
Log.d("TAG", ": "+entry.getValue()+"-"+entry.getKey());
|
||||||
LatLng lng = GeometryTools.createLatLng(key);
|
LatLng lng = GeometryTools.createLatLng(key);
|
||||||
listLatlng.add(lng);
|
listLatLng.add(lng);
|
||||||
}
|
}
|
||||||
Message obtain = Message.obtain();
|
Message obtain = Message.obtain();
|
||||||
obtain.what = Constant.JOB_SEARCH_WORD;
|
obtain.what = Constant.JOB_SEARCH_WORD;
|
||||||
@@ -377,7 +377,7 @@ public class TestActivity extends BaseActivity {
|
|||||||
latLngs.add(new LatLng(projection.fromScreenLocation(point)));
|
latLngs.add(new LatLng(projection.fromScreenLocation(point)));
|
||||||
com.vividsolutions.jts.geom.Polygon polygon = GeometryTools.createPolygon(latLngs);
|
com.vividsolutions.jts.geom.Polygon polygon = GeometryTools.createPolygon(latLngs);
|
||||||
//多点
|
//多点
|
||||||
MultiPoint multiPoint = GeometryTools.createMultiPoint(listLatlng);
|
MultiPoint multiPoint = GeometryTools.createMultiPoint(listLatLng);
|
||||||
//拿到覆蓋點
|
//拿到覆蓋點
|
||||||
Geometry intersection = polygon.intersection(multiPoint);
|
Geometry intersection = polygon.intersection(multiPoint);
|
||||||
String geometryType = intersection.getGeometryType();
|
String geometryType = intersection.getGeometryType();
|
||||||
@@ -440,7 +440,7 @@ public class TestActivity extends BaseActivity {
|
|||||||
@Override
|
@Override
|
||||||
public boolean onMarkerClick(Marker marker) {
|
public boolean onMarkerClick(Marker marker) {
|
||||||
if (marker.getTag().equals("marker")) {
|
if (marker.getTag().equals("marker")) {
|
||||||
Toast.makeText(TestActivity.this, marker.getId()+"sssssssssssssssssssss", Toast.LENGTH_SHORT).show();
|
Toast.makeText(TestActivity.this, marker.getId()+" ", Toast.LENGTH_SHORT).show();
|
||||||
//中心点的圆
|
//中心点的圆
|
||||||
// Geometry geometry = GeometryTools.createGeometry();
|
// Geometry geometry = GeometryTools.createGeometry();
|
||||||
// 多 点
|
// 多 点
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ public class Constant {
|
|||||||
|
|
||||||
public static String POI_DAO;
|
public static String POI_DAO;
|
||||||
|
|
||||||
public static String LOG_FOLDER;
|
public static String LOG_FOLDER=ROOT_FOLDER+"/log";
|
||||||
|
|
||||||
public static String SHARED_PREFERENCES = "navInfo";
|
public static String SHARED_PREFERENCES = "navInfo";
|
||||||
|
|
||||||
@@ -65,7 +65,6 @@ public class Constant {
|
|||||||
PICTURE_FOLDER = BASE_FOLDER + "/picture";
|
PICTURE_FOLDER = BASE_FOLDER + "/picture";
|
||||||
POI_DAO = BASE_FOLDER + "/BaseDao/";
|
POI_DAO = BASE_FOLDER + "/BaseDao/";
|
||||||
VIDEOS_ = BASE_FOLDER + "/videos";
|
VIDEOS_ = BASE_FOLDER + "/videos";
|
||||||
LOG_FOLDER =BASE_FOLDER+"/log";
|
|
||||||
|
|
||||||
|
|
||||||
// 初始化应用目录
|
// 初始化应用目录
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
package com.navinfo.outdoor.fragment;
|
package com.navinfo.outdoor.fragment;
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint;
|
||||||
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.CountDownTimer;
|
import android.os.CountDownTimer;
|
||||||
import android.os.Message;
|
import android.os.Message;
|
||||||
@@ -11,6 +14,7 @@ import android.widget.ImageView;
|
|||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import com.github.lazylibrary.util.FileUtils;
|
||||||
import com.lzy.okgo.model.HttpParams;
|
import com.lzy.okgo.model.HttpParams;
|
||||||
import com.navinfo.outdoor.R;
|
import com.navinfo.outdoor.R;
|
||||||
import com.navinfo.outdoor.activity.FragmentManagement;
|
import com.navinfo.outdoor.activity.FragmentManagement;
|
||||||
@@ -27,6 +31,10 @@ import com.navinfo.outdoor.util.RegexUtil;
|
|||||||
|
|
||||||
import org.greenrobot.eventbus.EventBus;
|
import org.greenrobot.eventbus.EventBus;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.text.DateFormat;
|
||||||
|
import java.text.SimpleDateFormat;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -37,6 +45,8 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
|
|||||||
private EditText etForgetPawPhone, etForgetPawNote, etForgetPawPaw, etForgetPawConfirmPaw;
|
private EditText etForgetPawPhone, etForgetPawNote, etForgetPawPaw, etForgetPawConfirmPaw;
|
||||||
private String sessionId;
|
private String sessionId;
|
||||||
private CountDownTimer timer;
|
private CountDownTimer timer;
|
||||||
|
private File logFile;
|
||||||
|
private StringBuilder forgetPawBuilder;
|
||||||
|
|
||||||
public static ForgetPawFragment newInstance(Bundle bundle) {
|
public static ForgetPawFragment newInstance(Bundle bundle) {
|
||||||
ForgetPawFragment fragment = new ForgetPawFragment();
|
ForgetPawFragment fragment = new ForgetPawFragment();
|
||||||
@@ -49,6 +59,33 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
|
|||||||
return R.layout.fragment_forget_paw;
|
return R.layout.fragment_forget_paw;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void initData() {
|
||||||
|
super.initData();
|
||||||
|
SharedPreferences sharedPreferences = Objects.requireNonNull(getActivity()).getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE);
|
||||||
|
SharedPreferences.Editor sharedEdit = sharedPreferences.edit();
|
||||||
|
@SuppressLint("SimpleDateFormat")
|
||||||
|
DateFormat formatter = new SimpleDateFormat("yyyyMMdd");
|
||||||
|
String newFormat = formatter.format(new Date(System.currentTimeMillis()));
|
||||||
|
String pictures_time = sharedPreferences.getString("pictures_time", null);
|
||||||
|
if (pictures_time==null){
|
||||||
|
sharedEdit.putString("pictures_time",newFormat);
|
||||||
|
sharedEdit.apply();
|
||||||
|
logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt");
|
||||||
|
}else {
|
||||||
|
if (pictures_time.equals(newFormat)){
|
||||||
|
logFile = new File(Constant.LOG_FOLDER + "/" + pictures_time + ".txt");
|
||||||
|
}else {
|
||||||
|
logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
forgetPawBuilder = new StringBuilder();
|
||||||
|
forgetPawBuilder.append("ForgetPawFragment-onViewCreated-initData,");
|
||||||
|
if (Constant.USHERED!=null){
|
||||||
|
forgetPawBuilder.append("userId:").append(Constant.USHERED).append(",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void initView() {
|
protected void initView() {
|
||||||
super.initView();
|
super.initView();
|
||||||
@@ -68,9 +105,11 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
|
|||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
switch (v.getId()) {
|
switch (v.getId()) {
|
||||||
case R.id.iv_forgePaw_finish:
|
case R.id.iv_forgePaw_finish:
|
||||||
|
forgetPawBuilder.append("点击了忘记密码的返回,");
|
||||||
Objects.requireNonNull(getActivity()).finish();
|
Objects.requireNonNull(getActivity()).finish();
|
||||||
break;
|
break;
|
||||||
case R.id.forgetPaw_get_note:
|
case R.id.forgetPaw_get_note:
|
||||||
|
forgetPawBuilder.append("点击了获取短信验证码,");
|
||||||
if (!RegexUtil.isPhone(etForgetPawPhone.getText().toString())) {
|
if (!RegexUtil.isPhone(etForgetPawPhone.getText().toString())) {
|
||||||
Toast.makeText(getActivity(), "手机号错误,请重新输入", Toast.LENGTH_SHORT).show();
|
Toast.makeText(getActivity(), "手机号错误,请重新输入", Toast.LENGTH_SHORT).show();
|
||||||
return;
|
return;
|
||||||
@@ -79,6 +118,7 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
case R.id.btn_forgetPaw:
|
case R.id.btn_forgetPaw:
|
||||||
|
forgetPawBuilder.append("点击了提交,");
|
||||||
initForgetPaw();
|
initForgetPaw();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -222,4 +262,24 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onPause() {
|
||||||
|
super.onPause();
|
||||||
|
forgetPawBuilder.append("onPause,");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onStop() {
|
||||||
|
super.onStop();
|
||||||
|
forgetPawBuilder.append("onStop,");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onDestroy() {
|
||||||
|
super.onDestroy();
|
||||||
|
forgetPawBuilder.append("onDestroy");
|
||||||
|
forgetPawBuilder.append("\r\n");
|
||||||
|
FileUtils.writeFile(logFile.getAbsolutePath(), forgetPawBuilder.toString(), true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -717,10 +717,10 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
|
|||||||
Toast.makeText(getActivity(), "存在类似名称---" + poiAddressName, Toast.LENGTH_SHORT).show();
|
Toast.makeText(getActivity(), "存在类似名称---" + poiAddressName, Toast.LENGTH_SHORT).show();
|
||||||
poiAddressName = "";
|
poiAddressName = "";
|
||||||
} else {
|
} else {
|
||||||
Toast.makeText(getActivity(), "没有类似名称可以作业", Toast.LENGTH_SHORT).show();
|
Toast.makeText(getActivity(), "没有类似名称,可以作业", Toast.LENGTH_SHORT).show();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Toast.makeText(getActivity(), "没有类似名称可以作业", Toast.LENGTH_SHORT).show();
|
Toast.makeText(getActivity(), "没有类似名称,可以作业", Toast.LENGTH_SHORT).show();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
editNameContent.setTextColor(Color.RED);
|
editNameContent.setTextColor(Color.RED);
|
||||||
|
|||||||
@@ -68,6 +68,22 @@ public class RecordFragment extends BaseFragment implements View.OnClickListener
|
|||||||
tabRecord.setupWithViewPager(vpRecord);
|
tabRecord.setupWithViewPager(vpRecord);
|
||||||
Objects.requireNonNull(tabRecord.getTabAt(0)).setText(names[0]);
|
Objects.requireNonNull(tabRecord.getTabAt(0)).setText(names[0]);
|
||||||
Objects.requireNonNull(tabRecord.getTabAt(1)).setText(names[1]);
|
Objects.requireNonNull(tabRecord.getTabAt(1)).setText(names[1]);
|
||||||
|
tabRecord.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
|
||||||
|
@Override
|
||||||
|
public void onTabSelected(TabLayout.Tab tab) {
|
||||||
|
refreshData();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onTabUnselected(TabLayout.Tab tab) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onTabReselected(TabLayout.Tab tab) {
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
package com.navinfo.outdoor.fragment;
|
package com.navinfo.outdoor.fragment;
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint;
|
||||||
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.CountDownTimer;
|
import android.os.CountDownTimer;
|
||||||
import android.os.Message;
|
import android.os.Message;
|
||||||
@@ -12,6 +15,9 @@ import android.widget.ImageView;
|
|||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import androidx.annotation.Nullable;
|
||||||
|
|
||||||
|
import com.github.lazylibrary.util.FileUtils;
|
||||||
import com.lzy.okgo.model.HttpParams;
|
import com.lzy.okgo.model.HttpParams;
|
||||||
import com.navinfo.outdoor.R;
|
import com.navinfo.outdoor.R;
|
||||||
import com.navinfo.outdoor.activity.LoginActivity;
|
import com.navinfo.outdoor.activity.LoginActivity;
|
||||||
@@ -28,6 +34,10 @@ import com.navinfo.outdoor.util.RegexUtil;
|
|||||||
|
|
||||||
import org.greenrobot.eventbus.EventBus;
|
import org.greenrobot.eventbus.EventBus;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.text.DateFormat;
|
||||||
|
import java.text.SimpleDateFormat;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
|
|
||||||
@@ -43,6 +53,8 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
|
|||||||
private String sessionId;
|
private String sessionId;
|
||||||
private CountDownTimer timer;
|
private CountDownTimer timer;
|
||||||
private CheckBox ivRegisterCheck;
|
private CheckBox ivRegisterCheck;
|
||||||
|
private File logFile;
|
||||||
|
private StringBuilder registerBuilder;
|
||||||
|
|
||||||
public static RegisterFragment newInstance(Bundle bundle) {
|
public static RegisterFragment newInstance(Bundle bundle) {
|
||||||
RegisterFragment fragment = new RegisterFragment();
|
RegisterFragment fragment = new RegisterFragment();
|
||||||
@@ -50,6 +62,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
|
|||||||
return fragment;
|
return fragment;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected int getLayout() {
|
protected int getLayout() {
|
||||||
return R.layout.fragment_register;
|
return R.layout.fragment_register;
|
||||||
@@ -77,23 +90,48 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
|
|||||||
@Override
|
@Override
|
||||||
protected void initData() {
|
protected void initData() {
|
||||||
super.initData();
|
super.initData();
|
||||||
|
SharedPreferences sharedPreferences = Objects.requireNonNull(getActivity()).getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE);
|
||||||
|
SharedPreferences.Editor sharedEdit = sharedPreferences.edit();
|
||||||
|
@SuppressLint("SimpleDateFormat")
|
||||||
|
DateFormat formatter = new SimpleDateFormat("yyyyMMdd");
|
||||||
|
String newFormat = formatter.format(new Date(System.currentTimeMillis()));
|
||||||
|
String pictures_time = sharedPreferences.getString("pictures_time", null);
|
||||||
|
if (pictures_time==null){
|
||||||
|
sharedEdit.putString("pictures_time",newFormat);
|
||||||
|
sharedEdit.apply();
|
||||||
|
logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt");
|
||||||
|
}else {
|
||||||
|
if (pictures_time.equals(newFormat)){
|
||||||
|
logFile = new File(Constant.LOG_FOLDER + "/" + pictures_time + ".txt");
|
||||||
|
}else {
|
||||||
|
logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
registerBuilder = new StringBuilder();
|
||||||
|
registerBuilder.append("RegisterFragment-onViewCreated-initData,");
|
||||||
|
if (Constant.USHERED!=null){
|
||||||
|
registerBuilder.append("userId:").append(Constant.USHERED).append(",");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
switch (v.getId()) {
|
switch (v.getId()) {
|
||||||
case R.id.iv_register_finish:
|
case R.id.iv_register_finish:
|
||||||
|
registerBuilder.append("注册点击了返回,");
|
||||||
Objects.requireNonNull(getActivity()).finish();
|
Objects.requireNonNull(getActivity()).finish();
|
||||||
break;
|
break;
|
||||||
case R.id.have_go_login:
|
case R.id.have_go_login:
|
||||||
|
registerBuilder.append("点击了已有账号,去登录,");
|
||||||
Intent registerLogin = new Intent(getActivity(), LoginActivity.class);
|
Intent registerLogin = new Intent(getActivity(), LoginActivity.class);
|
||||||
startActivity(registerLogin);
|
startActivity(registerLogin);
|
||||||
break;
|
break;
|
||||||
case R.id.btn_register:
|
case R.id.btn_register:
|
||||||
|
registerBuilder.append("点击了注册,");
|
||||||
initRegister();
|
initRegister();
|
||||||
break;
|
break;
|
||||||
case R.id.register_get_note:
|
case R.id.register_get_note:
|
||||||
|
registerBuilder.append("点击了获取短信验证码,");
|
||||||
if (!RegexUtil.isPhone(etRegisterPhone.getText().toString())) {
|
if (!RegexUtil.isPhone(etRegisterPhone.getText().toString())) {
|
||||||
Toast.makeText(getActivity(), "手机号错误,请重新输入", Toast.LENGTH_SHORT).show();
|
Toast.makeText(getActivity(), "手机号错误,请重新输入", Toast.LENGTH_SHORT).show();
|
||||||
return;
|
return;
|
||||||
@@ -252,4 +290,25 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
|
|||||||
};
|
};
|
||||||
timer.start();
|
timer.start();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onPause() {
|
||||||
|
super.onPause();
|
||||||
|
registerBuilder.append("onPause,");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onStop() {
|
||||||
|
super.onStop();
|
||||||
|
registerBuilder.append("onStop,");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onDestroy() {
|
||||||
|
super.onDestroy();
|
||||||
|
registerBuilder.append("onDestroy");
|
||||||
|
registerBuilder.append("\r\n");
|
||||||
|
FileUtils.writeFile(logFile.getAbsolutePath(), registerBuilder.toString(), true);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -35,6 +35,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
|
|||||||
import androidx.recyclerview.widget.RecyclerView;
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
import com.github.lazylibrary.util.DensityUtil;
|
import com.github.lazylibrary.util.DensityUtil;
|
||||||
|
import com.github.lazylibrary.util.FileUtils;
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import com.hjq.permissions.OnPermissionCallback;
|
import com.hjq.permissions.OnPermissionCallback;
|
||||||
import com.hjq.permissions.Permission;
|
import com.hjq.permissions.Permission;
|
||||||
@@ -100,6 +101,7 @@ import com.vividsolutions.jts.geom.Point;
|
|||||||
import org.greenrobot.eventbus.EventBus;
|
import org.greenrobot.eventbus.EventBus;
|
||||||
import org.greenrobot.eventbus.Subscribe;
|
import org.greenrobot.eventbus.Subscribe;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
import java.text.DateFormat;
|
import java.text.DateFormat;
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
@@ -135,13 +137,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
|||||||
private List<Removable> removables;
|
private List<Removable> removables;
|
||||||
private List<Removable> removableScreenMarker;
|
private List<Removable> removableScreenMarker;
|
||||||
private List<Removable> removablesLocality;
|
private List<Removable> removablesLocality;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* bitmapDescriptor1
|
* bitmapDescriptor1
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// private BitmapDescriptor bitmapDescriptor1, bitmapDescriptor2, bitmapDescriptor3, bitmapDescriptor4, bitmapDescriptor5;
|
// private BitmapDescriptor bitmapDescriptor1, bitmapDescriptor2, bitmapDescriptor3, bitmapDescriptor4, bitmapDescriptor5;
|
||||||
private Marker bigMarker;
|
private Marker bigMarker;
|
||||||
private List<Integer> upload;
|
private List<Integer> upload;
|
||||||
@@ -149,6 +147,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
|||||||
private final int MARKER_LINE = 2;
|
private final int MARKER_LINE = 2;
|
||||||
private final int MARKER_FACE = 1;
|
private final int MARKER_FACE = 1;
|
||||||
private final int MARKER_BIG = 4;
|
private final int MARKER_BIG = 4;
|
||||||
|
|
||||||
private boolean isBack = false;
|
private boolean isBack = false;
|
||||||
private HashMap<String, List<Marker>> removableHashMap;
|
private HashMap<String, List<Marker>> removableHashMap;
|
||||||
private ArrayList<LatLng> latList;
|
private ArrayList<LatLng> latList;
|
||||||
@@ -158,7 +157,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
|||||||
private SharedPreferences.Editor sharedEdit;
|
private SharedPreferences.Editor sharedEdit;
|
||||||
private SharedPreferences sharedPreferences;
|
private SharedPreferences sharedPreferences;
|
||||||
private AlertDialog.Builder builder;
|
private AlertDialog.Builder builder;
|
||||||
|
private File logFile;
|
||||||
|
private StringBuilder treasureBuilder;
|
||||||
|
|
||||||
public static TreasureFragment newInstance(Bundle bundle) {
|
public static TreasureFragment newInstance(Bundle bundle) {
|
||||||
TreasureFragment fragment = new TreasureFragment();
|
TreasureFragment fragment = new TreasureFragment();
|
||||||
@@ -217,7 +217,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
|||||||
* @param hour 需要加的时间
|
* @param hour 需要加的时间
|
||||||
*/
|
*/
|
||||||
public static String addDateMinot(String day, int hour) {
|
public static String addDateMinot(String day, int hour) {
|
||||||
@SuppressLint("SimpleDateFormat") SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
@SuppressLint("SimpleDateFormat")
|
||||||
|
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||||
Date date = null;
|
Date date = null;
|
||||||
try {
|
try {
|
||||||
date = format.parse(day);
|
date = format.parse(day);
|
||||||
@@ -262,7 +263,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
|||||||
Calendar calendar = Calendar.getInstance();
|
Calendar calendar = Calendar.getInstance();
|
||||||
calendar.setTimeInMillis(System.currentTimeMillis());
|
calendar.setTimeInMillis(System.currentTimeMillis());
|
||||||
String format = formatter.format(calendar.getTime());
|
String format = formatter.format(calendar.getTime());
|
||||||
Log.d("TAG", "onSuccessssss: " + format);
|
Log.d("TAG", "onSuccess: " + format);
|
||||||
sharedEdit.putInt("type", messageType);
|
sharedEdit.putInt("type", messageType);
|
||||||
sharedEdit.putString("dataTime", format);
|
sharedEdit.putString("dataTime", format);
|
||||||
sharedEdit.commit();
|
sharedEdit.commit();
|
||||||
@@ -282,7 +283,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
|||||||
@Override
|
@Override
|
||||||
protected void initView() {
|
protected void initView() {
|
||||||
super.initView();
|
super.initView();
|
||||||
EventBus.getDefault().register(this);
|
|
||||||
sharedPreferences = Objects.requireNonNull(getActivity()).getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE);
|
sharedPreferences = Objects.requireNonNull(getActivity()).getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE);
|
||||||
sharedEdit = sharedPreferences.edit();
|
sharedEdit = sharedPreferences.edit();
|
||||||
//fragment 管理器
|
//fragment 管理器
|
||||||
@@ -692,8 +692,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
|||||||
obtain.what = Constant.JOB_SEARCH_WORD;
|
obtain.what = Constant.JOB_SEARCH_WORD;
|
||||||
obtain.obj = response;
|
obtain.obj = response;
|
||||||
EventBus.getDefault().post(obtain);
|
EventBus.getDefault().post(obtain);
|
||||||
} else {
|
|
||||||
Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
@@ -1392,12 +1390,37 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
|||||||
@Override
|
@Override
|
||||||
protected void initData() {
|
protected void initData() {
|
||||||
super.initData();
|
super.initData();
|
||||||
|
SharedPreferences sharedPreferences = Objects.requireNonNull(getActivity()).getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE);
|
||||||
|
SharedPreferences.Editor sharedEdit = sharedPreferences.edit();
|
||||||
|
@SuppressLint("SimpleDateFormat")
|
||||||
|
DateFormat formatter = new SimpleDateFormat("yyyyMMdd");
|
||||||
|
String newFormat = formatter.format(new Date(System.currentTimeMillis()));
|
||||||
|
String pictures_time = sharedPreferences.getString("pictures_time", null);
|
||||||
|
if (pictures_time==null){
|
||||||
|
sharedEdit.putString("pictures_time",newFormat);
|
||||||
|
sharedEdit.apply();
|
||||||
|
logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt");
|
||||||
|
}else {
|
||||||
|
if (pictures_time.equals(newFormat)){
|
||||||
|
logFile = new File(Constant.LOG_FOLDER + "/" + pictures_time + ".txt");
|
||||||
|
}else {
|
||||||
|
logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
treasureBuilder = new StringBuilder();
|
||||||
|
treasureBuilder.append("TreasureFragment-onViewCreated-initData,");
|
||||||
|
if (Constant.USHERED!=null){
|
||||||
|
treasureBuilder.append("userId:").append(Constant.USHERED).append(",");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onStart() {
|
public void onStart() {
|
||||||
super.onStart();
|
super.onStart();
|
||||||
|
if (!EventBus.getDefault().isRegistered(this)) {//加上判断
|
||||||
|
EventBus.getDefault().register(this);
|
||||||
|
}
|
||||||
treasureMap.onStart();
|
treasureMap.onStart();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -1410,16 +1433,24 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
|||||||
public void onPause() {
|
public void onPause() {
|
||||||
super.onPause();
|
super.onPause();
|
||||||
treasureMap.onPause();
|
treasureMap.onPause();
|
||||||
|
treasureBuilder.append("onPause,");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onStop() {
|
public void onStop() {
|
||||||
super.onStop();
|
super.onStop();
|
||||||
treasureMap.onStop();
|
treasureMap.onStop();
|
||||||
|
treasureBuilder.append("onStop,");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDestroy() {
|
public void onDestroy() {
|
||||||
|
treasureBuilder.append("onDestroy");
|
||||||
|
treasureBuilder.append("\r\n");
|
||||||
|
FileUtils.writeFile(logFile.getAbsolutePath(), treasureBuilder.toString(), true);
|
||||||
|
if (EventBus.getDefault().isRegistered(this)){
|
||||||
|
EventBus.getDefault().unregister(this);
|
||||||
|
}
|
||||||
super.onDestroy();
|
super.onDestroy();
|
||||||
treasureMap.onDestroy();
|
treasureMap.onDestroy();
|
||||||
if (bigMarker != null) {
|
if (bigMarker != null) {
|
||||||
@@ -1429,24 +1460,27 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
|||||||
removableScreenMarker.get(i).remove();
|
removableScreenMarker.get(i).remove();
|
||||||
}
|
}
|
||||||
removableScreenMarker.clear();
|
removableScreenMarker.clear();
|
||||||
EventBus.getDefault().unregister(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
switch (v.getId()) {
|
switch (v.getId()) {
|
||||||
case R.id.iv_zoom_add://放大
|
case R.id.iv_zoom_add://放大
|
||||||
|
treasureBuilder.append("点击了放大的按钮,");
|
||||||
CameraUpdate cameraUpdateIn = CameraUpdateFactory.zoomIn();
|
CameraUpdate cameraUpdateIn = CameraUpdateFactory.zoomIn();
|
||||||
tencentMap.animateCamera(cameraUpdateIn);
|
tencentMap.animateCamera(cameraUpdateIn);
|
||||||
break;
|
break;
|
||||||
case R.id.iv_zoom_del://缩小
|
case R.id.iv_zoom_del://缩小:
|
||||||
|
treasureBuilder.append("点击了缩小的按钮,");
|
||||||
CameraUpdate cameraUpdateOut = CameraUpdateFactory.zoomOut();
|
CameraUpdate cameraUpdateOut = CameraUpdateFactory.zoomOut();
|
||||||
tencentMap.animateCamera(cameraUpdateOut);
|
tencentMap.animateCamera(cameraUpdateOut);
|
||||||
break;
|
break;
|
||||||
case R.id.iv_refrish://刷新
|
case R.id.iv_refrish://刷新:
|
||||||
|
treasureBuilder.append("点击了刷新的按钮,");
|
||||||
refreshFilterData();
|
refreshFilterData();
|
||||||
break;
|
break;
|
||||||
case R.id.iv_location://定位:
|
case R.id.iv_location://定位:
|
||||||
|
treasureBuilder.append("点击了定位的按钮,");
|
||||||
if (Constant.currentLocation != null) {
|
if (Constant.currentLocation != null) {
|
||||||
CameraUpdate cameraSigma =
|
CameraUpdate cameraSigma =
|
||||||
CameraUpdateFactory.newCameraPosition(new CameraPosition(
|
CameraUpdateFactory.newCameraPosition(new CameraPosition(
|
||||||
@@ -1461,6 +1495,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case R.id.iv_submit://弹窗
|
case R.id.iv_submit://弹窗
|
||||||
|
treasureBuilder.append("点击了弹窗 上报的按钮,");
|
||||||
debounce(ivSubmit);
|
debounce(ivSubmit);
|
||||||
if (upload == null) {
|
if (upload == null) {
|
||||||
Toast.makeText(getActivity(), "网络请求失败", Toast.LENGTH_SHORT).show();
|
Toast.makeText(getActivity(), "网络请求失败", Toast.LENGTH_SHORT).show();
|
||||||
@@ -1535,12 +1570,14 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
|||||||
}).setTitle(title);
|
}).setTitle(title);
|
||||||
break;
|
break;
|
||||||
case R.id.iv_filter:
|
case R.id.iv_filter:
|
||||||
|
treasureBuilder.append("点击了删选的按钮,");
|
||||||
debounce(ivFilter);
|
debounce(ivFilter);
|
||||||
FilterFragment filterFragment = FilterFragment.newInstance(new Bundle());
|
FilterFragment filterFragment = FilterFragment.newInstance(new Bundle());
|
||||||
showSlidingFragment(filterFragment);
|
showSlidingFragment(filterFragment);
|
||||||
refreshFilterData();
|
refreshFilterData();
|
||||||
break;
|
break;
|
||||||
case R.id.iv_message:
|
case R.id.iv_message:
|
||||||
|
treasureBuilder.append("点击了消息的按钮,");
|
||||||
Intent messageIntent = new Intent(getContext(), FragmentManagement.class);
|
Intent messageIntent = new Intent(getContext(), FragmentManagement.class);
|
||||||
messageIntent.putExtra("tag", 35);
|
messageIntent.putExtra("tag", 35);
|
||||||
startActivity(messageIntent);
|
startActivity(messageIntent);
|
||||||
@@ -1955,4 +1992,5 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
|||||||
treasureMap.onSizeChanged(measuredHeight, measuredWidth, measuredWidth, measuredHeight);
|
treasureMap.onSizeChanged(measuredHeight, measuredWidth, measuredWidth, measuredHeight);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,9 @@
|
|||||||
package com.navinfo.outdoor.fragment;
|
package com.navinfo.outdoor.fragment;
|
||||||
|
|
||||||
import android.annotation.SuppressLint;
|
import android.annotation.SuppressLint;
|
||||||
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
@@ -15,6 +17,7 @@ import android.widget.Toast;
|
|||||||
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
|
||||||
|
import com.github.lazylibrary.util.FileUtils;
|
||||||
import com.kongzue.dialog.interfaces.OnDialogButtonClickListener;
|
import com.kongzue.dialog.interfaces.OnDialogButtonClickListener;
|
||||||
import com.kongzue.dialog.util.BaseDialog;
|
import com.kongzue.dialog.util.BaseDialog;
|
||||||
import com.kongzue.dialog.util.DialogSettings;
|
import com.kongzue.dialog.util.DialogSettings;
|
||||||
@@ -30,13 +33,16 @@ import com.navinfo.outdoor.http.Callback;
|
|||||||
import com.navinfo.outdoor.http.HttpInterface;
|
import com.navinfo.outdoor.http.HttpInterface;
|
||||||
import com.navinfo.outdoor.http.OkGoBuilder;
|
import com.navinfo.outdoor.http.OkGoBuilder;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.text.DateFormat;
|
||||||
|
import java.text.SimpleDateFormat;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 提现页面的fragment
|
* 提现页面的fragment
|
||||||
*/
|
*/
|
||||||
public class WithdrawFragment extends BaseFragment implements View.OnClickListener {
|
public class WithdrawFragment extends BaseFragment implements View.OnClickListener {
|
||||||
|
|
||||||
private TextView tvUnit;
|
private TextView tvUnit;
|
||||||
private TextView tvAlready;
|
private TextView tvAlready;
|
||||||
private TextView tvTotal;
|
private TextView tvTotal;
|
||||||
@@ -53,6 +59,8 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
|
|||||||
private TextView otherPushMoney;
|
private TextView otherPushMoney;
|
||||||
private TextView otherReportMoney;
|
private TextView otherReportMoney;
|
||||||
private CheckBox checkBox;
|
private CheckBox checkBox;
|
||||||
|
private File logFile;
|
||||||
|
private StringBuilder withdrawBuilder;
|
||||||
|
|
||||||
public static WithdrawFragment newInstance(Bundle bundle) {
|
public static WithdrawFragment newInstance(Bundle bundle) {
|
||||||
WithdrawFragment fragment = new WithdrawFragment();
|
WithdrawFragment fragment = new WithdrawFragment();
|
||||||
@@ -68,6 +76,29 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
|
|||||||
@Override
|
@Override
|
||||||
protected void initData() {
|
protected void initData() {
|
||||||
super.initData();
|
super.initData();
|
||||||
|
SharedPreferences sharedPreferences = Objects.requireNonNull(getActivity()).getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE);
|
||||||
|
SharedPreferences.Editor sharedEdit = sharedPreferences.edit();
|
||||||
|
@SuppressLint("SimpleDateFormat")
|
||||||
|
DateFormat formatter = new SimpleDateFormat("yyyyMMdd");
|
||||||
|
String newFormat = formatter.format(new Date(System.currentTimeMillis()));
|
||||||
|
String pictures_time = sharedPreferences.getString("pictures_time", null);
|
||||||
|
if (pictures_time == null) {
|
||||||
|
sharedEdit.putString("pictures_time", newFormat);
|
||||||
|
sharedEdit.apply();
|
||||||
|
logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt");
|
||||||
|
} else {
|
||||||
|
if (pictures_time.equals(newFormat)) {
|
||||||
|
logFile = new File(Constant.LOG_FOLDER + "/" + pictures_time + ".txt");
|
||||||
|
} else {
|
||||||
|
logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
withdrawBuilder = new StringBuilder();
|
||||||
|
withdrawBuilder.append("WithdrawFragment-onViewCreated-initData,");
|
||||||
|
if (Constant.USHERED != null) {
|
||||||
|
withdrawBuilder.append("userId:").append(Constant.USHERED).append(",");
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -91,8 +122,10 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
|
|||||||
if (Constant.ID_NUMBER == null || Constant.BACKGROUND == null) {
|
if (Constant.ID_NUMBER == null || Constant.BACKGROUND == null) {
|
||||||
Toast.makeText(getActivity(), "没有绑定银行卡,请先绑定银行卡", Toast.LENGTH_SHORT).show();
|
Toast.makeText(getActivity(), "没有绑定银行卡,请先绑定银行卡", Toast.LENGTH_SHORT).show();
|
||||||
checkBox.setChecked(false);
|
checkBox.setChecked(false);
|
||||||
|
withdrawBuilder.append("点击了银行卡的勾选,");
|
||||||
} else {
|
} else {
|
||||||
checkBox.setChecked(true);
|
checkBox.setChecked(true);
|
||||||
|
withdrawBuilder.append("取消了银行卡的勾选,");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -162,14 +195,17 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
|
|||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
switch (v.getId()) {
|
switch (v.getId()) {
|
||||||
case R.id.iv_withdraw:
|
case R.id.iv_withdraw:
|
||||||
|
withdrawBuilder.append("点击了财务信息的返回,");
|
||||||
Objects.requireNonNull(getActivity()).finish();
|
Objects.requireNonNull(getActivity()).finish();
|
||||||
break;
|
break;
|
||||||
case R.id.tv_text:
|
case R.id.tv_text:
|
||||||
|
withdrawBuilder.append("点击了提现记录,");
|
||||||
Intent intentText = new Intent(getActivity(), FragmentManagement.class);
|
Intent intentText = new Intent(getActivity(), FragmentManagement.class);
|
||||||
intentText.putExtra("tag", 26);
|
intentText.putExtra("tag", 26);
|
||||||
startActivity(intentText);
|
startActivity(intentText);
|
||||||
break;
|
break;
|
||||||
case R.id.button:
|
case R.id.button:
|
||||||
|
withdrawBuilder.append("点击了立即提现,");
|
||||||
String price = etAllPrice.getText().toString().trim();
|
String price = etAllPrice.getText().toString().trim();
|
||||||
if (!price.equals("")) {
|
if (!price.equals("")) {
|
||||||
double aDouble = Double.parseDouble(price);
|
double aDouble = Double.parseDouble(price);
|
||||||
@@ -200,6 +236,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case R.id.tv_all:
|
case R.id.tv_all:
|
||||||
|
withdrawBuilder.append("点击了全部,");
|
||||||
etAllPrice.setText(canExchangePrice + "");
|
etAllPrice.setText(canExchangePrice + "");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -244,4 +281,24 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onPause() {
|
||||||
|
super.onPause();
|
||||||
|
withdrawBuilder.append("onPause,");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onStop() {
|
||||||
|
super.onStop();
|
||||||
|
withdrawBuilder.append("onStop,");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onDestroy() {
|
||||||
|
super.onDestroy();
|
||||||
|
withdrawBuilder.append("onDestroy");
|
||||||
|
withdrawBuilder.append("\r\n");
|
||||||
|
FileUtils.writeFile(logFile.getAbsolutePath(), withdrawBuilder.toString(), true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -161,8 +161,12 @@ public class ContactView {
|
|||||||
String areaCode = "";
|
String areaCode = "";
|
||||||
if (editAreaCode.isShown()) {
|
if (editAreaCode.isShown()) {
|
||||||
areaCode = editAreaCode.getText().toString().trim();
|
areaCode = editAreaCode.getText().toString().trim();
|
||||||
|
}else {
|
||||||
|
if (!Constant.CODE.equals("")){
|
||||||
|
areaCode=Constant.CODE;
|
||||||
}
|
}
|
||||||
if (!areaCode.equals("")&&!editPhoneNumber.getText().toString().trim().equals("")&&editPhoneNumber.getText().toString().trim()!=null){
|
}
|
||||||
|
if (!editPhoneNumber.getText().toString().trim().equals("")) {
|
||||||
poiBeans.add(new PhoneBean(null, editPhoneNumber.getText().toString().trim(), areaCode, 0));
|
poiBeans.add(new PhoneBean(null, editPhoneNumber.getText().toString().trim(), areaCode, 0));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ import java.io.IOException;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
import okhttp3.Response;
|
import okhttp3.Response;
|
||||||
|
|
||||||
@@ -311,6 +312,10 @@ public class PoiSaveUtils {
|
|||||||
for (int i = 0; i < photoFile.size(); i++) {
|
for (int i = 0; i < photoFile.size(); i++) {
|
||||||
photoFile.get(i).delete();
|
photoFile.get(i).delete();
|
||||||
}
|
}
|
||||||
|
if (videoFileList!=null){
|
||||||
|
File file = new File(Objects.requireNonNull(videoFileList.get(0).getParentFile()).getAbsoluteFile() + "");
|
||||||
|
file.delete();
|
||||||
|
}
|
||||||
Log.d("TAGss", "uploadPoiNet: 成功" + anInt);
|
Log.d("TAGss", "uploadPoiNet: 成功" + anInt);
|
||||||
anInt++;
|
anInt++;
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ public class UploadUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 道路
|
* road
|
||||||
* @param mContext
|
* @param mContext
|
||||||
* @param showPoiEntity
|
* @param showPoiEntity
|
||||||
* @param fileZip
|
* @param fileZip
|
||||||
@@ -56,6 +56,10 @@ public class UploadUtils {
|
|||||||
for (int i = 0; i < fileListByUUID.size(); i++) {
|
for (int i = 0; i < fileListByUUID.size(); i++) {
|
||||||
fileListByUUID.get(i).delete();
|
fileListByUUID.get(i).delete();
|
||||||
}
|
}
|
||||||
|
if (fileListByUUID.size()>0){
|
||||||
|
File file = new File(Objects.requireNonNull(fileListByUUID.get(0).getParentFile()).getAbsoluteFile() + "");
|
||||||
|
file.delete();
|
||||||
|
}
|
||||||
fileZip.delete();
|
fileZip.delete();
|
||||||
Objects.requireNonNull(mContext).runOnUiThread(new Runnable() {
|
Objects.requireNonNull(mContext).runOnUiThread(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
@@ -142,7 +146,7 @@ public class UploadUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* poiVideo
|
* PoiVideo
|
||||||
* @param mContext
|
* @param mContext
|
||||||
* @param showPoiEntity
|
* @param showPoiEntity
|
||||||
* @param fileZip
|
* @param fileZip
|
||||||
@@ -167,6 +171,10 @@ public class UploadUtils {
|
|||||||
for (int i = 0; i < fileListByUUID.size(); i++) {
|
for (int i = 0; i < fileListByUUID.size(); i++) {
|
||||||
fileListByUUID.get(i).delete();
|
fileListByUUID.get(i).delete();
|
||||||
}
|
}
|
||||||
|
if (fileListByUUID.size()>0){
|
||||||
|
File file = new File(Objects.requireNonNull(fileListByUUID.get(0).getParentFile()).getAbsoluteFile() + "");
|
||||||
|
file.delete();
|
||||||
|
}
|
||||||
fileZip.delete();
|
fileZip.delete();
|
||||||
Objects.requireNonNull(mContext).runOnUiThread(new Runnable() {
|
Objects.requireNonNull(mContext).runOnUiThread(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user