From 1f4b71362f942ccee80781f687819672f00943d2 Mon Sep 17 00:00:00 2001 From: wangdongsheng Date: Fri, 27 Aug 2021 16:23:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=95=E5=AF=BC=E9=A1=B5?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E4=BF=AE=E6=94=B9=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../outdoor/activity/GuidanceActivity.java | 173 +++++++++++++----- .../outdoor/activity/LoginActivity.java | 35 +++- .../outdoor/activity/PictureActivity.java | 1 + .../outdoor/activity/PicturesActivity.java | 2 +- .../outdoor/fragment/MineFragment.java | 3 + .../outdoor/fragment/TreasureFragment.java | 50 +++-- .../navinfo/outdoor/http/HttpInterface.java | 9 +- app/src/main/res/layout/activity_pictures.xml | 4 +- .../main/res/layout/fragment_gather_get.xml | 6 +- app/src/main/res/layout/login_task_item.xml | 60 ++++++ app/src/main/res/values/styles.xml | 76 +++++--- 12 files changed, 304 insertions(+), 117 deletions(-) create mode 100644 app/src/main/res/layout/login_task_item.xml diff --git a/app/build.gradle b/app/build.gradle index 1307bc8..3fa13e6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 29 buildToolsVersion '29.0.2' - ndkVersion '23.0.7123448' + //ndkVersion '23.0.7123448' defaultConfig { applicationId "com.navinfo.outdoor" 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 5de97a1..80dc7a2 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/GuidanceActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/GuidanceActivity.java @@ -1,21 +1,19 @@ package com.navinfo.outdoor.activity; import android.content.Intent; +import android.os.Handler; +import android.os.Message; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.widget.FrameLayout; import android.widget.Toast; - -import com.kongzue.dialog.interfaces.OnDialogButtonClickListener; -import com.kongzue.dialog.util.BaseDialog; -import com.kongzue.dialog.v3.MessageDialog; +import androidx.annotation.NonNull; import com.lzy.okgo.model.HttpParams; import com.navinfo.outdoor.R; import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseActivity; import com.navinfo.outdoor.bean.BaseBean; -import com.navinfo.outdoor.bean.UserBean; import com.navinfo.outdoor.http.Callback; import com.navinfo.outdoor.http.HttpInterface; import com.navinfo.outdoor.http.OkGoBuilder; @@ -25,8 +23,62 @@ import com.navinfo.outdoor.http.OkGoBuilder; */ public class GuidanceActivity extends BaseActivity { private FrameLayout frameLayout; - - + private View loginTaskItem, taskItem, refreshItem, screenItem, locationItem, gatherItem, submitItem, submittedItem, discoverItem, myHeadItem, dataItem, withdrawItem; + private Handler handler = new Handler(new Handler.Callback() { + @Override + public boolean handleMessage(@NonNull Message msg) { + switch (msg.what) { + case 0x101: + frameLayout.removeView(loginTaskItem); + frameLayout.addView(taskItem); + break; + case 0x102: + frameLayout.removeView(taskItem); + frameLayout.addView(refreshItem); + break; + case 0x103: + frameLayout.removeView(refreshItem); + frameLayout.addView(screenItem); + break; + case 0x104: + frameLayout.removeView(screenItem); + frameLayout.addView(locationItem); + break; + case 0x105: + frameLayout.removeView(locationItem); + frameLayout.addView(gatherItem); + break; + case 0x106: + frameLayout.removeView(gatherItem); + frameLayout.addView(submitItem); + break; + case 0x107: + frameLayout.removeView(submitItem); + frameLayout.addView(submittedItem); + break; + case 0x108: + frameLayout.removeView(submittedItem); + frameLayout.addView(discoverItem); + break; + case 0x109: + frameLayout.removeView(discoverItem); + frameLayout.addView(myHeadItem); + break; + case 0x110: + frameLayout.removeView(myHeadItem); + frameLayout.addView(dataItem); + break; + case 0x111: + frameLayout.removeView(dataItem); + frameLayout.addView(withdrawItem); + break; + case 0x112: + initGuide(); + break; + } + return false; + } + }); @Override protected int getLayout() { return R.layout.activity_guidance; @@ -41,97 +93,125 @@ public class GuidanceActivity extends BaseActivity { @Override protected void initData() { super.initData(); - View taskItem = LayoutInflater.from(this).inflate(R.layout.guidance_task_item, null); - View refreshItem = LayoutInflater.from(this).inflate(R.layout.guidance_refresh_item, null); - View screenItem = LayoutInflater.from(this).inflate(R.layout.guidance_screen_item, null); - View locationItem = LayoutInflater.from(this).inflate(R.layout.guidance_location_item, null); - View gatherItem = LayoutInflater.from(this).inflate(R.layout.guidance_gather_item, null); - View submitItem = LayoutInflater.from(this).inflate(R.layout.guidance_submit_item, null); - View submittedItem = LayoutInflater.from(this).inflate(R.layout.guidance_submitted_item, null); - View discoverItem = LayoutInflater.from(this).inflate(R.layout.guidance_discover_item, null); - View myHeadItem = LayoutInflater.from(this).inflate(R.layout.guidance_my_head_item, null); - View dataItem = LayoutInflater.from(this).inflate(R.layout.guidance_data_item, null); - View withdrawItem = LayoutInflater.from(this).inflate(R.layout.guidance_withdraw_item, null); - - frameLayout.addView(taskItem); + loginTaskItem = LayoutInflater.from(this).inflate(R.layout.login_task_item, null); + taskItem = LayoutInflater.from(this).inflate(R.layout.guidance_task_item, null); + refreshItem = LayoutInflater.from(this).inflate(R.layout.guidance_refresh_item, null); + screenItem = LayoutInflater.from(this).inflate(R.layout.guidance_screen_item, null); + locationItem = LayoutInflater.from(this).inflate(R.layout.guidance_location_item, null); + gatherItem = LayoutInflater.from(this).inflate(R.layout.guidance_gather_item, null); + submitItem = LayoutInflater.from(this).inflate(R.layout.guidance_submit_item, null); + submittedItem = LayoutInflater.from(this).inflate(R.layout.guidance_submitted_item, null); + discoverItem = LayoutInflater.from(this).inflate(R.layout.guidance_discover_item, null); + myHeadItem = LayoutInflater.from(this).inflate(R.layout.guidance_my_head_item, null); + dataItem = LayoutInflater.from(this).inflate(R.layout.guidance_data_item, null); + withdrawItem = LayoutInflater.from(this).inflate(R.layout.guidance_withdraw_item, null); + frameLayout.addView(loginTaskItem); + loginTaskItem.findViewById(R.id.btn_login).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Message message = new Message(); + message.what = 0x101; + handler.sendMessageDelayed(message, 1000); + v.setEnabled(false); + } + }); taskItem.findViewById(R.id.btn_next_step).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - frameLayout.removeView(taskItem); - frameLayout.addView(refreshItem); + v.setEnabled(false); + Message message = new Message(); + message.what = 0x102; + handler.sendMessageDelayed(message, 500); } }); refreshItem.findViewById(R.id.btn_next_step).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - frameLayout.removeView(refreshItem); - frameLayout.addView(screenItem); + v.setEnabled(false); + Message message = new Message(); + message.what = 0x103; + handler.sendMessageDelayed(message, 500); } }); screenItem.findViewById(R.id.btn_next_step).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - frameLayout.removeView(screenItem); - frameLayout.addView(locationItem); + v.setEnabled(false); + Message message = new Message(); + message.what = 0x104; + handler.sendMessageDelayed(message, 500); } }); locationItem.findViewById(R.id.btn_next_step).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - frameLayout.removeView(locationItem); - frameLayout.addView(gatherItem); + v.setEnabled(false); + Message message = new Message(); + message.what = 0x105; + handler.sendMessageDelayed(message, 500); } }); gatherItem.findViewById(R.id.btn_next_step).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - frameLayout.removeView(gatherItem); - frameLayout.addView(submitItem); + v.setEnabled(false); + Message message = new Message(); + message.what = 0x106; + handler.sendMessageDelayed(message, 500); } }); submitItem.findViewById(R.id.btn_next_step).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - frameLayout.removeView(submitItem); - frameLayout.addView(submittedItem); + v.setEnabled(false); + Message message = new Message(); + message.what = 0x107; + handler.sendMessageDelayed(message, 500); } }); submittedItem.findViewById(R.id.btn_next_step).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - frameLayout.removeView(submittedItem); - frameLayout.addView(discoverItem); + v.setEnabled(false); + Message message = new Message(); + message.what = 0x108; + handler.sendMessageDelayed(message, 500); } }); discoverItem.findViewById(R.id.btn_next_step).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - frameLayout.removeView(discoverItem); - frameLayout.addView(myHeadItem); + v.setEnabled(false); + Message message = new Message(); + message.what = 0x109; + handler.sendMessageDelayed(message, 500); } }); myHeadItem.findViewById(R.id.btn_next_step).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - frameLayout.removeView(myHeadItem); - frameLayout.addView(dataItem); + v.setEnabled(false); + Message message = new Message(); + message.what = 0x110; + handler.sendMessageDelayed(message, 500); + } }); dataItem.findViewById(R.id.btn_next_step).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - frameLayout.removeView(dataItem); - frameLayout.addView(withdrawItem); + v.setEnabled(false); + Message message = new Message(); + message.what = 0x111; + handler.sendMessageDelayed(message, 500); } }); withdrawItem.findViewById(R.id.btn_to_learn).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - initGuide(); - // Toast.makeText(GuidanceActivity.this, "可以在发现版块的任务说明中，进行再次学习哦", Toast.LENGTH_SHORT).show(); - Intent intent = new Intent(GuidanceActivity.this, HomeActivity.class); - startActivity(intent); - finish(); + Message message = new Message(); + message.what = 0x112; + handler.sendMessageDelayed(message, 500); } }); } @@ -152,7 +232,6 @@ public class GuidanceActivity extends BaseActivity { dismissLoadingDialog(); if (response.getCode() == 200) { Toast.makeText(GuidanceActivity.this, "可以在发现版块的任务说明中，进行再次学习哦", Toast.LENGTH_LONG).show(); - Intent intent = new Intent(GuidanceActivity.this, HomeActivity.class); startActivity(intent); finish(); @@ -163,7 +242,7 @@ public class GuidanceActivity extends BaseActivity { public void onError(Throwable e, int id) { dismissLoadingDialog(); Toast.makeText(GuidanceActivity.this, e.getMessage()+"", Toast.LENGTH_SHORT).show(); - Log.e("TAG", "onError: 错错错"+e.getMessage()+""); + Log.e("TAG", "onError: "+e.getMessage()+""); } }); } 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 e644661..cabf146 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java @@ -4,8 +4,15 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Configuration; +import android.graphics.Point; +import android.graphics.drawable.ColorDrawable; import android.os.Message; +import android.view.Display; +import android.view.KeyEvent; +import android.view.LayoutInflater; import android.view.View; +import android.view.Window; +import android.view.WindowManager; import android.widget.Button; import android.widget.CheckBox; import android.widget.EditText; @@ -13,6 +20,7 @@ import android.widget.TextView; import android.widget.Toast; import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; import com.github.lazylibrary.util.MD5; @@ -241,17 +249,30 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener navInfoEditor.commit(); int needGuide = body.getNeedGuide();//0不需要 1需要 if (needGuide==1){ - DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE; - MessageDialog.show((AppCompatActivity) LoginActivity.this, "提示", "请查看APP使用说明", "确定").setOkButton(new OnDialogButtonClickListener() { + Intent intent = new Intent(LoginActivity.this, GuidanceActivity.class); + startActivity(intent); + /* AlertDialog alertDialog = new AlertDialog.Builder(LoginActivity.this,R.style.dialog).create(); + alertDialog.show(); + WindowManager windowManager = getWindowManager(); + Display defaultDisplay = windowManager.getDefaultDisplay(); + Point point = new Point(); + defaultDisplay.getSize(point); + Window window = alertDialog.getWindow(); + assert window != null; + WindowManager.LayoutParams lp = ((Window) window).getAttributes(); + lp.width = point.x; // 设置宽度和高度 + lp.height = point.y; + getWindow().getDecorView().setPadding( 0 , 0 , 0 , 0 ); + window.setAttributes(lp); + window.setContentView(R.layout.login_task_item); + window.findViewById(R.id.btn_login).setOnClickListener(new View.OnClickListener() { @Override - public boolean onClick(BaseDialog baseDialog, View v) { + public void onClick(View v) { Intent intent = new Intent(LoginActivity.this, GuidanceActivity.class); startActivity(intent); - finish(); - return false; + alertDialog.dismiss(); } - }); - + });*/ }else { Toast.makeText(LoginActivity.this, "登录成功", Toast.LENGTH_SHORT).show(); Intent intent = new Intent(LoginActivity.this, HomeActivity.class); 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 c74b604..0ca2479 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java @@ -220,6 +220,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene uiSettings.setLogoScale(0.7f); uiSettings.setRotateGesturesEnabled(false);//禁止地图旋转手势. uiSettings.setTiltGesturesEnabled(false);//禁止倾斜手势. + // uiSettings.setAllGesturesEnabled(false); setLocMarkerStyle(LOCATION_TYPE_LOCATION_ROTATE); 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 fbe8d69..db9cef0 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java @@ -209,8 +209,8 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen videoIndex = Integer.parseInt(file.getName().replace(".jpg", "")); finalVideoPath = Objects.requireNonNull(file.getParentFile()).getAbsolutePath() + "/" + (videoIndex + 1) + ".jpg"; } - initMarkerPaper(); Message message = new Message(); + initMarkerPaper(); if (type == 3) { message.what = 0x103; handler.sendMessageDelayed(message, 0); 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 4b9998f..522b46b 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java @@ -17,6 +17,7 @@ import com.bumptech.glide.request.RequestOptions; import com.lzy.okgo.model.HttpParams; import com.navinfo.outdoor.R; import com.navinfo.outdoor.activity.FragmentManagement; +import com.navinfo.outdoor.activity.LoginActivity; import com.navinfo.outdoor.activity.UserActivity; import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseFragment; @@ -193,6 +194,8 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { startActivity(intentAbout); break; case R.id.btn_quit://退出登录 + Intent intent = new Intent(getContext(), LoginActivity.class); + startActivity(intent); Objects.requireNonNull(getActivity()).finish(); break; } 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 681838e..e8a098d 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -748,7 +748,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen .addAll(latLineString) // 折线设置圆形线头 .lineCap(true) - .color(Color.parseColor("#FFC107")) + .color(Color.parseColor("#FFE70C")) // 折线宽度为5像素 .width(10) .arrow(true) @@ -812,7 +812,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen poiMarker.setZIndex(MARKER_DOT); poiMarker.setTitle(poiEntity.getName() + ""); poiMarker.setTag(poiEntity); - removablesLocality.add(poiMarker); break; case 2://充电站 @@ -933,8 +932,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen Bundle bundle = new Bundle(); bundle.putSerializable("poiEntity", poiEntity); PoiFragment poiFragment = PoiFragment.newInstance(bundle); - LatLng newPoiLatLng = new LatLng(Double.parseDouble(poiEntity.getY()), Double.parseDouble(poiEntity.getX())); - // showPoiMarkerByType(1, newPoiLatLng); showSlidingFragment(poiFragment); initRemovePoiSharePre(); return false; @@ -949,8 +946,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen Bundle bundle = new Bundle(); bundle.putSerializable("poiEntity", poiEntity); ChargingStationFragment chargingStationFragment = ChargingStationFragment.newInstance(bundle); - LatLng newPoiLatLng = new LatLng(Double.parseDouble(poiEntity.getY()), Double.parseDouble(poiEntity.getX())); - // showPoiMarkerByType(4, newPoiLatLng); showSlidingFragment(chargingStationFragment); initRemovePoiSharePre(); return false; @@ -965,8 +960,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen Bundle bundle = new Bundle(); bundle.putSerializable("poiEntity", poiEntity); PoiVideoFragment poiVideoFragment = PoiVideoFragment.newInstance(bundle); - LatLng newPoiLatLng = new LatLng(Double.parseDouble(poiEntity.getY()), Double.parseDouble(poiEntity.getX())); - // showPoiMarkerByType(2, newPoiLatLng); showSlidingFragment(poiVideoFragment); initRemovePoiSharePre(); return false; @@ -981,8 +974,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen Bundle bundle = new Bundle(); bundle.putSerializable("poiEntity", poiEntity); RoadFragment roadFragment = RoadFragment.newInstance(bundle); - LatLng newPoiLatLng = new LatLng(Double.parseDouble(poiEntity.getY()), Double.parseDouble(poiEntity.getX())); - // showPoiMarkerByType(3, newPoiLatLng); showSlidingFragment(roadFragment); initRemovePoiSharePre(); return false; @@ -997,8 +988,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen Bundle bundle = new Bundle(); bundle.putSerializable("poiEntity", poiEntity); OtherFragment otherFragment = OtherFragment.newInstance(bundle); - LatLng newPoiLatLng = new LatLng(Double.parseDouble(poiEntity.getY()), Double.parseDouble(poiEntity.getX())); - // showPoiMarkerByType(5, newPoiLatLng); showSlidingFragment(otherFragment); initRemovePoiSharePre(); return false; @@ -1160,6 +1149,10 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen removablesLocality.get(i).remove(); } removablesLocality.clear(); + for (int i = 0; i < removableScreenMarker.size(); i++) { + removableScreenMarker.get(i).remove(); + } + removableScreenMarker.clear(); refreshFilterData(); } } else if (data.what == Constant.EVENT_WHAT_COMPLETE_TASK) { @@ -1612,20 +1605,24 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen String geo = listBean.getGeo(); poiListEntity.setGeoWkt(geo); Geometry geometry = GeometryTools.createGeometry(geo); - if (geometry.getGeometryType().equals("Point")) {//点 - LatLng latLng = GeometryTools.createLatLng(geo); - poiListEntity.setX(latLng.longitude + ""); - poiListEntity.setY(latLng.latitude + ""); - } else if (geometry.getGeometryType().equals("LineString")) {//线 - List latLineString = GeometryTools.getLatLngs(geo); - assert latLineString != null; - poiListEntity.setX(latLineString.get(0).longitude + ""); - poiListEntity.setY(latLineString.get(0).latitude + ""); - } else if (geometry.getGeometryType().equals("Polygon")) {//面 - List latPolygon = GeometryTools.getLatLngs(geo); - assert latPolygon != null; - poiListEntity.setX(latPolygon.get(0).longitude + ""); - poiListEntity.setY(latPolygon.get(0).latitude + ""); + switch (geometry.getGeometryType()) { + case "Point": //点 + LatLng latLng = GeometryTools.createLatLng(geo); + poiListEntity.setX(latLng.longitude + ""); + poiListEntity.setY(latLng.latitude + ""); + break; + case "LineString": //线 + List latLineString = GeometryTools.getLatLngs(geo); + assert latLineString != null; + poiListEntity.setX(latLineString.get(0).longitude + ""); + poiListEntity.setY(latLineString.get(0).latitude + ""); + break; + case "Polygon": //面 + List latPolygon = GeometryTools.getLatLngs(geo); + assert latPolygon != null; + poiListEntity.setX(latPolygon.get(0).longitude + ""); + poiListEntity.setY(latPolygon.get(0).latitude + ""); + break; } initMarker(poiListEntity, true); switch (listBean.getType()){ @@ -1634,7 +1631,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen case 5: marker.remove(); break; - case 3: case 4: case 6: 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 b7176f7..db88ca0 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -4,8 +4,11 @@ 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 DATA_IP = "http://172.23.139.4:9999/m4";//接口 + public static final String TEST_IP = "http://dtxbmaps.navinfo.com/dtxb_test/m4";//测试接口 + public static final String TEST_GUIDANCE_IP = "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 +144,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_IP1 +USER_PATH+"userGuide/"+USERID+"/insertUserGuide";//引导页完成接口 + INSERT_USER_GUIDE=TEST_GUIDANCE_IP +USER_PATH+"userGuide/"+USERID+"/insertUserGuide";//引导页完成接口 /** * 发现 * Path=/m4/msgList/** diff --git a/app/src/main/res/layout/activity_pictures.xml b/app/src/main/res/layout/activity_pictures.xml index 70d45b9..830e290 100644 --- a/app/src/main/res/layout/activity_pictures.xml +++ b/app/src/main/res/layout/activity_pictures.xml @@ -16,8 +16,8 @@ android:id="@+id/camera" android:layout_width="match_parent" android:layout_height="match_parent" - app:cameraPictureSizeMaxArea="2500" - app:cameraVideoSizeMaxWidth="2750000" + app:cameraPictureSizeMaxArea="1100" + app:cameraVideoSizeMaxWidth="800000" android:keepScreenOn="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/fragment_gather_get.xml b/app/src/main/res/layout/fragment_gather_get.xml index 753e68d..115b9fb 100644 --- a/app/src/main/res/layout/fragment_gather_get.xml +++ b/app/src/main/res/layout/fragment_gather_get.xml @@ -8,9 +8,9 @@