From 72dd2af310341cee9addfc3acaae6f92a4991832 Mon Sep 17 00:00:00 2001 From: md Date: Fri, 27 Aug 2021 16:02:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E6=89=8B=E5=BC=95?= =?UTF-8?q?=E5=AF=BCbug=E5=92=8C8.27=E6=8F=90=E5=87=BA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outdoor/activity/GuidanceActivity.java | 10 +- .../outdoor/activity/PictureActivity.java | 3 +- .../outdoor/activity/PicturesActivity.java | 5 +- .../navinfo/outdoor/http/HttpInterface.java | 4 +- .../res/layout/charging_pile_fragment.xml | 10 ++ .../res/layout/charging_station_fragment.xml | 102 ++++++++++-------- .../main/res/layout/fragment_gather_get.xml | 6 +- app/src/main/res/layout/fragment_other.xml | 11 +- app/src/main/res/layout/fragment_road.xml | 12 ++- app/src/main/res/layout/mine_fragment.xml | 9 +- app/src/main/res/layout/poi_fragment.xml | 11 +- .../main/res/layout/poi_video_fragment.xml | 17 +-- 12 files changed, 127 insertions(+), 73 deletions(-) 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 09fa8a4..5de97a1 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/GuidanceActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/GuidanceActivity.java @@ -128,7 +128,7 @@ public class GuidanceActivity extends BaseActivity { @Override public void onClick(View v) { initGuide(); - Toast.makeText(GuidanceActivity.this, "可以在发现版块的任务说明中，进行再次学习哦", Toast.LENGTH_SHORT).show(); + // Toast.makeText(GuidanceActivity.this, "可以在发现版块的任务说明中，进行再次学习哦", Toast.LENGTH_SHORT).show(); Intent intent = new Intent(GuidanceActivity.this, HomeActivity.class); startActivity(intent); finish(); @@ -145,14 +145,14 @@ public class GuidanceActivity extends BaseActivity { .Builder(this) .url(HttpInterface.INSERT_USER_GUIDE) .cls(BaseBean.class) - .token(Constant.ACCESS_TOKEN) .params(new HttpParams()) - .postRequest(new Callback>() { + .getRequest(new Callback>() { @Override public void onSuccess(BaseBean response, int id) { dismissLoadingDialog(); if (response.getCode() == 200) { - Toast.makeText(GuidanceActivity.this, "可以在发现版块的任务说明中，进行再次学习哦", Toast.LENGTH_SHORT).show(); + Toast.makeText(GuidanceActivity.this, "可以在发现版块的任务说明中，进行再次学习哦", Toast.LENGTH_LONG).show(); + Intent intent = new Intent(GuidanceActivity.this, HomeActivity.class); startActivity(intent); finish(); @@ -162,6 +162,8 @@ public class GuidanceActivity extends BaseActivity { @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()+""); } }); } diff --git a/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java index d1f2274..c74b604 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java @@ -117,6 +117,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene private ImageView ivLocation; private CheckBox cbMapType; private boolean isMapSlide = false; + private int pageNum = 0; private Handler handler = new Handler(new Handler.Callback() { @Override @@ -272,7 +273,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene @Override public void onFileReady(@Nullable @org.jetbrains.annotations.Nullable File file) { assert file != null; - Toast.makeText(PictureActivity.this, "保存成功:" + file.getPath(), Toast.LENGTH_SHORT).show(); + Toast.makeText(PictureActivity.this, "保存成功:" + pageNum++, Toast.LENGTH_SHORT).show(); } }); if (camera.isTakingVideo()) { 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 feb5653..fbe8d69 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java @@ -84,6 +84,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen private ViewGroup layerChange; // 切换地图和相机的父控件 private CheckBox capturePicture;//拍照 private boolean isMapSlide = false; + private int pageNum=1;//拍了多少张照片 private Handler handler = new Handler(new Handler.Callback() { @Override public boolean handleMessage(@NonNull Message msg) { @@ -213,10 +214,10 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen if (type == 3) { message.what = 0x103; handler.sendMessageDelayed(message, 0); - Toast.makeText(PicturesActivity.this, "保存成功:" + file.getPath(), Toast.LENGTH_SHORT).show(); + Toast.makeText(PicturesActivity.this, "保存成功:" + pageNum++, Toast.LENGTH_SHORT).show(); } else { message.what = 0x101; - Toast.makeText(PicturesActivity.this, "保存成功" + file.getPath(), Toast.LENGTH_SHORT).show(); + Toast.makeText(PicturesActivity.this, "保存成功" + pageNum++, Toast.LENGTH_SHORT).show(); handler.sendMessageDelayed(message, 2000); } 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 81de3a5..b7176f7 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -5,7 +5,7 @@ import com.navinfo.outdoor.api.Constant; public class HttpInterface { public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 public static final String TEST_IP = "http://172.23.139.4:9999/m4";//测试接口 - + public static final String TEST_IP1 = "http://172.21.98.90:9999/m4";//引导页完成接口 public static final String USER_PATH = "/user/";//我的 public static final String MSG_LIST_PATH = "/msgList/";//发现 public static final String USER_LOGIN_PATH = "/userlogin/";//登录 @@ -141,7 +141,7 @@ public class HttpInterface { //dtxbmaps.navinfo.com/dtxb/m4/user/user/1/getUserDetailByUserid/1?datetime=1628749294718 USER_DETAIL_BY_USER_ID = TEST_IP + USER_PATH + "user/" + USERID + "/getUserDetailByUserid/" + USERID; //获取用户信息 //http://172.21.98.90:9999/m4/user/userGuide/1/insertUserGuide - INSERT_USER_GUIDE=TEST_IP +USER_PATH+"userGuide/"+USERID+"/insertUserGuide";//引导页完成接口 + INSERT_USER_GUIDE=TEST_IP1 +USER_PATH+"userGuide/"+USERID+"/insertUserGuide";//引导页完成接口 /** * 发现 * Path=/m4/msgList/** diff --git a/app/src/main/res/layout/charging_pile_fragment.xml b/app/src/main/res/layout/charging_pile_fragment.xml index b2dee46..7e91047 100644 --- a/app/src/main/res/layout/charging_pile_fragment.xml +++ b/app/src/main/res/layout/charging_pile_fragment.xml @@ -314,6 +314,16 @@ android:layout_margin="10dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/linear_type" /> + + + + + + + + + + app:layout_constraintTop_toBottomOf="@id/linear_exist"> - - - - - - - - + app:layout_constraintTop_toBottomOf="@id/linear_type" /> + - + + - + - + android:textColor="#000" + android:textSize="20sp" + android:textStyle="bold" /> - + - + @@ -192,11 +186,18 @@ android:layout_marginTop="10dp" app:layout_constraintLeft_toLeftOf="@id/ll_pictures" app:layout_constraintTop_toBottomOf="@id/ll_pictures"> +