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

修改新手引导bug和8.27提出的bug

Browse Source
This commit is contained in:
md
2021-08-27 16:02:26 +08:00
parent 97f4db7efe
commit 72dd2af310
12 changed files with 127 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/navinfo/outdoor/activity/GuidanceActivity.java
+6 -4
View File
@@ -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<BaseBean<Integer>>() {
.getRequest(new Callback<BaseBean<Integer>>() {
@Override
public void onSuccess(BaseBean<Integer> 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()+"");
}
});
}
app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java
+2 -1
View File
@@ -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()) {
app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java
+3 -2
View File
@@ -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);
}
app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
+2 -2
View File
@@ -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/**