From f2fddaa0e7f73c40df26f4bd3cd57746ebf28473 Mon Sep 17 00:00:00 2001 From: wangdongsheng Date: Fri, 15 Oct 2021 18:29:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=85=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outdoor/activity/LoginActivity.java | 1 + .../outdoor/activity/PicturesActivity.java | 26 +++++----- .../com/navinfo/outdoor/api/Constant.java | 2 +- .../outdoor/fragment/MineFragment.java | 14 +++--- .../outdoor/fragment/RoadFragment.java | 4 +- .../outdoor/fragment/TreasureFragment.java | 9 ++-- .../navinfo/outdoor/http/HttpInterface.java | 46 ++++++++---------- .../marker_poi_video_show.png | Bin app/src/main/res/drawable/shape_radius_bg.xml | 1 + .../main/res/layout/fragment_has_submit.xml | 12 ++--- app/src/main/res/layout/mine_fragment.xml | 7 ++- 11 files changed, 55 insertions(+), 67 deletions(-) rename app/src/main/res/{drawable => drawable-hdpi}/marker_poi_video_show.png (100%) 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 d70bcfa..305379e 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java @@ -106,6 +106,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener public void onEvent(Message data) { if (data.what == Constant.REGISTER_WORD) { if ((boolean) data.obj) { + etLoginName.setText(Constant.USER_NAME); etLoginPaw.setText(Constant.PASS_WORD); } 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 451dce4..8fa1107 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java @@ -96,13 +96,20 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen private String finalVideoPath; // 摄像后最终保存的文件名 private ViewGroup layerChange; // 切换地图和相机的父控件 private CheckBox capturePicture, cbMapType; //拍照 - private boolean isMapSlide = false; + private boolean isMapSlide=false; private boolean isOration = false; private SimpleDateFormat formatter; - private File paperFile; + private File paperFile,logFile; private int poi_video_type; - private ImageView ivZoomAdd, ivZoomDel, ivLocation; + private ImageView ivZoomAdd, ivZoomDel, ivLocation,ivPicImage, ivPicVideoImage; private TencentLocation oldCurrentLocation = null; + private Timer timer; + private TimerTask timerTask; + private int videoIndex = -1; + private int oration = 0; + private SystemTTS systemTTS; + private boolean isBack = false; + private StringBuilder picturesBuilder; private Handler handler = new Handler(new Handler.Callback() { @Override public boolean handleMessage(@NonNull Message msg) { @@ -122,15 +129,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen return false; } }); - private Timer timer; - private TimerTask timerTask; - private int videoIndex = -1; - private int oration = 0; - private ImageView ivPicImage, ivPicVideoImage; - private SystemTTS systemTTS; - private boolean isBack = false; - private File logFile; - private StringBuilder picturesBuilder; @Override protected int getLayout() { @@ -161,7 +159,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen ivMap.setOnClickListener(this); ivPicImage = findViewById(R.id.iv_pic); ivPicVideoImage = findViewById(R.id.iv_pic_video); - if (poi_video_type == 1 || poi_video_type == 2) { ivPicVideoImage.setVisibility(View.VISIBLE); ivPicImage.setVisibility(View.GONE); @@ -329,7 +326,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen } } } - } @Override @@ -485,7 +481,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen } //小图 - private void initMapBig() { + private void initMapBig() { isMapSlide = false; ivZoomAdd.setVisibility(View.GONE); ivZoomDel.setVisibility(View.GONE); diff --git a/app/src/main/java/com/navinfo/outdoor/api/Constant.java b/app/src/main/java/com/navinfo/outdoor/api/Constant.java index 1ef9d8f..45882d8 100644 --- a/app/src/main/java/com/navinfo/outdoor/api/Constant.java +++ b/app/src/main/java/com/navinfo/outdoor/api/Constant.java @@ -183,7 +183,7 @@ public class Constant { public static SlidingUpPanelLayout SLIDING_LAYOUT = null;//設置 public static boolean IS_FILTER_LIST_ITEM = true;//poi页面的查重 public static TencentMap.OnMarkerClickListener markerClickListener = null; - public static final String NAVIN_FO = "10.14";//版本日期 + public static final String NAVIN_FO = "10.15";//版本日期 /* *联系我们的QQ群名称和QQ群号 */ 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 8fba7a4..c43304d 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java @@ -194,19 +194,17 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { case R.id.rl_set://设置 case R.id.rl_issue://常见问题 case R.id.rl_map://地图下载 - Toast.makeText(getActivity(), "该功能以后上新，敬请期待", Toast.LENGTH_SHORT).show(); - break; + case R.id.rl_grade://我的等级 case R.id.rl_privilege://我的特权 - mainBuilder.append("点击了item 跳转到我的特权,"); + /*mainBuilder.append("点击了item 跳转到我的特权,"); Intent intentPrivilege = new Intent(getActivity(), FragmentManagement.class); intentPrivilege.putExtra("tag", 18); - startActivity(intentPrivilege); - break; - case R.id.rl_grade://我的等级 - mainBuilder.append("点击了item 跳转到我的等级 ,"); + startActivity(intentPrivilege);*/ + /* mainBuilder.append("点击了item 跳转到我的等级 ,"); Intent intentGrade = new Intent(getActivity(), FragmentManagement.class); intentGrade.putExtra("tag", 17); - startActivity(intentGrade); + startActivity(intentGrade);*/ + Toast.makeText(getActivity(), "该功能以后上新，敬请期待", Toast.LENGTH_SHORT).show(); break; case R.id.btn_withdraw://提现页面 mainBuilder.append("点击了item 跳转到提现页面 ,"); 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 dfd39c7..2e5a594 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -400,7 +400,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList Toast.makeText(getContext(), "有正在提交的数据，等提交成功后，方可操作", Toast.LENGTH_SHORT).show(); } break; - } } @@ -435,7 +434,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList Toast.makeText(getActivity(), "没有申请权限，请手动申请", Toast.LENGTH_SHORT).show(); } } - @Override public void onDenied(List permissions, boolean never) { if (never) { @@ -444,7 +442,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList XXPermissions.startPermissionActivity(Objects.requireNonNull(getActivity()), permissions); } } - }); } @@ -538,6 +535,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); Log.d("TAG", "onError: " + e.getMessage()); } + }); } 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 7c520fe..0481cdd 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -263,6 +263,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen sharedEdit.putInt("type", messageType); sharedEdit.putString("dataTime", format); sharedEdit.commit(); + } else { Toast.makeText(getActivity(), messageNoticeBean.getMessage() + "", Toast.LENGTH_SHORT).show(); } @@ -786,7 +787,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen latLng.setLatitude(y); latLng.setLongitude(x); } - break; } BitmapDescriptor descriptor = null; @@ -824,7 +824,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen setMainButtonVisitable(View.GONE); FragmentTransaction fragmentTransaction = supportFragmentManager.beginTransaction(); Bundle bundle = new Bundle(); - /* bundle.putBoolean("boolean",aBoolean);*/ + /*bundle.putBoolean("boolean",aBoolean);*/ bundle.putSerializable("poiEntity", poiEntity); gatherGetFragment = GatherGetFragment.newInstance(bundle); fragmentTransaction.replace(R.id.frame_layout, gatherGetFragment); @@ -846,7 +846,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen //List allTaskStatus = poiDao.getAllPoi(); List allPoiStatus = poiDao.getAllPoiStatus(); if (allPoiStatus != null) { + poiDao.deleteAll(allPoiStatus); + } Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() { @Override @@ -902,7 +904,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen latLng = latLineString.get(0); } } - break; case "Polygon": //面 List latPolygon = GeometryTools.getLatLags(geo); @@ -921,7 +922,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen latLng.setLatitude(y); latLng.setLongitude(x); } - /*if (latPolygon != null && latPolygon.size() > 0) { latLng = latPolygon.get(0); }*/ @@ -1021,6 +1021,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen otherDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.grayother); } assert latLng != null; + Marker otherMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(otherDescriptor) .anchor(0.5f, 1f) .flat(true) 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 335fe71..bac28d7 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -3,8 +3,8 @@ 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";//测试接口 + public static final String IP_ = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 + public static final String IP= "http://dtxbmaps.navinfo.com/dtxb_test/m4";//测试接口 public static final String USER_PATH ="/user/";//我的 public static final String MSG_LIST_PATH ="/msgList/";//发现 @@ -14,20 +14,18 @@ public class HttpInterface { /* public static final String TEST_GUIDANCE_IP = "http://172.21.98.90:9999/m4";//引导页完成接口 public static final String APKIP = "http://172.23.139.4:8001/"; - public static final String DATA_IP = "http://172.23.139.4:9999/m4";//接口*/ - + public static String IP1 = "http://dtxbmaps.navinfo.com/dtxb/msg/"; + 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 + // 172.23.139.4:8001/appVersion/checkVersion?version=155&operationType=android //version是版本 operationType固定值 安卓 get public static String APP_CHECK_VERSION; //版本升级 public static void initAppPath(String userId) { - APP_CHECK_VERSION = IP + USER_PATH + "appVersion/" + userId + "/checkVersion"; //版本升级 - } - /* 我的 * Path=/m4/user/* */ @@ -41,26 +39,25 @@ public class HttpInterface { public static String USER_LOCATION; //上传用户坐标 //dtxbmaps.navinfo.com/dtxb/m4/user/user/1/getUserDetailByUserid/1?datetime=1628749294718 public static String USER_DETAIL_BY_USER_ID; //获取用户信息 - //http://172.21.98.90:9999/m4/user/userGuide/1/insertUserGuide + //172.21.98.90:9999/m4/user/userGuide/1/insertUserGuide public static String INSERT_USER_GUIDE;//引导页完成接口 /*发现 * Path=/m4/msgList/** - */ - // public static String IP1 = "http://dtxbmaps.navinfo.com/dtxb/msg/"; + */ public static String MSG_CONTENT;//发现 -富文本详情页请求 public static String LIST_TASK;//任务专区 public static String LIST_EVENT;//活动专区 public static String LIST_TASK_EXPLAIN;//任务说明 - //http://172.23.139.4:8002/findAndMessage/1/msg_list?fid=1&pageNum=1&pageSize=2 + //172.23.139.4:8002/findAndMessage/1/msg_list?fid=1&pageNum=1&pageSize=2 public static String MSG_LISt;//发现查询接口 - //http://172.23.139.4:8002/findAndMessage/1/exam_content?id=11 + //172.23.139.4:8002/findAndMessage/1/exam_content?id=11 public static String EXAM_CONTENT;//发现 -能力测评获取试题接口 - //http://172.23.139.4:8002/findAndMessage/1/submitExam + //172.23.139.4:8002/findAndMessage/1/submitExam public static String EXAM_SUBMIT;//发现 -能力测评提交试卷 post /*登录 * Path=/m4/userlogin/** */ - //http://172.23.139.4:9999/m4/userlogin/oauth/token + //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 public static String USER_REGISTER = IP + USER_PATH + "user/register";//注册接口 @@ -69,15 +66,13 @@ public class HttpInterface { ///m4/user/user/forgetPassword public static String USER_FORGET_PASSWORD = IP + USER_PATH + "user/forgetPassword";//忘记密码 //Flat - //dtxbmaps.navinfo.com/dtxb/m4/user/phone/message?mobile=18811794839&type=2 - /*提现 金额 * Path=/m4/price/** */ - //http://172.23.139.4:8004/userPrice/1/getPrice + //172.23.139.4:8004/userPrice/1/getPrice public static String GET_PRICE;//我的-总资产 - //http://172.23.139.4:8004/userPrice/1/userPriceExchange?exchangeMoney=10&payType=1 + //172.23.139.4:8004/userPrice/1/userPriceExchange?exchangeMoney=10&payType=1 public static String USER_PRICE_EXCHANGE;//我的-财务信息-提现 //dtxbmaps.navinfo.com/dtxb/m4/price/priceExchange/1/getList?datetime=1628647356815 public static String PRICE_EXCHANGE;//提现记录 @@ -150,29 +145,28 @@ public class HttpInterface { USER_LOCATION = IP + USER_PATH + "userLocation/" + USERID + "/userLocation"; //上传用户坐标 //dtxbmaps.navinfo.com/dtxb/m4/user/user/1/getUserDetailByUserid/1?datetime=1628749294718 USER_DETAIL_BY_USER_ID = IP + USER_PATH + "user/" + USERID + "/getUserDetailByUserid/" + USERID; //获取用户信息 - //http://172.21.98.90:9999/m4/user/userGuide/1/insertUserGuide + //172.21.98.90:9999/m4/user/userGuide/1/insertUserGuide INSERT_USER_GUIDE = IP + USER_PATH + "userGuide/" + USERID + "/insertUserGuide";//引导页完成接口 /* 发现 * Path=/m4/msgList/** */ - // public static String IP1 = "http://dtxbmaps.navinfo.com/dtxb/msg/"; MSG_CONTENT = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_content";//发现 -富文本详情页请求 LIST_TASK = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_list";//任务专区 LIST_EVENT = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_list";//活动专区 LIST_TASK_EXPLAIN = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_list";//任务说明 - //http://172.23.139.4:8002/findAndMessage/1/msg_list?fid=1&pageNum=1&pageSize=2 + //172.23.139.4:8002/findAndMessage/1/msg_list?fid=1&pageNum=1&pageSize=2 MSG_LISt = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_list";//发现查询接口 - //http://172.23.139.4:8002/findAndMessage/1/exam_content?id=11 + //172.23.139.4:8002/findAndMessage/1/exam_content?id=11 EXAM_CONTENT = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/exam_content";//发现 -能力测评获取试题接口 - //http://172.23.139.4:8002/findAndMessage/1/submitExam + //172.23.139.4:8002/findAndMessage/1/submitExam EXAM_SUBMIT = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/submitExam";//发现 -能力测评提交试卷 post MESSAGE_INFO_PUSH = IP + MSG_LIST_PATH + "InfoPush/" + USERID + "/push";//寻宝-消息通知 /*提现 金额 * Path=/m4/price/** */ - //http://172.23.139.4:8004/userPrice/1/getPrice + //172.23.139.4:8004/userPrice/1/getPrice GET_PRICE = IP + PRICE_PATH + "userPrice/" + USERID + "/getPrice";//我的-总资产 - //http://172.23.139.4:8004/userPrice/1/userPriceExchange?exchangeMoney=10&payType=1 + //172.23.139.4:8004/userPrice/1/userPriceExchange?exchangeMoney=10&payType=1 USER_PRICE_EXCHANGE = IP + PRICE_PATH + "userPrice/" + USERID + "/userPriceExchange";//我的-财务信息-提现 //dtxbmaps.navinfo.com/dtxb/m4/price/priceExchange/1/getList?datetime=1628647356815 PRICE_EXCHANGE = IP + PRICE_PATH + "priceExchange/" + USERID + "/getList";//提现记录 diff --git a/app/src/main/res/drawable/marker_poi_video_show.png b/app/src/main/res/drawable-hdpi/marker_poi_video_show.png similarity index 100% rename from app/src/main/res/drawable/marker_poi_video_show.png rename to app/src/main/res/drawable-hdpi/marker_poi_video_show.png diff --git a/app/src/main/res/drawable/shape_radius_bg.xml b/app/src/main/res/drawable/shape_radius_bg.xml index 04f8c6d..adc8c5a 100644 --- a/app/src/main/res/drawable/shape_radius_bg.xml +++ b/app/src/main/res/drawable/shape_radius_bg.xml @@ -2,4 +2,5 @@ + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_has_submit.xml b/app/src/main/res/layout/fragment_has_submit.xml index e6e8b4b..b90e1bc 100644 --- a/app/src/main/res/layout/fragment_has_submit.xml +++ b/app/src/main/res/layout/fragment_has_submit.xml @@ -41,7 +41,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - app:layout_constraintBottom_toBottomOf="@id/iv_poi" + app:layout_constraintBottom_toTopOf="@+id/has_submit_view" app:layout_constraintLeft_toLeftOf="@id/tv_poi" app:layout_constraintTop_toBottomOf="@id/tv_poi"> @@ -142,9 +142,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - app:layout_constraintBottom_toBottomOf="@id/iv_poiVideo" + app:layout_constraintBottom_toTopOf="@+id/poiVideo_has_submit_view" app:layout_constraintLeft_toLeftOf="@id/tv_poiVideo" - app:layout_constraintTop_toBottomOf="@id/iv_poiVideo"> + app:layout_constraintTop_toBottomOf="@+id/tv_poiVideo"> @@ -338,7 +338,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - app:layout_constraintBottom_toBottomOf="@id/iv_charging" + app:layout_constraintBottom_toTopOf="@+id/view5" app:layout_constraintLeft_toLeftOf="@id/tv_charging" app:layout_constraintTop_toBottomOf="@id/tv_charging"> @@ -435,7 +435,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - app:layout_constraintBottom_toBottomOf="@id/iv_other" + app:layout_constraintBottom_toTopOf="@+id/other_audit_view" app:layout_constraintLeft_toLeftOf="@id/tv_other" app:layout_constraintTop_toBottomOf="@+id/tv_other"> diff --git a/app/src/main/res/layout/mine_fragment.xml b/app/src/main/res/layout/mine_fragment.xml index 02c7433..cdbc1de 100644 --- a/app/src/main/res/layout/mine_fragment.xml +++ b/app/src/main/res/layout/mine_fragment.xml @@ -26,7 +26,7 @@