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<Fragment> 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 0000000..e85fa3c
Binary files /dev/null and b/app/src/main/res/drawable/charge_square.png differ
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 0000000..4b92974
Binary files /dev/null and b/app/src/main/res/drawable/icon_arrow_right.png differ
diff --git a/app/src/main/res/drawable/menpai_square.png b/app/src/main/res/drawable/menpai_square.png
new file mode 100644
index 0000000..c2708ca
Binary files /dev/null and b/app/src/main/res/drawable/menpai_square.png differ
diff --git a/app/src/main/res/drawable/other_square.png b/app/src/main/res/drawable/other_square.png
new file mode 100644
index 0000000..9c4f51a
Binary files /dev/null and b/app/src/main/res/drawable/other_square.png differ
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 0000000..c3caa71
Binary files /dev/null and b/app/src/main/res/drawable/poi_square.png differ
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 0000000..29c8249
Binary files /dev/null and b/app/src/main/res/drawable/road_square.png differ
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@color/colorPrimaryBlue" android:state_selected="true" />
+ <item android:drawable="@color/colormap" android:state_selected="false"/>
+
+</selector>
\ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<item android:drawable="@color/colorTransparent" android:state_selected="false"/>
+ <item android:drawable="@color/colorWhite" android:state_selected="true"/>
+</selector>
\ 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" />
+<!-- <LinearLayout-->
+<!-- android:id="@+id/ll_iv"-->
+<!-- android:layout_width="match_parent"-->
+<!-- android:layout_height="wrap_content"-->
+<!-- android:layout_gravity="bottom"-->
+<!-- android:orientation="horizontal"-->
+<!-- android:padding="16dp"-->
+<!-- android:weightSum="4"-->
+<!-- app:layout_constraintBottom_toBottomOf="parent">-->
+
+
+
+<!-- <Space-->
+<!-- android:layout_width="0dp"-->
+<!-- android:layout_height="1dp"-->
+<!-- android:layout_weight="1" />-->
<LinearLayout
- android:id="@+id/ll_iv"
+ android:id="@+id/ll_caiji"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="bottom"
+ android:gravity="center"
+
android:orientation="horizontal"
- android:padding="16dp"
- android:weightSum="4"
+ android:layout_marginBottom="20dp"
app:layout_constraintBottom_toBottomOf="parent">
+ <Button
+ android:id="@+id/capuretVideo"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"
+ android:text="开始采集"
+ android:layout_marginRight="10dp"
+ style="@style/user_data_style"/>
+ <Button
- <Space
- android:layout_width="0dp"
- android:layout_height="1dp"
- android:layout_weight="1" />
-
- <Space
- android:layout_width="0dp"
- android:layout_height="1dp"
- android:layout_weight="1" />
-
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"
+ android:text="结束采集"
+ android:layout_marginLeft="10dp"
+ android:background="@drawable/uploding_shape"
+ android:textColor="@color/colorBlue"/>
<ImageButton
android:id="@+id/capturePicture"
android:layout_width="56dp"
@@ -98,37 +117,59 @@
android:visibility="gone"
android:background="?attr/selectableItemBackgroundBorderless"
app:srcCompat="@drawable/ic_photo" />
+ </LinearLayout>
- <LinearLayout
- android:id="@+id/capturePictureSnapshot"
- android:layout_width="56dp"
- android:layout_height="56dp"
- android:background="?attr/selectableItemBackgroundBorderless"
- android:gravity="center"
- android:orientation="vertical"
- android:visibility="gone">
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- app:srcCompat="@drawable/ic_photo" />
+<!-- <Space-->
+<!-- android:layout_width="0dp"-->
+<!-- android:layout_height="1dp"-->
+<!-- android:layout_weight="1" />-->
+<!-- <Space-->
+<!-- android:layout_width="0dp"-->
+<!-- android:layout_height="1dp"-->
+<!-- android:layout_weight="1" />-->
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="SNAP"
- android:textColor="@android:color/white"
- android:textSize="10sp"
- android:textStyle="bold" />
+<!-- <Space-->
+<!-- android:layout_width="0dp"-->
+<!-- android:layout_height="1dp"-->
+<!-- android:layout_weight="1" />-->
+<!-- <Space-->
+<!-- android:layout_width="0dp"-->
+<!-- android:layout_height="1dp"-->
+<!-- android:layout_weight="1" />-->
- </LinearLayout>
- <ImageButton
- android:id="@+id/captureVideo"
- android:layout_width="56dp"
- android:layout_height="56dp"
- android:background="?attr/selectableItemBackgroundBorderless"
- app:srcCompat="@drawable/ic_video" />
+
+<!-- <LinearLayout-->
+<!-- android:id="@+id/capturePictureSnapshot"-->
+<!-- android:layout_width="56dp"-->
+<!-- android:layout_height="56dp"-->
+<!-- android:background="?attr/selectableItemBackgroundBorderless"-->
+<!-- android:gravity="center"-->
+<!-- android:orientation="vertical"-->
+<!-- android:visibility="gone">-->
+
+<!-- <ImageView-->
+<!-- android:layout_width="wrap_content"-->
+<!-- android:layout_height="wrap_content"-->
+<!-- app:srcCompat="@drawable/ic_photo" />-->
+
+<!-- <TextView-->
+<!-- android:layout_width="wrap_content"-->
+<!-- android:layout_height="wrap_content"-->
+<!-- android:text="SNAP"-->
+<!-- android:textColor="@android:color/white"-->
+<!-- android:textSize="10sp"-->
+<!-- android:textStyle="bold" />-->
+
+<!-- </LinearLayout>-->
+
+<!-- <ImageButton-->
+<!-- android:id="@+id/capuretVideo"-->
+<!-- android:layout_width="56dp"-->
+<!-- android:layout_height="56dp"-->
+<!-- android:background="?attr/selectableItemBackgroundBorderless"-->
+<!-- app:srcCompat="@drawable/ic_video" />-->
<!-- <LinearLayout-->
<!-- android:id="@+id/captureVideoSnapshot"-->
<!-- android:layout_width="56dp"-->
@@ -148,7 +189,7 @@
<!-- android:textSize="10sp"-->
<!-- android:text="SNAP"/>-->
<!-- </LinearLayout>-->
- </LinearLayout>
+<!-- </LinearLayout>-->
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index eafe790..07fda80 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -9,24 +9,26 @@
<TextView
android:id="@+id/tv_title"
- android:layout_width="match_parent"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="35dp"
android:layout_marginTop="70dp"
android:text="Welcome"
android:textColor="@color/colorWhite"
android:textSize="30sp"
+ app:layout_constraintBottom_toTopOf="@+id/tv_login_deck"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_login_deck"
- android:layout_width="match_parent"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="35dp"
android:text="欢迎来到地图寻宝"
android:textColor="@color/colorWhite"
android:textSize="35sp"
+ app:layout_constraintBottom_toTopOf="@+id/login_name"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_title" />
@@ -36,7 +38,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
+ android:layout_marginBottom="9dp"
android:text="用户名"
+ app:layout_constraintBottom_toTopOf="@+id/et_login_name"
app:layout_constraintLeft_toLeftOf="@id/tv_login_deck"
app:layout_constraintTop_toBottomOf="@id/tv_login_deck" />
@@ -119,12 +123,14 @@
<Button
android:id="@+id/btn_login"
+ style="@style/login_style"
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_marginTop="20dp"
+ android:layout_marginBottom="266dp"
android:gravity="center"
android:text="登录"
- style="@style/login_style"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@id/iv_login_check"
app:layout_constraintTop_toBottomOf="@id/tv_forget_paw" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_picture.xml b/app/src/main/res/layout/activity_picture.xml
index b5a2635..5626b69 100644
--- a/app/src/main/res/layout/activity_picture.xml
+++ b/app/src/main/res/layout/activity_picture.xml
@@ -1,93 +1,174 @@
<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".activity.PictureActivity">
+ android:background="#FF444444">
<com.otaliastudios.cameraview.CameraView
android:id="@+id/camera"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ app:layout_constraintBottom_toTopOf="@id/ll_caiji"
+ app:layout_constraintTop_toTopOf="parent"
+ />
+
+ <com.tencent.tencentmap.mapsdk.maps.MapView
+ android:id="@+id/iv_map"
+ android:layout_width="300dp"
+ android:layout_height="183dp"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <Button
+ android:id="@+id/btn_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_marginBottom="88dp"
- android:keepScreenOn="true"
- app:cameraExperimental="true"
- app:cameraEngine="camera2"
- app:cameraPreview="glSurface"
- app:cameraPlaySounds="true"
- app:cameraGrid="off"
- app:cameraFlash="auto"
- app:cameraAudio="on"
- app:cameraFacing="back"
- app:cameraGestureTap="autoFocus"
- app:cameraGestureLongTap="none"
- app:cameraGesturePinch="zoom"
- app:cameraGestureScrollHorizontal="filterControl1"
- app:cameraGestureScrollVertical="exposureCorrection"
- app:cameraMode="picture"
- app:cameraAutoFocusMarker="@string/cameraview_default_autofocus_marker">
+ android:layout_marginTop="20dp"
+ android:layout_marginRight="20dp"
+ android:text="切换"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+ <Button
+ app:layout_constraintTop_toBottomOf="@id/btn_switch"
+ app:layout_constraintRight_toRightOf="@id/btn_switch"
+ android:id="@+id/btn_video"
+ android:visibility="gone"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="停止" />
+
+ <ImageView
+ android:id="@+id/iv_pic"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@mipmap/take_pic_arrow"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
- </com.otaliastudios.cameraview.CameraView>
-<LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ <!-- <LinearLayout-->
+ <!-- android:id="@+id/ll_iv"-->
+ <!-- android:layout_width="match_parent"-->
+ <!-- android:layout_height="wrap_content"-->
+ <!-- android:layout_gravity="bottom"-->
+ <!-- android:orientation="horizontal"-->
+ <!-- android:padding="16dp"-->
+ <!-- android:weightSum="4"-->
+ <!-- app:layout_constraintBottom_toBottomOf="parent">-->
-</LinearLayout>
- <!-- Controls -->
+
+
+ <!-- <Space-->
+ <!-- android:layout_width="0dp"-->
+ <!-- android:layout_height="1dp"-->
+ <!-- android:layout_weight="1" />-->
<LinearLayout
+ android:id="@+id/ll_caiji"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:padding="16dp"
+ android:gravity="center"
+
android:orientation="horizontal"
- android:background="@color/colorPrimary"
- android:weightSum="4">
- <Space
- android:layout_width="0dp"
- android:layout_height="1dp"
- android:layout_weight="1" />
-
- <Space
- android:layout_width="0dp"
- android:layout_height="1dp"
- android:layout_weight="1" />
+ android:layout_marginBottom="20dp"
+ app:layout_constraintBottom_toBottomOf="parent">
+ <Button
+ android:id="@+id/capuretVideo"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"
+ android:text="开始采集"
+ android:layout_marginRight="10dp"
+ style="@style/user_data_style"/>
+ <Button
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"
+ android:text="结束采集"
+ android:layout_marginLeft="10dp"
+ android:background="@drawable/uploding_shape"
+ android:textColor="@color/colorBlue"/>
<ImageButton
android:id="@+id/capturePicture"
android:layout_width="56dp"
android:layout_height="56dp"
+ android:visibility="gone"
android:background="?attr/selectableItemBackgroundBorderless"
app:srcCompat="@drawable/ic_photo" />
-
- <Space
- android:layout_width="0dp"
- android:layout_height="1dp"
- android:layout_weight="1" />
-
- <Space
- android:layout_width="0dp"
- android:layout_height="1dp"
- android:layout_weight="1" />
-
</LinearLayout>
- <!-- Edit -->
-<!-- <androidx.core.widget.NestedScrollView-->
-<!-- android:id="@+id/controls"-->
-<!-- android:background="@android:color/white"-->
-<!-- app:layout_behavior="@string/bottom_sheet_behavior"-->
-<!-- app:behavior_hideable="true"-->
-<!-- app:behavior_peekHeight="300dp"-->
-<!-- app:behavior_skipCollapsed="false"-->
-<!-- android:elevation="4dp"-->
-<!-- android:layout_width="match_parent"-->
-<!-- android:layout_height="wrap_content">-->
-<!-- <LinearLayout-->
-<!-- android:orientation="vertical"-->
-<!-- android:layout_width="match_parent"-->
-<!-- android:layout_height="wrap_content"/>-->
-<!-- </androidx.core.widget.NestedScrollView>-->
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+ <!-- <Space-->
+ <!-- android:layout_width="0dp"-->
+ <!-- android:layout_height="1dp"-->
+ <!-- android:layout_weight="1" />-->
+ <!-- <Space-->
+ <!-- android:layout_width="0dp"-->
+ <!-- android:layout_height="1dp"-->
+ <!-- android:layout_weight="1" />-->
+
+ <!-- <Space-->
+ <!-- android:layout_width="0dp"-->
+ <!-- android:layout_height="1dp"-->
+ <!-- android:layout_weight="1" />-->
+ <!-- <Space-->
+ <!-- android:layout_width="0dp"-->
+ <!-- android:layout_height="1dp"-->
+ <!-- android:layout_weight="1" />-->
+
+
+
+ <!-- <LinearLayout-->
+ <!-- android:id="@+id/capturePictureSnapshot"-->
+ <!-- android:layout_width="56dp"-->
+ <!-- android:layout_height="56dp"-->
+ <!-- android:background="?attr/selectableItemBackgroundBorderless"-->
+ <!-- android:gravity="center"-->
+ <!-- android:orientation="vertical"-->
+ <!-- android:visibility="gone">-->
+
+ <!-- <ImageView-->
+ <!-- android:layout_width="wrap_content"-->
+ <!-- android:layout_height="wrap_content"-->
+ <!-- app:srcCompat="@drawable/ic_photo" />-->
+
+ <!-- <TextView-->
+ <!-- android:layout_width="wrap_content"-->
+ <!-- android:layout_height="wrap_content"-->
+ <!-- android:text="SNAP"-->
+ <!-- android:textColor="@android:color/white"-->
+ <!-- android:textSize="10sp"-->
+ <!-- android:textStyle="bold" />-->
+
+ <!-- </LinearLayout>-->
+
+ <!-- <ImageButton-->
+ <!-- android:id="@+id/capuretVideo"-->
+ <!-- android:layout_width="56dp"-->
+ <!-- android:layout_height="56dp"-->
+ <!-- android:background="?attr/selectableItemBackgroundBorderless"-->
+ <!-- app:srcCompat="@drawable/ic_video" />-->
+ <!-- <LinearLayout-->
+ <!-- android:id="@+id/captureVideoSnapshot"-->
+ <!-- android:layout_width="56dp"-->
+ <!-- android:layout_height="56dp"-->
+ <!-- android:orientation="vertical"-->
+ <!-- android:background="?attr/selectableItemBackgroundBorderless"-->
+ <!-- android:gravity="center" >-->
+ <!-- <ImageView-->
+ <!-- android:layout_width="wrap_content"-->
+ <!-- android:layout_height="wrap_content"-->
+ <!-- app:srcCompat="@drawable/ic_video"/>-->
+ <!-- <TextView-->
+ <!-- android:layout_width="wrap_content"-->
+ <!-- android:layout_height="wrap_content"-->
+ <!-- android:textColor="@android:color/white"-->
+ <!-- android:textStyle="bold"-->
+ <!-- android:textSize="10sp"-->
+ <!-- android:text="SNAP"/>-->
+ <!-- </LinearLayout>-->
+ <!-- </LinearLayout>-->
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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
new file mode 100644
index 0000000..61f7208
--- /dev/null
+++ b/app/src/main/res/layout/fragment_has_submit.xml
@@ -0,0 +1,389 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ tools:context=".fragment.HasSubmitFragment">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/cl_poi"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="20dp"
+ android:layout_marginTop="20dp"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <ImageView
+ android:id="@+id/iv_poi"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/poi_square"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/tv_poi"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="10dp"
+ android:text="POI任务列表"
+ android:textColor="@color/black"
+ app:layout_constraintLeft_toRightOf="@id/iv_poi"
+ app:layout_constraintTop_toTopOf="@id/iv_poi" />
+
+ <LinearLayout
+ android:id="@+id/linearLayout3"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ app:layout_constraintBottom_toBottomOf="@id/iv_poi"
+ app:layout_constraintLeft_toLeftOf="@id/tv_poi"
+ app:layout_constraintTop_toBottomOf="@id/tv_poi">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="审核中:"
+ android:textSize="12sp" />
+
+ <TextView
+ android:id="@+id/audit_process"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="1"
+ android:textSize="12sp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="30dp"
+ android:text="审核通过:"
+ android:textSize="12sp" />
+
+ <TextView
+ android:id="@+id/audit_through"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="1"
+ android:textSize="12sp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="30dp"
+ android:text="审核未通过:"
+ android:textSize="12sp" />
+
+ <TextView
+ android:id="@+id/audit_not_through"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="18"
+ android:textSize="12sp" />
+ </LinearLayout>
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="15dp"
+ android:src="@drawable/icon_arrow_right"
+ app:layout_constraintBottom_toBottomOf="@id/iv_poi"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toTopOf="@id/iv_poi" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginTop="20dp"
+ android:layout_marginRight="10dp"
+ android:background="@color/colormap"
+ app:layout_constraintTop_toBottomOf="@+id/iv_poi" />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/cl_charging"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="20dp"
+ android:layout_marginTop="10dp"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <ImageView
+ android:id="@+id/iv_charging"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/road_square"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/tv_charging"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="10dp"
+ android:text="道路任务列表"
+ android:textColor="@color/black"
+ app:layout_constraintLeft_toRightOf="@id/iv_charging"
+ app:layout_constraintTop_toTopOf="@id/iv_charging" />
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ app:layout_constraintBottom_toBottomOf="@id/iv_charging"
+ app:layout_constraintLeft_toLeftOf="@id/tv_charging"
+ app:layout_constraintTop_toBottomOf="@id/tv_charging">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="审核中:"
+ android:textSize="12sp" />
+
+ <TextView
+ android:id="@+id/charging_audit_process"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="1"
+ android:textSize="12sp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="30dp"
+ android:text="审核通过:"
+ android:textSize="12sp" />
+
+ <TextView
+ android:id="@+id/charging_audit_through"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="1"
+ android:textSize="12sp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="30dp"
+ android:text="审核未通过:"
+ android:textSize="12sp" />
+
+ <TextView
+ android:id="@+id/charging_audit_not_through"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="18"
+ android:textSize="12sp" />
+ </LinearLayout>
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="15dp"
+ android:src="@drawable/icon_arrow_right"
+ app:layout_constraintBottom_toBottomOf="@id/iv_charging"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toTopOf="@id/iv_charging" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginTop="20dp"
+ android:layout_marginRight="10dp"
+ android:background="@color/colormap"
+ app:layout_constraintTop_toBottomOf="@+id/iv_charging" />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/cl_road"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="20dp"
+ android:layout_marginTop="10dp"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <ImageView
+ android:id="@+id/iv_road"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/charge_square"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/tv_road"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="10dp"
+ android:text="充电站任务列表"
+ android:textColor="@color/black"
+ app:layout_constraintLeft_toRightOf="@id/iv_road"
+ app:layout_constraintTop_toTopOf="@id/iv_road" />
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ app:layout_constraintBottom_toBottomOf="@id/iv_road"
+ app:layout_constraintLeft_toLeftOf="@id/tv_road"
+ app:layout_constraintTop_toBottomOf="@id/tv_road">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="审核中:"
+ android:textSize="12sp" />
+
+ <TextView
+ android:id="@+id/road_audit_process"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="1"
+ android:textSize="12sp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="30dp"
+ android:text="审核通过:"
+ android:textSize="12sp" />
+
+ <TextView
+ android:id="@+id/road_audit_through"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="1"
+ android:textSize="12sp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="30dp"
+ android:text="审核未通过:"
+ android:textSize="12sp" />
+
+ <TextView
+ android:id="@+id/road_audit_not_through"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="18"
+ android:textSize="12sp" />
+ </LinearLayout>
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="15dp"
+ android:src="@drawable/icon_arrow_right"
+ app:layout_constraintBottom_toBottomOf="@id/iv_road"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toTopOf="@id/iv_road" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginTop="20dp"
+ android:layout_marginRight="10dp"
+ android:background="@color/colormap"
+ app:layout_constraintTop_toBottomOf="@+id/iv_road" />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/cl_other"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="20dp"
+ android:layout_marginTop="10dp"
+
+ app:layout_constraintTop_toTopOf="parent">
+
+ <ImageView
+ android:id="@+id/iv_other"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/other_square"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/tv_other"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="10dp"
+ android:text="其他任务列表"
+ android:textColor="@color/black"
+ app:layout_constraintLeft_toRightOf="@id/iv_other"
+ app:layout_constraintTop_toTopOf="@id/iv_other" />
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ app:layout_constraintBottom_toBottomOf="@id/iv_other"
+ app:layout_constraintLeft_toLeftOf="@id/tv_other"
+ app:layout_constraintTop_toBottomOf="@id/tv_other">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="审核中:"
+ android:textSize="12sp" />
+
+ <TextView
+ android:id="@+id/other_audit_process"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="1"
+ android:textSize="12sp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="30dp"
+ android:text="审核通过:"
+ android:textSize="12sp" />
+
+ <TextView
+ android:id="@+id/other_audit_through"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="1"
+ android:textSize="12sp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="30dp"
+ android:text="审核未通过:"
+ android:textSize="12sp" />
+
+ <TextView
+ android:id="@+id/other_audit_not_through"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="18"
+ android:textSize="12sp" />
+ </LinearLayout>
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="15dp"
+ android:src="@drawable/icon_arrow_right"
+ app:layout_constraintBottom_toBottomOf="@id/iv_other"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toTopOf="@id/iv_other" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginTop="20dp"
+ android:layout_marginRight="10dp"
+ android:background="@color/colormap"
+ app:layout_constraintTop_toBottomOf="@+id/iv_other" />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_poi_task.xml b/app/src/main/res/layout/fragment_poi_task.xml
new file mode 100644
index 0000000..8b962fb
--- /dev/null
+++ b/app/src/main/res/layout/fragment_poi_task.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context=".fragment.PoiTaskFragment">
+
+ <!-- TODO: Update blank fragment layout -->
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:text="@string/hello_blank_fragment" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_road.xml b/app/src/main/res/layout/fragment_road.xml
index 19632d8..5967c87 100644
--- a/app/src/main/res/layout/fragment_road.xml
+++ b/app/src/main/res/layout/fragment_road.xml
@@ -99,6 +99,51 @@
android:layout_gravity="center_vertical"
android:background="@null" />
</LinearLayout>
+ <TextView
+ android:id="@+id/tv_mode"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="02.拍照方式"
+ app:layout_constraintTop_toBottomOf="@+id/ll_name"
+ android:textSize="16sp"
+ android:textColor="@color/black"
+ app:layout_constraintLeft_toLeftOf="@id/ll_name"
+ android:layout_marginTop="10dp"/>
+ <LinearLayout
+ android:id="@+id/ll_mode"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginTop="15dp"
+ app:layout_constraintTop_toBottomOf="@id/tv_mode">
+<RadioGroup
+ android:layout_width="match_parent"
+ android:orientation="horizontal"
+ android:layout_gravity="center_horizontal"
+ android:layout_height="wrap_content">
+ <RadioButton
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="车行"/>
+ <RadioButton
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:text="自行车"/>
+ <RadioButton
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="步行"/>
+ <RadioButton
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:text="手动"/>
+</RadioGroup>
+
+ </LinearLayout>
<!--<LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
@@ -117,8 +162,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:orientation="horizontal"
- app:layout_constraintLeft_toLeftOf="@id/tv_message"
- app:layout_constraintTop_toBottomOf="@id/ll_name">
+ android:layout_marginLeft="10dp"
+ app:layout_constraintLeft_toLeftOf="@id/ll_mode"
+ app:layout_constraintTop_toBottomOf="@id/ll_mode">
<TextView
android:layout_width="wrap_content"
@@ -143,7 +189,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
- android:digits="1234567890"
android:hint="请输入高度"
android:inputType="number" />
diff --git a/app/src/main/res/layout/fragment_stay_submit.xml b/app/src/main/res/layout/fragment_stay_submit.xml
new file mode 100644
index 0000000..0e79303
--- /dev/null
+++ b/app/src/main/res/layout/fragment_stay_submit.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ tools:context=".fragment.StaySubmitFragment">
+<TextView
+ android:id="@+id/tv_type"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="类型"
+ android:textColor="@color/black"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintLeft_toLeftOf="parent"
+ android:layout_marginTop="20dp"
+ android:layout_marginLeft="10dp"/>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_type">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="10dp"
+ android:text="全部"
+ android:textColor="@color/black"
+ android:textSize="20dp" />
+
+<!-- <ImageView-->
+<!-- android:layout_width="wrap_content"-->
+<!-- android:layout_height="wrap_content"-->
+<!-- android:layout_gravity="right"-->
+<!-- android:src="@drawable/icon_arrow_right"/>-->
+ </LinearLayout>
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/record_fragment.xml b/app/src/main/res/layout/record_fragment.xml
index 59c5f24..b74eeb6 100644
--- a/app/src/main/res/layout/record_fragment.xml
+++ b/app/src/main/res/layout/record_fragment.xml
@@ -1,16 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
- <TextView
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:id="@+id/rl_record"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="记录的Fragment"
- app:layout_constraintBottom_toBottomOf="parent"
+ android:background="@color/colorPrimaryBlue"
+ android:orientation="horizontal"
+ android:paddingTop="@dimen/top_pind_sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent">
+
+ <TextView
+ android:id="@+id/tv_find"
+ android:layout_width="wrap_content"
+ android:layout_height="45dp"
+ android:layout_marginLeft="15dp"
+ android:layout_toRightOf="@id/iv_find_task"
+ android:gravity="center"
+ android:text="任务"
+ android:textColor="#fff"
+ android:textSize="20sp"
+ android:textStyle="bold" />
+ </LinearLayout>
+
+ <com.navinfo.outdoor.util.NoSlideViewPager
+ android:id="@+id/vp_record"
+ android:layout_width="wrap_content"
+ android:layout_height="0dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/tab_record"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ />
+
+ <com.google.android.material.tabs.TabLayout
+ android:id="@+id/tab_record"
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ app:tabTextColor="@color/colormap"
+ app:tabSelectedTextColor="@color/white"
+ app:tabRippleColor="@color/colormap"
+ app:tabIndicatorColor="@color/white"
+ android:background="@color/colorPrimaryBlue"
+ app:layout_constraintTop_toBottomOf="@id/rl_record" />
+
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 89ccb44..3fa75d3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -14,4 +14,6 @@
<color name="colorGray">#666666</color>
<color name="colorHui">#95CAF6</color>
<color name="colorRed">#F44236</color>
+ <color name="colorText">#87CDF6</color>
+
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index dfe5da3..6002ca1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -132,4 +132,15 @@
<!--Android 5.x开始需要把颜色设置透明，否则导航栏会呈现系统默认的浅灰色-->
<item name="android:statusBarColor">@android:color/transparent</item>
</style>
+
+
+<!-- <style name="MyTabLayoutTextAppearance" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">-->
+<!-- <item name="android:textSize">20sp</item>-->
+<!-- <item name="android:textColor">@android:color/white</item>-->
+<!-- </style>-->
+ <style name="MyTabLayoutTextAppearanceInverse" parent="TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse">
+ <item name="android:textSize">16sp</item>
+<!-- <item name="android:textColor">@drawable/textcolor_record</item>-->
+ </style>
+
</resources>
\ No newline at end of file