修改poi录像和道路录像的bug,抽屉滑动的bug

app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java

@@ -105,8 +105,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                 startActivity(forgetPaw);
                 break;
             case R.id.btn_login:
-                Intent intent = new Intent(LoginActivity.this, HomeActivity.class);
-                startActivity(intent);
                 String name = etLoginName.getText().toString().trim();
                 if (name == null||name.equals("")) {
                     Toast.makeText(this, "请输入账号", Toast.LENGTH_SHORT).show();
@@ -117,7 +115,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                     Toast.makeText(this, "请输入密码", Toast.LENGTH_SHORT).show();
                     return;
                 }
-                //initLogIn(name,paw);
+                initLogIn(name,paw);
                 break;
         }
     }

app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java

@@ -116,8 +116,8 @@ public class MainActivity extends BaseActivity {
                     @Override
                     public void onGranted(List<String> permissions, boolean all) {
                         if (all) {
-                           // initCheckVersion();
+                            initCheckVersion();
-                            initTime();
+                            //initTime();
                         } else {
                             initPermission();
                         }

app/src/main/java/com/navinfo/outdoor/base/BaseDrawerFragment.java

@@ -19,6 +19,7 @@ import com.navinfo.outdoor.room.ChargingPileEntity;
 import com.navinfo.outdoor.room.PoiEntity;
 import com.navinfo.outdoor.util.FragmentBackHandler;
 import com.navinfo.outdoor.util.GPSUtils;
+import com.sothree.slidinguppanel.SlidingUpPanelLayout;
 import com.tencent.tencentmap.mapsdk.maps.model.LatLng;
 
 import org.greenrobot.eventbus.EventBus;
@@ -29,7 +30,7 @@ import org.greenrobot.eventbus.EventBus;
 public abstract class BaseDrawerFragment extends BaseFragment {
     public boolean isSliding = true; // fragment被销毁时，true-抽屉收回，false-抽屉状态不变
     protected PoiEntity showPoiEntity;
-
+    public SlidingUpPanelLayout slidingPaneLayout;
     @Override
     protected void initData() {
         super.initData();
@@ -81,7 +82,11 @@ public abstract class BaseDrawerFragment extends BaseFragment {
             EventBus.getDefault().post(obtain);
         }
     }
-
+    public void setSlidingUpPanelLayout(SlidingUpPanelLayout slidingUpPanelLayout) {
+        if (slidingUpPanelLayout!=null) {
+            this.slidingPaneLayout = slidingUpPanelLayout;
+        }
+    }
     @Override
     public void onDestroy() {
         super.onDestroy();

app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java

@@ -26,6 +26,7 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.widget.NestedScrollView;
 
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
@@ -114,6 +115,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
     private int taskId;
     private Integer chargingPileBody;
     private ArrayList<File> phoneLists;
+    private NestedScrollView nestedScrollView;
 
     public static ChargingPileFragment newInstance(Bundle bundle) {
         ChargingPileFragment fragment = new ChargingPileFragment();
@@ -361,6 +363,10 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC
 
             }
         });
+        nestedScrollView = findViewById(R.id.nested_scroll_view);
+        if (slidingPaneLayout!=null) {
+            slidingPaneLayout.setScrollableView(nestedScrollView);
+        }
         rlPanorama = findViewById(R.id.rl_panorama);
         rlPanorama.setOnClickListener(this::onClick);
         ivPanorama = findViewById(R.id.iv_panorama);

app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java

@@ -27,6 +27,7 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.widget.NestedScrollView;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -124,6 +125,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
 
 //    private ArrayList<File> fileList;
     private File photoFile; // 拍照保存的路径
+    private NestedScrollView nestedScrollView;
 
     public static ChargingStationFragment newInstance(Bundle bundle) {
         ChargingStationFragment fragment = new ChargingStationFragment();
@@ -160,11 +162,6 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
                     obtain.what = Constant.TREASURE_FRAGMENT;
                     obtain.obj = isSliding;
                     EventBus.getDefault().post(obtain);
-
-                    Message mainButtonVisiableMsg = Message.obtain();
-                    mainButtonVisiableMsg.what = Constant.MAIN_BUTTON_VISIABLE;
-                    mainButtonVisiableMsg.obj = View.VISIBLE;
-                    EventBus.getDefault().post(mainButtonVisiableMsg);
                 }
                 onBackPressed();
             }
@@ -193,6 +190,10 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
         chargingPileDao = poiDatabase.getChargingPileDao();
         checkBoxLife = findViewById(R.id.check_pot_life);
         checkBoxRight = findViewById(R.id.check_pot_right);
+        nestedScrollView = findViewById(R.id.nested_scroll_view);
+        if (slidingPaneLayout!=null) {
+            slidingPaneLayout.setScrollableView(nestedScrollView);
+        }
         //添加桩
         linearChargingPile = findViewById(R.id.linear_charging_pile);
         linearChargingPile.setOnClickListener(this::onClick);
@@ -1329,10 +1330,10 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
         if (EventBus.getDefault().isRegistered(this))//加上判断
             EventBus.getDefault().unregister(this);
         super.onDestroy();
+        if (showPoiEntity!=null){
             new Thread(new Runnable() {
                 @Override
                 public void run() {
-                if (showPoiEntity.getId()!=null){
                     PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
                     if (poiDaoPoiEntity != null) {
                         if (poiDaoPoiEntity.getTaskStatus() == 5) {
@@ -1341,9 +1342,9 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View.
 
                     }
                 }
-            }
             }).start();
         }
+    }
 
     @Override
     protected PoiEntity initPoiEntityByUI(PoiEntity poiEntity) {

app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java

@@ -13,6 +13,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.slidingpanelayout.widget.SlidingPaneLayout;
 
 import com.jcodecraeer.xrecyclerview.ProgressStyle;
 import com.jcodecraeer.xrecyclerview.XRecyclerView;
@@ -28,6 +29,7 @@ import com.navinfo.outdoor.room.PoiDao;
 import com.navinfo.outdoor.room.PoiDatabase;
 import com.navinfo.outdoor.room.PoiEntity;
 import com.navinfo.outdoor.util.GeometryTools;
+import com.sothree.slidinguppanel.SlidingUpPanelLayout;
 import com.tencent.tencentmap.mapsdk.maps.model.LatLng;
 import com.vividsolutions.jts.geom.Geometry;
 
@@ -54,6 +56,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
     private List<PoiEntity> allPoi;
 
 
+
     public static FilterFragment newInstance(Bundle bundle) {
         FilterFragment fragment = new FilterFragment();
         fragment.setArguments(bundle);
@@ -247,6 +250,9 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
         btnFilter = findViewById(R.id.btn_filter);
         btnFilter.setOnClickListener(this::onClick);
         recyclerFilter = findViewById(R.id.recycler_filter);
+        if (slidingPaneLayout!=null) {
+            slidingPaneLayout.setScrollableView(recyclerFilter);
+        }
 
         //设置下划线
         recyclerFilter.setLayoutManager(new LinearLayoutManager(getActivity()));
@@ -291,6 +297,8 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
         });
     }
 
+
+
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
@@ -299,11 +307,6 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi
                 obtain.what = Constant.TREASURE_FRAGMENT;
                 obtain.obj = true;
                 EventBus.getDefault().post(obtain);
-
-                Message mainButtonVisiableMsg = Message.obtain();
-                mainButtonVisiableMsg.what = Constant.MAIN_BUTTON_VISIABLE;
-                mainButtonVisiableMsg.obj = View.VISIBLE;
-                EventBus.getDefault().post(mainButtonVisiableMsg);
                 break;
             case R.id.cl_number:
                 BottomMenu.show((AppCompatActivity) getContext(), new String[]{"200", "500", "1000"}, new OnMenuItemClickListener() {

app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java

@@ -590,10 +590,10 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
         if (EventBus.getDefault().isRegistered(this))//加上判断
             EventBus.getDefault().unregister(this);
         super.onDestroy();
+        if (showPoiEntity!=null){
             new Thread(new Runnable() {
                 @Override
                 public void run() {
-                if (showPoiEntity.getId()!=null){
                     PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
                     if (poiDaoPoiEntity != null) {
                         if (poiDaoPoiEntity.getTaskStatus() == 5) {
@@ -602,9 +602,9 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
 
                     }
                 }
-            }
             }).start();
         }
+    }
 
     @Override
     protected PoiEntity initPoiEntityByUI(PoiEntity poiEntity) {

app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java

@@ -26,6 +26,7 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.widget.NestedScrollView;
 
 import com.bumptech.glide.Glide;
 import com.github.lazylibrary.util.StringUtils;
@@ -108,7 +109,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
     private ArrayList<File> poiPicList;
     private String tagPanorama;
     private File file;
-
+    private NestedScrollView nestedScrollView;
 
 
     public static PoiFragment newInstance(Bundle bundle) {
@@ -184,6 +185,12 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
 
             }
         });
+        nestedScrollView = findViewById(R.id.nested_scroll_view);
+        if (slidingPaneLayout!=null) {
+            slidingPaneLayout.setScrollableView(nestedScrollView);
+        }
+
+
         checkBoxRight.setVisibility(View.GONE);
         btnSaveLocal = findViewById(R.id.btn_save_local);
         btnSaveLocal.setOnClickListener(this::onClick);
@@ -972,6 +979,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
         if (EventBus.getDefault().isRegistered(this))//加上判断
             EventBus.getDefault().unregister(this);
         super.onDestroy();
+        if (showPoiEntity!=null){
             new Thread(new Runnable() {
                 @Override
                 public void run() {
@@ -985,6 +993,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe
                 }
             }).start();
         }
+    }
 
     @Override
     protected PoiEntity initPoiEntityByUI(PoiEntity poiEntity) {

app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java

@@ -261,6 +261,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
     public void onEvent(Message data) {
         if (data.what == Constant.PICTURE_VIDEO_WORD) {
            if ((boolean)data.obj){
+
                initPoiVideoSharePre();
            }
         }
@@ -557,10 +558,10 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
         if (EventBus.getDefault().isRegistered(this))//加上判断
             EventBus.getDefault().unregister(this);
         super.onDestroy();
+        if (showPoiEntity!=null){
             new Thread(new Runnable() {
                 @Override
                 public void run() {
-                if (showPoiEntity.getId()!=null){
                     PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
                     if (poiDaoPoiEntity != null) {
                         if (poiDaoPoiEntity.getTaskStatus() == 5) {
@@ -569,9 +570,9 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
 
                     }
                 }
-            }
             }).start();
         }
+    }
 
     @Override
     protected PoiEntity initPoiEntityByUI(PoiEntity poiEntity) {
@@ -619,6 +620,12 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
         poiEntity.setType(3);
         poiEntity.setTaskStatus(2);
         poiEntity.setIsLocalData(1);
+        if (fmPoiVideoPic.getTag()==null){
+            List<File> videoFileListByUUID = AWMp4ParserHelper.getInstance().getVideoFileListByUUID(showPoiEntity.getId());
+            if (videoFileListByUUID!=null){
+                fmPoiVideoPic.setTag(videoFileListByUUID);
+            }
+        }
         if (fmPoiVideoPic.getTag() != null &&!((List<File>) fmPoiVideoPic.getTag()).isEmpty()) {
             List<LatLng> lineStringByVideoFileList = AWMp4ParserHelper.getInstance().getLineStringByVideoFileList((List<File>) fmPoiVideoPic.getTag());
             String lineString = GeometryTools.getLineString(lineStringByVideoFileList);

app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java

@@ -597,10 +597,10 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
         if (EventBus.getDefault().isRegistered(this))//加上判断
             EventBus.getDefault().unregister(this);
         super.onDestroy();
+        if (showPoiEntity!=null){
             new Thread(new Runnable() {
                 @Override
                 public void run() {
-                if (showPoiEntity.getId()!=null){
                     PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
                     if (poiDaoPoiEntity != null) {
                         if (poiDaoPoiEntity.getTaskStatus() == 5) {
@@ -609,9 +609,9 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
 
                     }
                 }
-            }
             }).start();
         }
+    }
 
     @Override
     protected PoiEntity initPoiEntityByUI(PoiEntity poiEntity) {
@@ -659,6 +659,12 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
         poiEntity.setType(4);
         poiEntity.setTaskStatus(2);
         poiEntity.setIsLocalData(1);
+        if (fmRoadPic.getTag()==null){
+            List<File> videoFileListByUUID = AWMp4ParserHelper.getInstance().getVideoFileListByUUID(showPoiEntity.getId());
+            if (videoFileListByUUID!=null){
+                fmRoadPic.setTag(videoFileListByUUID);
+            }
+        }
         if (fmRoadPic.getTag() != null &&!((List<File>) fmRoadPic.getTag()).isEmpty()) {
             List<LatLng> lineStringByVideoFileList = AWMp4ParserHelper.getInstance().getLineStringByVideoFileList((List<File>) fmRoadPic.getTag());
             String lineString = GeometryTools.getLineString(lineStringByVideoFileList);

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

@@ -1476,6 +1476,7 @@ 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;

app/src/main/res/layout/charging_pile_fragment.xml

@@ -4,7 +4,10 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        >
         <include
             android:id="@+id/charging_pile_header"
             layout="@layout/charging_pile_header"
@@ -828,4 +831,6 @@
                 android:text="保存并返回"
                 android:textColor="@color/white" />
         </LinearLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
        </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/charging_station_fragment.xml

@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.core.widget.NestedScrollView
         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">
-
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        >
         <include
             android:id="@+id/charging_station_header"
             layout="@layout/charging_station_header"
@@ -16,6 +19,7 @@
             app:layout_constraintTop_toTopOf="parent">
 
         </include>
+
         <TextView
             android:id="@+id/tv_01"
             android:layout_width="wrap_content"
@@ -619,3 +623,5 @@
                 android:text="上传" />
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.core.widget.NestedScrollView>

app/src/main/res/layout/fragment_filter.xml

@@ -10,7 +10,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
       >
-
     </include>
     <LinearLayout
         android:id="@+id/ll_filter"

app/src/main/res/layout/poi_fragment.xml

@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.core.widget.NestedScrollView
+    android:id="@+id/nested_scroll_view"
         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="wrap_content">
+        android:layout_height="match_parent">
-
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        >
         <include
             android:id="@+id/poi_header"
             layout="@layout/poi_header"
@@ -534,4 +538,6 @@
                 android:background="@drawable/shape_transparent_pink_radius_bg"
                 android:text="上传" />
         </LinearLayout>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.core.widget.NestedScrollView>

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

@@ -10,7 +10,6 @@
     sothree:umanoDragView="@id/dragView"
     sothree:umanoOverlay="false"
     sothree:umanoPanelHeight="0dp"
-    sothree:umanoScrollableView="@id/scroll_parent_view"
     sothree:umanoShadowHeight="0dp">
     <FrameLayout
         android:layout_width="match_parent"
@@ -140,11 +139,12 @@
         android:focusable="true"
         android:orientation="vertical">
 
-        <ScrollView
+    <!--    <ScrollView
-            android:id="@+id/scroll_parent_view"
+
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content">        </ScrollView>-->
             <LinearLayout
+                android:id="@+id/scroll_parent_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
@@ -153,7 +153,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"></FrameLayout>
             </LinearLayout>
-        </ScrollView>
+
 
     </LinearLayout>
 </com.sothree.slidinguppanel.SlidingUpPanelLayout>