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

完成‘寻宝’道路的布局显示

Browse Source 
Merge pull request  from Amdi/master
This commit is contained in:
肖岩 2021-06-07 18:31:36 +08:00 committed by Gitee
commit 65bf9a68f2
15 changed files with 411 additions and 3 deletions

34
app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java

@ -18,6 +18,7 @@ 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.PrivilegeFragment;
import com.navinfo.outdoor.fragment.RecordFragment;
import com.navinfo.outdoor.fragment.SetFragment;
@ -29,6 +30,7 @@ import com.navinfo.outdoor.fragment.TaskPrefectureFragment;
import com.navinfo.outdoor.fragment.RegisterFragment;
import com.navinfo.outdoor.fragment.TreasureFragment;
import com.navinfo.outdoor.fragment.UserAttestationFragment;
import com.navinfo.outdoor.fragment.RoadFragment;
import com.navinfo.outdoor.fragment.WithdrawFragment;
import com.gyf.immersionbar.ImmersionBar;
import com.navinfo.outdoor.fragment.WithdrawalRecordFragment;
@ -71,6 +73,8 @@ public class FragmentManagement extends BaseActivity {
private GatheringFragment gatheringFragment;//我的-用户资料-收款信息的fragment -24
private UserAttestationFragment userAttestationFragment;//我的-用户资料-实名认证的fragment -25
private WithdrawalRecordFragment withdrawalRecordFragment;//我的-提现-提现记录的fragment -26
private PoiFragment poiFragment;//寻宝-上传-POI的fragment -27
private RoadFragment roadFragment;//寻宝-上传-道路的fragment -28
@ -142,8 +146,12 @@ public class FragmentManagement extends BaseActivity {
fragmentTransaction.hide(gatheringFragment);
if (userAttestationFragment!=null)//我的-用户资料-实名认证的fragment-25
fragmentTransaction.hide(userAttestationFragment);
if (withdrawalRecordFragment!=null)
if (withdrawalRecordFragment!=null)//我的-提现-提现记录的fragment -26
fragmentTransaction.hide(withdrawalRecordFragment);
if (poiFragment !=null) //寻宝-上传-POI的fragment -27
fragmentTransaction.hide(poiFragment);
if (roadFragment !=null) //寻宝-上传-道路的fragment -28
fragmentTransaction.hide(roadFragment);
@ -356,7 +364,7 @@ public class FragmentManagement extends BaseActivity {
fragmentTransaction.show(userAttestationFragment);
}
break;
case 26:
case 26://我的-提现-提现记录的fragment
if (withdrawalRecordFragment ==null){
withdrawalRecordFragment=new WithdrawalRecordFragment();
fragmentTransaction.add(R.id.frame_layout,withdrawalRecordFragment);
@ -364,6 +372,22 @@ public class FragmentManagement extends BaseActivity {
fragmentTransaction.show(withdrawalRecordFragment);
}
break;
case 27://寻宝-上传-POI的fragment -
if (poiFragment ==null){
poiFragment=new PoiFragment();
fragmentTransaction.add(R.id.frame_layout,poiFragment);
}else {
fragmentTransaction.show(poiFragment);
}
break;
case 28://寻宝-上传-道路的fragment
if (roadFragment ==null){
roadFragment =new RoadFragment();
fragmentTransaction.add(R.id.frame_layout, roadFragment);
}else {
fragmentTransaction.show(roadFragment);
}
break;
}
fragmentTransaction.commit();
}
@ -450,6 +474,12 @@ public class FragmentManagement extends BaseActivity {
case 26:
withdrawalRecordFragment.onActivityResult(requestCode,resultCode,data);
break;
case 27:
poiFragment.onActivityResult(requestCode,resultCode,data);
break;
case 28:
roadFragment.onActivityResult(requestCode,resultCode,data);
break;
}
}

64
app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java Normal file

@ -0,0 +1,64 @@
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;
/**
* 寻宝-点击上传弹窗点击poi
*/
public class PoiFragment extends Fragment {
// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
private static final String ARG_PARAM1 = "param1";
private static final String ARG_PARAM2 = "param2";
// TODO: Rename and change types of parameters
private String mParam1;
private String mParam2;
public PoiFragment() {
// Required empty public constructor
}
/**
* Use this factory method to create a new instance of
* this fragment using the provided parameters.
*
* @param param1 Parameter 1.
* @param param2 Parameter 2.
* @return A new instance of fragment PoiFragment.
*/
// TODO: Rename and change types and number of parameters
public static PoiFragment newInstance(String param1, String param2) {
PoiFragment fragment = new PoiFragment();
Bundle args = new Bundle();
args.putString(ARG_PARAM1, param1);
args.putString(ARG_PARAM2, param2);
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
mParam1 = getArguments().getString(ARG_PARAM1);
mParam2 = getArguments().getString(ARG_PARAM2);
}
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_poi, container, false);
}
}

39
app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java Normal file

@ -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;
/**
* 寻宝-点击上传弹窗-道路
*/
public class RoadFragment extends BaseFragment implements View.OnClickListener {
@Override
protected int getLayout() {
return R.layout.fragment_road;
}
@Override
protected void initView() {
super.initView();
}
@Override
protected void initData() {
super.initData();
}
@Override
public void onClick(View v) {
}
}

12
app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java

@ -20,8 +20,10 @@ import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.FragmentManager;
import com.navinfo.outdoor.R;
import com.navinfo.outdoor.activity.FragmentManagement;
import com.navinfo.outdoor.api.Constant;
import com.navinfo.outdoor.base.BaseFragment;
import com.navinfo.outdoor.util.NetWorkUtils;
@ -59,6 +61,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
private MyLocationStyle locationStyle;
private OnLocationChangedListener locationChangedListener;
private ImageView ivLocation;
private ImageView ivRefish;
@Override
protected int getLayout() {
@ -68,6 +71,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
@Override
protected void initView() {
super.initView();
ivRefish = findViewById(R.id.iv_refrish);
ivRefish.setOnClickListener(this::onClick);
treasureMap = (MapView) findViewById(R.id.treasure_map);
tencentMap = treasureMap.getMap();
cbMapType = (CheckBox) findViewById(R.id.cb_map_type);
@ -130,7 +135,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
//创建定位请求
locationRequest = TencentLocationRequest.create();
//设置定位周期（位置监听器回调周期）为3s
locationRequest.setInterval(3000);
// locationRequest.setInterval(3000);
//地图上设置定位数据源
tencentMap.setLocationSource(this);
//设置当前位置可见
@ -211,6 +216,11 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
0)); //目标旋转角 0~360° (正北方为0)
tencentMap.animateCamera(cameraSigma);
break;
case R.id.iv_refrish://
Intent road = new Intent(getActivity(), FragmentManagement.class);
road.putExtra("tag",28);
startActivity(road);
break;
}
}

BIN
app/src/main/res/drawable/bg_01.png Normal file

Binary file not shown.
Side by Side

After

(image error) Size: 16 KiB

BIN
app/src/main/res/drawable/icon_close.png Normal file

Binary file not shown.
Side by Side

After

(image error) Size: 224 B

7
app/src/main/res/drawable/road_shape.xml Normal file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="2dp"/>
<size android:width="300dp" android:height="50dp"/>
<stroke android:color="@color/colorD0d0d0" android:width="1dp"/>
</shape>

BIN
app/src/main/res/drawable/top_bg.png Normal file

Binary file not shown.
Side by Side

After

(image error) Size: 16 KiB

BIN
app/src/main/res/drawable/top_bg_line_left.png Normal file

Binary file not shown.
Side by Side

After

(image error) Size: 219 B

BIN
app/src/main/res/drawable/top_bg_line_right.png Normal file

Binary file not shown.
Side by Side

After

(image error) Size: 220 B

5
app/src/main/res/drawable/uploding_shape.xml Normal file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white"/>
<corners android:radius="50dp"/>
</shape>

14
app/src/main/res/layout/fragment_poi.xml Normal file

@ -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.PoiFragment">
<!-- TODO: Update blank fragment layout -->
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/hello_blank_fragment" />
</FrameLayout>

217
app/src/main/res/layout/fragment_road.xml Normal file

@ -0,0 +1,217 @@
<?xml version="1.0" encoding="utf-8"?>
<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:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".fragment.RoadFragment">
<LinearLayout
android:id="@+id/rl_road"
android:layout_width="match_parent"
android:layout_height="wrap_content"
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">
<ImageView
android:id="@+id/iv_road_final"
android:layout_width="wrap_content"
android:layout_height="45dp"
android:layout_alignParentLeft="true"
android:layout_marginLeft="15dp"
android:src="@drawable/ic_baseline_arrow" />
<TextView
android:id="@+id/tv_road"
android:layout_width="wrap_content"
android:layout_height="45dp"
android:layout_marginLeft="15dp"
android:layout_toRightOf="@id/iv_road_final"
android:gravity="center"
android:text="编辑道路"
android:textColor="#fff"
android:textSize="17sp"
android:textStyle="bold" />
</LinearLayout>
<ImageView
android:id="@+id/road_bg"
android:layout_width="wrap_content"
android:layout_height="200dp"
android:background="@drawable/top_bg"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/rl_road" />
<TextView
android:id="@+id/tv1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="道路"
android:textColor="@color/white"
android:textSize="25sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/road_bg"
app:layout_constraintLeft_toLeftOf="@id/road_bg"
app:layout_constraintRight_toRightOf="@id/road_bg"
app:layout_constraintTop_toTopOf="@id/road_bg" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:background="@drawable/top_bg_line_left"
app:layout_constraintBottom_toBottomOf="@id/tv1"
app:layout_constraintRight_toLeftOf="@id/tv1"
app:layout_constraintTop_toTopOf="@id/tv1" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:background="@drawable/top_bg_line_right"
app:layout_constraintBottom_toBottomOf="@id/tv1"
app:layout_constraintLeft_toRightOf="@id/tv1"
app:layout_constraintTop_toTopOf="@id/tv1" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="任务说明"
android:textColor="@color/white"
app:layout_constraintLeft_toLeftOf="@id/tv1"
app:layout_constraintRight_toRightOf="@id/tv1"
app:layout_constraintTop_toBottomOf="@id/tv1" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="450dp"
app:layout_constraintTop_toBottomOf="@id/road_bg">
<TextView
android:id="@+id/tv_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="20dp"
android:text="01.基本信息"
android:textColor="@color/black"
android:textSize="16sp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/ll_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@drawable/road_shape"
android:orientation="horizontal"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_message">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="15dp"
android:text="名称 "
android:textColor="@color/black"
android:textSize="15sp" />
<EditText
android:id="@+id/et_road_name"
android:layout_width="200dp"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:background="@null" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_pictures"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:orientation="horizontal"
app:layout_constraintLeft_toLeftOf="@id/tv_message"
app:layout_constraintTop_toBottomOf="@id/ll_name">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="02.拍照 "
android:textColor="@color/black"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_pictures"
style="@style/user_style"
android:layout_width="40dp"
android:layout_height="25dp"
android:layout_marginLeft="5dp"
android:gravity="center"
android:text="拍照"
android:textColor="@color/white"
android:textSize="15sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintLeft_toLeftOf="@id/ll_pictures"
app:layout_constraintTop_toBottomOf="@id/ll_pictures">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="30dp"
android:text="03.描述"
android:textColor="@color/black"
android:textSize="16sp" />
<EditText
android:layout_width="320dp"
android:layout_height="100dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:background="@drawable/road_shape"
android:hint=" 任务描述"
android:paddingBottom="50dp"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_marginTop="30dp"
android:gravity="center_horizontal"
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@id/ll_desc">
<Button
style="@style/user_data_style"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="保存本地" />
<Button
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="10dp"
android:background="@drawable/uploding_shape"
android:text="上传" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

21
app/src/main/res/layout/treasure_fragment.xml

@ -88,4 +88,25 @@
android:src="@mipmap/mine_location"
app:layout_constraintLeft_toLeftOf="@id/iv_refrish"
app:layout_constraintTop_toBottomOf="@id/iv_refrish" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="请选择上报类型"
android:textSize="15sp"
android:layout_gravity="center_horizontal"
/>
<!-- <ImageView-->
<!-- android:layout_width="30dp"-->
<!-- android:layout_height="30dp"-->
<!-- android:src="@drawable/icon_close"-->
<!-- android:padding="10dp"-->
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

1
app/src/main/res/values/colors.xml

@ -10,6 +10,7 @@
<color name="colorGrey">#FAFAFA</color>
<color name="colorWhite">#ffffff</color>
<color name="colorTransparent">#7fffffff</color>
<color name="colorD0d0d0">#D0D0D0</color>
<color name="colorGray">#666666</color>
<color name="colorHui">#95CAF6</color>
<color name="colorRed">#F44236</color>