diff --git a/app/src/main/java/com/navinfo/outdoor/activity/GuidanceActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/GuidanceActivity.java index dccd17c..e06ff0d 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/GuidanceActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/GuidanceActivity.java @@ -11,6 +11,7 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.FrameLayout; import android.widget.Toast; + import androidx.annotation.NonNull; import com.github.lazylibrary.util.FileUtils; @@ -268,36 +269,39 @@ public class GuidanceActivity extends BaseActivity { private void initGuide() { showLoadingDialog(); - /* HttpParams httpParams = new HttpParams(); - long time = System.currentTimeMillis(); - httpParams.put("datetime", time);*/ - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(this) .url(HttpInterface.INSERT_USER_GUIDE) .cls(BaseBean.class) - .params(new HttpParams()) - .getRequest(new Callback>() { - @Override - public void onSuccess(BaseBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - startActivity(new Intent(GuidanceActivity.this, HomeActivity.class)); - GuidanceActivity.this.finish(); - Toast.makeText(GuidanceActivity.this, "可以在发现版块的任务说明中，进行再次学习哦", Toast.LENGTH_LONG).show(); - }else if (response.getCode()==203){ - FlushTokenUtil.flushToken(GuidanceActivity.this); - }else { - Toast.makeText(GuidanceActivity.this, response.getMessage(), Toast.LENGTH_SHORT).show(); - } - } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(GuidanceActivity.this, e.getMessage()+"", Toast.LENGTH_SHORT).show(); - Log.e("TAG", "onError: "+e.getMessage()+""); - } - }); + .params(new HttpParams()); + okGoBuilder.getRequest(new Callback>() { + @Override + public void onSuccess(BaseBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + startActivity(new Intent(GuidanceActivity.this, HomeActivity.class)); + GuidanceActivity.this.finish(); + Toast.makeText(GuidanceActivity.this, "可以在发现版块的任务说明中，进行再次学习哦", Toast.LENGTH_LONG).show(); + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(GuidanceActivity.this); + } else { + Toast.makeText(GuidanceActivity.this, response.getMessage(), Toast.LENGTH_SHORT).show(); + } + } + + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")){ + Toast.makeText(GuidanceActivity.this, "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(GuidanceActivity.this, message, Toast.LENGTH_SHORT).show(); + } + } + }); } @Override diff --git a/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java index d2f1a40..fedd169 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java @@ -148,8 +148,8 @@ public class HomeActivity extends BaseActivity{ }else if (data.what==Constant.NEST_WORD_SUBMIT){ String dataString = (String) data.obj; if (!dataString.equals("")) { - Constant.isPresent=true; DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; + Constant.isPresent=true; MessageDialog.show(this, "提示", dataString, "确定"); } } diff --git a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java index 9aa2354..d2faae1 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java @@ -196,123 +196,137 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener httpParams.put("grant_type", "password"); httpParams.put("datetime", time); showLoadingDialog(); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder + .getInstance() .time(30) .Builder(this) .url(HttpInterface.USER_LOGIN_OAUTH_TOKEN) .cls(LoginOauthTokenBean.class) - .params(httpParams) - .postRequest(new Callback() { - @Override - public void onSuccess(LoginOauthTokenBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - LoginOauthTokenBean.BodyBean body = response.getBody(); - if (body.getUserId() != null && !body.getUserId().equals("")) { - Constant.initRootFolder(body.getUserId()); - HttpInterface.initHttpInter(body.getUserId()); - loginBuilder.append("userId:").append(body.getUserId()).append(","); - } - navInfoEditor.putString("access_token", body.getAccess_token()); - navInfoEditor.putString("refresh_token", body.getRefresh_token()); - navInfoEditor.putString("pass_word", paw); - navInfoEditor.putString("user_name", name); - navInfoEditor.putString("user_id", body.getUserId()); - navInfoEditor.commit(); - Constant.ACCESS_TOKEN = body.getAccess_token(); - Constant.REFRESH_TOKEN = body.getRefresh_token(); - Constant.USHERED = body.getUserId(); - Constant.PASS_WORD = paw; - loginBuilder.append("登录获取token ,"); - initGetUserInfo();//获取用户信息 - } else { - Toast.makeText(LoginActivity.this, response.getMessage(), Toast.LENGTH_SHORT).show(); - } + .params(httpParams); + okGoBuilder.postRequest(new Callback() { + @Override + public void onSuccess(LoginOauthTokenBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + LoginOauthTokenBean.BodyBean body = response.getBody(); + if (body.getUserId() != null && !body.getUserId().equals("")) { + Constant.initRootFolder(body.getUserId()); + HttpInterface.initHttpInter(body.getUserId()); + loginBuilder.append("userId:").append(body.getUserId()).append(","); } + navInfoEditor.putString("access_token", body.getAccess_token()); + navInfoEditor.putString("refresh_token", body.getRefresh_token()); + navInfoEditor.putString("pass_word", paw); + navInfoEditor.putString("user_name", name); + navInfoEditor.putString("user_id", body.getUserId()); + navInfoEditor.commit(); + Constant.ACCESS_TOKEN = body.getAccess_token(); + Constant.REFRESH_TOKEN = body.getRefresh_token(); + Constant.USHERED = body.getUserId(); + Constant.PASS_WORD = paw; + loginBuilder.append("登录获取token ,"); + initGetUserInfo();//获取用户信息 + } else { + Toast.makeText(LoginActivity.this, response.getMessage(), Toast.LENGTH_SHORT).show(); + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(LoginActivity.this, e.getMessage() + "", Toast.LENGTH_SHORT).show(); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(LoginActivity.this, "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(LoginActivity.this, message, Toast.LENGTH_SHORT).show(); + } + } + }); } catch (Exception e) { e.printStackTrace(); } } private void initGetUserInfo() { - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder + .getInstance() .time(30) .Builder(this) .url(HttpInterface.USER_DETAIL_BY_USER_ID) .token(Constant.ACCESS_TOKEN) .params(new HttpParams()) - .cls(UserDetailBean.class) - .getRequest(new Callback() { - @Override - public void onSuccess(UserDetailBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - UserDetailBean.BodyBean body = response.getBody(); - if (body != null) { - navInfoEditor.putString("username", body.getUsername()); - Constant.USER_NAME = body.getUsername(); - navInfoEditor.putString("mobile", body.getMobile()); - Constant.MOBILE = body.getMobile(); - navInfoEditor.putInt("sex", body.getSex());//0:女 1：男 - Constant.SEX = body.getSex(); - navInfoEditor.putString("qq", body.getQq()); - Constant.QQ = body.getQq(); - navInfoEditor.putString("wechat", body.getWechat()); - Constant.WCHAR = body.getWechat(); - navInfoEditor.putInt("level", body.getLevel()); - Constant.LEVEL = body.getLevel(); - UserDetailBean.BodyBean.UserBankcardBean userBankcard = body.getUserBankcard(); - if (userBankcard != null) {//存储银行卡信息 - navInfoEditor.putString("bankAccount", userBankcard.getBankAccount());//银行卡号 - Constant.BACKGROUND = userBankcard.getBankAccount(); - navInfoEditor.putString("idNumber", userBankcard.getIdNumber());//身份证号 - Constant.ID_NUMBER = userBankcard.getIdNumber(); - navInfoEditor.putString("bankName", userBankcard.getBankName());//銀行姓名 - Constant.BACKGROUND_NAME = userBankcard.getBankName(); - } - UserDetailBean.BodyBean.UserAuthBean userAuth = body.getUserAuth(); - if (userAuth != null) {//存储身份证信息 - navInfoEditor.putString("name", userAuth.getName());//身份证姓名 - Constant.NAME = userAuth.getName(); - navInfoEditor.putString("idnum", userAuth.getIdnum());//身份证号码 - Constant.ID_NUM = userAuth.getIdnum(); - navInfoEditor.putInt("auditstatus", userAuth.getAuditstatus());//审核状态 - Constant.AUDIOTAPES = userAuth.getAuditstatus(); - navInfoEditor.putString("auditmsg", userAuth.getAuditmsg());//审核信息 - Constant.AUDITING = userAuth.getAuditmsg(); - } - navInfoEditor.commit(); - int needGuide = body.getNeedGuide();//0不需要 1需要 - if (needGuide == 1) { - loginBuilder.append("进入介绍页 ,"); - Intent intent = new Intent(LoginActivity.this, GuidanceActivity.class); - startActivity(intent); - } else { - loginBuilder.append("登录成功 ,"); - Toast.makeText(LoginActivity.this, "登录成功", Toast.LENGTH_SHORT).show(); - Intent intent = new Intent(LoginActivity.this, HomeActivity.class); - startActivity(intent); - finish(); - } - } + .cls(UserDetailBean.class); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(UserDetailBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + UserDetailBean.BodyBean body = response.getBody(); + if (body != null) { + navInfoEditor.putString("username", body.getUsername()); + Constant.USER_NAME = body.getUsername(); + navInfoEditor.putString("mobile", body.getMobile()); + Constant.MOBILE = body.getMobile(); + navInfoEditor.putInt("sex", body.getSex());//0:女 1：男 + Constant.SEX = body.getSex(); + navInfoEditor.putString("qq", body.getQq()); + Constant.QQ = body.getQq(); + navInfoEditor.putString("wechat", body.getWechat()); + Constant.WCHAR = body.getWechat(); + navInfoEditor.putInt("level", body.getLevel()); + Constant.LEVEL = body.getLevel(); + UserDetailBean.BodyBean.UserBankcardBean userBankcard = body.getUserBankcard(); + if (userBankcard != null) {//存储银行卡信息 + navInfoEditor.putString("bankAccount", userBankcard.getBankAccount());//银行卡号 + Constant.BACKGROUND = userBankcard.getBankAccount(); + navInfoEditor.putString("idNumber", userBankcard.getIdNumber());//身份证号 + Constant.ID_NUMBER = userBankcard.getIdNumber(); + navInfoEditor.putString("bankName", userBankcard.getBankName());//銀行姓名 + Constant.BACKGROUND_NAME = userBankcard.getBankName(); + } + UserDetailBean.BodyBean.UserAuthBean userAuth = body.getUserAuth(); + if (userAuth != null) {//存储身份证信息 + navInfoEditor.putString("name", userAuth.getName());//身份证姓名 + Constant.NAME = userAuth.getName(); + navInfoEditor.putString("idnum", userAuth.getIdnum());//身份证号码 + Constant.ID_NUM = userAuth.getIdnum(); + navInfoEditor.putInt("auditstatus", userAuth.getAuditstatus());//审核状态 + Constant.AUDIOTAPES = userAuth.getAuditstatus(); + navInfoEditor.putString("auditmsg", userAuth.getAuditmsg());//审核信息 + Constant.AUDITING = userAuth.getAuditmsg(); + } + navInfoEditor.commit(); + int needGuide = body.getNeedGuide();//0不需要 1需要 + if (needGuide == 1) { + loginBuilder.append("进入介绍页 ,"); + Intent intent = new Intent(LoginActivity.this, GuidanceActivity.class); + startActivity(intent); } else { - Toast.makeText(LoginActivity.this, response.getMessage() + "", Toast.LENGTH_SHORT).show(); + loginBuilder.append("登录成功 ,"); + Toast.makeText(LoginActivity.this, "登录成功", Toast.LENGTH_SHORT).show(); + Intent intent = new Intent(LoginActivity.this, HomeActivity.class); + startActivity(intent); + finish(); } } + } else { + Toast.makeText(LoginActivity.this, response.getMessage() + "", Toast.LENGTH_SHORT).show(); + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(LoginActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(LoginActivity.this, "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(LoginActivity.this, message, Toast.LENGTH_SHORT).show(); + } + } + }); } @Override diff --git a/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java index f3a9691..3848417 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java @@ -168,7 +168,7 @@ public class MainActivity extends BaseActivity { httpParams.put("operationType", "android"); showLoadingDialog(); OkGoBuilder.getInstance() - .time(30) + .time(0) .Builder(this) .url(HttpInterface.APP_CHECK_VERSION) .params(httpParams) @@ -195,7 +195,13 @@ public class MainActivity extends BaseActivity { @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(MainActivity.this, e.getMessage() + "", Toast.LENGTH_SHORT).show(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(MainActivity.this, "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(MainActivity.this, message, Toast.LENGTH_SHORT).show(); + } initTime(); } }); @@ -269,77 +275,83 @@ public class MainActivity extends BaseActivity { } private void initGetUserInfo() { - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(this) .url(HttpInterface.USER_DETAIL_BY_USER_ID) .token(Constant.ACCESS_TOKEN) .params(new HttpParams()) - .cls(UserDetailBean.class) - .getRequest(new Callback() { - @Override - public void onSuccess(UserDetailBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - UserDetailBean.BodyBean body = response.getBody(); - if (body != null) { - navInfoEditor.putString("username", body.getUsername()); - Constant.USER_NAME = body.getUsername(); - navInfoEditor.putString("mobile", body.getMobile()); - Constant.MOBILE = body.getMobile(); - navInfoEditor.putInt("sex", body.getSex());//0:女 1：男 - Constant.SEX = body.getSex(); - navInfoEditor.putString("qq", body.getQq()); - Constant.QQ = body.getQq(); - navInfoEditor.putString("wechat", body.getWechat()); - Constant.WCHAR = body.getWechat(); - navInfoEditor.putInt("level", body.getLevel()); - Constant.LEVEL = body.getLevel(); - UserDetailBean.BodyBean.UserBankcardBean userBankcard = body.getUserBankcard(); - if (userBankcard != null) {//存储银行卡信息 - navInfoEditor.putString("bankAccount", userBankcard.getBankAccount());//银行卡号 - Constant.BACKGROUND = userBankcard.getBankAccount(); - navInfoEditor.putString("idNumber", userBankcard.getIdNumber());//身份证号 - Constant.ID_NUMBER = userBankcard.getIdNumber(); - navInfoEditor.putString("bankName", userBankcard.getBankName());//銀行姓名 - Constant.BACKGROUND_NAME = userBankcard.getBankName(); - } - UserDetailBean.BodyBean.UserAuthBean userAuth = body.getUserAuth(); - if (userAuth != null) {//存储身份证信息 - navInfoEditor.putString("name", userAuth.getName());//身份证姓名 - Constant.NAME = userAuth.getName(); - navInfoEditor.putString("idnum", userAuth.getIdnum());//身份证号码 - Constant.ID_NUM = userAuth.getIdnum(); - navInfoEditor.putInt("auditstatus", userAuth.getAuditstatus());//审核状态 - Constant.AUDIOTAPES = userAuth.getAuditstatus(); - navInfoEditor.putString("auditmsg", userAuth.getAuditmsg());//审核信息 - Constant.AUDITING = userAuth.getAuditmsg(); - } - navInfoEditor.commit(); - int needGuide = body.getNeedGuide();//0不需要 1需要 - if (needGuide == 1) { - Intent intent = new Intent(MainActivity.this, GuidanceActivity.class); - startActivity(intent); - } else { - Intent intent = new Intent(MainActivity.this, HomeActivity.class); - startActivity(intent); - finish(); - } - } + .cls(UserDetailBean.class); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(UserDetailBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + UserDetailBean.BodyBean body = response.getBody(); + if (body != null) { + navInfoEditor.putString("username", body.getUsername()); + Constant.USER_NAME = body.getUsername(); + navInfoEditor.putString("mobile", body.getMobile()); + Constant.MOBILE = body.getMobile(); + navInfoEditor.putInt("sex", body.getSex());//0:女 1：男 + Constant.SEX = body.getSex(); + navInfoEditor.putString("qq", body.getQq()); + Constant.QQ = body.getQq(); + navInfoEditor.putString("wechat", body.getWechat()); + Constant.WCHAR = body.getWechat(); + navInfoEditor.putInt("level", body.getLevel()); + Constant.LEVEL = body.getLevel(); + UserDetailBean.BodyBean.UserBankcardBean userBankcard = body.getUserBankcard(); + if (userBankcard != null) {//存储银行卡信息 + navInfoEditor.putString("bankAccount", userBankcard.getBankAccount());//银行卡号 + Constant.BACKGROUND = userBankcard.getBankAccount(); + navInfoEditor.putString("idNumber", userBankcard.getIdNumber());//身份证号 + Constant.ID_NUMBER = userBankcard.getIdNumber(); + navInfoEditor.putString("bankName", userBankcard.getBankName());//銀行姓名 + Constant.BACKGROUND_NAME = userBankcard.getBankName(); + } + UserDetailBean.BodyBean.UserAuthBean userAuth = body.getUserAuth(); + if (userAuth != null) {//存储身份证信息 + navInfoEditor.putString("name", userAuth.getName());//身份证姓名 + Constant.NAME = userAuth.getName(); + navInfoEditor.putString("idnum", userAuth.getIdnum());//身份证号码 + Constant.ID_NUM = userAuth.getIdnum(); + navInfoEditor.putInt("auditstatus", userAuth.getAuditstatus());//审核状态 + Constant.AUDIOTAPES = userAuth.getAuditstatus(); + navInfoEditor.putString("auditmsg", userAuth.getAuditmsg());//审核信息 + Constant.AUDITING = userAuth.getAuditmsg(); + } + navInfoEditor.commit(); + int needGuide = body.getNeedGuide();//0不需要 1需要 + if (needGuide == 1) { + Intent intent = new Intent(MainActivity.this, GuidanceActivity.class); + startActivity(intent); } else { - Intent intent = new Intent(MainActivity.this, LoginActivity.class); + Intent intent = new Intent(MainActivity.this, HomeActivity.class); startActivity(intent); finish(); - } } + } else { + Intent intent = new Intent(MainActivity.this, LoginActivity.class); + startActivity(intent); + finish(); - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(MainActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); + } + } + + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(MainActivity.this, "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(MainActivity.this, message, Toast.LENGTH_SHORT).show(); + } + } + }); } private void initLogIn() { @@ -350,13 +362,13 @@ public class MainActivity extends BaseActivity { httpParams.put("refresh_token", Constant.REFRESH_TOKEN); httpParams.put("datetime", time); showLoadingDialog(); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(this) .url(HttpInterface.USER_LOGIN_OAUTH_TOKEN) .cls(LoginOauthTokenBean.class) - .params(httpParams) - .postRequest(new Callback() { + .params(httpParams); + okGoBuilder.postRequest(new Callback() { @Override public void onSuccess(LoginOauthTokenBean response, int id) { dismissLoadingDialog(); @@ -384,7 +396,13 @@ public class MainActivity extends BaseActivity { @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(MainActivity.this, e.getMessage() + "", Toast.LENGTH_SHORT).show(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(MainActivity.this, "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(MainActivity.this, message, Toast.LENGTH_SHORT).show(); + } } }); } catch (Exception e) { diff --git a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java index 4e018aa..ffad19e 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java @@ -269,7 +269,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen @SuppressLint("SetTextI18n") @Override public void run() { - //Toast.makeText(PicturesActivity.this, "保存成功:" + (videoIndex + 1), Toast.LENGTH_SHORT).show(); tvTitle.setText("保存成功:" + (videoIndex + 1)); } }); @@ -279,46 +278,51 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen message.what = 0x103; handler.sendMessage(message); } - /* if (file.exists()) { - WebPNative webPNative = new WebPNative(); - new Thread(new Runnable() { - @Override - public void run() { - try { - Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath()); - webPNative.encodeRGBA(bitmap, file.getPath(), 90); - runOnUiThread(new Runnable() { - @Override - public void run() { - if (file.exists()) { - initMarker(); - videoIndex = Integer.parseInt(file.getName().replace(".webp", "")); - finalVideoPath = Objects.requireNonNull(file.getParentFile()).getAbsolutePath() + "/" + (videoIndex + 1) + ".webp"; - Toast.makeText(PicturesActivity.this, "保存成功:" + (videoIndex + 1), Toast.LENGTH_SHORT).show(); + /* if (file.exists()) { + WebPNative webPNative = new WebPNative(); + new Thread(new Runnable() { + @Override + public void run() { + try { + Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath()); + webPNative.encodeRGBA(bitmap, file.getPath(), 90); + runOnUiThread(new Runnable() { + @Override + public void run() { + if (file.exists()) { + initMarker(); + videoIndex = Integer.parseInt(file.getName().replace(".webp", "")); + finalVideoPath = Objects.requireNonNull(file.getParentFile()).getAbsolutePath() + "/" + (videoIndex + 1) + ".webp"; + Toast.makeText(PicturesActivity.this, "保存成功:" + (videoIndex + 1), Toast.LENGTH_SHORT).show(); + } + if (poi_video_type == 2) { + Message message = new Message(); + message.what = 0x103; + handler.sendMessage(message); + } } - if (poi_video_type == 2) { - Message message = new Message(); - message.what = 0x103; - handler.sendMessage(message); - } - } - }); + }); - if (!bitmap.isRecycled()) { - bitmap.recycle(); + if (!bitmap.isRecycled()) { + bitmap.recycle(); + } + } catch (Exception e) { + Log.d("output:", e.toString()); } - } catch (Exception e) { - Log.d("output:", e.toString()); } - } - }).start(); - } else { - Toast.makeText(PicturesActivity.this, "源文件不存在", Toast.LENGTH_SHORT).show(); - }*/ + }).start(); + } else { + Toast.makeText(PicturesActivity.this, "源文件不存在", Toast.LENGTH_SHORT).show(); + }*/ } }); } else { isBack = false; + if (poi_video_type != 2) { + capturePicture.setText("开始采集"); + } + capturePicture.setChecked(false); + stopTimer(); } } }); @@ -342,9 +346,9 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen if (geometry.getGeometryType().equals("LineString")) {//线 BitmapDescriptor bitmapLine = null; if (type != null) { - if (type.equals("3")) {//poi录像 + if (type.equals("4")) {//poi录像 bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_arrows); - } else if (type.equals("4")) {//道路录像 + } else if (type.equals("3")) {//道路录像 bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.road_arrows); } } @@ -372,18 +376,32 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen String geo = Geohash.getInstance().decode(detail); Geometry geometry = GeometryTools.createGeometry(geo); if (geometry.getGeometryType().equals("LineString")) {//线 - List latLineString = GeometryTools.getLatLags(geo); - assert latLineString != null; - for (int i = 0; i < latLineString.size(); i++) { - LatLng latLng = latLineString.get(i); - if (latLng != null) { - BitmapDescriptor pileDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.ic_baseline); - Marker marker = tencentMap.addMarker(new MarkerOptions(latLng).icon(pileDescriptor).alpha(0.9f) - .flat(true) - .clockwise(false)); - removables.add(marker); + BitmapDescriptor bitmapLine = null; + if (type != null) { + if (type.equals("4")) {//poi录像 + bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_arrows); + } else if (type.equals("3")) {//道路录像 + bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.road_arrows); } } + List latLineString = GeometryTools.getLatLags(geo); + assert latLineString != null; + startLatLine = latLineString.get(0); + endLatLine = latLineString.get(latLineString.size() - 1); + // 构造 PolylineOnions + PolylineOptions polylineOptions = new PolylineOptions().addAll(latLineString) + // 折线设置圆形线头 + .lineCap(true) + // 折线的颜色为绿色 + .color(Color.parseColor("#BDBDBD")) + // 折线宽度为5像素 + .width(20) + .arrow(true) + .arrowSpacing(150) + .arrowTexture(bitmapLine); + // 绘制折线 + polyline = tencentMap.addPolyline(polylineOptions); + polyline.setZIndex(2); } } } @@ -458,7 +476,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen if (Constant.currentLocation != null) { CameraUpdate cameraSigma = CameraUpdateFactory .newCameraPosition(new CameraPosition(new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude()), //中心点坐标，地图目标经纬度 - tencentMap.getCameraPosition().zoom, //目标缩放级别 + 17, //目标缩放级别 0, //目标倾斜角[0.0 ~ 45.0] (垂直地图时为0) 0)); //目标旋转角 0~360° (正北方为0) tencentMap.animateCamera(cameraSigma); @@ -483,7 +501,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen } /* - * 设置定位图标样式 + 设置定位图标样式 */ private void setLocMarkerStyle(int type) { tencentMap.setLocationSource(new MyTecentLocationSource(this)); @@ -500,7 +518,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen tencentMap.setMyLocationStyle(locationStyle); } - public void benSwitch() { FrameLayout.LayoutParams layoutParamsMap = (FrameLayout.LayoutParams) ivMap.getLayoutParams();//地图的宽高 int heightMap = ivMap.getMeasuredHeight(); @@ -626,7 +643,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen TencentLocation tencentLocation = (TencentLocation) msg.obj; CameraUpdate cameraSigma = CameraUpdateFactory.newCameraPosition(new CameraPosition( new LatLng(tencentLocation.getLatitude(), tencentLocation.getLongitude()), //中心点坐标，地图目标经纬度 - 20, //目标缩放级别 + 17, //目标缩放级别 0, //目标倾斜角 tencentLocation.getBearing())); //目标旋转角 0~360° (正北方为0) tencentMap.animateCamera(cameraSigma); @@ -655,6 +672,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen sb.append("\r\n"); if (isBack) { FileUtils.writeFile(paperFile.getAbsolutePath(), sb.toString(), true); + //initSpeed(); } } catch (Exception e) { UMCrash.generateCustomLog(e, "自定义"); @@ -665,7 +683,27 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen } }, 100); } - /* float speed = Constant.currentLocation.getSpeed();//米/秒 + //快到终点的语音播报 + /*if (Constant.currentLocation != null) { + LatLng newLatLine = new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude()); + if (endLatLine != null && startLatLine != null) { + double startDistance = GeometryTools.distanceToDouble(newLatLine, startLatLine); + double endDistance = GeometryTools.distanceToDouble(newLatLine, endLatLine); + if (startDistance > endDistance) {//endDistance: 起点 startDistance:终点 + if (startDistance == 50) { + systemTTS.playText("即将到达任务终点"); + } + } else { + if (endDistance == 50) { + systemTTS.playText("即将到达任务终点"); + } + } + } + }*/ + } + + private void initSpeed() { + float speed = Constant.currentLocation.getSpeed();//米/秒 if (speed != 0) { float a = (speed * 3600 / 1000);//km/h if (poi_video_type == 1) { @@ -695,24 +733,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen } } oldCurrentLocation = Constant.currentLocation; - }*/ - //快到终点的语音播报 - /*if (Constant.currentLocation!=null){ - LatLng newLatLine = new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude()); - if (endLatLine!=null&&startLatLine!=null){ - double startDistance = GeometryTools.distanceToDouble(newLatLine, startLatLine); - double endDistance = GeometryTools.distanceToDouble(newLatLine, endLatLine); - if (startDistance>endDistance){//endDistance: 起点 startDistance:终点 - if (startDistance==50){ - systemTTS.playText("即将到达任务终点"); - } - }else { - if (endDistance==50){ - systemTTS.playText("即将到达任务终点"); - } - } - } - }*/ + } } @Override @@ -746,12 +767,11 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen LatLng latLng = new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude()); BitmapDescriptor pileDescriptor = BitmapDescriptorFactory .fromResource(R.drawable.circle); - Marker marker = tencentMap - .addMarker(new MarkerOptions(latLng) - .icon(pileDescriptor) - .alpha(0.9f) - .flat(true) - .clockwise(false)); + Marker marker = tencentMap.addMarker(new MarkerOptions(latLng) + .icon(pileDescriptor) + .alpha(0.9f) + .flat(true) + .clockwise(false)); removables.add(marker); } diff --git a/app/src/main/java/com/navinfo/outdoor/activity/TestActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/TestActivity.java index 0b9dd86..73b2ac7 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/TestActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/TestActivity.java @@ -123,196 +123,196 @@ public class TestActivity extends BaseActivity { httpParams.put("pageNum", treasurePage); httpParams.put("type", task_type); httpParams.put("isExclusive", limit_type); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(this) .url(HttpInterface.TASK_LIST) .cls(JobSearchBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(JobSearchBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - JobSearchBean.BodyBean body = response.getBody(); - if (body != null) { - Log.d("TAG", "onSuccess: " + response.getBody().toString()); - for (int i = 0; i < removables.size(); i++) { - removables.get(i).remove(); - } - removables.clear(); - stringListHashMap.clear(); - List list = response.getBody().getList(); - for (int i = 0; i < list.size(); i++) { - JobSearchBean.BodyBean.ListBean listBean = list.get(i); - String encodeStr = list.get(i).getGeo(); - // 解密geo - Geometry geoMe = GeometryTools.createGeometry(Geohash.getInstance().decode(encodeStr)); - String geo = geoMe.toString(); - listBean.setGeo(geo); - Log.d("TAG", "onSuccess: " + geo); - Geometry geometry = GeometryTools.createGeometry(geo); - LatLng latLng = null; - switch (geometry.getGeometryType()) { - case "Point": //点 - latLng = GeometryTools.createLatLng(geo); - break; - case "LineString": //线 - BitmapDescriptor bitmapLine = null; - if (listBean.getType() == 3) {//poi录像 - bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_arrows); - } else if (listBean.getType() == 4) {//道路录像 - bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.road_arrows); - } - List latLineString = GeometryTools.getLatLags(geo); - // 构造 PolylineOptions - PolylineOptions polylineOptions = new PolylineOptions() - .addAll(latLineString)// 折线设置圆形线头 - .lineCap(true)// 折线的颜色为绿色 - .color(Color.parseColor("#0096FF"))// 折线宽度为5像素 - .width(10) - .arrow(true) - //.borderColor(0xffff0000) // 还可以添加描边颜色 - //.borderWidth(1) // 描边颜色的宽度，线宽还是 25 像素，不过填充的部分宽度为 `width` - 2 * `borderWidth` - .arrowSpacing(100) - .arrowTexture(bitmapLine); - // 绘制折线 - Polyline polyline = tencentMap.addPolyline(polylineOptions); - polyline.setZIndex(MARKER_LINE); - removables.add(polyline); - if (latLineString != null && latLineString.size() > 0) { - latLng = latLineString.get(0); - } - break; - case "Polygon": //面 - List latPolygon = GeometryTools.getLatLags(geo); - Polygon polygon = tencentMap.addPolygon(new PolygonOptions(). - addAll(latPolygon).//连接封闭图形的点 - fillColor(Color.parseColor("#97E0E7EC")). //填充颜色为红色 - strokeColor(0xff000000).//边线颜色为黑色 - strokeWidth(5));//边线宽度15像素 - polygon.setZIndex(MARKER_FACE); - removables.add(polygon); - com.vividsolutions.jts.geom.Point centroid = geometry.getCentroid(); - double x = centroid.getX(); - double y = centroid.getY(); - latLng = new LatLng(); - latLng.setLatitude(y); - latLng.setLongitude(x); + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(JobSearchBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + JobSearchBean.BodyBean body = response.getBody(); + if (body != null) { + Log.d("TAG", "onSuccess: " + response.getBody().toString()); + for (int i = 0; i < removables.size(); i++) { + removables.get(i).remove(); + } + removables.clear(); + stringListHashMap.clear(); + List list = response.getBody().getList(); + for (int i = 0; i < list.size(); i++) { + JobSearchBean.BodyBean.ListBean listBean = list.get(i); + String encodeStr = list.get(i).getGeo(); + // 解密geo + Geometry geoMe = GeometryTools.createGeometry(Geohash.getInstance().decode(encodeStr)); + String geo = geoMe.toString(); + listBean.setGeo(geo); + Log.d("TAG", "onSuccess: " + geo); + Geometry geometry = GeometryTools.createGeometry(geo); + LatLng latLng = null; + switch (geometry.getGeometryType()) { + case "Point": //点 + latLng = GeometryTools.createLatLng(geo); + break; + case "LineString": //线 + BitmapDescriptor bitmapLine = null; + if (listBean.getType() == 3) {//poi录像 + bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_arrows); + } else if (listBean.getType() == 4) {//道路录像 + bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.road_arrows); + } + List latLineString = GeometryTools.getLatLags(geo); + // 构造 PolylineOptions + PolylineOptions polylineOptions = new PolylineOptions() + .addAll(latLineString)// 折线设置圆形线头 + .lineCap(true)// 折线的颜色为绿色 + .color(Color.parseColor("#0096FF"))// 折线宽度为5像素 + .width(10) + .arrow(true) + //.borderColor(0xffff0000) // 还可以添加描边颜色 + //.borderWidth(1) // 描边颜色的宽度，线宽还是 25 像素，不过填充的部分宽度为 `width` - 2 * `borderWidth` + .arrowSpacing(100) + .arrowTexture(bitmapLine); + // 绘制折线 + Polyline polyline = tencentMap.addPolyline(polylineOptions); + polyline.setZIndex(MARKER_LINE); + removables.add(polyline); + if (latLineString != null && latLineString.size() > 0) { + latLng = latLineString.get(0); + } + break; + case "Polygon": //面 + List latPolygon = GeometryTools.getLatLags(geo); + Polygon polygon = tencentMap.addPolygon(new PolygonOptions(). + addAll(latPolygon).//连接封闭图形的点 + fillColor(Color.parseColor("#97E0E7EC")). //填充颜色为红色 + strokeColor(0xff000000).//边线颜色为黑色 + strokeWidth(5));//边线宽度15像素 + polygon.setZIndex(MARKER_FACE); + removables.add(polygon); + com.vividsolutions.jts.geom.Point centroid = geometry.getCentroid(); + double x = centroid.getX(); + double y = centroid.getY(); + latLng = new LatLng(); + latLng.setLatitude(y); + latLng.setLongitude(x); /* if (latPolygon != null && latPolygon.size() > 0) { latLng = latPolygon.get(0); }*/ - break; - } - switch (list.get(i).getType()) { - case 1://poi - BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi); - //poiDescriptor.getForager().setScale(50); - assert latLng != null; - Marker poiMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor).alpha(0.9f) - .anchor(0.5f, 1.0f) - .flat(true) - .clockwise(false)); - poiMarker.setZIndex(MARKER_DOT); - poiMarker.setTag(listBean); - removables.add(poiMarker); - poiMarker.setClickable(true); - onMarker(geo, poiMarker); - break; - case 2://充电站 - BitmapDescriptor chargeDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge); - assert latLng != null; - Marker stationMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(chargeDescriptor).alpha(0.9f) - .anchor(0.5f, 1.0f) - .flat(true) - .clockwise(false)); - stationMarker.setZIndex(MARKER_DOT); - stationMarker.setTag(listBean); - removables.add(stationMarker); - stationMarker.setClickable(true); - onMarker(geo, stationMarker); - break; - case 3://poi录像 - BitmapDescriptor poiVideoDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_video); - assert latLng != null; - Marker poiVideoMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiVideoDescriptor).alpha(0.9f) - .anchor(0.5f, 1.0f) - .flat(true) - .clockwise(false)); - poiVideoMarker.setTag(listBean); - poiVideoMarker.setZIndex(MARKER_DOT); - removables.add(poiVideoMarker); - poiVideoMarker.setClickable(true); - onMarker(geo, poiVideoMarker); - break; - case 4://道路录像 - BitmapDescriptor roadDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_road); - assert latLng != null; - Marker roadMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(roadDescriptor).alpha(0.9f) - .anchor(0.5f, 1.0f) - .flat(true) - .clockwise(false)); - roadMarker.setZIndex(MARKER_DOT); - roadMarker.setTag(listBean); - removables.add(roadMarker); - roadMarker.setClickable(true); - onMarker(geo, roadMarker); - break; - case 5://其他 - BitmapDescriptor otherDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other); - assert latLng != null; - Marker otherMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(otherDescriptor).alpha(0.9f) - .anchor(0.5f, 1.0f) - .flat(true) - .clockwise(false)); - otherMarker.setZIndex(MARKER_DOT); - otherMarker.setTag(listBean); - removables.add(otherMarker); - otherMarker.setClickable(true); - onMarker(geo, otherMarker); - break; - case 6://面状任务 - BitmapDescriptor Descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_facet); - assert latLng != null; - Marker planarMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(Descriptor).alpha(0.9f) - .anchor(0.5f, 1.0f) - .flat(true) - .clockwise(false)); - planarMarker.setZIndex(MARKER_DOT); - planarMarker.setTag(listBean); - removables.add(planarMarker); - planarMarker.setClickable(true); - onMarker(geo, planarMarker); - break; - } - } + break; } - listLatLng.clear(); - for (Map.Entry> entry : stringListHashMap.entrySet()) { - String key = entry.getKey(); - List markerList = stringListHashMap.get(key); - assert markerList != null; - Log.d("TAG", ": "+markerList.toString()); - Log.d("TAG", ": "+entry.getValue()+"-"+entry.getKey()); - LatLng lng = GeometryTools.createLatLng(key); - listLatLng.add(lng); + switch (list.get(i).getType()) { + case 1://poi + BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi); + //poiDescriptor.getForager().setScale(50); + assert latLng != null; + Marker poiMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor).alpha(0.9f) + .anchor(0.5f, 1.0f) + .flat(true) + .clockwise(false)); + poiMarker.setZIndex(MARKER_DOT); + poiMarker.setTag(listBean); + removables.add(poiMarker); + poiMarker.setClickable(true); + onMarker(geo, poiMarker); + break; + case 2://充电站 + BitmapDescriptor chargeDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge); + assert latLng != null; + Marker stationMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(chargeDescriptor).alpha(0.9f) + .anchor(0.5f, 1.0f) + .flat(true) + .clockwise(false)); + stationMarker.setZIndex(MARKER_DOT); + stationMarker.setTag(listBean); + removables.add(stationMarker); + stationMarker.setClickable(true); + onMarker(geo, stationMarker); + break; + case 3://poi录像 + BitmapDescriptor poiVideoDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_video); + assert latLng != null; + Marker poiVideoMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiVideoDescriptor).alpha(0.9f) + .anchor(0.5f, 1.0f) + .flat(true) + .clockwise(false)); + poiVideoMarker.setTag(listBean); + poiVideoMarker.setZIndex(MARKER_DOT); + removables.add(poiVideoMarker); + poiVideoMarker.setClickable(true); + onMarker(geo, poiVideoMarker); + break; + case 4://道路录像 + BitmapDescriptor roadDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_road); + assert latLng != null; + Marker roadMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(roadDescriptor).alpha(0.9f) + .anchor(0.5f, 1.0f) + .flat(true) + .clockwise(false)); + roadMarker.setZIndex(MARKER_DOT); + roadMarker.setTag(listBean); + removables.add(roadMarker); + roadMarker.setClickable(true); + onMarker(geo, roadMarker); + break; + case 5://其他 + BitmapDescriptor otherDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other); + assert latLng != null; + Marker otherMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(otherDescriptor).alpha(0.9f) + .anchor(0.5f, 1.0f) + .flat(true) + .clockwise(false)); + otherMarker.setZIndex(MARKER_DOT); + otherMarker.setTag(listBean); + removables.add(otherMarker); + otherMarker.setClickable(true); + onMarker(geo, otherMarker); + break; + case 6://面状任务 + BitmapDescriptor Descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_facet); + assert latLng != null; + Marker planarMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(Descriptor).alpha(0.9f) + .anchor(0.5f, 1.0f) + .flat(true) + .clockwise(false)); + planarMarker.setZIndex(MARKER_DOT); + planarMarker.setTag(listBean); + removables.add(planarMarker); + planarMarker.setClickable(true); + onMarker(geo, planarMarker); + break; } - Message obtain = Message.obtain(); - obtain.what = Constant.JOB_SEARCH_WORD; - obtain.obj = response; - EventBus.getDefault().post(obtain); - } else { - Toast.makeText(TestActivity.this, response.getMessage(), Toast.LENGTH_SHORT).show(); } } - - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Log.d("TAG", "onError: " + e.getMessage() + ""); + listLatLng.clear(); + for (Map.Entry> entry : stringListHashMap.entrySet()) { + String key = entry.getKey(); + List markerList = stringListHashMap.get(key); + assert markerList != null; + Log.d("TAG", ": " + markerList.toString()); + Log.d("TAG", ": " + entry.getValue() + "-" + entry.getKey()); + LatLng lng = GeometryTools.createLatLng(key); + listLatLng.add(lng); } - }); + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_SEARCH_WORD; + obtain.obj = response; + EventBus.getDefault().post(obtain); + } else { + Toast.makeText(TestActivity.this, response.getMessage(), Toast.LENGTH_SHORT).show(); + } + } + + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + Log.d("TAG", "onError: " + e.getMessage() + ""); + } + }); } public void onMarker(String geo, Marker marker) { @@ -386,9 +386,9 @@ public class TestActivity extends BaseActivity { for (int i = 0; i < latList.size(); i++) { LatLng latL = latList.get(i); Geometry geometry = GeometryTools.createGeometry(latL); - Log.d("TAG", "onMarkerClick: "+geometry.toString()); + Log.d("TAG", "onMarkerClick: " + geometry.toString()); List markerList = stringListHashMap.get(geometry.toText()); - if (markerList!=null){ + if (markerList != null) { for (Marker mar : markerList) { JobSearchBean.BodyBean.ListBean listBean = (JobSearchBean.BodyBean.ListBean) mar.getTag(); if (listBean != null) { diff --git a/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java index fdef638..8a758e0 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java @@ -33,6 +33,7 @@ import com.navinfo.outdoor.bean.UserBean; import com.navinfo.outdoor.http.Callback; import com.navinfo.outdoor.http.HttpInterface; import com.navinfo.outdoor.http.OkGoBuilder; +import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.GetJsonDataUtil; import com.navinfo.outdoor.util.RegexUtil; @@ -240,45 +241,54 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { } } showLoadingDialog(); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder + .getInstance() .time(30) .Builder(this) .url(HttpInterface.USER_UPDATE) .cls(UserBean.class) .token(Constant.ACCESS_TOKEN) - .params(httpParams) - .postRequest(new Callback() { - @Override - public void onSuccess(UserBean response, int id) { - dismissLoadingDialog(); - Log.d("TAG", "onSuccess: " + response.toString()); - if (response.getCode() == 200) { - MessageDialog.show(UserActivity.this, "提示", "是否保存", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { - @Override - public boolean onClick(BaseDialog baseDialog, View v) { - navInfoEditor.putString("region", region_text); - navInfoEditor.putString("mobile", userphone); - Constant.MOBILE=userphone; - navInfoEditor.putString("qq", userqq); - Constant.QQ=userqq; - //navInfoEditor.putString("mailbox", usermailbox); - navInfoEditor.commit(); - finish(); - return false; - } - }); - } else { - Toast.makeText(UserActivity.this, response.getMessage() + "", Toast.LENGTH_SHORT).show(); + .params(httpParams); + okGoBuilder.postRequest(new Callback() { + @Override + public void onSuccess(UserBean response, int id) { + dismissLoadingDialog(); + Log.d("TAG", "onSuccess: " + response.toString()); + if (response.getCode() == 200) { + MessageDialog.show(UserActivity.this, "提示", "是否保存", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { + @Override + public boolean onClick(BaseDialog baseDialog, View v) { + navInfoEditor.putString("region", region_text); + navInfoEditor.putString("mobile", userphone); + Constant.MOBILE = userphone; + navInfoEditor.putString("qq", userqq); + Constant.QQ = userqq; + //navInfoEditor.putString("mailbox", usermailbox); + navInfoEditor.commit(); + finish(); + return false; } - } + }); + }else if(response.getCode()==203){ + FlushTokenUtil.flushToken(UserActivity.this); + } else { + Toast.makeText(UserActivity.this, response.getMessage() + "", Toast.LENGTH_SHORT).show(); + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(UserActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage()); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(UserActivity.this, "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(UserActivity.this, message, Toast.LENGTH_SHORT).show(); + } + Log.d("TAG", "onError: " + e.getMessage()); + } + }); } /*public static boolean isEmail(String email) { @@ -305,10 +315,10 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { && options3Items.get(options1).get(options2).size() > 0 ? options3Items.get(options1).get(options2).get(options3) : ""; region_id = cityItems.get(options1).get(options2).get(options3).getRegion_id(); - Log.d("TAG", "onOptionsSelect: "+region_id); + Log.d("TAG", "onOptionsSelect: " + region_id); region_text = opt1tx + " " + opt2tx + " " + opt3tx; region.setText(region_text); - Log.d("TAG", "onOptionsSelect: "+region_text); + Log.d("TAG", "onOptionsSelect: " + region_text); } }).setSubmitText("确定")//确定按钮文字 .setCancelText("取消")//取消按钮文字 @@ -403,7 +413,7 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { @Override protected void onDestroy() { super.onDestroy(); - userBuilder.append("onDestroy "); + userBuilder.append("onDestroy"); userBuilder.append("\r\n"); FileUtils.writeFile(logFile.getAbsolutePath(), userBuilder.toString(), true); } diff --git a/app/src/main/java/com/navinfo/outdoor/activity/VideoActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/VideoActivity.java index ff65e3a..f37bf3c 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/VideoActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/VideoActivity.java @@ -30,7 +30,7 @@ import cn.jzvd.JzvdStd; /** * 点击查看视频 */ -public class VideoActivity extends BaseActivity implements View.OnClickListener { +public class VideoActivity extends BaseActivity implements View.OnClickListener { @Override protected int getLayout() { diff --git a/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java index 57a69d5..29472e1 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java @@ -1,4 +1,5 @@ package com.navinfo.outdoor.activity; + import android.annotation.SuppressLint; import android.graphics.Bitmap; import android.os.Build; @@ -10,6 +11,7 @@ import android.webkit.WebView; import android.webkit.WebViewClient; import android.widget.ImageView; import android.widget.Toast; + import com.lzy.okgo.model.HttpParams; import com.navinfo.outdoor.R; import com.navinfo.outdoor.api.Constant; @@ -17,6 +19,8 @@ import com.navinfo.outdoor.base.BaseActivity; import com.navinfo.outdoor.bean.RichTextBean; import com.navinfo.outdoor.http.Callback; import com.navinfo.outdoor.http.OkGoBuilder; +import com.navinfo.outdoor.util.FlushTokenUtil; + import java.util.HashMap; import java.util.Map; @@ -48,7 +52,7 @@ public class WebActivity extends BaseActivity implements View.OnClickListener { private void initWebWork() { Bundle bundle = getIntent().getExtras(); - if (bundle!=null){ + if (bundle != null) { String url = bundle.getString("url"); if (url == null || url.equals("")) { Toast.makeText(this, "连接失败", Toast.LENGTH_SHORT).show(); @@ -56,42 +60,50 @@ public class WebActivity extends BaseActivity implements View.OnClickListener { } HttpParams httpParams = new HttpParams(); Map map = (HashMap) bundle.getSerializable("map"); - if (map!=null&&!map.isEmpty()){ - for(Map.Entry entry : map.entrySet()){ - httpParams.put(entry.getKey(),entry.getValue()); + if (map != null && !map.isEmpty()) { + for (Map.Entry entry : map.entrySet()) { + httpParams.put(entry.getKey(), entry.getValue()); } } showLoadingDialog(); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(this) .url(url) .cls(RichTextBean.class) .token(Constant.ACCESS_TOKEN) - .params(httpParams) - .getRequest(new Callback() { - @Override - public void onSuccess(RichTextBean response, int id) { - dismissLoadingDialog(); - if (response.getCode()==200){ - String richBody = response.getBody(); - if (richBody!=null){ - richBody = richBody.replace("() { + @Override + public void onSuccess(RichTextBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + String richBody = response.getBody(); + if (richBody != null) { + richBody = richBody.replace(" capacityList ; + private List capacityList; private File logFile; private StringBuilder capacityEvaluationBuilder; @@ -73,17 +73,18 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC capacityEvaluationRecycler.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader); capacityEvaluationRecycler.setLoadingMoreProgressStyle(ProgressStyle.BallRotate); //取消上拉加载，刷新功能 - //capacityEvaluationRecycler.setPullRefreshEnabled(false); - //capacityEvaluationRecycler.setLoadingMoreEnabled(false); - capacityEvaluationAdapter = new CapacityEvaluationAdapter(capacityList,getActivity()); + /*capacityEvaluationRecycler.setPullRefreshEnabled(false); + capacityEvaluationRecycler.setLoadingMoreEnabled(false);*/ + capacityEvaluationAdapter = new CapacityEvaluationAdapter(capacityList, getActivity()); capacityEvaluationRecycler.setAdapter(capacityEvaluationAdapter); capacityEvaluationRecycler.getDefaultFootView().setNoMoreHint("加载成功"); capacityEvaluationRecycler.setLoadingListener(new XRecyclerView.LoadingListener() { @Override public void onRefresh() { - capacityPage=1; + capacityPage = 1; initNewWork(true); } + @Override public void onLoadMore() { initNewWork(false); @@ -95,7 +96,7 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC capacityEvaluationBuilder.append("点击了item ,"); Intent capacityEvaWeb = new Intent(getActivity(), FragmentManagement.class); capacityEvaWeb.putExtra("tag", 14); - capacityEvaWeb.putExtra("id",id+""); + capacityEvaWeb.putExtra("id", id + ""); startActivity(capacityEvaWeb); } }); @@ -104,7 +105,7 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC @Override protected void initData() { super.initData(); - capacityList=new ArrayList<>(); + capacityList = new ArrayList<>(); initNewWork(true); SharedPreferences sharedPreferences = Objects.requireNonNull(getActivity()).getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE); SharedPreferences.Editor sharedEdit = sharedPreferences.edit(); @@ -136,37 +137,43 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC httpParams.put("fid", 4); httpParams.put("pageNum", capacityPage); httpParams.put("pageSize", 20); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.MSG_LISt) .cls(TaskPrefectureBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(TaskPrefectureBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200){ - initTaskPrefectureBean(response,aNet); - }else if (response.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - }else { - Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show(); - } - Log.d("TAG", "onSuccess: " + response.getMessage() + "sassafrases"); - } + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(TaskPrefectureBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + initTaskPrefectureBean(response, aNet); + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show(); + } + Log.d("TAG", "onSuccess: " + response.getMessage() + "sassafrases"); + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage()); - /* 友盟+ - * 返回自定义报错信息*/ - UMCrash.generateCustomLog("网络请求报错-位置：CapacityEvaluationFragment" + e.getMessage(), "UmengException"); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + Log.d("TAG", "onError: " + e.getMessage()); + /* 友盟+ + * 返回自定义报错信息*/ + UMCrash.generateCustomLog("网络请求报错-位置：CapacityEvaluationFragment" + e.getMessage(), "UmengException"); + } + }); } private void initTaskPrefectureBean(TaskPrefectureBean taskPrefectureBean, boolean aBoolean) { @@ -175,7 +182,7 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC if (capacityList.size() > 0) { capacityList.clear(); } - if (taskPrefectureBean.getBody().getList()== null) { + if (taskPrefectureBean.getBody().getList() == null) { Toast.makeText(getActivity(), "没有相关数据", Toast.LENGTH_SHORT).show(); } else { capacityList.addAll(taskPrefectureBean.getBody().getList()); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment2.java b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment2.java index 78cdde3..403cdd6 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment2.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment2.java @@ -88,34 +88,39 @@ public class CapacityEvaluationFragment2 extends BaseFragment implements View.On private void initNetWorks(boolean aBoolean) { showLoadingDialog(); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.MSG_LISt) .token(Constant.ACCESS_TOKEN) .params(new HttpParams()) - .cls(TaskPrefectureBean.class) - .getRequest(new Callback() { - @Override - public void onSuccess(TaskPrefectureBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200){ - capacityItemAdapter.setCapItemList(response.getBody().getList()); - }else if (response.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - }else { - Toast.makeText(getActivity(), response.getMessage()+"", Toast.LENGTH_SHORT).show(); - } - Log.d("TAG", "onSuccess: " + response.getMessage() + "sassafras's"+aBoolean); - } + .cls(TaskPrefectureBean.class); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(TaskPrefectureBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + capacityItemAdapter.setCapItemList(response.getBody().getList()); + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); + } + Log.d("TAG", "onSuccess: " + response.getMessage() + "sassafras's" + aBoolean); + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage()); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java index 9208c51..899fc5b 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java @@ -36,6 +36,7 @@ import com.navinfo.outdoor.http.OkGoBuilder; import com.kongzue.dialog.interfaces.OnDialogButtonClickListener; import com.kongzue.dialog.util.BaseDialog; import com.kongzue.dialog.v3.MessageDialog; +import com.navinfo.outdoor.util.FlushTokenUtil; import org.json.JSONException; @@ -142,6 +143,7 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On @Override public void onSuccess(MeasureBean response, int id) { dismissLoadingDialog(); + //单选 if (response.getBody().getMultiChoice() != null) { List multiChoice = response.getBody().getMultiChoice(); @@ -166,14 +168,18 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On tvCapacity.setVisibility(View.GONE); } } - - Log.d("TAG", "onSuccess: " + response.toString()); } @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")){ + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } Log.d("TAG", "onError: " + e.getMessage()); } }); @@ -252,7 +258,9 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On return false; } }); - } else { + }else if (response.getCode()==203){ + FlushTokenUtil.flushToken(getActivity()); + }else { Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show(); } Log.d("TAG", "onSuccess: " + response.toString()); @@ -261,7 +269,13 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } Log.d("TAG", "onError: " + e.getMessage()); } }); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java index bb9e4e9..0da917b 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java @@ -373,7 +373,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC public void onItemSelected(AdapterView parent, View view, int position, long id) { switch (position) { case 0: - rlFacility.setBackgroundColor(Color.parseColor("#EFEDED")); + rlFacility.setBackgroundResource(R.drawable.selector_hui_bg); rlScutcheon.setVisibility(View.GONE); rlDevice.setVisibility(View.GONE); sign_exist = 0; @@ -731,20 +731,19 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC int sign_exist = chargingPileEntity.getSign_exist(); spinnerScutcheon.setSelection(sign_exist, true); if (sign_exist == 0) { - rlFacility.setBackgroundColor(Color.parseColor("#EFEDED")); + rlFacility.setBackgroundResource(R.drawable.selector_hui_bg); rlScutcheon.setVisibility(View.GONE); rlDevice.setVisibility(View.GONE); } else if (sign_exist == 1) { int exist = chargingPileEntity.getExist(); - if (exist == 0) { rlFacility.setBackgroundColor(Color.parseColor("#03A9F4")); rlScutcheon.setVisibility(View.VISIBLE); + if (exist == 0) { rlDevice.setVisibility(View.VISIBLE); } else { rlScutcheon.setVisibility(View.GONE); rlDevice.setVisibility(View.GONE); } - } int cp_availableState = chargingPileEntity.getCp_availableState(); spinnerStake.setSelection(cp_availableState, true); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java index 6923d81..31850cf 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java @@ -49,6 +49,7 @@ import com.navinfo.outdoor.adapter.ChargingPileAdapter; import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseDrawerFragment; import com.navinfo.outdoor.util.FlushTokenUtil; +import com.navinfo.outdoor.util.PreserveUtils; import com.navinfo.outdoor.util.UploadUtils; import com.navinfo.outdoor.bean.ChargingPileSaveBean; import com.navinfo.outdoor.bean.ChargingStationBean; @@ -121,7 +122,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. private LatLng latLng; private RelativeLayout linearExist; private Spinner spinnerExist; - private Integer bodyId; + private LinearLayout linearContact; private ContactView contactView; private ArrayList chargingStationList; @@ -579,7 +580,6 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. if (address != null && !address.equals("")) { editSiteContent.setText(address); } - bodyId = showPoiEntity.getBodyId(); // 获取当前数据的bodyId String geoWkt = showPoiEntity.getGeoWkt(); if (geoWkt != null) { String geo = Geohash.getInstance().decode(geoWkt); @@ -776,9 +776,9 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } }); } - }else if (getPhoneBean.getCode()==203){ + } else if (getPhoneBean.getCode() == 203) { FlushTokenUtil.flushToken(getActivity()); - }else { + } else { Toast.makeText(getActivity(), getPhoneBean.getMessage(), Toast.LENGTH_SHORT).show(); } } @@ -786,7 +786,13 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } } }); } @@ -909,7 +915,9 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. switch (v.getId()) { case R.id.btn_save_local: chargingStationBuilder.append("点击了保存本地的按钮 ,"); - initRoadSaveLocal(false); + if (Constant.isPresent) { + initRoadSaveLocal(false); + } break; case R.id.btn_uploading: chargingStationBuilder.append("点击了上传的按钮 ,"); @@ -1120,37 +1128,6 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } } - /* OkGo - // 请求方式和请求url - .post(HttpInterface.CS_TASK_UP_LOAD_PIC) - // 请求的 tag, 主要用于取消对应的请求 - .params("auditId", chargingPileEntity.getBodyId()) - .addFileParams("file", chargingPileFileList) - .tag(this) - .execute(new DialogCallback(PoiUploadBean.class) { - @Override - public void onSuccess(Response poiUploadBeanResponse) { - dismissLoadingDialog(); - Toast.makeText(getActivity(), "上传成功", Toast.LENGTH_SHORT).show(); - isChargingPoleUploaded = true; - if (isChargeStationUploaded && isChargingPoleUploaded) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - getActivity().onBackPressed();//回退 - } - }); - } - } - @Override - public void onError(Response poiUploadBeanResponse) { - super.onError(poiUploadBeanResponse); - dismissLoadingDialog(); - Toast.makeText(getActivity(), poiUploadBeanResponse.code() + "", Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + poiUploadBeanResponse.code() + ""); - } - });*/ - private void initRoadSaveLocal(boolean isLocal) { XXPermissions.with(this) //读写权限 @@ -1175,7 +1152,12 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. getActivity().runOnUiThread(new Runnable() { @Override public void run() { - chargingStationSaveByWork(poiEntity, isLocal); + if (isLocal) { + chargingStationSaveByWork(poiEntity); + } else { + chargingStationSaveWork(poiEntity); + Constant.isPresent = false; + } } }); } @@ -1198,6 +1180,28 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. }); } + private void chargingStationSaveWork(PoiEntity poiEntity) { + HttpParams httpParams = new HttpParams(); + httpParams.put("taskId", poiEntity.getTaskId()); + httpParams.put("sptype", poiEntity.getStation_type()); + httpParams.put("name", poiEntity.getName()); + httpParams.put("address", poiEntity.getAddress()); + httpParams.put("telephone", poiEntity.getTelPhone()); + httpParams.put("memo", poiEntity.getMemo()); + httpParams.put("geo", poiEntity.getGeoWkt()); + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() + .time(30) + .Builder(getActivity()) + .url(HttpInterface.SUBMIT_CTASK) + .cls(ChargingStationBean.class) + .params(httpParams) + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(PreserveUtils.getInstance().getChargingPreserveCallback(getActivity(), poiEntity)); + Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退 + WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台保存中，请稍候..."); + WaitDialog.dismiss(1000); + } + private void stationUploadByNetWork(PoiEntity poiEntity, ArrayList chargingStationList) { if (poiEntity == null) { Toast.makeText(getActivity(), "没有保存本地", Toast.LENGTH_SHORT).show(); @@ -1220,15 +1224,15 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. public void run() { HttpParams httpParams = new HttpParams(); httpParams.put("auditId", poiEntity.getBodyId()); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(0) .Builder(getActivity()) .url(HttpInterface.C_TASK_UP_LOAD_PIC) .fileList(chargingStationList) .token(Constant.ACCESS_TOKEN) .params(httpParams) - .cls(PoiUploadBean.class) - .postFileAsynchronous(UploadUtils.getInstance().getChargingUploadCallback(getActivity(), showPoiEntity, chargingStationList)); + .cls(PoiUploadBean.class); + okGoBuilder.postFileAsynchronous(UploadUtils.getInstance().getChargingUploadCallback(getActivity(), showPoiEntity, chargingStationList)); Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退 WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候..."); WaitDialog.dismiss(3000); @@ -1241,7 +1245,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. /** * 保存充电站数据到服务器 */ - private void chargingStationSaveByWork(PoiEntity poiEntity, boolean isLocal) { + private void chargingStationSaveByWork(PoiEntity poiEntity) { HttpParams httpParams = new HttpParams(); httpParams.put("taskId", poiEntity.getTaskId()); httpParams.put("sptype", poiEntity.getStation_type()); @@ -1251,66 +1255,62 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. httpParams.put("memo", poiEntity.getMemo()); httpParams.put("geo", poiEntity.getGeoWkt()); showLoadingDialog(); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.SUBMIT_CTASK) .cls(ChargingStationBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(ChargingStationBean chargingStationBean, int id) { - dismissLoadingDialog(); - if (chargingStationBean.getCode() == 200) { - bodyId = chargingStationBean.getBody(); - if (bodyId != null && bodyId != 0) { - poiEntity.setBodyId(bodyId); - poiEntity.setTaskStatus(3); - new Thread(new Runnable() { - @Override - public void run() { - InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); - // 充电站数据已经保存在服务上，批量保存充电桩数据 - saveChargingPileByChargingStation(poiEntity); - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - if (isLocal) { - stationUploadByNetWork(poiEntity, chargingStationList); - Constant.isPresent = false; - } else { - Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); - Message obtain = Message.obtain(); - obtain.what = Constant.JOB_WORD_MONITOR; - obtain.obj = true; - EventBus.getDefault().post(obtain); - Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack(); - } - } - }); - + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(ChargingStationBean chargingStationBean, int id) { + dismissLoadingDialog(); + if (chargingStationBean.getCode() == 200) { + Integer bodyId = chargingStationBean.getBody(); + if (bodyId != null && bodyId != 0) { + poiEntity.setBodyId(bodyId); + poiEntity.setTaskStatus(3); + new Thread(new Runnable() { + @Override + public void run() { + InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); + // 充电站数据已经保存在服务上，批量保存充电桩数据 + saveChargingPileByChargingStation(poiEntity); + if (getActivity() != null) { + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + stationUploadByNetWork(poiEntity, chargingStationList); + Constant.isPresent = false; } - } - }).start(); - } else { - Toast.makeText(getActivity(), "" + chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show(); + }); + } } - }else if (chargingStationBean.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - } else { - Toast.makeText(getActivity(), "" + chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show(); - } + }).start(); + } else { + Toast.makeText(getActivity(), "" + chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show(); } + } else if (chargingStationBean.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), "" + chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show(); + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage()); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + Log.d("TAG", "onError: " + e.getMessage()); + } + }); } private void findingDuplicateByWork() { @@ -1318,51 +1318,57 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. String encode = Geohash.getInstance().encode(latLng.latitude, latLng.longitude); httpParams.put("geo", encode); httpParams.put("name", editNameContent.getText().toString()); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .Builder(getActivity()) .url(HttpInterface.TASK_NAME) .cls(TaskNameBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(TaskNameBean taskNameBean, int id) { - dismissLoadingDialog(); - if (taskNameBean.getCode() == 200) { - editNameContent.setTextColor(Color.BLACK); - btnSaveLocal.setEnabled(true); - btnUploading.setEnabled(true); - StringBuilder stringBuilder = new StringBuilder(); - List body = taskNameBean.getBody(); - if (body != null) { - for (int i = 0; i < body.size(); i++) { - stringBuilder.append(body.get(i)).append("；"); - } - Toast.makeText(getActivity(), "不允许新增上报. 存在类似名称--" + stringBuilder.toString(), Toast.LENGTH_SHORT).show(); - editNameContent.setText(null); - } else { - Toast.makeText(getActivity(), "没有类似名称可以作业", Toast.LENGTH_SHORT).show(); - } - }else if (taskNameBean.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - } else { - editNameContent.setTextColor(Color.RED); - btnSaveLocal.setEnabled(false); - btnUploading.setEnabled(false); - Toast.makeText(getActivity(), taskNameBean.getMessage() + "", Toast.LENGTH_SHORT).show(); + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(TaskNameBean taskNameBean, int id) { + dismissLoadingDialog(); + if (taskNameBean.getCode() == 200) { + editNameContent.setTextColor(Color.BLACK); + btnSaveLocal.setEnabled(true); + btnUploading.setEnabled(true); + StringBuilder stringBuilder = new StringBuilder(); + List body = taskNameBean.getBody(); + if (body != null) { + for (int i = 0; i < body.size(); i++) { + stringBuilder.append(body.get(i)).append("；"); } + Toast.makeText(getActivity(), "不允许新增上报. 存在类似名称--" + stringBuilder.toString(), Toast.LENGTH_SHORT).show(); + editNameContent.setText(null); + } else { + Toast.makeText(getActivity(), "没有类似名称可以作业", Toast.LENGTH_SHORT).show(); } + } else if (taskNameBean.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + editNameContent.setTextColor(Color.RED); + btnSaveLocal.setEnabled(false); + btnUploading.setEnabled(false); + Toast.makeText(getActivity(), taskNameBean.getMessage() + "", Toast.LENGTH_SHORT).show(); + } + } - @Override - public void onError(Throwable e, int id) { - if (getActivity() == null) { - return; - } - dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage()); - } - }); + @Override + public void onError(Throwable e, int id) { + if (getActivity() == null) { + return; + } + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + Log.d("TAG", "onError: " + e.getMessage()); + } + }); } private String initShowStation() { @@ -1571,7 +1577,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } removablesLocality.clear(); - chargingStationBuilder.append("onDestroy "); + chargingStationBuilder.append("onDestroy"); chargingStationBuilder.append("\r\n"); FileUtils.writeFile(logFile.getAbsolutePath(), chargingStationBuilder.toString(), true); } @@ -1584,60 +1590,66 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. HttpParams httpParams = new HttpParams(); httpParams.put("taskIds", poiEntity.getTaskId()); httpParams.put("auditIds", ""); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(url) .params(httpParams) .cls(UnPolygonTaskBean.class) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(UnPolygonTaskBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - new Thread(new Runnable() { - @Override - public void run() { - if (showPoiEntity != null) { - List chargingPileEntityList = PoiDatabase.getInstance(getActivity()).getChargingPileDao().getChargingPileByStationId(showPoiEntity.getId()); - if (chargingPileEntityList != null && !chargingPileEntityList.isEmpty()) { - for (ChargingPileEntity chargingPileEntity : chargingPileEntityList) { - List chargingPileFileList = new ArrayList<>(); - if (chargingPileEntity.getPhotos() != null && !chargingPileEntity.getPhotos().isEmpty()) { - for (String photoPath : chargingPileEntity.getPhotos()) { - chargingPileFileList.add(new File(photoPath)); - } - } - PoiDatabase.getInstance(getActivity()).getChargingPileDao().deleteChargingPileEntity(chargingPileEntity); - for (int i = 0; i < chargingPileFileList.size(); i++) { - chargingPileFileList.get(i).delete(); - } + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(UnPolygonTaskBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + new Thread(new Runnable() { + @Override + public void run() { + if (showPoiEntity != null) { + List chargingPileEntityList = PoiDatabase.getInstance(getActivity()).getChargingPileDao().getChargingPileByStationId(showPoiEntity.getId()); + if (chargingPileEntityList != null && !chargingPileEntityList.isEmpty()) { + for (ChargingPileEntity chargingPileEntity : chargingPileEntityList) { + List chargingPileFileList = new ArrayList<>(); + if (chargingPileEntity.getPhotos() != null && !chargingPileEntity.getPhotos().isEmpty()) { + for (String photoPath : chargingPileEntity.getPhotos()) { + chargingPileFileList.add(new File(photoPath)); } } + PoiDatabase.getInstance(getActivity()).getChargingPileDao().deleteChargingPileEntity(chargingPileEntity); + for (int i = 0; i < chargingPileFileList.size(); i++) { + chargingPileFileList.get(i).delete(); + } } - poiDao.deletePoiEntity(poiEntity); } - }).start(); - initList(); - Message obtain = Message.obtain(); - obtain.what = Constant.JOB_WORD_MONITOR; - obtain.obj = true; - EventBus.getDefault().post(obtain); - }else if (response.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - } else { - Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + } + poiDao.deletePoiEntity(poiEntity); } - } + }).start(); + initList(); + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_WORD_MONITOR; + obtain.obj = true; + EventBus.getDefault().post(obtain); + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage()); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + Log.d("TAG", "onError: " + e.getMessage()); + } + }); } @Override diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java index 8291f48..7530ac4 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java @@ -99,14 +99,14 @@ public class EventPrefectureFragment extends BaseFragment implements View.OnClic httpParams.put("fid", "2"); httpParams.put("pageNum", eventPage); httpParams.put("pageSize", "20"); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.LIST_EVENT) .cls(TaskPrefectureBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { @Override public void onSuccess(TaskPrefectureBean taskPrefectureBean, int id) { dismissLoadingDialog(); @@ -123,7 +123,13 @@ public class EventPrefectureFragment extends BaseFragment implements View.OnClic @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } Log.d("TAG", "onError: " + e.getMessage()); } }); @@ -221,7 +227,7 @@ public class EventPrefectureFragment extends BaseFragment implements View.OnClic @Override public void onDestroy() { super.onDestroy(); - eventPrefectureBuilder.append("onDestroy ,"); + eventPrefectureBuilder.append("onDestroy"); eventPrefectureBuilder.append("\r\n"); FileUtils.writeFile(logFile.getAbsolutePath(), eventPrefectureBuilder.toString(), true); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java index b5d8ceb..99f4124 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java @@ -111,6 +111,11 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi obtain.what = Constant.TREASURE_FRAGMENT; obtain.obj = isSliding; EventBus.getDefault().post(obtain); + + Message obtain1 = Message.obtain(); + obtain1.what = Constant.JOB_WORD_MONITOR; + obtain1.obj = true; + EventBus.getDefault().post(obtain1); } onBackPressed(); } @@ -525,14 +530,6 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi case 3: Constant.TASK_STARTUP = 2; break; - /* - case 3: - Constant.TASK_STATUS = 2; - break; - case 4: - Constant.TASK_STATUS = 3; - break; - */ } Message obtain = Message.obtain(); obtain.what = Constant.JOB_WORD_MONITOR; @@ -551,14 +548,14 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi HttpParams httpParams = new HttpParams(); httpParams.put("taskIds", taskId); showLoadingDialog(); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(60) .Builder(getActivity()) .token(Constant.ACCESS_TOKEN) .params(httpParams) .cls(FilterBatchBean.class) - .url(HttpInterface.RECEIVE_TASK) - .getRequest(new Callback() { + .url(HttpInterface.RECEIVE_TASK); + okGoBuilder.getRequest(new Callback() { @Override public void onSuccess(FilterBatchBean response, int id) { dismissLoadingDialog(); @@ -581,13 +578,17 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi }else { Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); } - } - @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } } }); } @@ -742,7 +743,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi if (EventBus.getDefault().isRegistered(this))//加上判断 EventBus.getDefault().unregister(this); super.onDestroy(); - filterBuilder.append("onDestroy "); + filterBuilder.append("onDestroy"); filterBuilder.append("\r\n"); FileUtils.writeFile(logFile.getAbsolutePath(), filterBuilder.toString(), true); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/FindFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/FindFragment.java index 1499b77..669e696 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/FindFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/FindFragment.java @@ -113,7 +113,6 @@ public class FindFragment extends BaseFragment implements View.OnClickListener { endIntent.putExtra("tag", 11); startActivity(endIntent);*/ break; - } } @@ -132,7 +131,7 @@ public class FindFragment extends BaseFragment implements View.OnClickListener { @Override public void onDestroy() { super.onDestroy(); - findBuilder.append("onDestroy "); + findBuilder.append("onDestroy"); findBuilder.append("\r\n"); FileUtils.writeFile(logFile.getAbsolutePath(), findBuilder.toString(), true); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java index 1a311dc..0998d1a 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java @@ -188,7 +188,6 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe obtain.obj = true; EventBus.getDefault().post(obtain); Objects.requireNonNull(getActivity()).finish(); - } else { Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); } @@ -197,7 +196,14 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage() + "", Toast.LENGTH_SHORT).show(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + + } } }); } @@ -260,7 +266,13 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } } }); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java index 35c3680..387edc9 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java @@ -160,7 +160,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe if (arguments != null) {//poiEntity poiEntity = (PoiEntity) arguments.getSerializable("poiEntity"); if (poiEntity != null) { - tvTitle.setText(poiEntity.getName()+""); + tvTitle.setText(poiEntity.getName() + ""); if (poiEntity.getPrecision() == null) { tvMoney.setText("￥" + 0); } else { @@ -427,7 +427,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe if (statusId == 1 || statusId == 5) { InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), chargingStationEntity); } - if (getActivity()!=null){ + if (getActivity() != null) { getActivity().runOnUiThread(new Runnable() { @Override public void run() { @@ -448,7 +448,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe } } else { - if (getActivity()!=null){ + if (getActivity() != null) { getActivity().runOnUiThread(new Runnable() { @Override public void run() { @@ -472,7 +472,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe } }).start(); } - }else if (response.getCode()==203){ + } else if (response.getCode() == 203) { FlushTokenUtil.flushToken(getActivity()); } else { Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show(); @@ -482,7 +482,13 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } Log.d("TAG", "onError: " + e.getMessage()); } }); @@ -540,14 +546,14 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe @Override public void run() { InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), polygonEntity); - if (getActivity()!=null){ + if (getActivity() != null) { getActivity().runOnUiThread(new Runnable() { @Override public void run() { initViewByTaskStatus(1); Toast.makeText(getActivity(), "领取成功", Toast.LENGTH_SHORT).show(); if (aBoolean) { - initCompleteTask(HttpInterface.SUBMIT_POLYGON_TASK , polygonEntity); + initCompleteTask(HttpInterface.SUBMIT_POLYGON_TASK, polygonEntity); } else { Message obtains = Message.obtain(); obtains.what = Constant.JOB_WORD_MONITOR; @@ -559,7 +565,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe } } }).start(); - }else if (response.getCode()==203){ + } else if (response.getCode() == 203) { FlushTokenUtil.flushToken(getActivity()); } else { Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); @@ -569,7 +575,13 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } Log.d("TAG", "onError: " + e.getMessage()); } }); @@ -607,7 +619,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe if (poiEntity.getType() == 2) { chargingPileDao.deleteChargingFidPileEntity(poiEntity.getId()); } - if (getActivity()!=null){ + if (getActivity() != null) { getActivity().runOnUiThread(new Runnable() { @Override public void run() { @@ -622,16 +634,23 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe } } }).start(); - }else if (response.getCode()==203){ + } else if (response.getCode() == 203) { FlushTokenUtil.flushToken(getActivity()); } else { Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); } } + @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } } }); } @@ -664,7 +683,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe @Override public void run() { InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); - if (getActivity()!=null){ + if (getActivity() != null) { getActivity().runOnUiThread(new Runnable() { @Override public void run() { @@ -682,17 +701,23 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe } } }).start(); - }else if (response.getCode()==203){ + } else if (response.getCode() == 203) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); } } + @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage()); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } } }); } @@ -706,7 +731,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe return; } HttpParams httpParams = new HttpParams(); - httpParams.put("id",poiEntity.getTaskId()); + httpParams.put("id", poiEntity.getTaskId()); showLoadingDialog(); OkGoBuilder.getInstance() .time(30) @@ -726,17 +751,23 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe poiDao.deletePoiEntity(poiEntity); } }).start(); - }else if (response.getCode()==203){ + } else if (response.getCode() == 203) { FlushTokenUtil.flushToken(getActivity()); } else { Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); } } + @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage()); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } } }); } @@ -750,123 +781,128 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe return; } showLoadingDialog(); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(url + "/" + poiEntity.getTaskId()) .cls(ReceivedPoiBean.class) .params(new HttpParams()) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(ReceivedPoiBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - ReceivedPoiBean.BodyBean body = response.getBody(); - if (body != null) { - new Thread(new Runnable() { - @Override - public void run() { - PoiEntity taskIdPoiEntity = poiDao.getTaskIdPoiEntity(poiEntity.getTaskId()); - if (taskIdPoiEntity == null) {//数据库没有这条数据 - ReceivedPoiBean.BodyBean listBean = response.getBody(); - PoiEntity poiListEntity = new PoiEntity(); - poiListEntity.setTaskId(poiEntity.getTaskId()); - poiListEntity.setName(listBean.getName()); - poiListEntity.setDescribe(listBean.getMemo()); - poiListEntity.setCreateTime(listBean.getEndDate()); - poiListEntity.setAddress(listBean.getAddress()); - poiListEntity.setType(listBean.getType()); - poiListEntity.setIsExclusive(listBean.getIsExclusive()); - if (listBean.getType() == 1) { - if (listBean.getTelephone() == null || listBean.getTelephone().equals("") || listBean.getTelephone().equals("null")) { - poiListEntity.setTelPhone(null); - } else { - poiListEntity.setTelPhone(listBean.getTelephone()); - } - } - - poiListEntity.setTaskStatus(statusId); - poiListEntity.setGeoWkt(listBean.getGeo()); - String encodeStr = listBean.getGeo(); - String geo = Geohash.getInstance().decode(encodeStr); - Geometry geometry = GeometryTools.createGeometry(geo); - switch (geometry.getGeometryType()) { - case "Point": //点 - LatLng latLng = GeometryTools.createLatLng(geo); - poiListEntity.setX(latLng.longitude + ""); - poiListEntity.setY(latLng.latitude + ""); - break; - case "LineString": //线 - case "Polygon": //面 - List latLineString = GeometryTools.getLatLags(geo); - assert latLineString != null; - poiListEntity.setX(latLineString.get(0).longitude + ""); - poiListEntity.setY(latLineString.get(0).latitude + ""); - break; - } - //senMessageMarker(poiEntity.getType(), poiEntity.getY(), poiEntity.getX()); - if (statusId == 1 || statusId == 5) { - InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiListEntity); - } - if (getActivity()!=null){ - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - initViewByTaskStatus(1);//已领取 - if (isSaver) { - Message obtain = Message.obtain(); - obtain.what = Constant.GATHER_GET_MAP; - obtain.obj = poiListEntity; - EventBus.getDefault().post(obtain); - } else { - Message obtain = Message.obtain(); - obtain.what = Constant.JOB_WORD_MONITOR; - obtain.obj = true; - EventBus.getDefault().post(obtain); - } - - } - }); - } + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(ReceivedPoiBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + ReceivedPoiBean.BodyBean body = response.getBody(); + if (body != null) { + new Thread(new Runnable() { + @Override + public void run() { + PoiEntity taskIdPoiEntity = poiDao.getTaskIdPoiEntity(poiEntity.getTaskId()); + if (taskIdPoiEntity == null) {//数据库没有这条数据 + ReceivedPoiBean.BodyBean listBean = response.getBody(); + PoiEntity poiListEntity = new PoiEntity(); + poiListEntity.setTaskId(poiEntity.getTaskId()); + poiListEntity.setName(listBean.getName()); + poiListEntity.setDescribe(listBean.getMemo()); + poiListEntity.setCreateTime(listBean.getEndDate()); + poiListEntity.setAddress(listBean.getAddress()); + poiListEntity.setType(listBean.getType()); + poiListEntity.setIsExclusive(listBean.getIsExclusive()); + if (listBean.getType() == 1) { + if (listBean.getTelephone() == null || listBean.getTelephone().equals("") || listBean.getTelephone().equals("null")) { + poiListEntity.setTelPhone(null); } else { - if (getActivity()!=null){ - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - initViewByTaskStatus(1); - if (isSaver) { - Message obtain = Message.obtain(); - obtain.what = Constant.GATHER_GET_MAP; - obtain.obj = taskIdPoiEntity; - EventBus.getDefault().post(obtain); - } else { - Message obtain = Message.obtain(); - obtain.what = Constant.JOB_WORD_MONITOR; - obtain.obj = true; - EventBus.getDefault().post(obtain); - } - } - }); - } + poiListEntity.setTelPhone(listBean.getTelephone()); } } - }).start(); - } - }else if (response.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - } else { - Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); - } - } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Log.d("TAG", "onError: " + e.getMessage()); - Toast.makeText(getActivity(), e.getMessage() + "", Toast.LENGTH_SHORT).show(); + poiListEntity.setTaskStatus(statusId); + poiListEntity.setGeoWkt(listBean.getGeo()); + String encodeStr = listBean.getGeo(); + String geo = Geohash.getInstance().decode(encodeStr); + Geometry geometry = GeometryTools.createGeometry(geo); + switch (geometry.getGeometryType()) { + case "Point": //点 + LatLng latLng = GeometryTools.createLatLng(geo); + poiListEntity.setX(latLng.longitude + ""); + poiListEntity.setY(latLng.latitude + ""); + break; + case "LineString": //线 + case "Polygon": //面 + List latLineString = GeometryTools.getLatLags(geo); + assert latLineString != null; + poiListEntity.setX(latLineString.get(0).longitude + ""); + poiListEntity.setY(latLineString.get(0).latitude + ""); + break; + } + //senMessageMarker(poiEntity.getType(), poiEntity.getY(), poiEntity.getX()); + if (statusId == 1 || statusId == 5) { + InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiListEntity); + } + if (getActivity() != null) { + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + initViewByTaskStatus(1);//已领取 + if (isSaver) { + Message obtain = Message.obtain(); + obtain.what = Constant.GATHER_GET_MAP; + obtain.obj = poiListEntity; + EventBus.getDefault().post(obtain); + } else { + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_WORD_MONITOR; + obtain.obj = true; + EventBus.getDefault().post(obtain); + } + + } + }); + } + } else { + if (getActivity() != null) { + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + initViewByTaskStatus(1); + if (isSaver) { + Message obtain = Message.obtain(); + obtain.what = Constant.GATHER_GET_MAP; + obtain.obj = taskIdPoiEntity; + EventBus.getDefault().post(obtain); + } else { + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_WORD_MONITOR; + obtain.obj = true; + EventBus.getDefault().post(obtain); + } + } + }); + } + } + } + }).start(); } - }); + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + } + } + + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } private void senMessageMarker(int type, String y, String x) { @@ -883,115 +919,121 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe */ private void taskByNet(String url, PoiEntity poiEntity, boolean isSaver, int statusId) { showLoadingDialog(); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder + .getInstance() .time(30) .Builder(getActivity()) .url(url + "/" + poiEntity.getTaskId()) .cls(TaskByNetBean.class) .params(new HttpParams()) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(TaskByNetBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - TaskByNetBean.BodyBean listBean = response.getBody(); - if (listBean != null) { - new Thread(new Runnable() { - @Override - public void run() { - PoiEntity taskIdPoiEntity = poiDao.getTaskIdPoiEntity(poiEntity.getTaskId()); - if (taskIdPoiEntity == null) {//数据库没有这条数据 - PoiEntity poiListEntity = new PoiEntity(); - poiListEntity.setTaskId(poiEntity.getTaskId()); - poiListEntity.setName(listBean.getName()); - poiListEntity.setMemo(listBean.getMemo()); - poiListEntity.setCreateTime(listBean.getEndDate()); - poiListEntity.setAddress(listBean.getAddress()); - poiListEntity.setType(listBean.getType()); - poiListEntity.setPrecision(String.valueOf(listBean.getPrice())); - poiListEntity.setIsExclusive(listBean.getIsExclusive()); - poiListEntity.setTaskStatus(statusId); - poiListEntity.setGeoWkt(listBean.getGeo()); - String encodeStr = listBean.getGeo(); - String geo = Geohash.getInstance().decode(encodeStr); - Geometry geometry = GeometryTools.createGeometry(geo); - switch (geometry.getGeometryType()) { - case "Point": //点 - LatLng latLng = GeometryTools.createLatLng(geo); - poiListEntity.setX(latLng.longitude + ""); - poiListEntity.setY(latLng.latitude + ""); - break; - case "LineString": //线 - case "Polygon": //面 - List latLineString = GeometryTools.getLatLags(geo); - assert latLineString != null; - poiListEntity.setX(latLineString.get(0).longitude + ""); - poiListEntity.setY(latLineString.get(0).latitude + ""); - break; - } - //senMessageMarker(poiEntity.getType(), poiEntity.getY(), poiEntity.getX()); - if (statusId == 1 || statusId == 5) { - InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiListEntity); - } - if (getActivity()!=null){ - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - initViewByTaskStatus(1); - if (isSaver) { - Message obtain = Message.obtain(); - obtain.what = Constant.GATHER_GET_MAP; - obtain.obj = poiListEntity; - EventBus.getDefault().post(obtain); - } else { - Message obtain = Message.obtain(); - obtain.what = Constant.JOB_WORD_MONITOR; - obtain.obj = true; - EventBus.getDefault().post(obtain); - } - } - }); - } - } else { - if (getActivity()!=null){ - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - initViewByTaskStatus(1); - if (isSaver) { - Message obtain = Message.obtain(); - obtain.what = Constant.GATHER_GET_MAP; - obtain.obj = taskIdPoiEntity; - EventBus.getDefault().post(obtain); - } else { - Message obtain = Message.obtain(); - obtain.what = Constant.JOB_WORD_MONITOR; - obtain.obj = true; - EventBus.getDefault().post(obtain); - } - - } - }); - } - } + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(TaskByNetBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + TaskByNetBean.BodyBean listBean = response.getBody(); + if (listBean != null) { + new Thread(new Runnable() { + @Override + public void run() { + PoiEntity taskIdPoiEntity = poiDao.getTaskIdPoiEntity(poiEntity.getTaskId()); + if (taskIdPoiEntity == null) {//数据库没有这条数据 + PoiEntity poiListEntity = new PoiEntity(); + poiListEntity.setTaskId(poiEntity.getTaskId()); + poiListEntity.setName(listBean.getName()); + poiListEntity.setMemo(listBean.getMemo()); + poiListEntity.setCreateTime(listBean.getEndDate()); + poiListEntity.setAddress(listBean.getAddress()); + poiListEntity.setType(listBean.getType()); + poiListEntity.setPrecision(String.valueOf(listBean.getPrice())); + poiListEntity.setIsExclusive(listBean.getIsExclusive()); + poiListEntity.setTaskStatus(statusId); + poiListEntity.setGeoWkt(listBean.getGeo()); + String encodeStr = listBean.getGeo(); + String geo = Geohash.getInstance().decode(encodeStr); + Geometry geometry = GeometryTools.createGeometry(geo); + switch (geometry.getGeometryType()) { + case "Point": //点 + LatLng latLng = GeometryTools.createLatLng(geo); + poiListEntity.setX(latLng.longitude + ""); + poiListEntity.setY(latLng.latitude + ""); + break; + case "LineString": //线 + case "Polygon": //面 + List latLineString = GeometryTools.getLatLags(geo); + assert latLineString != null; + poiListEntity.setX(latLineString.get(0).longitude + ""); + poiListEntity.setY(latLineString.get(0).latitude + ""); + break; } - }).start(); - } - }else if (response.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - } else { - Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); - } - } + //senMessageMarker(poiEntity.getType(), poiEntity.getY(), poiEntity.getX()); + if (statusId == 1 || statusId == 5) { + InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiListEntity); + } + if (getActivity() != null) { + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + initViewByTaskStatus(1); + if (isSaver) { + Message obtain = Message.obtain(); + obtain.what = Constant.GATHER_GET_MAP; + obtain.obj = poiListEntity; + EventBus.getDefault().post(obtain); + } else { + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_WORD_MONITOR; + obtain.obj = true; + EventBus.getDefault().post(obtain); + } + } + }); + } + } else { + if (getActivity() != null) { + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + initViewByTaskStatus(1); + if (isSaver) { + Message obtain = Message.obtain(); + obtain.what = Constant.GATHER_GET_MAP; + obtain.obj = taskIdPoiEntity; + EventBus.getDefault().post(obtain); + } else { + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_WORD_MONITOR; + obtain.obj = true; + EventBus.getDefault().post(obtain); + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Log.d("TAG", "onError: " + e.getMessage()); - Toast.makeText(getActivity(), e.getMessage() + "", Toast.LENGTH_SHORT).show(); + } + }); + } + } + } + }).start(); } - }); + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + } + } + + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } public static String format5(double value) { @@ -1013,7 +1055,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe @Override public void onDestroy() { super.onDestroy(); - gatherGetBuilder.append("onDestroy ,"); + gatherGetBuilder.append("onDestroy"); gatherGetBuilder.append("\r\n"); FileUtils.writeFile(logFile.getAbsolutePath(), gatherGetBuilder.toString(), true); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java index d9fca77..caefc62 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java @@ -18,6 +18,7 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; + import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.DividerItemDecoration; @@ -47,7 +48,9 @@ import com.navinfo.outdoor.http.OkGoBuilder; import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.GetJsonDataUtil; import com.navinfo.outdoor.util.PhotoUtils; + import org.json.JSONArray; + import java.io.File; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -101,12 +104,12 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe } if (Constant.BACKGROUND != null) { etBankNum.setText(Constant.BACKGROUND); - if (Constant.BACKGROUND_NAME==null){ + if (Constant.BACKGROUND_NAME == null) { String bank = navInfo.getString("bankName", null); - if (bank!=null&&!bank.equals("")){ + if (bank != null && !bank.equals("")) { tvBank.setText(bank); } - }else { + } else { tvBank.setText(Constant.BACKGROUND_NAME); } @@ -123,20 +126,20 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe 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); + 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)){ + } else { + if (pictures_time.equals(newFormat)) { logFile = new File(Constant.LOG_FOLDER + "/" + pictures_time + ".txt"); - }else { + } else { logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt"); } } gatheringBuilder = new StringBuilder(); gatheringBuilder.append("GatheringFragment-onCreate-initData ,"); - if (Constant.USHERED!=null){ + if (Constant.USHERED != null) { gatheringBuilder.append("userId:").append(Constant.USHERED).append(","); } } @@ -187,7 +190,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe bankPathBeans.clear(); for (int i = 0; i < jsonBean.size(); i++) { String label = jsonBean.get(i).getLabel(); - if (label.contains(s.toString())){//含有 + if (label.contains(s.toString())) {//含有 BankPathBean bankPathBean = jsonBean.get(i); bankPathBeans.add(bankPathBean); } @@ -200,7 +203,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe bankPathBeans.clear(); for (int i = 0; i < jsonBean.size(); i++) { String label = jsonBean.get(i).getLabel(); - if (label.contains(s.toString())){//含有 + if (label.contains(s.toString())) {//含有 BankPathBean bankPathBean = jsonBean.get(i); bankPathBeans.add(bankPathBean); } @@ -238,7 +241,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe } private void gatheringNetWork() { - if (Constant.USHERED==null){ + if (Constant.USHERED == null) { return; } ArrayList gatheringList = new ArrayList<>(); @@ -263,49 +266,55 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe showLoadingDialog(); HttpParams httpParams = new HttpParams(); httpParams.put("userid", Constant.USHERED); - httpParams.put("bankAccount",etBankAccount);//银行卡号 + httpParams.put("bankAccount", etBankAccount);//银行卡号 httpParams.put("bankName", bank);//银行id - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.USER_BANKCARD_UP_DATA) .cls(BankPhoneBean.class) .token(Constant.ACCESS_TOKEN) .params(httpParams) - .fileList(gatheringList) - .postFileAsynchronous(new Callback() { - @Override - public void onSuccess(BankPhoneBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; - DialogSettings.cancelable=false; - MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "绑定成功", "确定").setOkButton(new OnDialogButtonClickListener() { - @Override - public boolean onClick(BaseDialog baseDialog, View v) { - gatheringBuilder.append("绑定成功 ,"); - Constant.BACKGROUND_NAME = bank; - Constant.BACKGROUND = etBankAccount; - navInfoEditor.putString("bankAccount", etBankAccount); - navInfoEditor.putString("bankName",bank); - navInfoEditor.commit(); - getActivity().finish(); - return false; - } - }); - }else if (response.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - } else { - Toast.makeText(getActivity(), "绑定失败！", Toast.LENGTH_SHORT).show(); + .fileList(gatheringList); + okGoBuilder.postFileAsynchronous(new Callback() { + @Override + public void onSuccess(BankPhoneBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; + DialogSettings.cancelable = false; + MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "绑定成功", "确定").setOkButton(new OnDialogButtonClickListener() { + @Override + public boolean onClick(BaseDialog baseDialog, View v) { + gatheringBuilder.append("绑定成功 ,"); + Constant.BACKGROUND_NAME = bank; + Constant.BACKGROUND = etBankAccount; + navInfoEditor.putString("bankAccount", etBankAccount); + navInfoEditor.putString("bankName", bank); + navInfoEditor.commit(); + getActivity().finish(); + return false; } - } + }); + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), "绑定失败！", Toast.LENGTH_SHORT).show(); + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage() + "", Toast.LENGTH_SHORT).show(); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } @Override @@ -326,8 +335,8 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe if (bankCardBean == null) { Toast.makeText(getContext(), "识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show(); } else { - if (bankCardBean.getResult()!=null){ - if (bankCardBean.getResult().getBank_card_number()!=null){ + if (bankCardBean.getResult() != null) { + if (bankCardBean.getResult().getBank_card_number() != null) { String bankCardNumber = bankCardBean.getResult().getBank_card_number().trim(); String bank_card_number = bankCardNumber.replace(" ", ""); if (StringUtils.isEmpty(bank_card_number)) { @@ -335,10 +344,10 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe return; } etBankNum.setText(bank_card_number); - }else { + } else { Toast.makeText(getActivity(), "识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show(); } - }else { + } else { Toast.makeText(getActivity(), "识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show(); } } @@ -378,7 +387,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe @Override public void onDestroy() { super.onDestroy(); - gatheringBuilder.append("onDestroy "); + gatheringBuilder.append("onDestroy"); gatheringBuilder.append("\r\n"); FileUtils.writeFile(logFile.getAbsolutePath(), gatheringBuilder.toString(), true); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java index 27e42bc..bd4a805 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java @@ -120,15 +120,15 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe public void onEvent(Message data) { if (data.what == Constant.HAS_SUBMIT_ITEM) { if ((boolean) data.obj) { - initRequest(); + initRequest(); } } } public void initRequest() { - if (Constant.USHERED!=null){ + if (Constant.USHERED != null) { HttpInterface.initHttpInter(Constant.USHERED); - if (HttpInterface.GET_COMMIT_LIST!=null){ + if (HttpInterface.GET_COMMIT_LIST != null) { initPoiSubMitWork();//poi initCaningSubMitWork();//充电站 initPoiVideoSubMitWork();//poi录像 @@ -143,46 +143,52 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe httpParams.put("type", 5); httpParams.put("pageSize", 10); httpParams.put("pageNum", 1); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.GET_COMMIT_LIST) .cls(HasSubmitBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(HasSubmitBean hasSubmitBean, int id) { - dismissLoadingDialog(); - if (hasSubmitBean.getCode() == 200) { - HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody(); - if (hasSubmitBeanBody != null) { - if (getActivity()!=null){ - getActivity().runOnUiThread(new Runnable() { - @SuppressLint("SetTextI18n") - @Override - public void run() { - otherAuditProcess.setText(hasSubmitBeanBody.getAuditingCount() + ""); - otherAuditThrough.setText(hasSubmitBeanBody.getPassCount() + ""); - otherAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount() + ""); - } - }); + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(HasSubmitBean hasSubmitBean, int id) { + dismissLoadingDialog(); + if (hasSubmitBean.getCode() == 200) { + HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody(); + if (hasSubmitBeanBody != null) { + if (getActivity() != null) { + getActivity().runOnUiThread(new Runnable() { + @SuppressLint("SetTextI18n") + @Override + public void run() { + otherAuditProcess.setText(hasSubmitBeanBody.getAuditingCount() + ""); + otherAuditThrough.setText(hasSubmitBeanBody.getPassCount() + ""); + otherAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount() + ""); } - - } - }else if (hasSubmitBean.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - }else { - Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); + }); } - } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(getActivity(), "请求失败", Toast.LENGTH_SHORT).show(); } - }); + } else if (hasSubmitBean.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); + } + } + + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } private void initCaningSubMitWork() { @@ -190,45 +196,51 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe httpParams.put("type", 2); httpParams.put("pageSize", 10); httpParams.put("pageNum", 1); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.GET_COMMIT_LIST) .cls(HasSubmitBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(HasSubmitBean hasSubmitBean, int id) { - dismissLoadingDialog(); - if (hasSubmitBean.getCode() == 200) { - HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody(); - if (hasSubmitBeanBody != null) { - if (getActivity()!=null){ - getActivity().runOnUiThread(new Runnable() { - @SuppressLint("SetTextI18n") - @Override - public void run() { - chargingAuditProcess.setText(hasSubmitBeanBody.getAuditingCount() + ""); - chargingAuditThrough.setText(hasSubmitBeanBody.getPassCount() + ""); - chargingAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount() + ""); - } - }); + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(HasSubmitBean hasSubmitBean, int id) { + dismissLoadingDialog(); + if (hasSubmitBean.getCode() == 200) { + HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody(); + if (hasSubmitBeanBody != null) { + if (getActivity() != null) { + getActivity().runOnUiThread(new Runnable() { + @SuppressLint("SetTextI18n") + @Override + public void run() { + chargingAuditProcess.setText(hasSubmitBeanBody.getAuditingCount() + ""); + chargingAuditThrough.setText(hasSubmitBeanBody.getPassCount() + ""); + chargingAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount() + ""); } - } - }else if (hasSubmitBean.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - }else { - Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); + }); } - } + } else if (hasSubmitBean.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } private void initRoadSubMitWork() { @@ -236,44 +248,51 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe httpParams.put("type", 4); httpParams.put("pageSize", 10); httpParams.put("pageNum", 1); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.GET_COMMIT_LIST) .cls(HasSubmitBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(HasSubmitBean hasSubmitBean, int id) { - dismissLoadingDialog(); - if (hasSubmitBean.getCode() == 200) { - HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody(); - if (hasSubmitBeanBody != null) { - if (getActivity()!=null){ - getActivity().runOnUiThread(new Runnable() { - @SuppressLint("SetTextI18n") - @Override - public void run() { - roadAuditProcess.setText(hasSubmitBeanBody.getAuditingCount() + ""); - roadAuditThrough.setText(hasSubmitBeanBody.getPassCount() + ""); - roadAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount() + ""); - } - }); + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(HasSubmitBean hasSubmitBean, int id) { + dismissLoadingDialog(); + if (hasSubmitBean.getCode() == 200) { + HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody(); + if (hasSubmitBeanBody != null) { + if (getActivity() != null) { + getActivity().runOnUiThread(new Runnable() { + @SuppressLint("SetTextI18n") + @Override + public void run() { + roadAuditProcess.setText(hasSubmitBeanBody.getAuditingCount() + ""); + roadAuditThrough.setText(hasSubmitBeanBody.getPassCount() + ""); + roadAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount() + ""); } - } - }else if (hasSubmitBean.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - }else { - Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); + }); } } + } else if (hasSubmitBean.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } private void initPoiVideoSubMitWork() { @@ -281,44 +300,51 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe httpParams.put("type", 3); httpParams.put("pageSize", 10); httpParams.put("pageNum", 1); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.GET_COMMIT_LIST) .cls(HasSubmitBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(HasSubmitBean hasSubmitBean, int id) { - dismissLoadingDialog(); - if (hasSubmitBean.getCode() == 200) { - HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody(); - if (hasSubmitBeanBody != null) { - if (getActivity()!=null){ - getActivity().runOnUiThread(new Runnable() { - @SuppressLint("SetTextI18n") - @Override - public void run() { - poiVideoAuditProcess.setText(hasSubmitBeanBody.getAuditingCount() + ""); - poiVideoAuditThrough.setText(hasSubmitBeanBody.getPassCount() + ""); - poiVideoAuditProcessAbleNotThrough.setText(hasSubmitBeanBody.getNotPassCount() + ""); - } - }); + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(HasSubmitBean hasSubmitBean, int id) { + dismissLoadingDialog(); + if (hasSubmitBean.getCode() == 200) { + HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody(); + if (hasSubmitBeanBody != null) { + if (getActivity() != null) { + getActivity().runOnUiThread(new Runnable() { + @SuppressLint("SetTextI18n") + @Override + public void run() { + poiVideoAuditProcess.setText(hasSubmitBeanBody.getAuditingCount() + ""); + poiVideoAuditThrough.setText(hasSubmitBeanBody.getPassCount() + ""); + poiVideoAuditProcessAbleNotThrough.setText(hasSubmitBeanBody.getNotPassCount() + ""); } - } - }else if (hasSubmitBean.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - }else { - Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); + }); } } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - ToastUtil.show(getContext(),"请求失败",1000); - } - }); + } else if (hasSubmitBean.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); + } + } + + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } private void initPoiSubMitWork() { @@ -327,45 +353,52 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe httpParams.put("pageSize", 10); httpParams.put("pageNum", 1); showLoadingDialog(); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.GET_COMMIT_LIST) .cls(HasSubmitBean.class) .token(Constant.ACCESS_TOKEN) - .params(httpParams) - .getRequest(new Callback() { - @Override - public void onSuccess(HasSubmitBean hasSubmitBean, int id) { - dismissLoadingDialog(); - if (hasSubmitBean.getCode() == 200) { - hasSubmitBeanBody = hasSubmitBean.getBody(); - if (hasSubmitBeanBody != null) { - if (getActivity()!=null){ - getActivity().runOnUiThread(new Runnable() { - @SuppressLint("SetTextI18n") - @Override - public void run() { - auditProcess.setText(hasSubmitBeanBody.getAuditingCount() + ""); - auditThrough.setText(hasSubmitBeanBody.getPassCount() + ""); - auditNotThrough.setText(hasSubmitBeanBody.getNotPassCount() + ""); - } - }); + .params(httpParams); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(HasSubmitBean hasSubmitBean, int id) { + dismissLoadingDialog(); + if (hasSubmitBean.getCode() == 200) { + hasSubmitBeanBody = hasSubmitBean.getBody(); + if (hasSubmitBeanBody != null) { + if (getActivity() != null) { + getActivity().runOnUiThread(new Runnable() { + @SuppressLint("SetTextI18n") + @Override + public void run() { + auditProcess.setText(hasSubmitBeanBody.getAuditingCount() + ""); + auditThrough.setText(hasSubmitBeanBody.getPassCount() + ""); + auditNotThrough.setText(hasSubmitBeanBody.getNotPassCount() + ""); } - - } - }else if (hasSubmitBean.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - }else { - Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); + }); } - } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); } - }); + } else if (hasSubmitBean.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); + } + } + + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } @Override @@ -454,7 +487,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe if (EventBus.getDefault().isRegistered(this))//加上判断 EventBus.getDefault().unregister(this); super.onDestroy(); - hasSubmitBuilder.append("onDestroy "); + hasSubmitBuilder.append("onDestroy"); hasSubmitBuilder.append("\r\n"); FileUtils.writeFile(logFile.getAbsolutePath(), hasSubmitBuilder.toString(), true); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java index 56ddd3e..553bc6d 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java @@ -67,35 +67,40 @@ public class IssueFragment extends BaseFragment implements View.OnClickListener httpParams.put("fid", 1); httpParams.put("pageNum", issuePage); httpParams.put("pageSize", 10); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder + .getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.MSG_LISt) .cls(TaskPrefectureBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(TaskPrefectureBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200){ - issueProblemAdapter.setExplainList(response.getBody().getList()); - issuePage++; - }else if (response.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - }else { - Toast.makeText(getActivity(), response.getMessage()+"", Toast.LENGTH_SHORT).show(); - } - Log.d("TAG", "onSuccess: " + response.getMessage() + ""); - } + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(TaskPrefectureBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + issueProblemAdapter.setExplainList(response.getBody().getList()); + issuePage++; + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - // Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage()); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } @Override @@ -117,19 +122,21 @@ public class IssueFragment extends BaseFragment implements View.OnClickListener mainIssueRecycler.getDefaultFootView().setNoMoreHint("成功加载完毕"); mainIssueRecycler.setLoadingListener(new XRecyclerView.LoadingListener() { @Override - public void onRefresh() {} + public void onRefresh() { + } + @Override - public void onLoadMore() {} + public void onLoadMore() { + } }); issueProblemAdapter.setOnIssueClick(new IssueProblemAdapter.OnIssueClick() { @Override public void onClick(int pos) { Intent issueWeb = new Intent(getActivity(), FragmentManagement.class); - issueWeb.putExtra("tag",16); + issueWeb.putExtra("tag", 16); startActivity(issueWeb); } - }); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MapDownloadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MapDownloadFragment.java index e3ca516..6028b02 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MapDownloadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MapDownloadFragment.java @@ -31,8 +31,6 @@ public class MapDownloadFragment extends BaseFragment implements View.OnClickLis super.initView(); ImageView ivDownLoad = findViewById(R.id.iv_download); ivDownLoad.setOnClickListener(this); - XRecyclerView recyclerView = findViewById(R.id.recycler_view); - } @Override diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java index ceb6507..fa910dc 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java @@ -40,7 +40,7 @@ import java.util.Objects; /** * 寻宝-消息的Fragment */ -public class MessageFragment extends BaseFragment implements View.OnClickListener { +public class MessageFragment extends BaseFragment implements View.OnClickListener { private MessageAdapter messageAdapter; private int messagePage = 1; @@ -76,57 +76,69 @@ public class MessageFragment extends BaseFragment implements View.OnClickListen messageAdapter.setMessageClickItem(new MessageAdapter.messageClickItem() { @Override public void item(int id) { + messageBuilder.append("点击item ,"); HashMap paramMap = new HashMap<>(); - paramMap.put("id",id+""); + paramMap.put("id", id + ""); intint2WebActivity(HttpInterface.MSG_CONTENT, paramMap); } }); messageRecycler.getDefaultFootView().setNoMoreHint("已全部加载完毕"); messageRecycler.setLoadingListener(new XRecyclerView.LoadingListener() { - @Override - public void onRefresh() { } @Override - public void onLoadMore() { } + public void onRefresh() { + } + + @Override + public void onLoadMore() { + } }); } + private void initNetwork() { showLoadingDialog(); HttpParams httpParams = new HttpParams(); httpParams.put("fid", 5); httpParams.put("pageNum", messagePage); httpParams.put("pageSize", 10); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.MSG_LISt) .cls(TaskPrefectureBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(TaskPrefectureBean taskPrefectureBean, int id) { - dismissLoadingDialog(); - if (taskPrefectureBean.getCode() == 200){ - messageAdapter.setMessageList(taskPrefectureBean.getBody().getList()); - messagePage++; - }else if (taskPrefectureBean.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - }else { - Toast.makeText(getActivity(), taskPrefectureBean.getMessage()+"", Toast.LENGTH_SHORT).show(); - } - Log.d("TAG", "onSuccess: " + taskPrefectureBean.getMessage() + ""); - //initTaskSpecification(taskSpecificationBean,start); - } + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(TaskPrefectureBean taskPrefectureBean, int id) { + dismissLoadingDialog(); + if (taskPrefectureBean.getCode() == 200) { + messageAdapter.setMessageList(taskPrefectureBean.getBody().getList()); + messagePage++; + } else if (taskPrefectureBean.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), taskPrefectureBean.getMessage() + "", Toast.LENGTH_SHORT).show(); + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Log.d("TAG", "onError: " + e.getMessage()); - } - }); + } + + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + Log.d("TAG", "onError: " + e.getMessage()); + } + }); } + @Override protected void initData() { super.initData(); @@ -137,23 +149,22 @@ public class MessageFragment extends BaseFragment implements View.OnClickListen 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); + 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)){ + } else { + if (pictures_time.equals(newFormat)) { logFile = new File(Constant.LOG_FOLDER + "/" + pictures_time + ".txt"); - }else { + } else { logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt"); } } messageBuilder = new StringBuilder(); messageBuilder.append("MessageFragment-onCreate-initData ,"); - if (Constant.USHERED!=null){ + if (Constant.USHERED != null) { messageBuilder.append("userId:").append(Constant.USHERED).append(","); } - } @Override diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java index d4c91d5..337c696 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java @@ -110,7 +110,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { } if (Constant.USHERED != null) { HttpInterface.initHttpInter(Constant.USHERED); - if (HttpInterface.GET_PRICE!=null){ + if (HttpInterface.GET_PRICE != null) { initNetWork(); } } @@ -120,9 +120,9 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { public void onEvent(Message data) { if (data.what == Constant.HOME_MINE) { if ((boolean) data.obj) { - if (Constant.USHERED!=null){ + if (Constant.USHERED != null) { HttpInterface.initHttpInter(Constant.USHERED); - if (HttpInterface.GET_PRICE!=null){ + if (HttpInterface.GET_PRICE != null) { initNetWork(); } } @@ -132,45 +132,52 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { private void initNetWork() { showLoadingDialog(); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.GET_PRICE) .cls(GetPriceBean.class) .params(new HttpParams()) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(GetPriceBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - GetPriceBean.BodyBean body = response.getBody(); - if (body != null) { - Double userPrice = body.getUserPrice(); - if (getActivity()!=null){ - getActivity().runOnUiThread(new Runnable() { - @SuppressLint("SetTextI18n") - @Override - public void run() { - tvMoney.setText(userPrice+""); - } - }); + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(GetPriceBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + GetPriceBean.BodyBean body = response.getBody(); + if (body != null) { + Double userPrice = body.getUserPrice(); + if (getActivity() != null) { + getActivity().runOnUiThread(new Runnable() { + @SuppressLint("SetTextI18n") + @Override + public void run() { + tvMoney.setText(userPrice + ""); } - } - }else if (response.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - }else { - Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); + }); } - Log.d("TAG", "onSuccess: " + response.toString()); } + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); + } + Log.d("TAG", "onSuccess: " + response.toString()); + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Log.d("TAG", "onError: " + e.getMessage()); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + Log.d("TAG", "onError: " + e.getMessage()); + } + }); } @Override diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java index b363e74..0a95ed5 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java @@ -44,6 +44,7 @@ import com.navinfo.outdoor.activity.PhotographActivity; import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseDrawerFragment; import com.navinfo.outdoor.util.FlushTokenUtil; +import com.navinfo.outdoor.util.PreserveUtils; import com.navinfo.outdoor.util.UploadUtils; import com.navinfo.outdoor.bean.Info; import com.navinfo.outdoor.bean.PoiSaveBean; @@ -232,6 +233,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis break; } } + @Override public void onNothingSelected(AdapterView parent) { } @@ -516,7 +518,9 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis break; case R.id.btn_other_local: otherBuilder.append("点击了保存本地的按钮,"); - initPoiSaveLocal(false); + if (Constant.isPresent) { + initPoiSaveLocal(false); + } break; case R.id.btn_other_uploading: otherBuilder.append("点击了上传的按钮,"); @@ -586,7 +590,13 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() { @Override public void run() { - otherSaveByNetWork(poiEntity, isLocal); + if (isLocal) { + otherSaveByNetWork(poiEntity); + } else { + otherSaveNetWork(poiEntity); + Constant.isPresent = false; + } + } }); } @@ -607,6 +617,27 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis }); } + private void otherSaveNetWork(PoiEntity poiEntity) { + HttpParams httpParams = new HttpParams(); + httpParams.put("type", poiEntity.getStation_type()); + httpParams.put("taskId", poiEntity.getTaskId()); + httpParams.put("name", poiEntity.getName()); + httpParams.put("existence", poiEntity.getExistence()); + httpParams.put("geo", poiEntity.getGeoWkt()); + httpParams.put("memo", poiEntity.getMemo()); + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() + .time(30) + .Builder(getActivity()) + .url(HttpInterface.SUBMIT_OTHER_TASK) + .cls(PoiSaveBean.class) + .params(httpParams) + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(PreserveUtils.getInstance().getOtherPreserveCallback(getActivity(), poiEntity)); + Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退 + WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台保存中，请稍候..."); + WaitDialog.dismiss(1000); + } + private void otherUploadByNet(int body, List otherUploadList) { if (body == 0) { Toast.makeText(getActivity(), "没有保存本地", Toast.LENGTH_SHORT).show(); @@ -615,23 +646,21 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis } HttpParams httpParams = new HttpParams(); httpParams.put("auditId", body); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(0) .Builder(getActivity()) .url(HttpInterface.OTHER_TASK_UPLOAD_PIC) .fileList(otherUploadList) .token(Constant.ACCESS_TOKEN) .params(httpParams) - .cls(PoiUploadBean.class) - .postFileAsynchronous(UploadUtils.getInstance().getOtherUploadCallback(getActivity(), showPoiEntity, otherUploadList)); + .cls(PoiUploadBean.class); + okGoBuilder.postFileAsynchronous(UploadUtils.getInstance().getOtherUploadCallback(getActivity(), showPoiEntity, otherUploadList)); Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退 WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候..."); WaitDialog.dismiss(3000); } - private void otherSaveByNetWork(PoiEntity poiEntity, boolean isLocal) { - showLoadingDialog(); - setLoadingDialogText("保存中..."); + private void otherSaveByNetWork(PoiEntity poiEntity) { HttpParams httpParams = new HttpParams(); httpParams.put("type", poiEntity.getStation_type()); httpParams.put("taskId", poiEntity.getTaskId()); @@ -639,63 +668,61 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis httpParams.put("existence", poiEntity.getExistence()); httpParams.put("geo", poiEntity.getGeoWkt()); httpParams.put("memo", poiEntity.getMemo()); - OkGoBuilder.getInstance() + showLoadingDialog(); + setLoadingDialogText("保存中..."); + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.SUBMIT_OTHER_TASK) .cls(PoiSaveBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(PoiSaveBean poiSaveBean, int id) { - dismissLoadingDialog(); - if (poiSaveBean.getCode() == 200) { - Integer body = poiSaveBean.getBody(); - if (body != null && body != 0) { - poiEntity.setBodyId(body); - poiEntity.setTaskStatus(3); - new Thread(new Runnable() { - @Override - public void run() { - InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - if (isLocal) { - otherUploadByNet(body, otherUploadList); - Constant.isPresent = false; - } else { - Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); - Message obtain = Message.obtain(); - obtain.what = Constant.JOB_WORD_MONITOR; - obtain.obj = true; - EventBus.getDefault().post(obtain); - Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack(); - } - } - }); + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(PoiSaveBean poiSaveBean, int id) { + dismissLoadingDialog(); + if (poiSaveBean.getCode() == 200) { + Integer body = poiSaveBean.getBody(); + if (body != null && body != 0) { + poiEntity.setBodyId(body); + poiEntity.setTaskStatus(3); + new Thread(new Runnable() { + @Override + public void run() { + InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); + if (getActivity() != null) { + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + otherUploadByNet(body, otherUploadList); + Constant.isPresent = false; } - } - }).start(); - } else { - Toast.makeText(getActivity(), "" + poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); + }); + } } - } else if (poiSaveBean.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - }else { - Toast.makeText(getActivity(), "" + poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); - } + }).start(); + } else { + Toast.makeText(getActivity(), "" + poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); } + } else if (poiSaveBean.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), poiSaveBean.getMessage() + "", Toast.LENGTH_SHORT).show(); + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage()); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } @Override @@ -799,7 +826,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis if (markerOther != null) { markerOther.remove(); } - otherBuilder.append("onDestroy "); + otherBuilder.append("onDestroy"); otherBuilder.append("\r\n"); FileUtils.writeFile(logFile.getAbsolutePath(), otherBuilder.toString(), true); } @@ -812,43 +839,49 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis HttpParams httpParams = new HttpParams(); httpParams.put("taskIds", poiEntity.getTaskId()); httpParams.put("auditIds", ""); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder + .getInstance() .time(30) .Builder(getActivity()) .url(url) .params(httpParams) .cls(UnPolygonTaskBean.class) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(UnPolygonTaskBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - new Thread(new Runnable() { - @Override - public void run() { - poiDao.deletePoiEntity(poiEntity); - } - }).start(); - initList(); - Message obtain = Message.obtain(); - obtain.what = Constant.JOB_WORD_MONITOR; - obtain.obj = true; - EventBus.getDefault().post(obtain); - }else if (response.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - } else { - Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(UnPolygonTaskBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + new Thread(new Runnable() { + @Override + public void run() { + poiDao.deletePoiEntity(poiEntity); } - } + }).start(); + initList(); + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_WORD_MONITOR; + obtain.obj = true; + EventBus.getDefault().post(obtain); + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage()); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } @Override @@ -878,7 +911,8 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis } poiEntity.setPhotoInfo(arrayList); poiEntity.setStation_type(station_type); - @SuppressLint("SimpleDateFormat") DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + @SuppressLint("SimpleDateFormat") + DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(System.currentTimeMillis()); String format = formatter.format(calendar.getTime()); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java index b34619d..a275836 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -48,6 +48,7 @@ import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseDrawerFragment; import com.navinfo.outdoor.util.AWMp4ParserHelper; import com.navinfo.outdoor.util.FlushTokenUtil; +import com.navinfo.outdoor.util.PreserveUtils; import com.navinfo.outdoor.util.UploadUtils; import com.navinfo.outdoor.bean.GetPhoneBean; import com.navinfo.outdoor.bean.Info; @@ -435,7 +436,6 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe }); } - private void initShowPoi() { // 添加信息： assert getArguments() != null; @@ -567,19 +567,14 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe if (showPoiEntity.getTaskStatus() == 3) { disables(); } - - if (editNameContent.getText().toString() != null || editNameContent != null) { - editNameContent.setOnFocusChangeListener(new View.OnFocusChangeListener() { - @Override - public void onFocusChange(View v, boolean hasFocus) { - if (!hasFocus) { - findingDuplicateByWork(); - } + editNameContent.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + if (!hasFocus) { + findingDuplicateByWork(); } - }); - } else { - Toast.makeText(getActivity(), "请输入名称", Toast.LENGTH_SHORT).show(); - } + } + }); } @@ -618,9 +613,9 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } }); } - }else if (getPhoneBean.getCode()==203){ + } else if (getPhoneBean.getCode() == 203) { FlushTokenUtil.flushToken(getActivity()); - }else { + } else { Toast.makeText(getActivity(), getPhoneBean.getMessage(), Toast.LENGTH_SHORT).show(); } } @@ -628,7 +623,13 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } } }); } @@ -702,7 +703,9 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe switch (v.getId()) { case R.id.btn_save_local: poiBuilder.append("点击了保存本地的按钮,"); - initPoiSaveLocal(false); + if (Constant.isPresent) { + initPoiSaveLocal(false); + } break; case R.id.btn_uploading: poiBuilder.append("点击了上传的按钮,"); @@ -810,52 +813,54 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe String encode = Geohash.getInstance().encode(latLng.latitude, latLng.longitude); httpParams.put("geo", encode); httpParams.put("name", editNameContent.getText().toString()); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.TASK_NAME) .cls(TaskNameBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(TaskNameBean taskNameBean, int id) { - dismissLoadingDialog(); - if (taskNameBean.getCode() == 200) { - btnUploading.setEnabled(true); - btnSaveLocal.setEnabled(true); - editNameContent.setTextColor(Color.BLACK); - List body = taskNameBean.getBody(); - if (body != null) { - for (int i = 0; i < body.size(); i++) { - poiAddressName += body.get(i) + ","; - } - if (poiAddressName != null) { - Toast.makeText(getActivity(), "存在类似名称---" + poiAddressName, Toast.LENGTH_SHORT).show(); - poiAddressName = ""; - } else { - Toast.makeText(getActivity(), "没有类似名称,可以作业", Toast.LENGTH_SHORT).show(); - } - } else { - Toast.makeText(getActivity(), "没有类似名称,可以作业", Toast.LENGTH_SHORT).show(); - } - } else if (taskNameBean.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - }else { - editNameContent.setTextColor(Color.RED); - btnUploading.setEnabled(false); - btnSaveLocal.setEnabled(false); - Toast.makeText(getActivity(), taskNameBean.getMessage() + "", Toast.LENGTH_SHORT).show(); + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(TaskNameBean taskNameBean, int id) { + dismissLoadingDialog(); + if (taskNameBean.getCode() == 200) { + btnUploading.setEnabled(true); + btnSaveLocal.setEnabled(true); + editNameContent.setTextColor(Color.BLACK); + List body = taskNameBean.getBody(); + if (body != null) { + for (int i = 0; i < body.size(); i++) { + poiAddressName += body.get(i) + ","; } + if (poiAddressName != null) { + Toast.makeText(getActivity(), "存在类似名称---" + poiAddressName, Toast.LENGTH_SHORT).show(); + poiAddressName = ""; + } else { + Toast.makeText(getActivity(), "没有类似名称,可以作业", Toast.LENGTH_SHORT).show(); + } + } else { + Toast.makeText(getActivity(), "没有类似名称,可以作业", Toast.LENGTH_SHORT).show(); } + } else if (taskNameBean.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), taskNameBean.getMessage() + "", Toast.LENGTH_SHORT).show(); + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage()); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } public void initPoiSaveLocal(boolean isLocal) { @@ -881,7 +886,13 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() { @Override public void run() { - poiSaveByNet(poiEntity, isLocal); + if (isLocal) { + poiSaveByNet(poiEntity); + } else { + poiSaveNet(poiEntity); + Constant.isPresent = false; + } + } }); } @@ -903,6 +914,28 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } + private void poiSaveNet(PoiEntity poiEntity) { + HttpParams httpParams = new HttpParams(); + httpParams.put("taskId", poiEntity.getTaskId()); + httpParams.put("name", poiEntity.getName()); + httpParams.put("address", poiEntity.getAddress()); + httpParams.put("existence", poiEntity.getExistence()); + httpParams.put("geo", poiEntity.getGeoWkt()); + httpParams.put("memo", poiEntity.getMemo()); + httpParams.put("telephone", poiEntity.getTelPhone()); + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() + .time(30) + .Builder(getActivity()) + .url(HttpInterface.SUBMIT_POI_TASK) + .cls(PoiSaveBean.class) + .token(Constant.ACCESS_TOKEN) + .params(httpParams); + okGoBuilder.getRequest(PreserveUtils.getInstance().getPoiPreserveCallback(getActivity(), poiEntity)); + Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退 + WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台保存中，请稍候..."); + WaitDialog.dismiss(1000); + } + private void poiUploadByNetWork(int body, ArrayList poiPicList) { if (body == 0) { Toast.makeText(getActivity(), "没有保存本地", Toast.LENGTH_SHORT).show(); @@ -911,22 +944,21 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } HttpParams httpParams = new HttpParams(); httpParams.put("auditId", body); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(0) .Builder(getActivity()) .url(HttpInterface.POI_TASK_UPLOAD_PIC) .cls(OtherUploadPicBean.class) .token(Constant.ACCESS_TOKEN) .fileList(poiPicList) - .params(httpParams) - .postFileAsynchronous(UploadUtils.getInstance().getPoiUploadCallback(getActivity(), showPoiEntity, poiPicList)); + .params(httpParams); + okGoBuilder.postFileAsynchronous(UploadUtils.getInstance().getPoiUploadCallback(getActivity(), showPoiEntity, poiPicList)); Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退 WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候..."); WaitDialog.dismiss(3000); - } - private void poiSaveByNet(PoiEntity poiEntity, boolean isLocal) { + private void poiSaveByNet(PoiEntity poiEntity) { HttpParams httpParams = new HttpParams(); httpParams.put("taskId", poiEntity.getTaskId()); httpParams.put("name", poiEntity.getName()); @@ -937,61 +969,58 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe httpParams.put("telephone", poiEntity.getTelPhone()); showLoadingDialog(); setLoadingDialogText("保存中..."); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.SUBMIT_POI_TASK) .cls(PoiSaveBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(PoiSaveBean poiSaveBean, int id) { - dismissLoadingDialog(); - if (poiSaveBean.getCode() == 200) { - Integer body = poiSaveBean.getBody(); - if (body != null && body != 0) { - poiEntity.setBodyId(body); - poiEntity.setTaskStatus(3); - new Thread(new Runnable() { + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(PoiSaveBean poiSaveBean, int id) { + dismissLoadingDialog(); + if (poiSaveBean.getCode() == 200) { + Integer body = poiSaveBean.getBody(); + if (body != null && body != 0) { + poiEntity.setBodyId(body); + poiEntity.setTaskStatus(3); + new Thread(new Runnable() { + @Override + public void run() { + InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); + Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() { @Override public void run() { - InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); - Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() { - @Override - public void run() { - if (isLocal) { - poiUploadByNetWork(body, poiPicList);//上传 - Constant.isPresent = false; - } else { - Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); - Message obtain = Message.obtain(); - obtain.what = Constant.JOB_WORD_MONITOR; - obtain.obj = true; - EventBus.getDefault().post(obtain); - Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack(); - } - } - }); + poiUploadByNetWork(body, poiPicList);//上传 + Constant.isPresent = false; } - }).start(); - } else { - Toast.makeText(getActivity(), "" + poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); + }); } - }else if (poiSaveBean.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - } else { - Toast.makeText(getActivity(), "" + poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); - } + }).start(); + } else { + Toast.makeText(getActivity(), "" + poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); } + } else if (poiSaveBean.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), "" + poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage()); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + Log.d("TAG", "onError: " + e.getMessage()); + } + }); } /** @@ -1164,44 +1193,51 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe HttpParams httpParams = new HttpParams(); httpParams.put("taskIds", poiEntity.getTaskId()); httpParams.put("auditIds", ""); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(url) .params(httpParams) .cls(UnPolygonTaskBean.class) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(UnPolygonTaskBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - new Thread(new Runnable() { - @Override - public void run() { - poiDao.deletePoiEntity(poiEntity); - } - }).start(); - initList(); - Message obtain = Message.obtain(); - obtain.what = Constant.JOB_WORD_MONITOR; - obtain.obj = true; - EventBus.getDefault().post(obtain); - }else if (response.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - } else { - Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(UnPolygonTaskBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + new Thread(new Runnable() { + @Override + public void run() { + poiDao.deletePoiEntity(poiEntity); } + }).start(); + initList(); + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_WORD_MONITOR; + obtain.obj = true; + EventBus.getDefault().post(obtain); + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + } - } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Log.d("TAG", "onError: " + e.getMessage()); - } + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + Log.d("TAG", "onError: " + e.getMessage()); + } - }); + }); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java index 16642ee..16e8f94 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java @@ -40,7 +40,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene private XRecyclerView poiTaskXrv; private int type; private PoiTaskAdapter poiTaskAdapter; - private int page=1; + private int page = 1; private List listBeans; public static PoiTaskFragment newInstance(Bundle bundle) { @@ -58,7 +58,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene protected void initView() { super.initView(); TextView tvTaskTitle = findViewById(R.id.tv_poiTask_title); - switch (type){ + switch (type) { case 1: tvTaskTitle.setText("POI任务列表"); break; @@ -85,11 +85,12 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene @Override public void onRefresh() { page = 1; - initWork(type,true); + initWork(type, true); } + @Override public void onLoadMore() { - initWork(type,false); + initWork(type, false); } }); poiTaskAdapter = new PoiTaskAdapter(getContext(), listBeans); @@ -103,9 +104,9 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene assert getArguments() != null; type = getArguments().getInt("type", 0); listBeans = new ArrayList<>(); - if (Constant.currentLocation!=null){ - if (Constant.USHERED!=null){ - initWork(type,true); + if (Constant.currentLocation != null) { + if (Constant.USHERED != null) { + initWork(type, true); } } } @@ -116,35 +117,40 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene httpParams.put("pageSize", "20"); httpParams.put("pageNum", page); showLoadingDialog(); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.GET_COMMIT_LIST) .cls(HasSubmitBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(HasSubmitBean hasSubmitBean, int id) { - dismissLoadingDialog(); - if (hasSubmitBean.getCode() == 200){ - if (hasSubmitBean.getBody()!=null){ - initHasSubmitBean(hasSubmitBean,aBoolean); - } - }else if (hasSubmitBean.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - }else { - Toast.makeText(getActivity(), hasSubmitBean.getMessage()+"", Toast.LENGTH_SHORT).show(); - } + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(HasSubmitBean hasSubmitBean, int id) { + dismissLoadingDialog(); + if (hasSubmitBean.getCode() == 200) { + if (hasSubmitBean.getBody() != null) { + initHasSubmitBean(hasSubmitBean, aBoolean); } + } else if (hasSubmitBean.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), hasSubmitBean.getMessage() + "", Toast.LENGTH_SHORT).show(); + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Log.d("TAG", "onError: " + e.getMessage()); - Toast.makeText(getActivity(), "请求失败", Toast.LENGTH_SHORT).show(); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } private void initHasSubmitBean(HasSubmitBean hasSubmitBean, boolean aBoolean) { @@ -153,7 +159,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene if (listBeans.size() > 0) { listBeans.clear(); } - if (hasSubmitBean.getBody().getList()== null) { + if (hasSubmitBean.getBody().getList() == null) { Toast.makeText(getActivity(), "没有相关数据", Toast.LENGTH_SHORT).show(); } else { listBeans.addAll(hasSubmitBean.getBody().getList()); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java index 44423c6..8c49f3c 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -55,6 +55,7 @@ import com.navinfo.outdoor.util.AWMp4ParserHelper; import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.Geohash; import com.navinfo.outdoor.util.GeometryTools; +import com.navinfo.outdoor.util.PreserveUtils; import com.navinfo.outdoor.util.UploadUtils; import com.navinfo.outdoor.util.ZipUtils; import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptor; @@ -121,7 +122,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick header.findViewById(R.id.iv_final).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - initBack(); + initBack(); } }); header.findViewById(R.id.tv_explain).setOnClickListener(new View.OnClickListener() { @@ -143,7 +144,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick private void initBack() { DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; - MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定","取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() { + MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() { @Override public boolean onClick(BaseDialog baseDialog, View v) { if (showPoiEntity != null) { @@ -306,7 +307,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick moveLatlng(latLng, null); } else { String detail = showPoiEntity.getDetail(); - if (detail!=null){ + if (detail != null) { String geo = Geohash.getInstance().decode(detail); Geometry geometry = GeometryTools.createGeometry(geo); switch (geometry.getGeometryType()) { @@ -325,7 +326,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick markerPoiVideo = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiVideoDescriptor).anchor(0.5f, 1.0f)); markerPoiVideo.setZIndex(4); moveLatlng(latLng, null); - }else { + } else { String x = showPoiEntity.getX(); String y = showPoiEntity.getY(); if (x != null && y != null) { @@ -424,7 +425,9 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick break; case R.id.btn_poi_video_save: poiVideoBuilder.append("点击了保存本地的按钮 ,"); - initPoiSaveLocal(false); + if (Constant.isPresent) { + initPoiSaveLocal(false); + } break; case R.id.tv_short://手动拍摄 poiVideoBuilder.append("点击了手动拍摄的按钮 ,"); @@ -442,7 +445,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick intents.putExtra(Constant.INTENT_JPG_PATH, filePath.getAbsolutePath()); intents.putExtra(Constant.INTENT_VIDEO_OBLATION, 0); intents.putExtra(Constant.INTENT_POI_VIDEO_TYPE, 2); - intents.putExtra(Constant.INTENT_TYPE, showPoiEntity.getType()+""); + intents.putExtra(Constant.INTENT_TYPE, showPoiEntity.getType() + ""); intents.putExtra(Constant.INTENT_GEO_WKT, showPoiEntity.getGeoWkt()); intents.putExtra(Constant.INTENT_DETAIL, showPoiEntity.getDetail()); startActivityForResult(intents, 0x102); @@ -462,7 +465,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick intent.putExtra(Constant.INTENT_JPG_PATH, fileJpgPath.getAbsolutePath()); intent.putExtra(Constant.INTENT_VIDEO_OBLATION, 0); intent.putExtra(Constant.INTENT_POI_VIDEO_TYPE, 1); - intent.putExtra(Constant.INTENT_TYPE, showPoiEntity.getType()+""); + intent.putExtra(Constant.INTENT_TYPE, showPoiEntity.getType() + ""); intent.putExtra(Constant.INTENT_GEO_WKT, showPoiEntity.getGeoWkt()); intent.putExtra(Constant.INTENT_DETAIL, showPoiEntity.getDetail()); startActivityForResult(intent, 0x101); @@ -543,13 +546,18 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick getActivity().runOnUiThread(new Runnable() { @Override public void run() { - poiVideoSave(poiEntity, isLocal); + if (isLocal) { + poiVideoSave(poiEntity); + } else { + poiVideoSaveNet(poiEntity); + Constant.isPresent = false; + } + } }); } } }).start(); - //onBackPressed(); } else { Toast.makeText(getActivity(), "没有申请权限，请手动申请", Toast.LENGTH_SHORT).show(); } @@ -566,6 +574,26 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick }); } + private void poiVideoSaveNet(PoiEntity poiEntity) { + HttpParams httpParams = new HttpParams(); + httpParams.put("taskId", poiEntity.getTaskId()); + httpParams.put("name", poiEntity.getName()); + httpParams.put("address", poiEntity.getAddress()); + httpParams.put("workType", poiEntity.getWork_type()); + httpParams.put("memo", poiEntity.getMemo()); + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() + .time(30) + .Builder(getActivity()) + .url(HttpInterface.INSIDE_API_LIST) + .cls(PoiVideoBean.class) + .params(httpParams) + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(PreserveUtils.getInstance().getPoiVideoPreserveCallback(getActivity(), poiEntity)); + Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退 + WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台保存中，请稍候..."); + WaitDialog.dismiss(1000); + } + private void poiVideoUpload(int poiVideoBody, File fileZip) { if (poiVideoBody == 0) { Toast.makeText(getActivity(), "请先保存本地在上传", Toast.LENGTH_SHORT).show(); @@ -580,20 +608,20 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick long time = System.currentTimeMillis(); httpParams.put("datetime", time); httpParams.put("file", fileZip); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(0) .Builder(getActivity()) .url(HttpInterface.POI_VIDEO_UPLOAD_PIC) .cls(OtherUploadPicBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .postRequest(UploadUtils.getInstance().getPoiVideoUploadCallback(getActivity(), showPoiEntity, fileZip)); + .token(Constant.ACCESS_TOKEN); + okGoBuilder.postRequest(UploadUtils.getInstance().getPoiVideoUploadCallback(getActivity(), showPoiEntity, fileZip)); Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退 WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候..."); WaitDialog.dismiss(3000); } - private void poiVideoSave(PoiEntity poiEntity, boolean isLocal) { + private void poiVideoSave(PoiEntity poiEntity) { HttpParams httpParams = new HttpParams(); httpParams.put("taskId", poiEntity.getTaskId()); httpParams.put("name", poiEntity.getName()); @@ -601,61 +629,59 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick httpParams.put("workType", poiEntity.getWork_type()); httpParams.put("memo", poiEntity.getMemo()); showLoadingDialog(); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.INSIDE_API_LIST) .cls(PoiVideoBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(PoiVideoBean poiVideoBean, int id) { - dismissLoadingDialog(); - if (poiVideoBean.getCode() == 200) { - Integer poiVideoBody = poiVideoBean.getBody(); - if (poiVideoBody != null && poiVideoBody != 0) { - poiEntity.setBodyId(poiVideoBody); - poiEntity.setTaskStatus(3); - new Thread(new Runnable() { - @Override - public void run() { - InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - if (isLocal) { - poiVideoUpload(poiVideoBody, fileZip); - } else { - Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); - Message obtain = Message.obtain(); - obtain.what = Constant.JOB_WORD_MONITOR; - obtain.obj = true; - EventBus.getDefault().post(obtain); - getActivity().getSupportFragmentManager().popBackStack(); - } - } - }); + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(PoiVideoBean poiVideoBean, int id) { + dismissLoadingDialog(); + if (poiVideoBean.getCode() == 200) { + Integer poiVideoBody = poiVideoBean.getBody(); + if (poiVideoBody != null && poiVideoBody != 0) { + poiEntity.setBodyId(poiVideoBody); + poiEntity.setTaskStatus(3); + new Thread(new Runnable() { + @Override + public void run() { + InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); + if (getActivity() != null) { + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + poiVideoUpload(poiVideoBody, fileZip); + Constant.isPresent = false; } - } - }).start(); - } else { - Toast.makeText(getContext(), "" + poiVideoBean.getMessage(), Toast.LENGTH_SHORT).show(); + }); + } } - }else if (poiVideoBean.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - }else { - Toast.makeText(getContext(), poiVideoBean.getMessage(), Toast.LENGTH_SHORT).show(); - } + }).start(); + } else { + Toast.makeText(getContext(), "" + poiVideoBean.getMessage(), Toast.LENGTH_SHORT).show(); } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(getContext(), e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage()); - } - }); + } else if (poiVideoBean.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getContext(), poiVideoBean.getMessage(), Toast.LENGTH_SHORT).show(); + } + } + + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } @Override @@ -739,49 +765,55 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick HttpParams httpParams = new HttpParams(); httpParams.put("taskIds", poiEntity.getTaskId()); httpParams.put("auditIds", ""); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(url) .params(httpParams) .cls(UnPolygonTaskBean.class) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(UnPolygonTaskBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - new Thread(new Runnable() { - @Override - public void run() { - poiDao.deletePoiEntity(poiEntity); - } - }).start(); - if (poiEntity.getId() != null) { - List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(poiEntity.getId()); - for (int i = 0; i < fileListByUUID.size(); i++) { - fileListByUUID.get(i).delete(); - } - File filePath = AWMp4ParserHelper.getInstance().getFilePath(poiEntity.getId()); - filePath.delete(); - } - Message obtain = Message.obtain(); - obtain.what = Constant.JOB_WORD_MONITOR; - obtain.obj = true; - EventBus.getDefault().post(obtain); - }else if (response.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - } else { - Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(UnPolygonTaskBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + new Thread(new Runnable() { + @Override + public void run() { + poiDao.deletePoiEntity(poiEntity); } + }).start(); + if (poiEntity.getId() != null) { + List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(poiEntity.getId()); + for (int i = 0; i < fileListByUUID.size(); i++) { + fileListByUUID.get(i).delete(); + } + File filePath = AWMp4ParserHelper.getInstance().getFilePath(poiEntity.getId()); + filePath.delete(); } + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_WORD_MONITOR; + obtain.obj = true; + EventBus.getDefault().post(obtain); + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), response.getMessage()+"", Toast.LENGTH_SHORT).show(); + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } @Override @@ -837,7 +869,6 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick poiEntity.setDetail(lineString); } } - return poiEntity; } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java index 7ba8535..809e490 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java @@ -96,20 +96,20 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen 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); + 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)){ + } else { + if (pictures_time.equals(newFormat)) { logFile = new File(Constant.LOG_FOLDER + "/" + pictures_time + ".txt"); - }else { + } else { logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt"); } } registerBuilder = new StringBuilder(); registerBuilder.append("RegisterFragment-onViewCreated-initData,"); - if (Constant.USHERED!=null){ + if (Constant.USHERED != null) { registerBuilder.append("userId:").append(Constant.USHERED).append(","); } } @@ -156,34 +156,40 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen } httpParams.put("type", 1); showLoadingDialog(); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.USER_MESSAGE) .cls(MessageCodeBean.class) .token(null) - .params(httpParams) - .getRequest(new Callback() { - @Override - public void onSuccess(MessageCodeBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - sessionId = response.getBody(); - registerNote(); - Toast.makeText(getActivity(), "验证码已发送", Toast.LENGTH_SHORT).show(); - } else { - if (response.getMessage() != null) { - Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); - } - } + .params(httpParams); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(MessageCodeBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + sessionId = response.getBody(); + registerNote(); + Toast.makeText(getActivity(), "验证码已发送", Toast.LENGTH_SHORT).show(); + } else { + if (response.getMessage() != null) { + Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); } + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } private void initRegister() { @@ -235,39 +241,45 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen long time = System.currentTimeMillis(); httpParams.put("datetime", time); showLoadingDialog(); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.USER_REGISTER) .token(null) .params(httpParams) - .cls(UserBean.class) - .postRequest(new Callback() { - @Override - public void onSuccess(UserBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - Toast.makeText(getActivity(), "注册成功", Toast.LENGTH_SHORT).show(); - Constant.USER_NAME = mobile; - Constant.PASS_WORD = password; - Message obtain = Message.obtain(); - obtain.what = Constant.REGISTER_WORD; - obtain.obj = true; - EventBus.getDefault().post(obtain); - Objects.requireNonNull(getActivity()).finish(); - } else { - if (response.getMessage() != null) { - Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); - } - } + .cls(UserBean.class); + okGoBuilder.postRequest(new Callback() { + @Override + public void onSuccess(UserBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + Toast.makeText(getActivity(), "注册成功", Toast.LENGTH_SHORT).show(); + Constant.USER_NAME = mobile; + Constant.PASS_WORD = password; + Message obtain = Message.obtain(); + obtain.what = Constant.REGISTER_WORD; + obtain.obj = true; + EventBus.getDefault().post(obtain); + Objects.requireNonNull(getActivity()).finish(); + } else { + if (response.getMessage() != null) { + Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); } + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage() + "", Toast.LENGTH_SHORT).show(); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")){ + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java index b3715e3..225eef5 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -41,6 +41,7 @@ import com.navinfo.outdoor.activity.PicturesActivity; import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseDrawerFragment; import com.navinfo.outdoor.util.FlushTokenUtil; +import com.navinfo.outdoor.util.PreserveUtils; import com.navinfo.outdoor.util.UploadUtils; import com.navinfo.outdoor.bean.OtherUploadPicBean; import com.navinfo.outdoor.bean.RoadSaveBean; @@ -120,7 +121,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList header.findViewById(R.id.iv_final).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - initBack(); + initBack(); } }); header.findViewById(R.id.tv_road_explain).setOnClickListener(new View.OnClickListener() { @@ -136,61 +137,63 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList private void initBack() { DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; - MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定","取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() { - @Override - public boolean onClick(BaseDialog baseDialog, View v) { - if (showPoiEntity != null) { - if (showPoiEntity.getTaskStatus() == 5) { - initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity); - } else if (showPoiEntity.getTaskStatus() == 0 || showPoiEntity.getTaskStatus() == 1) { - if (showPoiEntity.getId() != null) { - List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId()); - for (int i = 0; i < fileListByUUID.size(); i++) { - fileListByUUID.get(i).delete(); + MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消") + .setOnOkButtonClickListener(new OnDialogButtonClickListener() { + @Override + public boolean onClick(BaseDialog baseDialog, View v) { + if (showPoiEntity != null) { + if (showPoiEntity.getTaskStatus() == 5) { + initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity); + } else if (showPoiEntity.getTaskStatus() == 0 || showPoiEntity.getTaskStatus() == 1) { + if (showPoiEntity.getId() != null) { + List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId()); + for (int i = 0; i < fileListByUUID.size(); i++) { + fileListByUUID.get(i).delete(); + } + File filePath = AWMp4ParserHelper.getInstance().getFilePath(showPoiEntity.getId()); + filePath.delete(); + } + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_WORD_MONITOR; + obtain.obj = true; + EventBus.getDefault().post(obtain); + Bundle arguments = getArguments(); + if (arguments != null) { + isSliding = arguments.getBoolean("isSliding", true); + } + if (isSliding) { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.TREASURE_FRAGMENT; + obtain1.obj = isSliding; + EventBus.getDefault().post(obtain1); + } + } else { + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_WORD_MONITOR; + obtain.obj = true; + EventBus.getDefault().post(obtain); + Bundle arguments = getArguments(); + if (arguments != null) { + isSliding = arguments.getBoolean("isSliding", true); + } + if (isSliding) { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.TREASURE_FRAGMENT; + obtain1.obj = isSliding; + EventBus.getDefault().post(obtain1); + } } - File filePath = AWMp4ParserHelper.getInstance().getFilePath(showPoiEntity.getId()); - filePath.delete(); - } - Message obtain = Message.obtain(); - obtain.what = Constant.JOB_WORD_MONITOR; - obtain.obj = true; - EventBus.getDefault().post(obtain); - Bundle arguments = getArguments(); - if (arguments != null) { - isSliding = arguments.getBoolean("isSliding", true); - } - if (isSliding) { - Message obtain1 = Message.obtain(); - obtain1.what = Constant.TREASURE_FRAGMENT; - obtain1.obj = isSliding; - EventBus.getDefault().post(obtain1); - } - } else { - Message obtain = Message.obtain(); - obtain.what = Constant.JOB_WORD_MONITOR; - obtain.obj = true; - EventBus.getDefault().post(obtain); - Bundle arguments = getArguments(); - if (arguments != null) { - isSliding = arguments.getBoolean("isSliding", true); - } - if (isSliding) { - Message obtain1 = Message.obtain(); - obtain1.what = Constant.TREASURE_FRAGMENT; - obtain1.obj = isSliding; - EventBus.getDefault().post(obtain1); + Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack(); } + return false; } - Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack(); - } - return false; - } - }).setOnCancelButtonClickListener(new OnDialogButtonClickListener() { - @Override - public boolean onClick(BaseDialog baseDialog, View v) { - return false; - } - }); + }) + .setOnCancelButtonClickListener(new OnDialogButtonClickListener() { + @Override + public boolean onClick(BaseDialog baseDialog, View v) { + return false; + } + }); } @Override @@ -241,8 +244,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList roadUpload.setOnClickListener(this); //数据展示 initShowPoi(); - //禁用可操作性控件 - // disables(); } @Override @@ -303,7 +304,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList moveLatlng(latLng, null); } else { String detail = showPoiEntity.getDetail(); - if (detail!=null){ + if (detail != null) { String geo = Geohash.getInstance().decode(detail); Geometry geometry = GeometryTools.createGeometry(geo); switch (geometry.getGeometryType()) { @@ -322,7 +323,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList markerRoad = tencentMap.addMarker(new MarkerOptions(latLng).icon(roadDescriptor).anchor(0.5f, 1.0f)); markerRoad.setZIndex(4); moveLatlng(latLng, null); - }else { + } else { String x = showPoiEntity.getX(); String y = showPoiEntity.getY(); if (x != null && y != null) { @@ -427,7 +428,9 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList switch (v.getId()) { case R.id.btn_road_save: roadBuilder.append("点击了保存本地的按钮 ,"); - initPoiSaveLocal(false); + if (Constant.isPresent) { + initPoiSaveLocal(false); + } break; case R.id.fm_road_picture: roadBuilder.append("点击了图片查看列表 ,"); @@ -456,7 +459,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList intent.putExtra(Constant.INTENT_JPG_PATH, finalFile.getAbsolutePath()); intent.putExtra(Constant.INTENT_VIDEO_OBLATION, 0); intent.putExtra(Constant.INTENT_POI_VIDEO_TYPE, 3); - intent.putExtra(Constant.INTENT_TYPE, showPoiEntity.getType()+""); + intent.putExtra(Constant.INTENT_TYPE, showPoiEntity.getType() + ""); intent.putExtra(Constant.INTENT_GEO_WKT, showPoiEntity.getGeoWkt()); intent.putExtra(Constant.INTENT_DETAIL, showPoiEntity.getDetail()); startActivityForResult(intent, 0x101); @@ -537,7 +540,13 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() { @Override public void run() { - roadSaveBetWork(poiEntity, isLocal); + if (isLocal) { + roadSaveBetWork(poiEntity); + } else { + roadSaveWork(poiEntity); + Constant.isPresent = false; + } + } }); } @@ -558,6 +567,26 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList }); } + private void roadSaveWork(PoiEntity poiEntity) { + HttpParams httpParams = new HttpParams(); + httpParams.put("taskId", poiEntity.getTaskId()); + httpParams.put("name", poiEntity.getName()); + httpParams.put("address", poiEntity.getAddress()); + httpParams.put("workType", poiEntity.getWork_type()); + httpParams.put("memo", poiEntity.getMemo()); + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() + .time(30) + .Builder(getActivity()) + .url(HttpInterface.ROAD_TASK_SUBMIT) + .cls(RoadSaveBean.class) + .params(httpParams) + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(PreserveUtils.getInstance().getRoadPreserveCallback(getActivity(), poiEntity)); + Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退 + WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台保存中，请稍候..."); + WaitDialog.dismiss(1000); + } + private void poiVideoUpload(int body, File fileZip) { if (body == 0) { @@ -573,87 +602,81 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList long time = System.currentTimeMillis(); httpParams.put("datetime", time); httpParams.put("file", fileZip); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(0) .Builder(getActivity()) .url(HttpInterface.ROAD_TASK_UPLOAD_PIC) .params(httpParams) .token(Constant.ACCESS_TOKEN) - .cls(OtherUploadPicBean.class) - .postRequest(UploadUtils.getInstance().getRoadUploadCallback(getActivity(), showPoiEntity, fileZip)); + .cls(OtherUploadPicBean.class); + okGoBuilder.postRequest(UploadUtils.getInstance().getRoadUploadCallback(getActivity(), showPoiEntity, fileZip)); Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();//回退 WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候..."); WaitDialog.dismiss(3000); - - } - private void roadSaveBetWork(PoiEntity poiEntity, boolean isLocal) { + private void roadSaveBetWork(PoiEntity poiEntity) { showLoadingDialog(); + setLoadingDialogText("保存中..."); HttpParams httpParams = new HttpParams(); httpParams.put("taskId", poiEntity.getTaskId()); httpParams.put("name", poiEntity.getName()); httpParams.put("address", poiEntity.getAddress()); httpParams.put("workType", poiEntity.getWork_type()); httpParams.put("memo", poiEntity.getMemo()); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.ROAD_TASK_SUBMIT) .cls(RoadSaveBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(RoadSaveBean roadSaveBean, int id) { - dismissLoadingDialog(); - if (roadSaveBean.getCode() == 200) { - Integer roadBody = roadSaveBean.getBody(); - if (roadBody != null && roadBody != 0) { - poiEntity.setBodyId(roadBody); - poiEntity.setTaskStatus(3); - new Thread(new Runnable() { - @Override - public void run() { - InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - if (isLocal) { - poiVideoUpload(roadBody, fileZip); - Constant.isPresent = false; - } else { - Toast.makeText(getActivity(), "保存成功", Toast.LENGTH_SHORT).show(); - Message obtain = Message.obtain(); - obtain.what = Constant.JOB_WORD_MONITOR; - obtain.obj = true; - EventBus.getDefault().post(obtain); - getActivity().getSupportFragmentManager().popBackStack(); - } - } - }); + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(RoadSaveBean roadSaveBean, int id) { + dismissLoadingDialog(); + if (roadSaveBean.getCode() == 200) { + Integer roadBody = roadSaveBean.getBody(); + if (roadBody != null && roadBody != 0) { + poiEntity.setBodyId(roadBody); + poiEntity.setTaskStatus(3); + new Thread(new Runnable() { + @Override + public void run() { + InsertAndUpdateUtils.getInstance().insertOrUpdate(getContext(), poiEntity); + if (getActivity() != null) { + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + poiVideoUpload(roadBody, fileZip); + Constant.isPresent = false; } - } - }).start(); - } else { - Toast.makeText(getActivity(), "" + roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); + }); + } } - }else if (roadSaveBean.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - } else { - Toast.makeText(getActivity(), "" + roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); - } + }).start(); + } else { + Toast.makeText(getActivity(), "" + roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); } + } else if (roadSaveBean.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), "" + roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage()); - } - - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } @Override @@ -676,14 +699,13 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList } } - @Override public void onSaveInstanceState(@NonNull Bundle outState) { super.onSaveInstanceState(outState); initRoadSharePre(); } - /** + /* * 防止程序崩溃后数据丢失 */ public void initRoadSharePre() { @@ -724,7 +746,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList if (markerRoad != null) { markerRoad.remove(); } - roadBuilder.append("onDestroy "); + roadBuilder.append("onDestroy"); roadBuilder.append("\r\n"); FileUtils.writeFile(logFile.getAbsolutePath(), roadBuilder.toString(), true); } @@ -737,50 +759,55 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList HttpParams httpParams = new HttpParams(); httpParams.put("taskIds", poiEntity.getTaskId()); httpParams.put("auditIds", ""); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(url) .params(httpParams) .cls(UnPolygonTaskBean.class) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(UnPolygonTaskBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - new Thread(new Runnable() { - @Override - public void run() { - poiDao.deletePoiEntity(poiEntity); - } - }).start(); - if (poiEntity.getId() != null) { - List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(poiEntity.getId()); - for (int i = 0; i < fileListByUUID.size(); i++) { - fileListByUUID.get(i).delete(); - } - File filePath = AWMp4ParserHelper.getInstance().getFilePath(poiEntity.getId()); - filePath.delete(); - } - Message obtain = Message.obtain(); - obtain.what = Constant.JOB_WORD_MONITOR; - obtain.obj = true; - EventBus.getDefault().post(obtain); - }else if (response.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - } else { - Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(UnPolygonTaskBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + new Thread(new Runnable() { + @Override + public void run() { + poiDao.deletePoiEntity(poiEntity); } + }).start(); + if (poiEntity.getId() != null) { + List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(poiEntity.getId()); + for (int i = 0; i < fileListByUUID.size(); i++) { + fileListByUUID.get(i).delete(); + } + File filePath = AWMp4ParserHelper.getInstance().getFilePath(poiEntity.getId()); + filePath.delete(); } + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_WORD_MONITOR; + obtain.obj = true; + EventBus.getDefault().post(obtain); + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage()); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } @Override diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java index ece28e7..7d729e5 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java @@ -67,7 +67,6 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList private File logFile; private StringBuilder staySubmitBuilder; - public static StaySubmitFragment newInstance(Bundle bundle) { StaySubmitFragment fragment = new StaySubmitFragment(); fragment.setArguments(bundle); @@ -82,7 +81,6 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList } } - @Override protected int getLayout() { return R.layout.fragment_stay_submit; @@ -179,8 +177,8 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList if (messageDialog != null) { messageDialog.doDismiss(); } - }else if (data.what==Constant.STAY_SUBMIT_ITEM){ - if ((boolean)data.obj){ + } else if (data.what == Constant.STAY_SUBMIT_ITEM) { + if ((boolean) data.obj) { if (cbSelect != null) { cbSelect.setChecked(false); } @@ -335,32 +333,38 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList HttpParams httpParams = new HttpParams(); httpParams.put("taskIds", taskIds.toString()); httpParams.put("auditIds", auditIds.toString()); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.UNRECEIVED_POLYGON_TASK) .params(httpParams) .token(Constant.ACCESS_TOKEN) - .cls(UnPolygonTaskBean.class) - .getRequest(new Callback() { - @Override - public void onSuccess(UnPolygonTaskBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - staySubmitAdapter.setAllCheckedDelete(); - } else if (response.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - }else { - Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); - } - } + .cls(UnPolygonTaskBean.class); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(UnPolygonTaskBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + staySubmitAdapter.setAllCheckedDelete(); + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage() + "", Toast.LENGTH_SHORT).show(); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } }); } @@ -408,20 +412,20 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList } } + @Override public void onPause() { super.onPause(); staySubmitBuilder.append("onPause ,"); } - @Override public void onDestroy() { if (EventBus.getDefault().isRegistered(this))//加上判断 EventBus.getDefault().unregister(this); super.onDestroy(); dismissLoadingDialog(); - staySubmitBuilder.append("onDestroy "); + staySubmitBuilder.append("onDestroy"); staySubmitBuilder.append("\r\n"); FileUtils.writeFile(logFile.getAbsolutePath(), staySubmitBuilder.toString(), true); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java index 44ec43c..53aacd4 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java @@ -68,25 +68,25 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis protected void initView() { super.initView(); ImageView ivFindTaskExplain = findViewById(R.id.iv_find_task_explain); - taskExplainRecycle =findViewById(R.id.task_explain_recycler); + taskExplainRecycle = findViewById(R.id.task_explain_recycler); ivFindTaskExplain.setOnClickListener(this); taskExplainRecycle.setLayoutManager(new LinearLayoutManager(getActivity())); //下划线 - // taskExplainRecycle.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL)); + // taskExplainRecycle.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL)); taskExplainRecycle.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader); taskExplainRecycle.setLoadingMoreProgressStyle(ProgressStyle.BallRotate); //取消上啦加载下拉刷新 // taskExplainRecycle.setPullRefreshEnabled(false); // taskExplainRecycle.setLoadingMoreEnabled(false); - taskExplainAdapter = new TaskExplainAdapter(explainList,getActivity()); + taskExplainAdapter = new TaskExplainAdapter(explainList, getActivity()); taskExplainRecycle.setAdapter(taskExplainAdapter); taskExplainRecycle.setLoadingListener(new XRecyclerView.LoadingListener() { @Override public void onRefresh() { - taskPage=1; + taskPage = 1; initNetWork(true); } @@ -102,7 +102,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis taskExplainBuilder.append("点击了item ,"); Intent itemIntent = new Intent(getActivity(), FragmentManagement.class); itemIntent.putExtra("tag", 10); - itemIntent.putExtra("id",pos+""); + itemIntent.putExtra("id", pos + ""); startActivity(itemIntent); } }); @@ -143,33 +143,39 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis httpParams.put("fid", 3); httpParams.put("pageNum", taskPage); httpParams.put("pageSize", 20); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.LIST_TASK_EXPLAIN) .cls(TaskPrefectureBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(TaskPrefectureBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200){ - initTaskPrefectureBean(response,aNet); - }else if (response.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - }else { - Toast.makeText(getActivity(), response.getMessage()+"", Toast.LENGTH_SHORT).show(); - } - Log.d("TAG", "onSuccess: " + response.getMessage() + ""); - } + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(TaskPrefectureBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + initTaskPrefectureBean(response, aNet); + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Log.d("TAG", "onError: " + e.getMessage()); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + Log.d("TAG", "onError: " + e.getMessage()); + } + }); } private void initTaskPrefectureBean(TaskPrefectureBean taskPrefectureBean, boolean aBoolean) { @@ -178,7 +184,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis if (explainList.size() > 0) { explainList.clear(); } - if (taskPrefectureBean.getBody().getList()== null) { + if (taskPrefectureBean.getBody().getList() == null) { Toast.makeText(getActivity(), "没有相关数据", Toast.LENGTH_SHORT).show(); } else { explainList.addAll(taskPrefectureBean.getBody().getList()); @@ -202,6 +208,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis Log.d("TAG", "" + taskPrefectureBean.getMessage()); } } + @Override public void onClick(View v) { if (v.getId() == R.id.iv_find_task_explain) { @@ -225,7 +232,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis @Override public void onDestroy() { super.onDestroy(); - taskExplainBuilder.append("onDestroy "); + taskExplainBuilder.append("onDestroy"); taskExplainBuilder.append("\r\n"); FileUtils.writeFile(logFile.getAbsolutePath(), taskExplainBuilder.toString(), true); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment2.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment2.java index 73b05d4..8e046f7 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment2.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment2.java @@ -79,19 +79,19 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi //取消上拉加载，刷新功能。 // taskExplain2Recycler.setPullRefreshEnabled(false); // taskExplain2Recycler.setLoadingMoreEnabled(false); - taskExplainAdapter2 = new TaskExplainAdapter2(explainList,getActivity()); + taskExplainAdapter2 = new TaskExplainAdapter2(explainList, getActivity()); taskExplain2Recycler.setAdapter(taskExplainAdapter2); taskExplain2Recycler.getDefaultFootView().setNoMoreHint("加载完毕"); taskExplain2Recycler.setLoadingListener(new XRecyclerView.LoadingListener() { @Override public void onRefresh() { - taskExplainPage=1; + taskExplainPage = 1; initNetWork2(true); } @Override public void onLoadMore() { - initNetWork2(false); + initNetWork2(false); } }); taskExplainAdapter2.setOnItemClick(new TaskExplainAdapter2.OnItemClick2() { @@ -99,12 +99,13 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi public void onClick2(int pos) { taskExplain2Builder.append("点击了item ,"); HashMap paramMap = new HashMap<>(); - paramMap.put("id",pos+""); + paramMap.put("id", pos + ""); intint2WebActivity(HttpInterface.MSG_CONTENT, paramMap); } }); } + @Override protected void initData() { super.initData(); @@ -141,34 +142,39 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi httpParams.put("pageNum", taskExplainPage); httpParams.put("pageSize", 20); showLoadingDialog(); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.LIST_TASK) .cls(TaskPrefectureBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(TaskPrefectureBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200){ - initTaskPrefectureBean(response,aBoolean); - }else if (response.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - }else { - Toast.makeText(getActivity(), response.getMessage()+"", Toast.LENGTH_SHORT).show(); - } - Log.d("TAG", "onSuccess: " + response.getMessage() + ""); - } + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(TaskPrefectureBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + initTaskPrefectureBean(response, aBoolean); + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); + } + Log.d("TAG", "onSuccess: " + response.getMessage() + ""); + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage()); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } private void initTaskPrefectureBean(TaskPrefectureBean taskPrefectureBean, boolean aBoolean) { @@ -177,7 +183,7 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi if (explainList.size() > 0) { explainList.clear(); } - if (taskPrefectureBean.getBody().getList()== null) { + if (taskPrefectureBean.getBody().getList() == null) { Toast.makeText(getActivity(), "没有相关数据", Toast.LENGTH_SHORT).show(); } else { explainList.addAll(taskPrefectureBean.getBody().getList()); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java index 72b2e2d..22b275e 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java @@ -77,22 +77,22 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick taskRecycler.setLoadingListener(new XRecyclerView.LoadingListener() { @Override public void onRefresh() { - taskPage=1; - initNetwork(true); + taskPage = 1; + initNetwork(true); } @Override public void onLoadMore() { - initNetwork(false); + initNetwork(false); } }); - taskPrefectureAdapter = new TaskPrefectureAdapter(dataBeanList,getActivity()); + taskPrefectureAdapter = new TaskPrefectureAdapter(dataBeanList, getActivity()); taskRecycler.setAdapter(taskPrefectureAdapter); taskPrefectureAdapter.setClickItem(new TaskPrefectureAdapter.clickItem() { @Override public void item(int id) { taskPrefectureBuilder.append("点击了item ,"); HashMap paramMap = new HashMap<>(); - paramMap.put("id",id+""); + paramMap.put("id", id + ""); intint2WebActivity(HttpInterface.MSG_CONTENT, paramMap); } }); @@ -133,35 +133,41 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick httpParams.put("fid", "1"); httpParams.put("pageNum", taskPage); httpParams.put("pageSize", "20"); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.LIST_TASK) .cls(TaskPrefectureBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(TaskPrefectureBean taskPrefectureBean, int id) { - dismissLoadingDialog(); - initTaskPrefectureBean(taskPrefectureBean,aNet); - Log.d("TAG", "onSuccess: " + taskPrefectureBean.getMessage() + ""); - //initTaskSpecification(taskSpecificationBean,start); - } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Log.d("TAG", "onError: " + e.getMessage()); - } - }); + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(TaskPrefectureBean taskPrefectureBean, int id) { + dismissLoadingDialog(); + initTaskPrefectureBean(taskPrefectureBean, aNet); + } + + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } + private void initTaskPrefectureBean(TaskPrefectureBean taskPrefectureBean, boolean aBoolean) { if (taskPrefectureBean.getCode() == 200) { if (aBoolean) { if (dataBeanList.size() > 0) { dataBeanList.clear(); } - if (taskPrefectureBean.getBody().getList()== null) { + if (taskPrefectureBean.getBody().getList() == null) { Toast.makeText(getActivity(), "没有相关数据", Toast.LENGTH_SHORT).show(); } else { dataBeanList.addAll(taskPrefectureBean.getBody().getList()); @@ -179,52 +185,13 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick taskPage++; } } - }else if (taskPrefectureBean.getCode()==203){ + } else if (taskPrefectureBean.getCode() == 203) { FlushTokenUtil.flushToken(getActivity()); } else { Toast.makeText(getActivity(), taskPrefectureBean.getMessage(), Toast.LENGTH_SHORT).show(); Log.d("TAG", "" + taskPrefectureBean.getMessage()); } } -/* private void initTaskSpecification(TaskPrefectureBean taskPrefectureBean, boolean start) { - if (taskPrefectureBean.getStatus() == 0) { - if (start) { - if (dataBeanList.size() > 0) { - dataBeanList.clear(); - } - if (taskPrefectureBean.getBody() == null) { - Toast.makeText(getActivity(), "没有相关数据", Toast.LENGTH_SHORT).show(); - } else { - dataBeanList.addAll(taskPrefectureBean.getBody().getList()); - page++; - } - taskPrefectureAdapter.notifyDataSetChanged(); - taskRecycler.refreshComplete(); - } else { - if (taskPrefectureBean.getBody() == null) { - taskRecycler.setNoMore(true); - } else { - dataBeanList.addAll(taskPrefectureBean.getBody().getList()); - taskPrefectureAdapter.notifyDataSetChanged(); - taskRecycler.loadMoreComplete(); - page++; - } - } - } else if (taskPrefectureBean.getStatus() == 2) { - if (start) { - if (dataBeanList.size() > 0) { - dataBeanList.clear(); - taskPrefectureAdapter.notifyDataSetChanged(); - } - taskRecycler.refreshComplete(); - } else { - taskRecycler.setNoMore(true); - } - Toast.makeText(getActivity(), taskPrefectureBean.getMessage(), Toast.LENGTH_SHORT).show(); - } else { - Toast.makeText(getActivity(), taskPrefectureBean.getMessage(), Toast.LENGTH_SHORT).show(); - } - }*/ @Override public void onClick(View v) { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java index 0d35bbf..1b1c42a 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -123,7 +123,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen private TextureMapView mapView; private TencentMap tencentMap; private CheckBox cbMapType; - private ImageView ivZoomAdd, ivZoomDel,ivLocation, ivSubmit, ivRaffish,ivFilter,ivMessage,ivMassNotification; + private ImageView ivZoomAdd, ivZoomDel, ivLocation, ivSubmit, ivRaffish, ivFilter, ivMessage, ivMassNotification; private MyLocationStyle locationStyle; private SlidingUpPanelLayout sliding_layout; @@ -154,7 +154,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen private File logFile; private StringBuilder treasureBuilder; private Marker gatherMarker; - /*private boolean isHandler = false; private Handler handler = new Handler(new Handler.Callback() { @Override @@ -195,7 +194,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen return false; } });*/ - public static TreasureFragment newInstance(Bundle bundle) { TreasureFragment fragment = new TreasureFragment(); fragment.setArguments(bundle); @@ -283,7 +281,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen CameraUpdate cameraSigma = CameraUpdateFactory.newCameraPosition(new CameraPosition( new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude()), //中心点坐标，地图目标经纬度 - 18, //目标缩放级别 + 17, //目标缩放级别 0, //目标倾斜角[0.0 ~ 45.0] (垂直地图时为0) 0)); //目标旋转角 0~360° (正北方为0) tencentMap.animateCamera(cameraSigma, new TencentMap.CancelableCallback() { @@ -431,7 +429,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen sharedEdit.putInt("type", messageType); sharedEdit.putString("dataTime", format); sharedEdit.commit(); - }else if (messageNoticeBean.getCode()==203){ + } else if (messageNoticeBean.getCode() == 203) { FlushTokenUtil.flushToken(getActivity()); } else { Toast.makeText(getActivity(), messageNoticeBean.getMessage() + "", Toast.LENGTH_SHORT).show(); @@ -441,18 +439,23 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: "+e.getMessage()); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + Log.d("TAG", "onError: " + e.getMessage()); } }); - } /* 得到电话区号，电话位数*/ private void initPhone() { if (Constant.USHERED == null) { return; - }else { + } else { if (HttpInterface.GET_PHONES == null) { return; } @@ -479,7 +482,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen Integer telLength = getPhoneBean.getBody().getTelLength(); Constant.CODE = code; Constant.TelLength = telLength; - }else if (getPhoneBean.getCode()==203){ + } else if (getPhoneBean.getCode() == 203) { FlushTokenUtil.flushToken(getActivity()); } else { Toast.makeText(getActivity(), getPhoneBean.getMessage(), Toast.LENGTH_SHORT).show(); @@ -489,8 +492,14 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: "+e.getMessage()); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + Log.d("TAG", "onError: " + e.getMessage()); } }); } @@ -525,7 +534,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen private void iniUserLocation() { if (Constant.USHERED == null) { return; - }else { + } else { if (HttpInterface.USER_LOCATION == null) { return; } @@ -548,31 +557,36 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen dismissLoadingDialog(); if (response.getCode() == 200) {//上传用户位置金纬度 寻宝删选接口请求成功 Toast.makeText(getActivity(), "上传用户位置成功", Toast.LENGTH_SHORT).show(); - }else if (response.getCode()==203){ + } else if (response.getCode() == 203) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), response.getMessage()+"", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); } - Log.d("TAG", "onSuccess:" + response.getMessage() + ""); } @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage() + "", Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onSuccess:" + e.getMessage() + ""); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } } }); } /** * 网络删选接口 + * * @param tencentLocation */ private void initList(TencentLocation tencentLocation) { if (Constant.USHERED == null) { return; - }else { + } else { if (HttpInterface.TASK_LIST == null) { return; } @@ -604,8 +618,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen httpParams.put("pageNum", 1); httpParams.put("type", task_type); httpParams.put("isExclusive", limit_type); - if (taskStatus==2){ - if (Constant.USHERED!=null){ + if (taskStatus == 2) { + if (Constant.USHERED != null) { httpParams.put("received", Constant.USHERED); } } @@ -818,10 +832,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen obtain.what = Constant.JOB_SEARCH_WORD; obtain.obj = response; EventBus.getDefault().post(obtain); - }else if (response.getCode()==203){ + } else if (response.getCode() == 203) { FlushTokenUtil.flushToken(getActivity()); - } - else { + } else { Toast.makeText(getActivity(), "任务搜索接口：" + response.getMessage(), Toast.LENGTH_SHORT).show(); } } @@ -829,14 +842,20 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage()+"", Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage() + ""); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } } }); } /** * 坐标点转成geo + * * @param latLng * @return */ @@ -859,23 +878,24 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen /** * marker 选中的状态 + * * @param poiEntity * @param aBoolean */ public void initMarker(PoiEntity poiEntity, boolean aBoolean) { String geoWkt = poiEntity.getGeoWkt(); - if (geoWkt==null){ - if (poiEntity.getDetail()!=null){ + if (geoWkt == null) { + if (poiEntity.getDetail() != null) { geoWkt = poiEntity.getDetail(); - }else { + } else { if (poiEntity.getX() != null && poiEntity.getY() != null) { String encode = Geohash.getInstance().encode(Double.parseDouble(poiEntity.getY()), Double.parseDouble(poiEntity.getX())); - if (encode==null){ + if (encode == null) { return; - }else { - geoWkt=encode; + } else { + geoWkt = encode; } - }else { + } else { return; } } @@ -1088,7 +1108,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } } else { String detail = allTaskStatus.get(i).getDetail(); - if (detail!=null){ + if (detail != null) { String geo = Geohash.getInstance().decode(detail);//解密geo Geometry geometry = GeometryTools.createGeometry(geo); switch (geometry.getGeometryType()) { @@ -1150,7 +1170,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } break; } - }else { + } else { if (allTaskStatus.get(i).getX() != null && allTaskStatus.get(i).getY() != null) { latLng = new LatLng(Double.parseDouble(allTaskStatus.get(i).getY()), Double.parseDouble(allTaskStatus.get(i).getX())); } @@ -1480,6 +1500,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen treasureBuilder.append("userId:").append(Constant.USHERED).append(","); } } + /** * 奔溃后的数据 */ @@ -1665,7 +1686,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen CameraUpdate cameraSigma = CameraUpdateFactory.newCameraPosition(new CameraPosition( new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude()),//中心点坐标，地图目标经纬度 - 18,//目标缩放级别 + 17,//目标缩放级别 0,//目标倾斜角[0.0 ~ 45.0] (垂直地图时为0) 0));//目标旋转角 0~360° (正北方为0) tencentMap.animateCamera(cameraSigma); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java index b910d52..0a62829 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java @@ -53,7 +53,7 @@ import static android.app.Activity.RESULT_OK; /** * 实名认证 */ -public class UserAttestationFragment extends BaseFragment implements View.OnClickListener { +public class UserAttestationFragment extends BaseFragment implements View.OnClickListener { private ImageView ivAttestation2; private ImageView ivAttestation1; @@ -94,20 +94,20 @@ public class UserAttestationFragment extends BaseFragment implements View.OnC 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); + 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)){ + } else { + if (pictures_time.equals(newFormat)) { logFile = new File(Constant.LOG_FOLDER + "/" + pictures_time + ".txt"); - }else { + } else { logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt"); } } userAttestationBuilder = new StringBuilder(); userAttestationBuilder.append("UserAttestationFragment-onCreate-initData ,"); - if (Constant.USHERED!=null){ + if (Constant.USHERED != null) { userAttestationBuilder.append("userId:").append(Constant.USHERED).append(","); } } @@ -173,8 +173,6 @@ public class UserAttestationFragment extends BaseFragment implements View.OnC btnAttestation.setEnabled(false); useCamera.setEnabled(false); } - - } @Override @@ -291,44 +289,52 @@ public class UserAttestationFragment extends BaseFragment implements View.OnC httpParams.put("userid", Constant.USHERED); httpParams.put("name", attestationName); httpParams.put("idnum", namePhone); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.USER_AUTH_ADD) .cls(NameAuthenticationBean.class) .token(Constant.ACCESS_TOKEN) .params(httpParams) - .fileList(takePhoneList) - .postFileAsynchronous(new Callback() { - @Override - public void onSuccess(NameAuthenticationBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; - DialogSettings.cancelable=false; - MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "提交成功", "确定").setOkButton(new OnDialogButtonClickListener() { - @Override - public boolean onClick(BaseDialog baseDialog, View v) { - userAttestationBuilder.append("提交成功 ,"); - Constant.NAME = attestationName; - Constant.ID_NUM = namePhone; - Constant.AUDIOTAPES = -1; - getActivity().finish(); - return false; - } - }); - }else if (response.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - } else { - Toast.makeText(getActivity(), "提交失败！", Toast.LENGTH_SHORT).show(); + .fileList(takePhoneList); + okGoBuilder.postFileAsynchronous(new Callback() { + @Override + public void onSuccess(NameAuthenticationBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; + DialogSettings.cancelable = false; + MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "提交成功", "确定").setOkButton(new OnDialogButtonClickListener() { + @Override + public boolean onClick(BaseDialog baseDialog, View v) { + userAttestationBuilder.append("提交成功 ,"); + Constant.NAME = attestationName; + Constant.ID_NUM = namePhone; + Constant.AUDIOTAPES = -1; + getActivity().finish(); + return false; } - } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Log.d("TAG", "onSuccess: 失败" + e.getMessage() + ""); - } - }); + }); + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), "提交失败！", Toast.LENGTH_SHORT).show(); + } + } + + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + Log.d("TAG", "onSuccess: 失败" + e.getMessage() + ""); + } + }); } @Override @@ -393,11 +399,11 @@ public class UserAttestationFragment extends BaseFragment implements View.OnC Toast.makeText(getActivity(), "身份号识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show(); userAttestationBuilder.append("身份号识别失败，可以重新识别或则进行手动输入 ,"); } - if (idCardNumberBean.getWords_result().get姓名()!=null){ + if (idCardNumberBean.getWords_result().get姓名() != null) { String words = idCardNumberBean.getWords_result().get姓名().getWords(); etAttestationName.setText(words); userAttestationBuilder.append("姓名识别成功 ,"); - }else { + } else { Toast.makeText(getActivity(), "姓名识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show(); userAttestationBuilder.append("姓名识别失败，可以重新识别或则进行手动输入 ,"); } @@ -429,7 +435,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnC @Override public void onDestroy() { super.onDestroy(); - userAttestationBuilder.append("onDestroy ,"); + userAttestationBuilder.append("onDestroy"); userAttestationBuilder.append("\r\n"); FileUtils.writeFile(logFile.getAbsolutePath(), userAttestationBuilder.toString(), true); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java index 3b86664..a7606de 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java @@ -137,55 +137,61 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen private void initNetWork() { showLoadingDialog(); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.GET_PRICE) .cls(GetPriceBean.class) .params(new HttpParams()) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(GetPriceBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - GetPriceBean.BodyBean body = response.getBody(); - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @SuppressLint("SetTextI18n") - @Override - public void run() { - tvTotal.setText(body.getUserPrice() + ""); - canExchangePrice = body.getCanExchangePrice(); - tvUnit.setText(canExchangePrice + ""); - tvAlready.setText(body.getHaveExchangePrice() + ""); - poiPushMoney.setText(body.getPoiPushPrice() + "元"); - poiReportMoney.setText(body.getPoiNonepushPrice() + "元"); - poiVideoPushMoney.setText(body.getPoivideoPushPrice() + "元"); - poiVideoReportMoney.setText(body.getPoivideoNonepushPrice() + "元"); - roadPushMoney.setText(body.getRoadPushPrice() + "元"); - roadReportMoney.setText(body.getRoadNonepushPrice() + "元"); - chargingPushMoney.setText(body.getCsPushPrice() + "元"); - chargingReportMoney.setText(body.getCsNonepushPrice() + "元"); - otherPushMoney.setText(body.getOtherPushPrice() + "元"); - otherReportMoney.setText(body.getOtherNonepushPrice() + "元"); - } - }); + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(GetPriceBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + GetPriceBean.BodyBean body = response.getBody(); + if (getActivity() != null) { + getActivity().runOnUiThread(new Runnable() { + @SuppressLint("SetTextI18n") + @Override + public void run() { + tvTotal.setText(body.getUserPrice() + ""); + canExchangePrice = body.getCanExchangePrice(); + tvUnit.setText(canExchangePrice + ""); + tvAlready.setText(body.getHaveExchangePrice() + ""); + poiPushMoney.setText(body.getPoiPushPrice() + "元"); + poiReportMoney.setText(body.getPoiNonepushPrice() + "元"); + poiVideoPushMoney.setText(body.getPoivideoPushPrice() + "元"); + poiVideoReportMoney.setText(body.getPoivideoNonepushPrice() + "元"); + roadPushMoney.setText(body.getRoadPushPrice() + "元"); + roadReportMoney.setText(body.getRoadNonepushPrice() + "元"); + chargingPushMoney.setText(body.getCsPushPrice() + "元"); + chargingReportMoney.setText(body.getCsNonepushPrice() + "元"); + otherPushMoney.setText(body.getOtherPushPrice() + "元"); + otherReportMoney.setText(body.getOtherNonepushPrice() + "元"); } - }else if (response.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - }else { - Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); - } - Log.d("TAG", "onSuccess: " + response.toString()); + }); } + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); + } + Log.d("TAG", "onSuccess: " + response.toString()); + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Log.d("TAG", "onError: " + e.getMessage()); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } @@ -248,45 +254,51 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen HttpParams httpParams = new HttpParams(); httpParams.put("exchangeMoney", etAllPrice.getText().toString()); httpParams.put("payType", 1); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.USER_PRICE_EXCHANGE) .cls(UserPriceExchangeBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(UserPriceExchangeBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; - DialogSettings.cancelable = false; - MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "该提现申请已提交", "确定").setOnOkButtonClickListener(new OnDialogButtonClickListener() { - @Override - public boolean onClick(BaseDialog baseDialog, View v) { - withdrawBuilder.append("提现了成功 ，"); - initNetWork(); - return false; - } - }); - }else if (response.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - } else { - withdrawBuilder.append("提现了失败 ，"); - Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(UserPriceExchangeBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; + DialogSettings.cancelable = false; + MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "该提现申请已提交", "确定").setOnOkButtonClickListener(new OnDialogButtonClickListener() { + @Override + public boolean onClick(BaseDialog baseDialog, View v) { + withdrawBuilder.append("提现了成功 ，"); + initNetWork(); + return false; } - etAllPrice.getText().clear(); - Log.d("TAG", "onSuccess: " + response.getMessage() + response.getCode()); - } + }); + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + withdrawBuilder.append("提现了失败 ，"); + Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); + } + etAllPrice.getText().clear(); + Log.d("TAG", "onSuccess: " + response.getMessage() + response.getCode()); + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage()); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + Log.d("TAG", "onError: " + e.getMessage()); + } + }); } @Override diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java index 1b6bd61..65ba934 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java @@ -64,12 +64,12 @@ public class WithdrawalRecordFragment extends BaseFragment implements View.OnCli rxlWithdraw.setAdapter(withdrawalAdapter); rxlWithdraw.getDefaultFootView().setNoMoreHint("已全部加载完毕"); //设置下划线 - // rxlWithdraw.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL)); + // rxlWithdraw.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL)); rxlWithdraw.setLoadingListener(new XRecyclerView.LoadingListener() { @Override public void onRefresh() { withdrawalAdapter.withClearData(); - withPage=1; + withPage = 1; initNetwork(); } @@ -85,44 +85,51 @@ public class WithdrawalRecordFragment extends BaseFragment implements View.OnCli protected void initData() { super.initData(); } + private void initNetwork() { showLoadingDialog(); HttpParams httpParams = new HttpParams(); httpParams.put("pageNum", withPage); - - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.PRICE_EXCHANGE) .cls(WithdrawalBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(WithdrawalBean withdrawalBean, int id) { - dismissLoadingDialog(); - if (withdrawalBean.getCode() == 200){ - withdrawalAdapter.setDataBeans(withdrawalBean.getBody().getList()); - withPage++; - }else if (withdrawalBean.getCode()==203){ - FlushTokenUtil.flushToken(getActivity()); - } else { - Toast.makeText(getActivity(), withdrawalBean.getMessage()+"", Toast.LENGTH_SHORT).show(); - } - rxlWithdraw.loadMoreComplete(); - rxlWithdraw.refreshComplete(); - Log.d("TAG", "onSuccess: " + withdrawalBean.getMessage() + ""); - } + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(WithdrawalBean withdrawalBean, int id) { + dismissLoadingDialog(); + if (withdrawalBean.getCode() == 200) { + withdrawalAdapter.setDataBeans(withdrawalBean.getBody().getList()); + withPage++; + } else if (withdrawalBean.getCode() == 203) { + FlushTokenUtil.flushToken(getActivity()); + } else { + Toast.makeText(getActivity(), withdrawalBean.getMessage() + "", Toast.LENGTH_SHORT).show(); + } + rxlWithdraw.loadMoreComplete(); + rxlWithdraw.refreshComplete(); + Log.d("TAG", "onSuccess: " + withdrawalBean.getMessage() + ""); + } - @Override - public void onError(Throwable e, int id) { - rxlWithdraw.loadMoreComplete(); - rxlWithdraw.refreshComplete(); - dismissLoadingDialog(); - Log.d("TAG", "onError: " + e.getMessage()); - } - }); + @Override + public void onError(Throwable e, int id) { + rxlWithdraw.loadMoreComplete(); + rxlWithdraw.refreshComplete(); + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout")||message.equals("Read time out")){ + Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + } + } + }); } + @Override public void onClick(View v) { if (v.getId() == R.id.iv_withdraw) { diff --git a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java index 2f2b0f1..bb9a3c1 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -1,7 +1,5 @@ package com.navinfo.outdoor.http; -import com.navinfo.outdoor.api.Constant; - public class HttpInterface { public static final String IP_= "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 public static final String IP= "http://dtxbmaps.navinfo.com/dtxb_test/m4";//测试接口 @@ -10,7 +8,6 @@ public class HttpInterface { public static final String USER_LOGIN_PATH ="/userlogin/";//登录 public static final String PRICE_PATH ="/price/";//提现 public static final String TASK_PATH ="/task/";//任务 - /* public static final String TEST_GUIDANCE_IP = "http://172.21.98.90:9999/m4";//引导页完成接口 public static final String APK_IP = "http://172.23.139.4:8001/"; @@ -18,7 +15,7 @@ public class HttpInterface { public static final String DATA_IP = "http://172.23.139.4:9999/m4";//接口 */ /* - *用户版本升级 + 用户版本升级 */ // dtxbmaps.navinfo.com/dtxb/m4/user/appVersion/checkVersion?version=155&operationType=android // 172.23.139.4:8001/appVersion/checkVersion?version=155&operationType=android //version是版本 operationType固定值 安卓 get @@ -27,7 +24,7 @@ public class HttpInterface { APP_CHECK_VERSION = IP + USER_PATH + "appVersion/" + userId + "/checkVersion"; //版本升级 } /* 我的 - * Path=/m4/user/* + Path=/m4/user/* */ //172.23.139.4:8001/m4/user/update public static String USER_UPDATE;//用户资料 @@ -42,7 +39,7 @@ public class HttpInterface { //172.21.98.90:9999/m4/user/userGuide/1/insertUserGuide public static String INSERT_USER_GUIDE;//引导页完成接口 /*发现 - * Path=/m4/msgList/** + * Path=/m4/msgList/** */ public static String MSG_CONTENT;//发现 -富文本详情页请求 public static String LIST_TASK;//任务专区 @@ -57,6 +54,7 @@ public class HttpInterface { /*登录 * Path=/m4/userlogin/** */ + //172.23.139.4:9999/m4/userlogin/oauth/token public static String USER_LOGIN_OAUTH_TOKEN = IP + USER_LOGIN_PATH + "oauth/token"; //登录接口 ///m4/user/user/register diff --git a/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java b/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java index 229623c..25af2f6 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java +++ b/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java @@ -149,7 +149,6 @@ public class OkGoBuilder { //全局统一缓存时间，默认永不过期，可以不传 .setCacheTime(CacheEntity.CACHE_NEVER_EXPIRE) .setRetryCount(0); - } /** diff --git a/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java b/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java index 2462f20..4cdc3d5 100644 --- a/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java +++ b/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java @@ -50,7 +50,6 @@ public class PoiEntity implements Serializable { private int bodyId;//保存本地的bodyId private int work_type;//0."车行" 1."自行车" 2."步行" private int record_way; //等同于 canReceived : 1是可领取 0是不可领取 - public int getRecord_way() { return record_way; } diff --git a/app/src/main/java/com/navinfo/outdoor/util/FlushTokenUtil.java b/app/src/main/java/com/navinfo/outdoor/util/FlushTokenUtil.java index a7c842a..92cbb43 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/FlushTokenUtil.java +++ b/app/src/main/java/com/navinfo/outdoor/util/FlushTokenUtil.java @@ -31,7 +31,7 @@ public class FlushTokenUtil { private static SharedPreferences.Editor navInfoEditor; public static void flushToken(Activity activity) { - Constant.isPresent=true; + Constant.isPresent = true; DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; MessageDialog.show((AppCompatActivity) Objects.requireNonNull(activity), "提示", "登录已过期,是否重新登录", "确定").setOnOkButtonClickListener(new OnDialogButtonClickListener() { @Override @@ -42,28 +42,31 @@ public class FlushTokenUtil { }); } - private static void initLogin(Activity activity){ + private static void initLogin(Activity activity) { SharedPreferences navInfo = activity.getSharedPreferences(Constant.SHARED_PREFERENCES, Context.MODE_PRIVATE); navInfoEditor = navInfo.edit(); if (Constant.USHERED == null) { + Toast.makeText(activity, "token ：更新失败", Toast.LENGTH_SHORT).show(); return; - }else { + } else { if (HttpInterface.USER_LOGIN_OAUTH_TOKEN == null) { + Toast.makeText(activity, "token ：更新失败", Toast.LENGTH_SHORT).show(); return; } } try { HttpParams httpParams = new HttpParams(); - long time = System.currentTimeMillis(); httpParams.put("grant_type", "refresh_token"); httpParams.put("refresh_token", Constant.REFRESH_TOKEN); + long time = System.currentTimeMillis(); httpParams.put("datetime", time); - OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() - .time(30) + OkGoBuilder okGoBuilder = OkGoBuilder + .getInstance() .Builder(activity) + .time(30) .url(HttpInterface.USER_LOGIN_OAUTH_TOKEN) - .cls(LoginOauthTokenBean.class) - .params(httpParams); + .params(httpParams) + .cls(LoginOauthTokenBean.class); okGoBuilder.postRequest(new Callback() { @Override public void onSuccess(LoginOauthTokenBean response, int id) { @@ -85,7 +88,6 @@ public class FlushTokenUtil { } else { initGetUserInfo(activity);//获取用户信息 } - } else { Toast.makeText(activity, response.getMessage(), Toast.LENGTH_SHORT).show(); } @@ -93,8 +95,13 @@ public class FlushTokenUtil { @Override public void onError(Throwable e, int id) { - Toast.makeText(activity, e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage()); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(activity, "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(activity, message, Toast.LENGTH_SHORT).show(); + } } }); } catch (Exception e) { @@ -103,7 +110,8 @@ public class FlushTokenUtil { } private static void initGetUserInfo(Activity activity) { - OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder + .getInstance() .time(30) .Builder(activity) .url(HttpInterface.USER_DETAIL_BY_USER_ID) @@ -158,8 +166,13 @@ public class FlushTokenUtil { @Override public void onError(Throwable e, int id) { - Toast.makeText(activity, e.getMessage(), Toast.LENGTH_SHORT).show(); - Log.d("TAG", "onError: " + e.getMessage()); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + Toast.makeText(activity, "请求超时", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(activity, message, Toast.LENGTH_SHORT).show(); + } } }); } diff --git a/app/src/main/java/com/navinfo/outdoor/util/PreserveUtils.java b/app/src/main/java/com/navinfo/outdoor/util/PreserveUtils.java new file mode 100644 index 0000000..a232cb5 --- /dev/null +++ b/app/src/main/java/com/navinfo/outdoor/util/PreserveUtils.java @@ -0,0 +1,410 @@ +package com.navinfo.outdoor.util; + +import android.app.Activity; +import android.os.Message; +import android.util.Log; + + +import com.google.gson.Gson; +import com.lzy.okgo.model.HttpParams; +import com.navinfo.outdoor.api.Constant; +import com.navinfo.outdoor.bean.ChargingPileSaveBean; +import com.navinfo.outdoor.bean.ChargingStationBean; +import com.navinfo.outdoor.bean.PoiSaveBean; +import com.navinfo.outdoor.bean.PoiVideoBean; +import com.navinfo.outdoor.bean.RoadSaveBean; +import com.navinfo.outdoor.http.Callback; +import com.navinfo.outdoor.http.HttpInterface; +import com.navinfo.outdoor.http.OkGoBuilder; +import com.navinfo.outdoor.room.ChargingPileEntity; +import com.navinfo.outdoor.room.InsertAndUpdateUtils; +import com.navinfo.outdoor.room.PoiDatabase; +import com.navinfo.outdoor.room.PoiEntity; + +import org.greenrobot.eventbus.EventBus; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Objects; + +import okhttp3.Response; + +public class PreserveUtils { + private static PreserveUtils instance; + + public static PreserveUtils getInstance() { + if (instance == null) { + instance = new PreserveUtils(); + } + return instance; + } + + /** + * road + * @param mContext + */ + public Callback getRoadPreserveCallback(Activity mContext, PoiEntity poiEntity) { + return new Callback() { + @Override + public void onSuccess(RoadSaveBean response, int id) { + if (response.getCode() == 200) { + Integer body = response.getBody(); + if (body != null && body != 0) { + poiEntity.setBodyId(body); + poiEntity.setTaskStatus(3); + new Thread(new Runnable() { + @Override + public void run() { + InsertAndUpdateUtils.getInstance().insertOrUpdate(mContext, poiEntity); + Objects.requireNonNull(mContext).runOnUiThread(new Runnable() { + @Override + public void run() { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "道路：" + poiEntity.getName() + " 保存成功"; + EventBus.getDefault().post(obtain1); + + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_WORD_MONITOR; + obtain.obj = true; + EventBus.getDefault().post(obtain); + } + }); + } + }).start(); + } else { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "道路：" + poiEntity.getName() + " 保存失败"; + EventBus.getDefault().post(obtain1); + } + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(mContext); + } else { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "道路：" + poiEntity.getName() + "保存失败"; + EventBus.getDefault().post(obtain1); + } + + } + + @Override + public void onError(Throwable e, int id) { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "道路：" + poiEntity.getName() + " 保存失败"; + EventBus.getDefault().post(obtain1); + } + }; + } + + /** + * poi + * @param mContext + */ + public Callback getPoiPreserveCallback(Activity mContext, PoiEntity poiEntity) { + return new Callback() { + @Override + public void onSuccess(PoiSaveBean response, int id) { + if (response.getCode() == 200) { + Integer body = response.getBody(); + if (body != null && body != 0) { + poiEntity.setBodyId(body); + poiEntity.setTaskStatus(3); + new Thread(new Runnable() { + @Override + public void run() { + InsertAndUpdateUtils.getInstance().insertOrUpdate(mContext, poiEntity); + Objects.requireNonNull(mContext).runOnUiThread(new Runnable() { + @Override + public void run() { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "Poi：" + poiEntity.getName() + " 保存成功"; + EventBus.getDefault().post(obtain1); + + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_WORD_MONITOR; + obtain.obj = true; + EventBus.getDefault().post(obtain); + } + }); + } + }).start(); + } else { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "Poi：" + poiEntity.getName() + " 保存失败"; + EventBus.getDefault().post(obtain1); + } + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(mContext); + } else { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "Poi：" + poiEntity.getName() + "保存失败"; + EventBus.getDefault().post(obtain1); + } + + } + + @Override + public void onError(Throwable e, int id) { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "Poi：" + poiEntity.getName() + " 保存失败"; + EventBus.getDefault().post(obtain1); + } + }; + } + + /** + * PoiVideo + * + * @param mContext + * @return + */ + public Callback getPoiVideoPreserveCallback(Activity mContext, PoiEntity poiEntity) { + return new Callback() { + @Override + public void onSuccess(PoiVideoBean response, int id) { + if (response.getCode() == 200) { + Integer body = response.getBody(); + if (body != null && body != 0) { + poiEntity.setBodyId(body); + poiEntity.setTaskStatus(3); + new Thread(new Runnable() { + @Override + public void run() { + InsertAndUpdateUtils.getInstance().insertOrUpdate(mContext, poiEntity); + Objects.requireNonNull(mContext).runOnUiThread(new Runnable() { + @Override + public void run() { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "Poi录像：" + poiEntity.getName() + " 保存成功"; + EventBus.getDefault().post(obtain1); + + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_WORD_MONITOR; + obtain.obj = true; + EventBus.getDefault().post(obtain); + } + }); + } + }).start(); + } else { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "Poi录像：" + poiEntity.getName() + " 保存失败"; + EventBus.getDefault().post(obtain1); + } + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(mContext); + } else { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "Poi录像：" + poiEntity.getName() + "保存失败"; + EventBus.getDefault().post(obtain1); + } + + } + + @Override + public void onError(Throwable e, int id) { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "Poi录像：" + poiEntity.getName() + " 保存失败"; + EventBus.getDefault().post(obtain1); + } + }; + } + + /** + * other + * @param mContext + * @return + */ + public Callback getOtherPreserveCallback(Activity mContext, PoiEntity poiEntity) { + return new Callback() { + @Override + public void onSuccess(PoiSaveBean response, int id) { + if (response.getCode() == 200) { + Integer body = response.getBody(); + if (body != null && body != 0) { + poiEntity.setBodyId(body); + poiEntity.setTaskStatus(3); + new Thread(new Runnable() { + @Override + public void run() { + InsertAndUpdateUtils.getInstance().insertOrUpdate(mContext, poiEntity); + mContext.runOnUiThread(new Runnable() { + @Override + public void run() { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "其他：" + poiEntity.getName() + " 保存成功"; + EventBus.getDefault().post(obtain1); + + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_WORD_MONITOR; + obtain.obj = true; + EventBus.getDefault().post(obtain); + } + }); + } + }).start(); + } else { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "其他：" + poiEntity.getName() + " 保存失败"; + EventBus.getDefault().post(obtain1); + } + } else if (response.getCode() == 203) { + FlushTokenUtil.flushToken(mContext); + } else { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "其他：" + poiEntity.getName() + "保存失败"; + EventBus.getDefault().post(obtain1); + } + + } + + @Override + public void onError(Throwable e, int id) { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "其他：" + poiEntity.getName() + " 保存失败"; + EventBus.getDefault().post(obtain1); + } + }; + } + + /** + * charging + * @param mContext + */ + public Callback getChargingPreserveCallback(Activity mContext, PoiEntity poiEntity) { + return new Callback() { + @Override + public void onSuccess(ChargingStationBean chargingStationBean, int id) { + if (chargingStationBean.getCode() == 200) { + Integer bodyId = chargingStationBean.getBody(); + if (bodyId != null && bodyId != 0) { + poiEntity.setBodyId(bodyId); + poiEntity.setTaskStatus(3); + new Thread(new Runnable() { + @Override + public void run() { + InsertAndUpdateUtils.getInstance().insertOrUpdate(mContext, poiEntity); + // 充电站数据已经保存在服务上，批量保存充电桩数据 + saveChargingPileByChargingStation(mContext,poiEntity); + mContext.runOnUiThread(new Runnable() { + @Override + public void run() { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "充电站：" + poiEntity.getName() + " 保存成功"; + EventBus.getDefault().post(obtain1); + + Message obtain = Message.obtain(); + obtain.what = Constant.JOB_WORD_MONITOR; + obtain.obj = true; + EventBus.getDefault().post(obtain); + } + }); + } + }).start(); + } else { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "充电站：" + poiEntity.getName() + " 保存失败"; + EventBus.getDefault().post(obtain1); + } + } else if (chargingStationBean.getCode() == 203) { + FlushTokenUtil.flushToken(mContext); + } else { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "充电站：" + poiEntity.getName() + " 保存失败"; + EventBus.getDefault().post(obtain1); + } + } + + @Override + public void onError(Throwable e, int id) { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "充电站：" + poiEntity.getName() + " 保存失败"; + EventBus.getDefault().post(obtain1); + Log.d("TAG", "onError: " + e.getMessage() + ""); + } + }; + } + + /* + * 根据充电站数据检查充电桩数据，如果没有网络保存，则批量网络保存 + */ + private void saveChargingPileByChargingStation(Activity mContext,PoiEntity chargingStationPoiEntity) { + if (chargingStationPoiEntity != null) { + List chargingPileEntityList = PoiDatabase.getInstance(mContext).getChargingPileDao().getChargingPileByStationId(chargingStationPoiEntity.getId()); + PoiEntity poiEntity = PoiDatabase.getInstance(mContext).getPoiDao().getPoiEntity(chargingStationPoiEntity.getId()); + if (chargingPileEntityList != null && !chargingPileEntityList.isEmpty()) { + for (ChargingPileEntity pileEntity : chargingPileEntityList) { + if (pileEntity.getBodyId() == 0) { + saveChargingPileByWork(mContext,pileEntity, poiEntity.getBodyId()); + } + } + } + } + } + + /** + * 保存充电桩数据到服务端 + */ + private void saveChargingPileByWork(Activity mContext,ChargingPileEntity chargingPileEntity, int bodyId) { + HttpParams httpParams = new HttpParams(); + httpParams.put("taskId", chargingPileEntity.getTaskId()); + httpParams.put("name", chargingPileEntity.getName()); + httpParams.put("existence", chargingPileEntity.getExist()); + httpParams.put("geo", chargingPileEntity.getP()); + httpParams.put("memo", chargingPileEntity.getMemo()); + httpParams.put("ffid", bodyId); + HashMap hashMap = new HashMap<>(); + hashMap.put("cp_openType", chargingPileEntity.getCp_openType()); + hashMap.put("cp_floor", chargingPileEntity.getCp_floor()); + hashMap.put("cp_availableState", chargingPileEntity.getCp_availableState()); + hashMap.put("sign_exist", chargingPileEntity.getSign_exist()); + httpParams.put("detail", String.valueOf(hashMap)); + try { + Response execute = OkGoBuilder + .getInstance() + .url(HttpInterface.SUBMIT_CSTASK) + .token(Constant.ACCESS_TOKEN) + .params(httpParams) + .getSynchronization(); + if (execute != null) { + assert execute.body() != null; + String responseBodyStr = execute.body().string(); + Gson gson = new Gson(); + ChargingPileSaveBean chargingPileSaveBean = gson.fromJson(responseBodyStr, ChargingPileSaveBean.class); + if (chargingPileSaveBean.getCode() != 200) { + return; + } + chargingPileEntity.setBodyId(chargingPileSaveBean.getBody()); + InsertAndUpdateUtils.getInstance().insertOrUpdateChargingPile(mContext, chargingPileEntity); // 更新当前充电桩的bodyId + } + + } catch (IOException e) { + e.printStackTrace(); + } + } + + + +} diff --git a/app/src/main/java/com/navinfo/outdoor/util/UploadUtils.java b/app/src/main/java/com/navinfo/outdoor/util/UploadUtils.java index 47de6a8..179811d 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/UploadUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/UploadUtils.java @@ -36,7 +36,6 @@ public class UploadUtils { * @param mContext * @param showPoiEntity * @param fileZip - * @return */ public Callback getRoadUploadCallback(Activity mContext, PoiEntity showPoiEntity, File fileZip) { PoiDao poiDao = PoiDatabase.getInstance(mContext).getPoiDao(); diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 30f18de..3aa9fc3 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -11,7 +11,7 @@ android:id="@+id/tv_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="35dp" + android:layout_marginStart="35dp" android:layout_marginTop="70dp" android:text="@string/tv_login_title" android:textColor="@color/colorWhite" @@ -24,7 +24,7 @@ android:id="@+id/tv_login_deck" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="35dp" + android:layout_marginStart="35dp" android:text="@string/tv_login_deck" android:textColor="@color/colorWhite" android:textSize="35sp" @@ -134,7 +134,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:layout_marginRight="10dp" + android:layout_marginEnd="10dp" android:text="@string/tv_register" app:layout_constraintRight_toLeftOf="@id/tv_forget_paw" app:layout_constraintTop_toBottomOf="@id/et_login_paw" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index a042ae4..06007b6 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,6 +7,4 @@ android:background="@drawable/start_bg" tools:context="activity.MainActivity"> - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_pictures.xml b/app/src/main/res/layout/activity_pictures.xml index dd64522..e82a257 100644 --- a/app/src/main/res/layout/activity_pictures.xml +++ b/app/src/main/res/layout/activity_pictures.xml @@ -48,6 +48,7 @@ app:layout_constraintWidth_default="percent" app:layout_constraintWidth_percent="0.4" /> + + @@ -113,12 +115,12 @@