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

修改弹窗上的bug

Browse Source
This commit is contained in:
wds 2021-08-12 13:02:07 +08:00
parent 6aee99ac85
commit 1942162fa4
15 changed files with 2439 additions and 2374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/navinfo/outdoor/api/Constant.java
View File

@ -5,6 +5,7 @@ import android.widget.TextView;
import com.navinfo.outdoor.R;
import com.navinfo.outdoor.bean.JobSearchBean;
import com.navinfo.outdoor.util.SdkFolderCreate;
import com.sothree.slidinguppanel.SlidingUpPanelLayout;
import com.tencent.map.geolocation.TencentLocation;
import com.tencent.tencentmap.mapsdk.maps.MapView;
import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptor;
@ -133,5 +134,7 @@ public class Constant {
public static final String INTENT_VIDEO_PATH = "INTENT_VIDEO_PATH"; // 拍照界面指定的视频文件保存位置
public static final String INTENT_VIDEO_ORATATION = "INTENT_VIDEO_ORATATION"; // 视频拍摄时屏幕方向 0-强制横屏 其他-任意
public static SlidingUpPanelLayout SLIDING_LAYOUT=null;//設置
public static boolean IS_FILTER_LIST_ITEM =true;//poi页面的查重
}

7
app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java
View File

@ -101,8 +101,6 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
private String station;
private LatLng latLng;
private File file;
private String takePhotoPath1;
private String takePhotoPath2;
private String takePhotoPath3;
@ -302,8 +300,6 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
case 9:
cp_floor = -5;
break;
}
}
@ -372,6 +368,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
}
});
setSlidingUpPanelLayout(Constant.SLIDING_LAYOUT);
nestedScrollView = findViewById(R.id.nested_scroll_view);
if (slidingPaneLayout!=null) {
slidingPaneLayout.setScrollableView(nestedScrollView);
@ -421,9 +418,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
btnSaveLocal.setOnClickListener(this::onClick);
//展示数据
initShowPileSharePre();
onLongDelPic();
}
private void onLongDelPic() {

9
app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java
View File

@ -143,7 +143,12 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
public void onHiddenChanged(boolean hidden) {
super.onHiddenChanged(hidden);
if (!hidden) {
setSlidingUpPanelLayout(Constant.SLIDING_LAYOUT);
if (slidingPaneLayout!=null) {
slidingPaneLayout.setScrollableView(nestedScrollView);
}
initHeader();
}
}
@ -183,14 +188,15 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
if (!EventBus.getDefault().isRegistered(this)) {//加上判断
EventBus.getDefault().register(this);
}
}
@Override
public void onResume() {
super.onResume();
initHeader();
}
}
@Override
protected void initView() {
super.initView();
@ -200,6 +206,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
checkBoxLife = findViewById(R.id.check_pot_life);
checkBoxRight = findViewById(R.id.check_pot_right);
nestedScrollView = findViewById(R.id.nested_scroll_view);
setSlidingUpPanelLayout(Constant.SLIDING_LAYOUT);
if (slidingPaneLayout!=null) {
slidingPaneLayout.setScrollableView(nestedScrollView);
}

16
app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java
View File

@ -67,6 +67,10 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
public void onHiddenChanged(boolean hidden) {
super.onHiddenChanged(hidden);
if (!hidden) {
setSlidingUpPanelLayout(Constant.SLIDING_LAYOUT);
if (slidingPaneLayout!=null) {
slidingPaneLayout.setScrollableView(recyclerFilter);
}
initHeader();
}
}
@ -250,6 +254,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
btnFilter = findViewById(R.id.btn_filter);
btnFilter.setOnClickListener(this::onClick);
setSlidingUpPanelLayout(Constant.SLIDING_LAYOUT);
recyclerFilter = findViewById(R.id.recycler_filter);
if (slidingPaneLayout!=null) {
slidingPaneLayout.setScrollableView(recyclerFilter);
@ -266,6 +271,17 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
recyclerFilter.setLoadingMoreEnabled(false);
filterAdapter = new FilterAdapter(getContext(), poiEntities);
recyclerFilter.setAdapter(filterAdapter);
recyclerFilter.setScrollAlphaChangeListener(new XRecyclerView.ScrollAlphaChangeListener() {
@Override
public void onAlphaChange(int alpha) {
}
@Override
public int setLimitHeight() {
return 0;
}
});
recyclerFilter.getDefaultFootView().setNoMoreHint("成功加载完毕");
recyclerFilter.setLoadingListener(new XRecyclerView.LoadingListener() {

1
app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java
View File

@ -194,6 +194,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
}
});
setSlidingUpPanelLayout(Constant.SLIDING_LAYOUT);
nestedScrollView = findViewById(R.id.nested_scroll_view);
if (slidingPaneLayout!=null) {
slidingPaneLayout.setScrollableView(nestedScrollView);

1
app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
View File

@ -158,6 +158,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
poiDao = poiDatabase.getPoiDao();
tvPictures = (TextView) findViewById(R.id.tv_pictures);
tvPictures.setOnClickListener(this::onClick);
setSlidingUpPanelLayout(Constant.SLIDING_LAYOUT);
nestedScrollView = findViewById(R.id.nested_scroll_view);
if (slidingPaneLayout!=null){
slidingPaneLayout.setScrollableView(nestedScrollView);

1
app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
View File

@ -157,6 +157,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
poiDao = poiDatabase.getPoiDao();
tvPictures = (TextView) findViewById(R.id.tv_pictures);
tvPictures.setOnClickListener(this::onClick);
setSlidingUpPanelLayout(Constant.SLIDING_LAYOUT);
nestedScrollView = findViewById(R.id.nested_scroll_view);
if (slidingPaneLayout!=null){
slidingPaneLayout.setScrollableView(nestedScrollView);

17
app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
View File

@ -28,12 +28,14 @@ import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.widget.NestedScrollView;
import androidx.fragment.app.FragmentTransaction;
import androidx.recyclerview.widget.RecyclerView;
import com.github.lazylibrary.util.DensityUtil;
import com.google.gson.Gson;
import com.hjq.permissions.OnPermissionCallback;
import com.hjq.permissions.Permission;
import com.hjq.permissions.XXPermissions;
import com.jcodecraeer.xrecyclerview.XRecyclerView;
import com.kongzue.dialog.interfaces.OnDialogButtonClickListener;
import com.kongzue.dialog.util.BaseDialog;
import com.kongzue.dialog.util.DialogSettings;
@ -191,7 +193,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
// ivMessage.setVisibility(View.GONE);
// }
cbMapType = (CheckBox) findViewById(R.id.cb_map_type);
//sliding_layout.setScrollableViewHelper(new NestedScrollableViewHelper());
sliding_layout.setScrollableViewHelper(new NestedScrollableViewHelper());
//地图转换
cbMapType.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
@ -363,7 +365,15 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
View child = nsv.getChildAt(0);
return (child.getBottom() - (nsv.getHeight() + nsv.getScrollY()));
}
} else {
} else if (mScrollableView instanceof XRecyclerView) {
if (isSlidingUp) {
return ((XRecyclerView) mScrollableView).getScrollDyCounter();
} else {
XRecyclerView nsv = ((XRecyclerView) mScrollableView);
View child = nsv.getChildAt(0);
return (child.getBottom() - (nsv.getHeight() + nsv.getScrollY()));
}
}else {
return 0;
}
}
@ -1546,6 +1556,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
} else if (item.getText().equals("其他")) {
showPoiMarkerByType(5, newPoiLatLng);
OtherFragment otherFragment = OtherFragment.newInstance(bundle);
otherFragment.setSlidingUpPanelLayout(sliding_layout);
showSlidingFragment(otherFragment);
}
return false;
@ -1554,7 +1565,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
break;
case R.id.iv_filter:
FilterFragment filterFragment = FilterFragment.newInstance(new Bundle());
filterFragment.setSlidingUpPanelLayout(sliding_layout);
showSlidingFragment(filterFragment);
refreshFilterData();
break;
@ -1588,6 +1598,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
int[] deviceInfo = DensityUtil.getDeviceInfo(getActivity());
sliding_layout.setPanelHeight(deviceInfo[1] / 2);
sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
Constant.SLIDING_LAYOUT=sliding_layout;
fragmentTransaction.add(R.id.scroll_view, fragment, fragment.getClass().getName());
if (!(fragment instanceof FilterFragment)) {
FilterFragment filterFragment = (FilterFragment) supportFragmentManager.findFragmentByTag(FilterFragment.class.getName());

1418
app/src/main/res/layout/charging_pile_fragment.xml
View File

File diff suppressed because it is too large Load Diff

1190
app/src/main/res/layout/charging_station_fragment.xml
View File

File diff suppressed because it is too large Load Diff

3
app/src/main/res/layout/fragment_filter.xml
View File

@ -213,6 +213,5 @@
<com.jcodecraeer.xrecyclerview.XRecyclerView
android:id="@+id/recycler_filter"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
android:layout_height="match_parent" />
</LinearLayout>

603
app/src/main/res/layout/fragment_other.xml
View File

@ -15,327 +15,334 @@
</include>
<androidx.core.widget.NestedScrollView
android:id="@+id/nested_scroll_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
>
<TextView
android:id="@+id/tv_select_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:text="01.选择情报类型"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<LinearLayout
android:id="@+id/ll_text"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintLeft_toLeftOf="@id/tv_select_type"
app:layout_constraintTop_toBottomOf="@id/tv_select_type">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:background="@drawable/other_text">
<Spinner
android:id="@+id/spinner_other"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_margin="2dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="5dp"
android:background="@color/white"
android:textColor="#333"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginEnd="5dp"
android:background="@drawable/ic_baseline_arrow_drop"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_data"
android:layout_width="match_parent"
android:layout_height="160dp"
android:layout_margin="20dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@+id/tv_other_picture"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll_text">
android:layout_height="match_parent"
>
<TextView
android:id="@+id/tv_select_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="02.基本资料填写"
android:layout_margin="20dp"
android:text="01.选择情报类型"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
android:textStyle="bold" />
<androidx.constraintlayout.widget.ConstraintLayout
<LinearLayout
android:id="@+id/ll_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:background="@drawable/other_text">
android:orientation="vertical"
app:layout_constraintLeft_toLeftOf="@id/tv_select_type"
app:layout_constraintTop_toBottomOf="@id/tv_select_type">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:background="@drawable/other_text">
<Spinner
android:id="@+id/spinner_other"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_margin="2dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="5dp"
android:background="@color/white"
android:textColor="#333"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginEnd="5dp"
android:background="@drawable/ic_baseline_arrow_drop"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_data"
android:layout_width="match_parent"
android:layout_height="160dp"
android:layout_margin="20dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@+id/tv_other_picture"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll_text">
<TextView
android:id="@+id/tv_indeo"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_marginLeft="10dp"
android:gravity="center_vertical"
android:text="点位*"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<CheckBox
android:id="@+id/check_pot"
android:layout_width="50dp"
android:layout_height="20dp"
android:layout_centerVertical="true"
android:layout_marginStart="20dp"
android:background="@drawable/selector_change_bg"
android:button="@null"
android:gravity="center"
android:text="编辑"
android:textSize="8sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/tv_indeo"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_other_map"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:background="@drawable/icon_location"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
android:text="02.基本资料填写"
android:textStyle="bold" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:background="@drawable/other_text">
<TextView
android:id="@+id/tv_indeo"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_marginLeft="10dp"
android:gravity="center_vertical"
android:text="点位*"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<CheckBox
android:id="@+id/check_pot"
android:layout_width="50dp"
android:layout_height="20dp"
android:layout_centerVertical="true"
android:layout_marginStart="20dp"
android:background="@drawable/selector_change_bg"
android:button="@null"
android:gravity="center"
android:text="编辑"
android:textSize="8sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/tv_indeo"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_other_map"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:background="@drawable/icon_location"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginTop="20dp"
android:background="@drawable/other_text"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="10dp"
android:text="名称*" />
<EditText
android:id="@+id/et_task_name"
android:layout_width="300dp"
android:layout_height="match_parent"
android:layout_marginLeft="15dp"
android:background="@null"
android:hint="任务名称"
android:singleLine="true"
android:textColor="@color/test_color_selector"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/tv_other_picture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="03.拍照"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="@id/ll_data"
app:layout_constraintTop_toBottomOf="@id/ll_data" />
<LinearLayout
android:id="@+id/ll_image_picture"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="9dp"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toTopOf="@+id/tv_03"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_other_picture">
<RelativeLayout
android:id="@+id/rl_picture"
android:layout_width="150dp"
android:layout_height="100dp"
android:layout_margin="10dp"
android:background="@drawable/selector_red_bg"
android:gravity="center">
<ImageView
android:id="@+id/image_picture"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:background="@drawable/plus" />
<TextView
android:id="@+id/tv_picture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/image_picture"
android:layout_centerHorizontal="true"
android:layout_margin="5dp"
android:text="照片"
android:textColor="@color/pickerview_wheelview_textcolor_divider"
android:textSize="12sp" />
<ImageView
android:id="@+id/iv_picture"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:scaleType="fitXY" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_pictures"
android:layout_width="150dp"
android:layout_height="100dp"
android:layout_margin="10dp"
android:background="@drawable/selector_red_bg"
android:gravity="center">
<ImageView
android:id="@+id/image_pictures"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:background="@drawable/plus" />
<TextView
android:id="@+id/tv_pictures"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/image_pictures"
android:layout_centerHorizontal="true"
android:layout_margin="12dp"
android:text="照片"
android:textColor="@color/pickerview_wheelview_textcolor_divider"
android:textSize="12sp" />
<ImageView
android:id="@+id/iv_pictures"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:scaleType="fitXY" />
</RelativeLayout>
</LinearLayout>
<TextView
android:id="@+id/tv_03"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="04概述"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="@+id/tv_other_picture"
app:layout_constraintTop_toBottomOf="@id/ll_image_picture" />
<LinearLayout
android:id="@+id/linear_describe"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="@drawable/underline"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_03">
<EditText
android:id="@+id/edit_other_describe"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:background="@color/white"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="top"
android:hint="任务描述"
android:paddingLeft="10dp"
android:paddingTop="10dp"
android:paddingBottom="30dp"
android:textColor="@color/test_color_selector"
android:textSize="15sp"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="20dp"
android:background="@drawable/other_text"
android:orientation="horizontal">
android:layout_marginRight="10dp"
android:layout_marginBottom="20dp"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/linear_describe">
<TextView
android:layout_width="wrap_content"
<Button
android:id="@+id/btn_other_local"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="10dp"
android:text="名称*" />
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/selector_red_radius_bg"
android:text="保存本地"
android:textColor="@color/white" />
<EditText
android:id="@+id/et_task_name"
android:layout_width="300dp"
android:layout_height="match_parent"
android:layout_marginLeft="15dp"
android:background="@null"
android:hint="任务名称"
android:singleLine="true"
android:textColor="@color/test_color_selector"
android:textSize="12sp" />
<Button
android:id="@+id/btn_other_uploading"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/shape_transparent_pink_radius_bg"
android:text="上传" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<TextView
android:id="@+id/tv_other_picture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="03.拍照"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="@id/ll_data"
app:layout_constraintTop_toBottomOf="@id/ll_data" />
<LinearLayout
android:id="@+id/ll_image_picture"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="9dp"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toTopOf="@+id/tv_03"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_other_picture">
<RelativeLayout
android:id="@+id/rl_picture"
android:layout_width="150dp"
android:layout_height="100dp"
android:layout_margin="10dp"
android:background="@drawable/selector_red_bg"
android:gravity="center">
<ImageView
android:id="@+id/image_picture"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:background="@drawable/plus" />
<TextView
android:id="@+id/tv_picture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/image_picture"
android:layout_centerHorizontal="true"
android:layout_margin="5dp"
android:text="照片"
android:textColor="@color/pickerview_wheelview_textcolor_divider"
android:textSize="12sp" />
<ImageView
android:id="@+id/iv_picture"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:scaleType="fitXY" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_pictures"
android:layout_width="150dp"
android:layout_height="100dp"
android:layout_margin="10dp"
android:background="@drawable/selector_red_bg"
android:gravity="center">
<ImageView
android:id="@+id/image_pictures"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:background="@drawable/plus" />
<TextView
android:id="@+id/tv_pictures"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/image_pictures"
android:layout_centerHorizontal="true"
android:layout_margin="12dp"
android:text="照片"
android:textColor="@color/pickerview_wheelview_textcolor_divider"
android:textSize="12sp" />
<ImageView
android:id="@+id/iv_pictures"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:scaleType="fitXY" />
</RelativeLayout>
</LinearLayout>
<TextView
android:id="@+id/tv_03"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="04概述"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="@+id/tv_other_picture"
app:layout_constraintTop_toBottomOf="@id/ll_image_picture" />
<LinearLayout
android:id="@+id/linear_describe"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="@drawable/underline"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_03">
<EditText
android:id="@+id/edit_other_describe"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:background="@color/white"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="top"
android:hint="任务描述"
android:paddingLeft="10dp"
android:paddingTop="10dp"
android:paddingBottom="30dp"
android:textColor="@color/test_color_selector"
android:textSize="15sp"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="20dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="20dp"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/linear_describe">
<Button
android:id="@+id/btn_other_local"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/selector_red_radius_bg"
android:text="保存本地"
android:textColor="@color/white" />
<Button
android:id="@+id/btn_other_uploading"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/shape_transparent_pink_radius_bg"
android:text="上传" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout>

1005
app/src/main/res/layout/poi_fragment.xml
View File

File diff suppressed because it is too large Load Diff

535
app/src/main/res/layout/poi_video_fragment.xml
View File

@ -20,292 +20,297 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<androidx.constraintlayout.widget.ConstraintLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<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:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/road_shape"
android:orientation="horizontal"
app:layout_constraintStart_toStartOf="@+id/tv_message"
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_poi_video_name"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:background="@null"
android:inputType="text"
android:maxLines="1"
android:textSize="14sp" />
</LinearLayout>
<TextView
android:id="@+id/tv_mode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="02.拍照方式"
android:textColor="@color/black"
android:textSize="16sp"
app:layout_constraintLeft_toLeftOf="@id/ll_name"
app:layout_constraintTop_toBottomOf="@+id/ll_name" />
<LinearLayout
android:id="@+id/ll_mode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginTop="15dp"
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@id/tv_mode">
<RadioGroup
android:id="@+id/rg_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="horizontal">
<RadioButton
android:id="@+id/rb_car"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="车行"
android:textColor="@color/test_color_selector" />
<RadioButton
android:id="@+id/rb_bicycle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="骑行"
android:textColor="@color/test_color_selector" />
<RadioButton
android:id="@+id/rb_walking"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="步行"
android:textColor="@color/test_color_selector" />
<!-- <RadioButton-->
<!-- android:id="@+id/rb_manual"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_weight="1"-->
<!-- android:textColor="@color/test_color_selector"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="手动"/>-->
</RadioGroup>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_pictures"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="20dp"
android:orientation="horizontal"
app:layout_constraintLeft_toLeftOf="@id/ll_mode"
app:layout_constraintTop_toBottomOf="@id/ll_mode">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="03.录像 "
android:textColor="@color/black"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_pictures"
style="@style/user_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:gravity="center"
android:text="录像"
android:textColor="@color/white"
android:textSize="15sp" />
</LinearLayout>
<FrameLayout
android:id="@+id/fm_poi_video_picture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
app:layout_constraintLeft_toLeftOf="@id/ll_pictures"
app:layout_constraintTop_toBottomOf="@id/ll_pictures">
<ImageView
android:id="@+id/iv_poi_video_picture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="200dp"
android:maxHeight="100dp"
android:minWidth="140dp"
android:minHeight="70dp"
android:scaleType="fitXY" />
</FrameLayout>
<LinearLayout
android:id="@+id/ll_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintLeft_toLeftOf="@id/fm_poi_video_picture"
app:layout_constraintTop_toBottomOf="@id/fm_poi_video_picture">
<RelativeLayout
android:id="@+id/linear_exist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="@drawable/other_text"
android:padding="2dp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/linear_phone">
<TextView
android:id="@+id/tv_exist"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:text="是否存在*"
android:textColor="#333" />
<Spinner
android:id="@+id/spinner_exist"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:layout_marginRight="10dp"
android:layout_toEndOf="@id/tv_exist"
android:layout_toRightOf="@id/tv_exist"
android:background="@color/white"
android:textColor="#333"
android:textSize="15sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/ic_baseline_arrow_drop" />
</RelativeLayout>
android:layout_height="match_parent"
>
<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="04.描述"
android:text="01.基本信息"
android:textColor="@color/black"
android:textSize="16sp" />
android:textSize="16sp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<LinearLayout
android:id="@+id/linear_describe"
android:id="@+id/ll_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="@drawable/underline"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_03">
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/road_shape"
android:orientation="horizontal"
app:layout_constraintStart_toStartOf="@+id/tv_message"
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_desc"
android:id="@+id/et_poi_video_name"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:background="@color/white"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="top"
android:hint="任务描述"
android:paddingLeft="10dp"
android:paddingTop="10dp"
android:paddingBottom="30dp"
android:textColor="@color/test_color_selector"
android:textSize="15sp"
/>
android:layout_gravity="center_vertical"
android:background="@null"
android:inputType="text"
android:maxLines="1"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="20dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="20dp"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_desc">
<Button
android:id="@+id/btn_poi_video_save"
android:layout_width="0dp"
<TextView
android:id="@+id/tv_mode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/selector_red_radius_bg"
android:text="保存本地"
android:textColor="@color/white" />
android:layout_marginTop="10dp"
android:text="02.拍照方式"
android:textColor="@color/black"
android:textSize="16sp"
app:layout_constraintLeft_toLeftOf="@id/ll_name"
app:layout_constraintTop_toBottomOf="@+id/ll_name" />
<Button
android:id="@+id/btn_poi_video_upload"
android:layout_width="0dp"
<LinearLayout
android:id="@+id/ll_mode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/shape_transparent_pink_radius_bg"
android:text="上传" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
android:layout_marginLeft="2dp"
android:layout_marginTop="15dp"
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@id/tv_mode">
<RadioGroup
android:id="@+id/rg_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="horizontal">
<RadioButton
android:id="@+id/rb_car"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="车行"
android:textColor="@color/test_color_selector" />
<RadioButton
android:id="@+id/rb_bicycle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="骑行"
android:textColor="@color/test_color_selector" />
<RadioButton
android:id="@+id/rb_walking"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="步行"
android:textColor="@color/test_color_selector" />
<!-- <RadioButton-->
<!-- android:id="@+id/rb_manual"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_weight="1"-->
<!-- android:textColor="@color/test_color_selector"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="手动"/>-->
</RadioGroup>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_pictures"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="20dp"
android:orientation="horizontal"
app:layout_constraintLeft_toLeftOf="@id/ll_mode"
app:layout_constraintTop_toBottomOf="@id/ll_mode">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="03.录像 "
android:textColor="@color/black"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_pictures"
style="@style/user_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:gravity="center"
android:text="录像"
android:textColor="@color/white"
android:textSize="15sp" />
</LinearLayout>
<FrameLayout
android:id="@+id/fm_poi_video_picture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
app:layout_constraintLeft_toLeftOf="@id/ll_pictures"
app:layout_constraintTop_toBottomOf="@id/ll_pictures">
<ImageView
android:id="@+id/iv_poi_video_picture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="200dp"
android:maxHeight="100dp"
android:minWidth="140dp"
android:minHeight="70dp"
android:scaleType="fitXY" />
</FrameLayout>
<LinearLayout
android:id="@+id/ll_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintLeft_toLeftOf="@id/fm_poi_video_picture"
app:layout_constraintTop_toBottomOf="@id/fm_poi_video_picture">
<RelativeLayout
android:id="@+id/linear_exist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="@drawable/other_text"
android:padding="2dp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/linear_phone">
<TextView
android:id="@+id/tv_exist"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:text="是否存在*"
android:textColor="#333" />
<Spinner
android:id="@+id/spinner_exist"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:layout_marginRight="10dp"
android:layout_toEndOf="@id/tv_exist"
android:layout_toRightOf="@id/tv_exist"
android:background="@color/white"
android:textColor="#333"
android:textSize="15sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/ic_baseline_arrow_drop" />
</RelativeLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="20dp"
android:text="04.描述"
android:textColor="@color/black"
android:textSize="16sp" />
<LinearLayout
android:id="@+id/linear_describe"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="@drawable/underline"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_03">
<EditText
android:id="@+id/et_desc"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:background="@color/white"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="top"
android:hint="任务描述"
android:paddingLeft="10dp"
android:paddingTop="10dp"
android:paddingBottom="30dp"
android:textColor="@color/test_color_selector"
android:textSize="15sp"
/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="20dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="20dp"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_desc">
<Button
android:id="@+id/btn_poi_video_save"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/selector_red_radius_bg"
android:text="保存本地"
android:textColor="@color/white" />
<Button
android:id="@+id/btn_poi_video_upload"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/shape_transparent_pink_radius_bg"
android:text="上传" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout>

4
xrecyclerview/src/main/java/com/jcodecraeer/xrecyclerview/XRecyclerView.java
View File

@ -875,6 +875,10 @@ public class XRecyclerView extends RecyclerView {
}
}
public int getScrollDyCounter() {
return scrollDyCounter;
}
private ScrollAlphaChangeListener scrollAlphaChangeListener;
public void setScrollAlphaChangeListener(
ScrollAlphaChangeListener scrollAlphaChangeListener