diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/AreaHubFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/AreaHubFragment.java
index 0224481..17583f3 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/AreaHubFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/AreaHubFragment.java
@@ -146,18 +146,18 @@ public class AreaHubFragment extends BaseDrawerFragment implements View.OnClickL
         if (showPoiEntity != null) {
             if (showPoiEntity.getTaskStatus() == 5) {
                 DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
-                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
+                MessageDialog.show((AppCompatActivity) requireActivity(), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
                     @Override
                     public boolean onClick(BaseDialog baseDialog, View v) {
                         poiVideoBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 确定 按钮,");
                         initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity);
-                        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                        requireActivity().getSupportFragmentManager().popBackStack();
                         return false;
                     }
                 });
             } else if (showPoiEntity.getTaskStatus() == 0 || showPoiEntity.getTaskStatus() == 1) {
                 DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
-                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
+                MessageDialog.show((AppCompatActivity) requireActivity(), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
                     @Override
                     public boolean onClick(BaseDialog baseDialog, View v) {
                         poiVideoBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 确定 按钮,");
@@ -185,7 +185,7 @@ public class AreaHubFragment extends BaseDrawerFragment implements View.OnClickL
                             obtain1.obj = isSliding;
                             EventBus.getDefault().post(obtain1);
                         }
-                        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                        requireActivity().getSupportFragmentManager().popBackStack();
                         return false;
                     }
                 });
@@ -204,7 +204,7 @@ public class AreaHubFragment extends BaseDrawerFragment implements View.OnClickL
                     obtain1.obj = isSliding;
                     EventBus.getDefault().post(obtain1);
                 }
-                Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                requireActivity().getSupportFragmentManager().popBackStack();
             }
         }
     }
@@ -260,7 +260,7 @@ public class AreaHubFragment extends BaseDrawerFragment implements View.OnClickL
     @Override
     protected void initData() {
         super.initData();
-        SharedPreferences sharedPreferences = Objects.requireNonNull(getActivity()).getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE);
+        SharedPreferences sharedPreferences = requireActivity().getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE);
         SharedPreferences.Editor sharedEdit = sharedPreferences.edit();
         @SuppressLint("SimpleDateFormat")
         DateFormat formatter = new SimpleDateFormat("yyyyMMdd");
@@ -364,7 +364,7 @@ public class AreaHubFragment extends BaseDrawerFragment implements View.OnClickL
             if (memo != null && !memo.equals("")) {
                 etDesc.setText(memo);
             }
-            showPoiEntity.setType(3);
+            showPoiEntity.setType(12);
             String photoList = showPoiEntity.getPhoto();
             if (!StringUtils.isEmpty(photoList)) {
                 boolean isImageLoad = false;
@@ -373,7 +373,7 @@ public class AreaHubFragment extends BaseDrawerFragment implements View.OnClickL
                     if (fileListByUUID.get(i).getPath().contains(".webp") && !fileListByUUID.get(i).getPath().contains("paper.txt")) {
                         if (fileListByUUID.get(i).exists() && !isImageLoad) {
                             // 使用glide加载视频的第一帧
-                            Glide.with(Objects.requireNonNull(getActivity())).load(fileListByUUID.get(i)).into(ivPoiVideoPicture);
+                            Glide.with(requireActivity()).load(fileListByUUID.get(i)).into(ivPoiVideoPicture);
                             isImageLoad = true;
                         }
                     }
@@ -577,7 +577,7 @@ public class AreaHubFragment extends BaseDrawerFragment implements View.OnClickL
                         if (never) {
                             ToastUtils.Message(getActivity(), "被永久拒绝授权，请手动授予权限");
                             // 如果是被永久拒绝就跳转到应用权限系统设置页面
-                            XXPermissions.startPermissionActivity(Objects.requireNonNull(getActivity()), permissions);
+                            XXPermissions.startPermissionActivity(requireActivity(), permissions);
                         }
                     }
                 });
@@ -746,7 +746,7 @@ public class AreaHubFragment extends BaseDrawerFragment implements View.OnClickL
         //表示文件名，系统将会在/dada/dada/包名/shared_prefs目录下生成
         //一个以该参数命名的.xml文件。第二个mode表示创建的模式，通过查看
         //方法注释得知，建议以0或者MODE_PRIVATE为默认值。
-        SharedPreferences poi = Objects.requireNonNull(getActivity()).getSharedPreferences(Constant.DATA_FILE, 0);
+        SharedPreferences poi = requireActivity().getSharedPreferences(Constant.DATA_FILE, 0);
         //获取Editor对象
         SharedPreferences.Editor edit = poi.edit();
         //根据要保存的数据的类型，调用对应的put方法,
@@ -874,7 +874,7 @@ public class AreaHubFragment extends BaseDrawerFragment implements View.OnClickL
 //            }
 //            sb.append("-").append(formats);
 //            poiEntity.setName(sb.toString());
-//            Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() {
+//            requireActivity().runOnUiThread(new Runnable() {
 //                @Override
 //                public void run() {
 //                    etRoadName.setText(sb);
@@ -892,7 +892,7 @@ public class AreaHubFragment extends BaseDrawerFragment implements View.OnClickL
         String format = formatter.format(calendar.getTime());
         poiEntity.setCreateTime(format);
         poiEntity.setChecked(false);
-        poiEntity.setType(3);
+        poiEntity.setType(12);
         if (showPoiEntity.getId() != null) {
             List<File> fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId());
             if (fileListByUUID != null&&!fileListByUUID.isEmpty()) {
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/BuildingInFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/BuildingInFragment.java
index 3c271f8..e359725 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/BuildingInFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/BuildingInFragment.java
@@ -155,18 +155,18 @@ public class BuildingInFragment extends BaseDrawerFragment implements View.OnCli
         if (showPoiEntity != null) {
             if (showPoiEntity.getTaskStatus() == 5) {
                 DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
-                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
+                MessageDialog.show((AppCompatActivity) requireActivity(), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
                     @Override
                     public boolean onClick(BaseDialog baseDialog, View v) {
                         poiVideoBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 确定 按钮,");
                         initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity);
-                        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                        requireActivity().getSupportFragmentManager().popBackStack();
                         return false;
                     }
                 });
             } else if (showPoiEntity.getTaskStatus() == 0 || showPoiEntity.getTaskStatus() == 1) {
                 DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
-                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
+                MessageDialog.show((AppCompatActivity) requireActivity(), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
                     @Override
                     public boolean onClick(BaseDialog baseDialog, View v) {
                         poiVideoBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 确定 按钮,");
@@ -194,7 +194,7 @@ public class BuildingInFragment extends BaseDrawerFragment implements View.OnCli
                             obtain1.obj = isSliding;
                             EventBus.getDefault().post(obtain1);
                         }
-                        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                        requireActivity().getSupportFragmentManager().popBackStack();
                         return false;
                     }
                 });
@@ -213,7 +213,7 @@ public class BuildingInFragment extends BaseDrawerFragment implements View.OnCli
                     obtain1.obj = isSliding;
                     EventBus.getDefault().post(obtain1);
                 }
-                Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                requireActivity().getSupportFragmentManager().popBackStack();
             }
         }
     }
@@ -269,7 +269,7 @@ public class BuildingInFragment extends BaseDrawerFragment implements View.OnCli
     @Override
     protected void initData() {
         super.initData();
-        SharedPreferences sharedPreferences = Objects.requireNonNull(getActivity()).getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE);
+        SharedPreferences sharedPreferences = requireActivity().getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE);
         SharedPreferences.Editor sharedEdit = sharedPreferences.edit();
         @SuppressLint("SimpleDateFormat")
         DateFormat formatter = new SimpleDateFormat("yyyyMMdd");
@@ -425,7 +425,7 @@ public class BuildingInFragment extends BaseDrawerFragment implements View.OnCli
             if (memo != null && !memo.equals("")) {
                 etDesc.setText(memo);
             }
-            showPoiEntity.setType(3);
+            showPoiEntity.setType(13);
             String photoList = showPoiEntity.getPhoto();
             if (!StringUtils.isEmpty(photoList)) {
                 boolean isImageLoad = false;
@@ -434,7 +434,7 @@ public class BuildingInFragment extends BaseDrawerFragment implements View.OnCli
                     if (fileListByUUID.get(i).getPath().contains(".webp") && !fileListByUUID.get(i).getPath().contains("paper.txt")) {
                         if (fileListByUUID.get(i).exists() && !isImageLoad) {
                             // 使用glide加载视频的第一帧
-                            Glide.with(Objects.requireNonNull(getActivity())).load(fileListByUUID.get(i)).into(ivPoiVideoPicture);
+                            Glide.with(requireActivity()).load(fileListByUUID.get(i)).into(ivPoiVideoPicture);
                             isImageLoad = true;
                         }
                     }
@@ -678,7 +678,7 @@ public class BuildingInFragment extends BaseDrawerFragment implements View.OnCli
                         if (never) {
                             ToastUtils.Message(getActivity(), "被永久拒绝授权，请手动授予权限");
                             // 如果是被永久拒绝就跳转到应用权限系统设置页面
-                            XXPermissions.startPermissionActivity(Objects.requireNonNull(getActivity()), permissions);
+                            XXPermissions.startPermissionActivity(requireActivity(), permissions);
                         }
                     }
                 });
@@ -847,7 +847,7 @@ public class BuildingInFragment extends BaseDrawerFragment implements View.OnCli
         //表示文件名，系统将会在/dada/dada/包名/shared_prefs目录下生成
         //一个以该参数命名的.xml文件。第二个mode表示创建的模式，通过查看
         //方法注释得知，建议以0或者MODE_PRIVATE为默认值。
-        SharedPreferences poi = Objects.requireNonNull(getActivity()).getSharedPreferences(Constant.DATA_FILE, 0);
+        SharedPreferences poi = requireActivity().getSharedPreferences(Constant.DATA_FILE, 0);
         //获取Editor对象
         SharedPreferences.Editor edit = poi.edit();
         //根据要保存的数据的类型，调用对应的put方法,
@@ -977,7 +977,7 @@ public class BuildingInFragment extends BaseDrawerFragment implements View.OnCli
 //            }
 //            sb.append("-").append(formats);
 //            poiEntity.setName(sb.toString());
-//            Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() {
+//            requireActivity().runOnUiThread(new Runnable() {
 //                @Override
 //                public void run() {
 //                    etRoadName.setText(sb);
@@ -995,7 +995,7 @@ public class BuildingInFragment extends BaseDrawerFragment implements View.OnCli
         String format = formatter.format(calendar.getTime());
         poiEntity.setCreateTime(format);
         poiEntity.setChecked(false);
-        poiEntity.setType(3);
+        poiEntity.setType(13);
         if (showPoiEntity.getId() != null) {
             List<File> fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId());
             if (fileListByUUID != null&&!fileListByUUID.isEmpty()) {
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TrafficHubFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TrafficHubFragment.java
index d73cc94..9b462fe 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/TrafficHubFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/TrafficHubFragment.java
@@ -146,18 +146,18 @@ public class TrafficHubFragment extends BaseDrawerFragment implements View.OnCli
         if (showPoiEntity != null) {
             if (showPoiEntity.getTaskStatus() == 5) {
                 DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
-                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
+                MessageDialog.show((AppCompatActivity) requireActivity(), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
                     @Override
                     public boolean onClick(BaseDialog baseDialog, View v) {
                         poiVideoBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 确定 按钮,");
                         initEndReceiveTask(HttpInterface.UNRECEIVED_POLYGON_TASK, showPoiEntity);
-                        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                        requireActivity().getSupportFragmentManager().popBackStack();
                         return false;
                     }
                 });
             } else if (showPoiEntity.getTaskStatus() == 0 || showPoiEntity.getTaskStatus() == 1) {
                 DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
-                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getActivity()), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
+                MessageDialog.show((AppCompatActivity) requireActivity(), "提示", "当前在任务作业中，是否退出", "确定", "取消").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
                     @Override
                     public boolean onClick(BaseDialog baseDialog, View v) {
                         poiVideoBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 确定 按钮,");
@@ -185,7 +185,7 @@ public class TrafficHubFragment extends BaseDrawerFragment implements View.OnCli
                             obtain1.obj = isSliding;
                             EventBus.getDefault().post(obtain1);
                         }
-                        Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                        requireActivity().getSupportFragmentManager().popBackStack();
                         return false;
                     }
                 });
@@ -204,7 +204,7 @@ public class TrafficHubFragment extends BaseDrawerFragment implements View.OnCli
                     obtain1.obj = isSliding;
                     EventBus.getDefault().post(obtain1);
                 }
-                Objects.requireNonNull(getActivity()).getSupportFragmentManager().popBackStack();
+                requireActivity().getSupportFragmentManager().popBackStack();
             }
         }
     }
@@ -260,7 +260,7 @@ public class TrafficHubFragment extends BaseDrawerFragment implements View.OnCli
     @Override
     protected void initData() {
         super.initData();
-        SharedPreferences sharedPreferences = Objects.requireNonNull(getActivity()).getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE);
+        SharedPreferences sharedPreferences = requireActivity().getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE);
         SharedPreferences.Editor sharedEdit = sharedPreferences.edit();
         @SuppressLint("SimpleDateFormat")
         DateFormat formatter = new SimpleDateFormat("yyyyMMdd");
@@ -364,7 +364,7 @@ public class TrafficHubFragment extends BaseDrawerFragment implements View.OnCli
             if (memo != null && !memo.equals("")) {
                 etDesc.setText(memo);
             }
-            showPoiEntity.setType(3);
+            showPoiEntity.setType(11);
             String photoList = showPoiEntity.getPhoto();
             if (!StringUtils.isEmpty(photoList)) {
                 boolean isImageLoad = false;
@@ -373,7 +373,7 @@ public class TrafficHubFragment extends BaseDrawerFragment implements View.OnCli
                     if (fileListByUUID.get(i).getPath().contains(".webp") && !fileListByUUID.get(i).getPath().contains("paper.txt")) {
                         if (fileListByUUID.get(i).exists() && !isImageLoad) {
                             // 使用glide加载视频的第一帧
-                            Glide.with(Objects.requireNonNull(getActivity())).load(fileListByUUID.get(i)).into(ivPoiVideoPicture);
+                            Glide.with(requireActivity()).load(fileListByUUID.get(i)).into(ivPoiVideoPicture);
                             isImageLoad = true;
                         }
                     }
@@ -577,7 +577,7 @@ public class TrafficHubFragment extends BaseDrawerFragment implements View.OnCli
                         if (never) {
                             ToastUtils.Message(getActivity(), "被永久拒绝授权，请手动授予权限");
                             // 如果是被永久拒绝就跳转到应用权限系统设置页面
-                            XXPermissions.startPermissionActivity(Objects.requireNonNull(getActivity()), permissions);
+                            XXPermissions.startPermissionActivity(requireActivity(), permissions);
                         }
                     }
                 });
@@ -746,7 +746,7 @@ public class TrafficHubFragment extends BaseDrawerFragment implements View.OnCli
         //表示文件名，系统将会在/dada/dada/包名/shared_prefs目录下生成
         //一个以该参数命名的.xml文件。第二个mode表示创建的模式，通过查看
         //方法注释得知，建议以0或者MODE_PRIVATE为默认值。
-        SharedPreferences poi = Objects.requireNonNull(getActivity()).getSharedPreferences(Constant.DATA_FILE, 0);
+        SharedPreferences poi = requireActivity().getSharedPreferences(Constant.DATA_FILE, 0);
         //获取Editor对象
         SharedPreferences.Editor edit = poi.edit();
         //根据要保存的数据的类型，调用对应的put方法,
@@ -874,7 +874,7 @@ public class TrafficHubFragment extends BaseDrawerFragment implements View.OnCli
 //            }
 //            sb.append("-").append(formats);
 //            poiEntity.setName(sb.toString());
-//            Objects.requireNonNull(getActivity()).runOnUiThread(new Runnable() {
+//            requireActivity().runOnUiThread(new Runnable() {
 //                @Override
 //                public void run() {
 //                    etRoadName.setText(sb);
@@ -892,7 +892,7 @@ public class TrafficHubFragment extends BaseDrawerFragment implements View.OnCli
         String format = formatter.format(calendar.getTime());
         poiEntity.setCreateTime(format);
         poiEntity.setChecked(false);
-        poiEntity.setType(3);
+        poiEntity.setType(11);
         if (showPoiEntity.getId() != null) {
             List<File> fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId());
             if (fileListByUUID != null&&!fileListByUUID.isEmpty()) {