From 84b4eaca1e3c1d055123aec07e15b183db4ae49a Mon Sep 17 00:00:00 2001 From: md Date: Tue, 15 Jun 2021 18:25:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=AE=B0=E5=BD=95-=E5=B7=B2?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9A=84=E5=B8=83=E5=B1=80=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 10 +- .../outdoor/activity/FragmentManagement.java | 32 ++ .../outdoor/activity/PictureActivity.java | 70 ++-- .../outdoor/fragment/HasSubmitFragment.java | 79 ++++ .../outdoor/fragment/PoiTaskFragment.java | 26 ++ .../outdoor/fragment/RecordFragment.java | 52 ++- .../outdoor/fragment/RoadFragment.java | 39 +- .../outdoor/fragment/StaySubmitFragment.java | 39 ++ .../outdoor/fragment/TreasureFragment.java | 5 - app/src/main/res/drawable/charge_square.png | Bin 0 -> 369 bytes .../main/res/drawable/icon_arrow_right.png | Bin 0 -> 192 bytes app/src/main/res/drawable/menpai_square.png | Bin 0 -> 296 bytes app/src/main/res/drawable/other_square.png | Bin 0 -> 291 bytes app/src/main/res/drawable/poi_square.png | Bin 0 -> 558 bytes app/src/main/res/drawable/road_square.png | Bin 0 -> 391 bytes app/src/main/res/drawable/tabbackground.xml | 6 + .../main/res/drawable/textcolor_record.xml | 5 + app/src/main/res/layout/activity_camera.xml | 127 ++++-- app/src/main/res/layout/activity_login.xml | 12 +- app/src/main/res/layout/activity_picture.xml | 217 +++++++--- .../main/res/layout/fragment_has_submit.xml | 389 ++++++++++++++++++ app/src/main/res/layout/fragment_poi_task.xml | 14 + app/src/main/res/layout/fragment_road.xml | 51 ++- .../main/res/layout/fragment_stay_submit.xml | 43 ++ app/src/main/res/layout/record_fragment.xml | 51 ++- app/src/main/res/values/colors.xml | 2 + app/src/main/res/values/styles.xml | 11 + 27 files changed, 1076 insertions(+), 204 deletions(-) create mode 100644 app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java create mode 100644 app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java create mode 100644 app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java create mode 100644 app/src/main/res/drawable/charge_square.png create mode 100644 app/src/main/res/drawable/icon_arrow_right.png create mode 100644 app/src/main/res/drawable/menpai_square.png create mode 100644 app/src/main/res/drawable/other_square.png create mode 100644 app/src/main/res/drawable/poi_square.png create mode 100644 app/src/main/res/drawable/road_square.png create mode 100644 app/src/main/res/drawable/tabbackground.xml create mode 100644 app/src/main/res/drawable/textcolor_record.xml create mode 100644 app/src/main/res/layout/fragment_has_submit.xml create mode 100644 app/src/main/res/layout/fragment_poi_task.xml create mode 100644 app/src/main/res/layout/fragment_stay_submit.xml diff --git a/app/build.gradle b/app/build.gradle index 90c8399..d29b04c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,12 +3,12 @@ apply plugin: 'com.android.application' android { compileSdkVersion 30 buildToolsVersion "30.0.3" - // ndkVersion '23.0.7123448' + ndkVersion '23.0.7123448' defaultConfig { applicationId "com.navinfo.outdoor" minSdkVersion 23 - targetSdkVersion 30 + targetSdkVersion 22 versionCode 1 versionName "1.0" @@ -26,6 +26,12 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + lintOptions { + checkReleaseBuilds false + // Or, if you prefer, you can continue to check for errors in release builds, + // but continue the build even when errors are found: + abortOnError false + } } //efs { // //是否对启动过程进程插桩的开关，如果使用自动集成监控则必须开启 diff --git a/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java b/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java index 1d6cd32..9df59d1 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java @@ -14,15 +14,18 @@ import com.navinfo.outdoor.fragment.FindFragment; import com.navinfo.outdoor.fragment.ForgetPawFragment; import com.navinfo.outdoor.fragment.GatheringFragment; import com.navinfo.outdoor.fragment.GradeFragment; +import com.navinfo.outdoor.fragment.HasSubmitFragment; import com.navinfo.outdoor.fragment.IssueFragment; import com.navinfo.outdoor.fragment.IssueWebFragment; import com.navinfo.outdoor.fragment.MapDownloadFragment; import com.navinfo.outdoor.fragment.MineFragment; import com.navinfo.outdoor.fragment.PoiFragment; +import com.navinfo.outdoor.fragment.PoiTaskFragment; import com.navinfo.outdoor.fragment.PrivilegeFragment; import com.navinfo.outdoor.fragment.RecordFragment; import com.navinfo.outdoor.fragment.RoadFragment; import com.navinfo.outdoor.fragment.SetFragment; +import com.navinfo.outdoor.fragment.StaySubmitFragment; import com.navinfo.outdoor.fragment.TaskExWebFragment; import com.navinfo.outdoor.fragment.TaskExplainFragment; import com.navinfo.outdoor.fragment.TaskExplainFragment2; @@ -75,6 +78,9 @@ public class FragmentManagement extends BaseActivity { private WithdrawalRecordFragment withdrawalRecordFragment;//我的-提现-提现记录的fragment -26 private PoiFragment poiFragment;//寻宝-上传-POI的fragment -27 private RoadFragment roadFragment;//寻宝-上传-道路的fragment -28 + private StaySubmitFragment staySubmitFragment;//记录-待提交的fragment -29 + private HasSubmitFragment hasSubmitFragment;//记录-已提交的fragment -30 + //private PoiTaskFragment poiTaskFragment;//记录-已提交-POI任务列表的fragment -31 @Override protected int getLayout() { @@ -150,6 +156,10 @@ public class FragmentManagement extends BaseActivity { fragmentTransaction.hide(poiFragment); if (roadFragment !=null) //寻宝-上传-道路的fragment -28 fragmentTransaction.hide(roadFragment); + if (staySubmitFragment !=null) //记录-待提交的fragment -29 + fragmentTransaction.hide(staySubmitFragment); + if (hasSubmitFragment !=null) //记录-已提交的fragment -30 + fragmentTransaction.hide(hasSubmitFragment); @@ -386,6 +396,22 @@ public class FragmentManagement extends BaseActivity { fragmentTransaction.show(roadFragment); } break; + case 29:////记录-待提交的fragment -29 + if (staySubmitFragment ==null){ + staySubmitFragment =new StaySubmitFragment(); + fragmentTransaction.add(R.id.frame_layout, staySubmitFragment); + }else { + fragmentTransaction.show(staySubmitFragment); + } + break; + case 30://记录-已提交的fragment + if (hasSubmitFragment ==null){ + hasSubmitFragment =new HasSubmitFragment(); + fragmentTransaction.add(R.id.frame_layout, hasSubmitFragment); + }else { + fragmentTransaction.show(hasSubmitFragment); + } + break; } fragmentTransaction.commit(); } @@ -478,6 +504,12 @@ public class FragmentManagement extends BaseActivity { case 28: roadFragment.onActivityResult(requestCode,resultCode,data); break; + case 29: + staySubmitFragment.onActivityResult(requestCode,resultCode,data); + break; + case 30: + hasSubmitFragment.onActivityResult(requestCode,resultCode,data); + break; } } 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 7ecbc8e..9a58796 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java @@ -6,10 +6,12 @@ import androidx.annotation.Nullable; import android.content.Intent; import android.content.pm.ActivityInfo; +import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Matrix; import android.location.Location; +import android.media.Image; import android.os.Looper; import android.os.Message; import android.util.DisplayMetrics; @@ -19,6 +21,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.ImageButton; +import android.widget.ImageView; import android.widget.Toast; import com.navinfo.outdoor.R; @@ -35,6 +38,7 @@ import com.otaliastudios.cameraview.CameraView; import com.otaliastudios.cameraview.FileCallback; import com.otaliastudios.cameraview.PictureResult; import com.otaliastudios.cameraview.VideoResult; +import com.otaliastudios.cameraview.controls.Engine; import com.otaliastudios.cameraview.controls.Mode; import com.otaliastudios.cameraview.size.AspectRatio; @@ -71,29 +75,27 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene private ImageButton capturePicture; private long captureTime = 0; private android.widget.Button btnSwitch; - private android.widget.ImageView ivPic; - private boolean USE_FRAME_PROCESSOR = false; - private boolean DECODE_BITMAP = false; private TencentMap tencentMap; private TencentLocationManager locationManager; private TencentLocationRequest locationRequest; private MyLocationStyle locationStyle; private OnLocationChangedListener locationChangedListener; private MapView ivMap; - private ImageButton captureVideo; + private Button captureVideo; private Button btnVideo; + private ImageView ivPic; @Override protected int getLayout() { - return R.layout.activity_camera; + return R.layout.activity_picture; } @Override protected void initView() { super.initView(); - this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); ivMap = (MapView) findViewById(R.id.iv_map); + ivPic = findViewById(R.id.iv_pic); btnVideo = findViewById(R.id.btn_video); btnVideo.setOnClickListener(this::onClick); btnSwitch = (Button) findViewById(R.id.btn_switch); @@ -103,22 +105,23 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene CameraLogger.setLogLevel(CameraLogger.LEVEL_VERBOSE); camera = findViewById(R.id.camera); camera.setOnClickListener(this::onClick); - captureVideo = findViewById(R.id.captureVideo); + captureVideo = findViewById(R.id.capuretVideo); captureVideo.setOnClickListener(this::onClick); - - + //拍照权限 camera.setLifecycleOwner(this); + camera.setEngine(Engine.CAMERA1); - //设置拍照的宽高 - //camera.setVideoSize(SizeSelectors.or(SizeSelectors.maxHeight(1000), SizeSelectors.smallest(), SizeSelectors.aspectRatio(AspectRatio.of(1, 1), 0))); - -// Intent intent = getIntent(); -// String pic = intent.getStringExtra("pic"); -// camera.setVideoSize(SizeSelectors.or(SizeSelectors.maxHeight(Integer.parseInt(pic)),SizeSelectors.aspectRatio(AspectRatio.of(1, 1), 0))); - + //设置拍照的宽高 + //camera.setVideoSize(SizeSelectors.or(SizeSelectors.maxHeight(1000), SizeSelectors.smallest(), SizeSelectors.aspectRatio(AspectRatio.of(1, 1), 0))); + camera.setVideoSize(SizeSelectors.or(SizeSelectors.maxHeight(Integer.parseInt(getIntent().getStringExtra("pic"))), SizeSelectors.aspectRatio(AspectRatio.of(1, 1), 0))); + // SdkFolderCreate.mkdirs(Constant.PICTURE_FOLDER); + //获取地图 + tencentMap = ivMap.getMap(); + //地图定位 + initLocation(); -//相机预览监听 + //相机预览监听 camera.addCameraListener(new CameraListener() { @Override public void onPictureTaken(@NonNull @NotNull PictureResult result) { @@ -151,16 +154,6 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene super.onVideoTaken(result); Toast.makeText(PictureActivity.this, "停止摄像", Toast.LENGTH_SHORT).show(); finish(); -// DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); -// Calendar calendar = Calendar.getInstance(); -// calendar.setTimeInMillis(System.currentTimeMillis()); -// String format = formatter.format(calendar.getTime()); - //文件 -// File file = new File(Constant.PICTURE_FOLDER, format + ".mp4"); -// camera.takeVideo(file,5000); -// VideoPreviewActivity.Companion.setVideoResult(result); -// Intent videoIntent = new Intent(PictureActivity.this, VideoPreviewActivity.class); -// startActivity(videoIntent); } @Override @@ -207,13 +200,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene case R.id.btn_switch: btnSwich(); break; - case R.id.captureVideo: - Intent intent = getIntent(); - String pic = intent.getStringExtra("pic"); - Log.d("lllllllllll", pic + ""); - if (pic!=null){ - camera.setVideoSize(SizeSelectors.or(SizeSelectors.maxHeight(Integer.parseInt(pic)))); - } + case R.id.capuretVideo: DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(System.currentTimeMillis()); @@ -221,11 +208,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene //文件 File file = new File(Constant.PICTURE_FOLDER, format + ".mp4"); camera.takeVideo(file, 15000); - - break; - - } } @@ -281,7 +264,6 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene tencentMap.setMyLocationStyle(locationStyle); } - public void btnSwich() { DisplayMetrics dm = new DisplayMetrics(); getWindowManager().getDefaultDisplay().getMetrics(dm); @@ -290,10 +272,11 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene ViewGroup.LayoutParams layoutParams = ivMap.getLayoutParams();//地图的宽高 int height = layoutParams.height; int width = layoutParams.width; - ViewGroup.LayoutParams layoutParams1 = camera.getLayoutParams(); + ViewGroup.LayoutParams layoutParams1 = camera.getLayoutParams();//相机的宽高 int height1 = layoutParams1.height; int width1 = layoutParams1.width; if (width > width1) { + ivPic.setVisibility(View.GONE); layoutParams1.width = dm.widthPixels; layoutParams1.height = dm.heightPixels; layoutParams.height = height1; @@ -305,15 +288,12 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene layoutParams.width = dm.widthPixels; layoutParams1.height = height; layoutParams1.width = width; - camera.setLayoutParams(layoutParams1); - ivMap.setLayoutParams(layoutParams); + camera.setLayoutParams(layoutParams); + ivMap.setLayoutParams(layoutParams1); } } - - @Override protected void onResume() { - super.onResume(); camera.open(); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java new file mode 100644 index 0000000..16f40b1 --- /dev/null +++ b/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java @@ -0,0 +1,79 @@ +package com.navinfo.outdoor.fragment; + +import android.content.Intent; +import android.view.View; +import android.widget.TextView; + +import androidx.constraintlayout.widget.ConstraintLayout; + +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.activity.FragmentManagement; +import com.navinfo.outdoor.base.BaseFragment; + +/** + * 记录-已提交 + */ +public class HasSubmitFragment extends BaseFragment implements View.OnClickListener { + + + private ConstraintLayout clPoi; + private TextView auditProcess; + private TextView auditThrough; + private TextView auditNotThrough; + private ConstraintLayout clCharging; + private TextView tvCharging; + private TextView chargingAuditProcess; + private TextView chargingAuditThrough; + private TextView chargingAuditNotThrough; + private ConstraintLayout clRoad; + private TextView tvRoad; + private TextView roadAuditProcess; + private TextView roadAuditThrough; + private TextView roadAuditNotThrough; + private ConstraintLayout clOther; + private TextView otherAuditProcess; + private TextView otherAuditThrough; + private TextView otherAuditNotThrough; + + @Override + protected int getLayout() { + return R.layout.fragment_has_submit; + } + + @Override + protected void initView() { + super.initView(); + clPoi = (ConstraintLayout) findViewById(R.id.cl_poi); + clPoi.setOnClickListener(this::onClick); + auditProcess = (TextView) findViewById(R.id.audit_process); + auditThrough = (TextView) findViewById(R.id.audit_through); + auditNotThrough = (TextView) findViewById(R.id.audit_not_through); + clCharging = (ConstraintLayout) findViewById(R.id.cl_charging); + chargingAuditProcess = (TextView) findViewById(R.id.charging_audit_process); + chargingAuditThrough = (TextView) findViewById(R.id.charging_audit_through); + chargingAuditNotThrough = (TextView) findViewById(R.id.charging_audit_not_through); + clRoad = (ConstraintLayout) findViewById(R.id.cl_road); + roadAuditProcess = (TextView) findViewById(R.id.road_audit_process); + roadAuditThrough = (TextView) findViewById(R.id.road_audit_through); + roadAuditNotThrough = (TextView) findViewById(R.id.road_audit_not_through); + clOther = (ConstraintLayout) findViewById(R.id.cl_other); + otherAuditProcess = (TextView) findViewById(R.id.other_audit_process); + otherAuditThrough = (TextView) findViewById(R.id.other_audit_through); + otherAuditNotThrough = (TextView) findViewById(R.id.other_audit_not_through); + } + + @Override + protected void initData() { + super.initData(); + } + + @Override + public void onClick(View v) { + switch (v.getId()) { + case R.id.iv_poi: + // Intent hasIntent = new Intent(getContext(), FragmentManagement.class); + + break; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java new file mode 100644 index 0000000..2661bfd --- /dev/null +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java @@ -0,0 +1,26 @@ +package com.navinfo.outdoor.fragment; + +import android.os.Bundle; + +import androidx.fragment.app.Fragment; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.base.BaseFragment; + +/** + * 记录-已提交-poi任务列表 + */ +public class PoiTaskFragment extends BaseFragment { + + + + + @Override + protected int getLayout() { + return R.layout.fragment_poi_task; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RecordFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RecordFragment.java index 978d51a..335d1f7 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RecordFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RecordFragment.java @@ -1,29 +1,75 @@ package com.navinfo.outdoor.fragment; -import android.view.Gravity; +import android.graphics.Color; import android.view.View; -import android.widget.Button; + +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; + +import com.google.android.material.tabs.TabLayout; import com.navinfo.outdoor.R; import com.navinfo.outdoor.base.BaseFragment; +import com.navinfo.outdoor.util.NoSlideViewPager; + +import org.jetbrains.annotations.NotNull; + +import java.util.ArrayList; /** * 记录的Fragment * 2021-5-25 */ -public class RecordFragment extends BaseFragment { +public class RecordFragment extends BaseFragment implements View.OnClickListener { + + + private TabLayout tabRecord; + private NoSlideViewPager vpRecord; + private final String[] names = {"待提交", "已提交"}; @Override protected int getLayout() { return R.layout.record_fragment; } + @Override protected void initView() { super.initView(); + tabRecord = (TabLayout) findViewById(R.id.tab_record); + vpRecord = (NoSlideViewPager) findViewById(R.id.vp_record); + + ArrayList fragments = new ArrayList<>(); + fragments.add(new StaySubmitFragment()); + fragments.add(new HasSubmitFragment()); + vpRecord.setAdapter(new FragmentPagerAdapter(getFragmentManager()) { + @NonNull + @NotNull + @Override + public Fragment getItem(int position) { + return fragments.get(position); + } + + @Override + public int getCount() { + return fragments.size(); + } + }); + + tabRecord.setupWithViewPager(vpRecord); + tabRecord.getTabAt(0).setText(names[0]); + tabRecord.getTabAt(1).setText(names[1]); + } @Override protected void initData() { super.initData(); } + + @Override + public void onClick(View v) { + + } } \ No newline at end of file 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 a06afff..39b1bcf 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -17,6 +17,7 @@ import com.navinfo.outdoor.R; import com.navinfo.outdoor.activity.PictureActivity; import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseFragment; + import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -24,9 +25,10 @@ import org.greenrobot.eventbus.ThreadMode; /** * 寻宝-点击上传弹窗-道路 */ -public class RoadFragment extends BaseFragment implements View.OnClickListener { +public class RoadFragment extends BaseFragment { private TextView tvPictures; private EditText etHeight; + @Override protected int getLayout() { return R.layout.fragment_road; @@ -35,36 +37,23 @@ public class RoadFragment extends BaseFragment implements View.OnClickListener { @Override protected void initView() { super.initView(); - tvPictures = (TextView) findViewById(R.id.tv_pictures); - tvPictures.setOnClickListener(this::onClick); etHeight = (EditText) findViewById(R.id.et_height); - etHeight.setOnClickListener(this::onClick); + tvPictures.setOnClickListener(v -> { + String trim = etHeight.getText().toString().trim(); + Intent intent = new Intent(getContext(), PictureActivity.class); + if (trim != null) { + intent.putExtra("pic", trim); + }else { + intent.putExtra("pic", 1000); + } + startActivity(intent); + }); + } @Override protected void initData() { super.initData(); } - @Override - public void onClick(View v) { - switch (v.getId()) { - case R.id.tv_pictures: - Intent picturesIntent = new Intent(getContext(), PictureActivity.class); - startActivity(picturesIntent); - break; - case R.id.et_height: - String ssss = etHeight.getText().toString(); - if (ssss != null && !ssss.isEmpty()) { - Intent intent = new Intent(getContext(), PictureActivity.class); -// PictureActivity activity = (PictureActivity) getActivity(); -// activity. - intent.putExtra("pic", etHeight.getText().toString()); - startActivity(intent); - } else { - Toast.makeText(getContext(), "不能为空", Toast.LENGTH_SHORT).show(); - } - break; - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java new file mode 100644 index 0000000..490090d --- /dev/null +++ b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java @@ -0,0 +1,39 @@ +package com.navinfo.outdoor.fragment; + +import android.os.Bundle; + +import androidx.fragment.app.Fragment; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.base.BaseFragment; + +/** + * 记录-待提交的fragment + */ +public class StaySubmitFragment extends BaseFragment implements View.OnClickListener { + + + @Override + protected int getLayout() { + return R.layout.fragment_stay_submit; + } + + @Override + protected void initView() { + super.initView(); + } + + @Override + protected void initData() { + super.initData(); + } + + @Override + public void onClick(View v) { + + } +} \ No newline at end of file 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 de81711..3db6413 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -237,11 +237,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } } -// @Override -// public boolean onBackPressed() { -// -// return BackHandlerHelper.handleBackPress(supportFragmentManager); -// } /** * 设置定位图标样式 diff --git a/app/src/main/res/drawable/charge_square.png b/app/src/main/res/drawable/charge_square.png new file mode 100644 index 0000000000000000000000000000000000000000..e85fa3ced45aa54a2fe0b8bd2429e6c2c3a89717 GIT binary patch literal 369 zcmV-%0gnEOP)8?y|({o~7PvpxtDf+FFg)MdbC;)bO~=?W(%xkFw)| ztl@X5;By)yQM&*D00MMUPE+Ga48W8l00022Nkl&GlDdYz|eK06!a0-|^5I~54&>h)K8aBbVLTu_H3Dd{uGWx=~$exyoGFlt3 z$qbm{GfT0x5}UjOld6}~)P)JNab`lQwGNvztZG8%LI(0T`JFV^r80!MvDt9KG*R4= zvl_d!l;M)ql##JbDKqHA=MMKUR`+tN*VSJW^Y4-$qmY4)`c4Cy`21sUvkMRF2N}S$ P00000NkvXXu0mjfv|z#R literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_arrow_right.png b/app/src/main/res/drawable/icon_arrow_right.png new file mode 100644 index 0000000000000000000000000000000000000000..4b929744ab60cb4830617c216f40a9b1ae83eb1d GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1g!VDz)#5+NhL4Z$)E0ErQ_$&w=I=lbK*#k$< z?mKc0$T)K3!v4c&_8&QO;4qMT?%=TthYw#kc;fu&G+Sq&9)Xe|zhH*fPwuDtxLPS( zkB>AlR8yTLSbPpBr|;?F7{YNqSs*&)kL&rPOYtj^W&4Z*bqOTUq0Pv_(GPtr5H9A~Inb=k(KEh$}=yRpI+_hx2pU pt2Hn0SybDT|G__pi}_}bJpmzf47gW|1yuk5002ovPDHLkV1nW4h~@wQ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/poi_square.png b/app/src/main/res/drawable/poi_square.png new file mode 100644 index 0000000000000000000000000000000000000000..c3caa71687019832e85198b2e23022e6b4a0d0a1 GIT binary patch literal 558 zcmV+}0@3}6P)qy!+v? z`P-xT*O~a!jrY)o_sVzo$8Pn!QU3Vq`Q54c+@|)wTlBh5@~tlNtu67M1pM&X_sDPc z!esNWGxDx4Rz;_<00002bW%=J<4Fv_lp_ED0W(QNK~y-)#njhwfG?l$rkSg(u# zh~f@20rVLWx&8r|R!m6@iEi;3>=q-#Q0X3tA!!(88%RWDH0&BihEA2dAgLP*GrGmS zKIb^qO}Hi!(k!GP%k2I0m_%50W3ISSy-d9LPLXrtVplg?#?4W-7cr4xx4$QcM1rn4 z-bJPNF*h2D=DL>rTSPQYiqz-kfVeTA4O17+bu!C6iJsIlA7P4Rbv&O|`*t|1js5#~Qeht+is(@o$J&jO*+Fy${XiAaN)^z>p1CeGIQ w>g~=1CSVWr%K}b=9X!YX*X7YL`O7`_4YG$C6j9_BUH||907*qoM6N<$g0aver~m)} literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/road_square.png b/app/src/main/res/drawable/road_square.png new file mode 100644 index 0000000000000000000000000000000000000000..29c8249d396cc7f73125f0cd392887936fdd1282 GIT binary patch literal 391 zcmV;20eJq2P)!RPal)#z2e+^XK~rM_+C00002bW%=J<4Fv_lp_ED0N_bP zK~y-))zr;ygD?;T;OQ)`!4QY?*ED_q_w2ezt%iss$|;%4F7g~ckTBlB>+uG7D*$ij zsXMiq&2@@qAG@7{cT(GoKKh+bh<+H_X7cg1)2aMyU>CB_qjZ#W@cC^D!iE!NIH7c=vVHz{lrxaW#H=7FXRJz2CLjn$ z(o5&^>j((KvAQdnO+XNi&Aud_qky2C#PaSO1q9`UwKE9_!Wp=B@(S8?`uCE`w=R(B l_o?9v{DY5QF1Y6&`vEvI50x|r2Cx7C002ovPDHLkV1ldc$~FK1 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/tabbackground.xml b/app/src/main/res/drawable/tabbackground.xml new file mode 100644 index 0000000..8ac3cb7 --- /dev/null +++ b/app/src/main/res/drawable/tabbackground.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/textcolor_record.xml b/app/src/main/res/drawable/textcolor_record.xml new file mode 100644 index 0000000..d58abbd --- /dev/null +++ b/app/src/main/res/drawable/textcolor_record.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_camera.xml b/app/src/main/res/layout/activity_camera.xml index adba966..4e711cb 100644 --- a/app/src/main/res/layout/activity_camera.xml +++ b/app/src/main/res/layout/activity_camera.xml @@ -27,7 +27,7 @@ app:cameraMode="picture" app:cameraPlaySounds="true" app:cameraPreview="glSurface" - app:layout_constraintBottom_toTopOf="@id/ll_iv" + app:layout_constraintBottom_toTopOf="@id/ll_caiji" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.0" tools:layout_editor_absoluteX="-76dp"> @@ -47,7 +47,6 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" android:layout_marginRight="20dp" - android:visibility="gone" android:text="切换" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -71,26 +70,46 @@ app:layout_constraintTop_toTopOf="parent" /> + + + + + + + + + + + + + + + + +