1

app/build.gradle

@@ -65,14 +65,14 @@ dependencies {
     implementation 'androidx.navigation:navigation-fragment:2.3.5'
     implementation 'androidx.navigation:navigation-ui:2.3.5'
     implementation 'io.github.youth5201314:banner:2.2.3'
-    implementation 'com.google.android.exoplayer:exoplayer-core:2.19.1'
-    implementation 'com.google.android.exoplayer:exoplayer-ui:2.19.1'
+    implementation 'com.google.android.exoplayer:exoplayer-core:2.15.1'
+    implementation 'com.google.android.exoplayer:exoplayer-ui:2.15.1'
     // implementation 'com.google.android.exoplayer:exoplayer-dash:latest_version'
-    implementation 'com.google.android.exoplayer:exoplayer-hls:2.19.1'
+    implementation 'com.google.android.exoplayer:exoplayer-hls:2.15.1'
     implementation 'com.github.ittianyu:BottomNavigationViewEx:2.0.4'
-    //implementation 'com.android.support:appcompat-v7:28.0.0'
-    //implementation "com.google.android.material:material:1.4.0"
-    //implementation 'com.google.android.material:material:1.1.0'
+    implementation 'com.readystatesoftware.systembartint:systembartint:1.0.3'
+//    implementation 'com.github.AnJiaoDe:StatusNavigationTransparent:V1.2.4'
+//    implementation 'com.readystatesoftware.systembartint:systembartint:1.0.3'
 
 
 }

app/src/main/AndroidManifest.xml

@@ -55,7 +55,10 @@
         android:theme="@style/AppTheme"
         tools:replace="allowBackup">
 
-
+        <!-- 沉浸式状态栏适配 -->
+        <meta-data
+            android:name="android.max_aspect"
+            android:value="2.4" />
         <activity
             android:name="com.sjkj.appthreefloor_tsgz.activity.SplashActivity"
             android:noHistory="true"

app/src/main/java/com/sjkj/appthreefloor_tsgz/activity/ExoPlayerActivity.java

@@ -8,8 +8,12 @@ import android.widget.Button;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.google.android.exoplayer2.DefaultLoadControl;
+import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.MediaItem;
+import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.ui.PlayerView;
 import com.sjkj.appthreefloor_tsgz.R;
 
@@ -39,7 +43,8 @@ public class ExoPlayerActivity extends AppCompatActivity {
     }
 
     private void initializePlayer() {
-        player = new ExoPlayer.Builder(this).build();
+        player = new SimpleExoPlayer.Builder(this).build();
+
         playerView.setUseController(false); // 设置为不使用控制器
         playerView.setPlayer(player);
 

app/src/main/java/com/sjkj/appthreefloor_tsgz/activity/MainActivity.java

@@ -1,12 +1,17 @@
 package com.sjkj.appthreefloor_tsgz.activity;
 
 import android.content.Intent;
+import android.graphics.Color;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.util.SparseIntArray;
 import android.view.KeyEvent;
 import android.view.MenuItem;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -58,10 +63,64 @@ public class MainActivity extends BaseActivity {
         binding.setViewModel(viewModel);
         binding.setLifecycleOwner(this);
     }
-
+    public void setStatusBarTransparent() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = getWindow();
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            int currentApiVersion = Build.VERSION.SDK_INT;
+            if (currentApiVersion >= Build.VERSION_CODES.M) {
+                // 如果你想要设置状态栏文字颜色为深色，使用以下代码
+                window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+            } else {
+                // 对于Android 6.0以下版本，你可以这样设置状态栏为透明
+                window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+                window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+                window.setStatusBarColor(Color.TRANSPARENT);
+            }
+            // 对于导航栏也可以这样设置
+            // window.setNavigationBarColor(Color.TRANSPARENT);
+        }
+    }
     @Override
     public void initView() {
         super.initView();
+
+       // setStatusBarTransparent(); // 调用沉浸式状态栏方法
+//        ImmersionBar.with(this)
+//                .transparentStatusBar()  //透明状态栏，不写默认透明色
+//                .transparentNavigationBar()  //透明导航栏，不写默认黑色(设置此方法，fullScreen()方法自动为true)
+//                .transparentBar()             //透明状态栏和导航栏，不写默认状态栏为透明色，导航栏为黑色（设置此方法，fullScreen()方法自动为true）
+//                .statusBarColor(R.color.colorPrimary)     //状态栏颜色，不写默认透明色
+//                .navigationBarColor(R.color.colorPrimary) //导航栏颜色，不写默认黑色
+//                .barColor(R.color.colorPrimary)  //同时自定义状态栏和导航栏颜色，不写默认状态栏为透明色，导航栏为黑色
+//                .statusBarAlpha(0.3f)  //状态栏透明度，不写默认0.0f
+//                .navigationBarAlpha(0.4f)  //导航栏透明度，不写默认0.0F
+//                .barAlpha(0.3f)  //状态栏和导航栏透明度，不写默认0.0f
+//                .statusBarDarkFont(true)   //状态栏字体是深色，不写默认为亮色
+//                .navigationBarDarkIcon(true) //导航栏图标是深色，不写默认为亮色
+//                .autoDarkModeEnable(true) //自动状态栏字体和导航栏图标变色，必须指定状态栏颜色和导航栏颜色才可以自动变色哦
+//                .autoStatusBarDarkModeEnable(true,0.2f) //自动状态栏字体变色，必须指定状态栏颜色才可以自动变色哦
+//                .autoNavigationBarDarkModeEnable(true,0.2f) //自动导航栏图标变色，必须指定导航栏颜色才可以自动变色哦
+//                .fullScreen(true)      //有导航栏的情况下，activity全屏显示，也就是activity最下面被导航栏覆盖，不写默认非全屏
+//                .hideBar(BarHide.FLAG_HIDE_BAR)  //隐藏状态栏或导航栏或两者，不写默认不隐藏
+//                .fitsSystemWindows(true)    //解决状态栏和布局重叠问题，任选其一，默认为false，当为true时一定要指定statusBarColor()，不然状态栏为透明色，还有一些重载方法
+//                .supportActionBar(true) //支持ActionBar使用
+//                .removeSupportAllView() //移除全部view支持
+//                .navigationBarEnable(true)   //是否可以修改导航栏颜色，默认为true
+//                .navigationBarWithKitkatEnable(true)  //是否可以修改安卓4.4和emui3.x手机导航栏颜色，默认为true
+//                .navigationBarWithEMUI3Enable(true) //是否可以修改emui3.x手机导航栏颜色，默认为true
+//                .keyboardEnable(true)  //解决软键盘与底部输入框冲突问题，默认为false，还有一个重载方法，可以指定软键盘mode
+//                .keyboardMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)  //单独指定软键盘模式
+//                .setOnKeyboardListener(new OnKeyboardListener() {    //软键盘监听回调，keyboardEnable为true才会回调此方法
+//                    @Override
+//                    public void onKeyboardChange(boolean isPopup, int keyboardHeight) {
+//                    }
+//                })
+//                .addTag("tag")  //给以上设置的参数打标记
+//                .getTag("tag")  //根据tag获得沉浸式参数
+//                .reset()  //重置所以沉浸式参数
+//                .init();  //必须调用方可应用以上所配置的参数
+
         fragmentArrayList.add(eventFragment);
         fragmentArrayList.add(mainFragment);
         fragmentArrayList.add(mineFragment);

app/src/main/java/com/sjkj/appthreefloor_tsgz/activity/WaterCraneResourcesActivity.java

@@ -1,5 +1,6 @@
 package com.sjkj.appthreefloor_tsgz.activity;
 
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 
@@ -7,6 +8,7 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.ViewModelProvider;
 
+import com.google.android.material.tabs.TabLayout;
 import com.sjkj.appthreefloor_tsgz.R;
 import com.sjkj.appthreefloor_tsgz.activity.viewModel.ResourceVisualizationViewModel;
 import com.sjkj.appthreefloor_tsgz.app.App;
@@ -18,6 +20,7 @@ import com.sjkj.appthreefloor_tsgz.map.MapMarkBean;
 import com.sjkj.appthreefloor_tsgz.net.NewDataCenterRequest;
 import com.sjkj.base_lib.entity.Params;
 import com.sjkj.base_lib.net.domain.interactor.ProcessErrorSubscriber;
+import com.sjkj.base_lib.utils.Constants;
 import com.sjkj.base_lib.utils.ToastUtils;
 import com.sjkj.base_lib.view.BaseActivity;
 import com.sjkj.base_lib.weight.LoadingDialog;
@@ -56,34 +59,34 @@ public class WaterCraneResourcesActivity extends BaseActivity {
         super.initView();
         //eventTypeName = getIntent().getStringExtra("name");
         getTitleView().setText(getIntent().getStringExtra("title"));
-//        binding.tabLayout.addTab(binding.tabLayout.newTab().setText("数据"));
-//        binding.tabLayout.addTab(binding.tabLayout.newTab().setText("地图"));
-//        binding.tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
-//            @Override
-//            public void onTabSelected(TabLayout.Tab tab) {
-//                if (TextUtils.equals(tab.getText(), "数据")) {
-//                    getSupportFragmentManager().beginTransaction()
-//                            .show(dataListFragment)
-//                            .hide(mapFragment)
-//                            .commit();
-//                } else {
-//                    getSupportFragmentManager().beginTransaction()
-//                            .hide(dataListFragment)
-//                            .show(mapFragment)
-//                            .commit();
-//                }
-//            }
-//
-//            @Override
-//            public void onTabUnselected(TabLayout.Tab tab) {
-//
-//            }
-//
-//            @Override
-//            public void onTabReselected(TabLayout.Tab tab) {
-//
-//            }
-//        });
+        binding.tabLayout.addTab(binding.tabLayout.newTab().setText("数据"));
+        binding.tabLayout.addTab(binding.tabLayout.newTab().setText("地图"));
+        binding.tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                if (TextUtils.equals(tab.getText(), "数据")) {
+                    getSupportFragmentManager().beginTransaction()
+                            .show(dataListFragment)
+                            .hide(mapFragment)
+                            .commit();
+                } else {
+                    getSupportFragmentManager().beginTransaction()
+                            .hide(dataListFragment)
+                            .show(mapFragment)
+                            .commit();
+                }
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+
+            }
+        });
 
         dataListFragment = new CommonDataListFragment(eventTypeName);
         mapFragment = new CommonMapFragment(eventTypeName);
@@ -152,7 +155,8 @@ public class WaterCraneResourcesActivity extends BaseActivity {
                         mapList.add(bean);
                     }
                     mapFragment.refreshData(mList);
-                } else {
+                }
+//                } else {
 //                    bean = new MapMarkBean();
 //                    bean.setLatitude(getIntent().getDoubleExtra("Latitude", Constants.DEFAULT_LOCATION_LAT));
 //                    bean.setLongitude(getIntent().getDoubleExtra("Longitude", Constants.DEFAULT_LOCATION_LNG));
@@ -160,7 +164,7 @@ public class WaterCraneResourcesActivity extends BaseActivity {
 //                    bean.setName("附近暂无资源");
 //                    mapList.add(bean);
 //                    mapFragment.refreshData(mapList, mList, eventTypeName, 1);
-                }
+//                }
                 //finishRefreshOrLoadMore(binding.smartRefreshLayout);
             }
         });

app/src/main/java/com/sjkj/appthreefloor_tsgz/adapter/EventCenterAdapter.java

@@ -30,11 +30,7 @@ public class EventCenterAdapter extends BaseRecAdapter<EventBean, ItemEventListB
         binding.setModel(bean);
         binding.executePendingBindings();
 //        binding.titleTv TODO
-        if (bean.getEventStatus().equals("是")){
-            binding.tvCui.setVisibility(View.VISIBLE);
-        }else {
-            binding.tvCui.setVisibility(View.GONE);
-        }
+
     }
 
 

app/src/main/java/com/sjkj/appthreefloor_tsgz/fragment/EventFragment.java

@@ -1,6 +1,6 @@
 package com.sjkj.appthreefloor_tsgz.fragment;
 
-import android.content.Intent;
+import android.content.Context;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextUtils;
@@ -10,31 +10,39 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.tabs.TabLayout;
+import com.scwang.smartrefresh.layout.SmartRefreshLayout;
+import com.scwang.smartrefresh.layout.api.DefaultRefreshFooterCreator;
+import com.scwang.smartrefresh.layout.api.DefaultRefreshHeaderCreator;
+import com.scwang.smartrefresh.layout.api.RefreshFooter;
+import com.scwang.smartrefresh.layout.api.RefreshHeader;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
 import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.sjkj.appthreefloor_tsgz.R;
-import com.sjkj.appthreefloor_tsgz.activity.NewEventActivity;
 import com.sjkj.appthreefloor_tsgz.adapter.EventCenterAdapter;
 import com.sjkj.appthreefloor_tsgz.app.App;
 import com.sjkj.appthreefloor_tsgz.bean.EventBean;
 import com.sjkj.appthreefloor_tsgz.bean.EventCenterListBean;
 import com.sjkj.appthreefloor_tsgz.databinding.FragmentEventBinding;
 import com.sjkj.appthreefloor_tsgz.fragment.viewModel.EventFargmentViewModel;
+import com.sjkj.appthreefloor_tsgz.header.MyClassicsHeader;
 import com.sjkj.appthreefloor_tsgz.net.EventListRequest;
+import com.sjkj.appthreefloor_tsgz.utils.StatusBarUtil;
 import com.sjkj.base_lib.adapter.BaseRecAdapter;
-import com.sjkj.base_lib.divider.DividerItem;
 import com.sjkj.base_lib.entity.Params;
 import com.sjkj.base_lib.net.domain.interactor.ProcessErrorSubscriber;
 import com.sjkj.base_lib.utils.Constants;
 import com.sjkj.base_lib.view.BaseFragment;
 import com.sjkj.base_lib.weight.LoadingDialog;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class EventFragment extends BaseFragment /*implements View.OnClickListener */ {
@@ -45,7 +53,25 @@ public class EventFragment extends BaseFragment /*implements View.OnClickListene
     private int currentPage = 1;
     private EventCenterAdapter adapter;
     public EventListRequest eventListRequest = new EventListRequest(App.getInstance());
-    private List<EventBean> eventItemList;
+    private List<EventBean> eventItemList = new ArrayList<>();
+    static {
+        SmartRefreshLayout.setDefaultRefreshHeaderCreator(new DefaultRefreshHeaderCreator() {
+            @NonNull
+            @Override
+            public RefreshHeader createRefreshHeader(@NonNull Context context, @NonNull RefreshLayout layout) {
+                layout.setPrimaryColorsId(R.color.color_transparent00, R.color.color_transparent00);//全局设置主题颜色
+                return new MyClassicsHeader(context).setAccentColor(context.getResources().getColor(R.color.white));
+            }
+        });
+        SmartRefreshLayout.setDefaultRefreshFooterCreator(new DefaultRefreshFooterCreator() {
+            @NonNull
+            @Override
+            public RefreshFooter createRefreshFooter(@NonNull Context context, @NonNull RefreshLayout layout) {
+                return new ClassicsFooter(context).setDrawableSize(20);
+            }
+        });
+    }
+
     @Override
     protected int initLayout() {
         return R.layout.fragment_event;
@@ -60,9 +86,11 @@ public class EventFragment extends BaseFragment /*implements View.OnClickListene
         return binding.getRoot();
     }
 
-
     @Override
     public void initView() {
+      //  fitsLayoutOverlap();
+        //StatusBarUtil.transparencyBar(getActivity());
+
         initTab();
         LinearLayoutManager manager = new LinearLayoutManager(getActivity());
         manager.setOrientation(RecyclerView.VERTICAL);
@@ -79,6 +107,7 @@ public class EventFragment extends BaseFragment /*implements View.OnClickListene
             }
         });
         binding.recyclerView.setAdapter(adapter);
+        binding.smartRefreshLayout.setPrimaryColors(getResources().getColor(R.color.colorPrimary));
         binding.smartRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
             @Override
             public void onRefresh(RefreshLayout refreshLayout) {
@@ -91,18 +120,18 @@ public class EventFragment extends BaseFragment /*implements View.OnClickListene
                 requestListLoadMore();
             }
         });
-        binding.recyclerView.addItemDecoration(new DividerItem(getActivity()));
+       // binding.recyclerView.addItemDecoration(new DividerItem(getActivity()));
 
     }
 
     private void initTab() {
-//        for (int i = 0; i < eventStatusNames.length; i++) {
-//            binding.tabLayout.addTab(binding.tabLayout.newTab().setText(eventStatusNames[i]).setTag(eventStatusValues[i]));
-//        }
+        for (int i = 0; i < eventStatusNames.length; i++) {
+            binding.tabLayout.addTab(binding.tabLayout.newTab().setText(eventStatusNames[i]).setTag(eventStatusValues[i]));
+        }
     }
 
     private void requestListRefresh() {
-        showLoadingDialog();
+
         currentPage = 1;
         Params params = new Params();
         params.put("pageSize", Constants.ITEM_NUMBERS);
@@ -127,9 +156,12 @@ public class EventFragment extends BaseFragment /*implements View.OnClickListene
             @Override
             public void onNext(List<EventCenterListBean> bean) {
                 super.onNext(bean);
+                Log.d("ZHR111", bean.size() + "");
                 finishRefreshOrLoadMore(binding.smartRefreshLayout);
-                hideLoadingDialog(LoadingDialog.LOADING_SUCCESS);
+
                 eventItemList.clear();
+
+                Log.d("ZHR111", bean.size() + "" + "===");
                 if (bean != null && bean.size() > 0) {
                     for (int i = 0; i < bean.size(); i++) {
                         String id = bean.get(i).getId();
@@ -140,14 +172,15 @@ public class EventFragment extends BaseFragment /*implements View.OnClickListene
                         String eventSource = bean.get(i).getReportSource();
                         String eventCode = bean.get(i).getEventCode();
                         String isUrged = "";
-                        if (viewModel.eventStatusValue.get().equals("forest_event_status_5") || viewModel.eventStatusValue.get().equals("forest_event_status_6")) {
-                            isUrged = "否";
-                        } else {
-                            isUrged = bean.get(i).getIsUrged();
-                        }
+//                        if (viewModel.eventStatusValue.get().equals("forest_event_status_5") || viewModel.eventStatusValue.get().equals("forest_event_status_6")) {
+//                            isUrged = "否";
+//                        } else {
+//                            isUrged = bean.get(i).getIsUrged();
+//                        }
 
 
                         EventBean eventBean = new EventBean(id, title, content, time, type, "", isUrged, "", "", eventCode, eventSource);
+                        Log.d("ZHR11111", title);
                         eventItemList.add(eventBean);
                     }
 
@@ -161,7 +194,7 @@ public class EventFragment extends BaseFragment /*implements View.OnClickListene
     }
 
     private void requestListLoadMore() {
-       showLoadingDialog();
+        showLoadingDialog();
         Params params = new Params();
         params.put("pageSize", Constants.ITEM_NUMBERS);
         params.put("pageNum", currentPage + 1);
@@ -219,11 +252,11 @@ public class EventFragment extends BaseFragment /*implements View.OnClickListene
 
     @Override
     public void initListener() {
-        binding.report.setOnClickListener(new View.OnClickListener() {
+        binding.ivSerch.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Log.d("ZHR21111", "上报");
-                startActivityForResult(new Intent(getActivity(), NewEventActivity.class), 1000);
+                Log.d("ZHR21111", "搜索");
+                // startActivityForResult(new Intent(getActivity(), NewEventActivity.class), 1000);
             }
         });
         binding.llChongzhi.setOnClickListener(new View.OnClickListener() {
@@ -258,7 +291,7 @@ public class EventFragment extends BaseFragment /*implements View.OnClickListene
         binding.llTime.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-               // startActivityForResult(new Intent(getActivity(), EventCenterSerchTimeActivity.class).putExtra("starttime", viewModel.satrtTime.get()).putExtra("endtime", viewModel.endTime.get()), 3000);
+                // startActivityForResult(new Intent(getActivity(), EventCenterSerchTimeActivity.class).putExtra("starttime", viewModel.satrtTime.get()).putExtra("endtime", viewModel.endTime.get()), 3000);
             }
         });
 //        setTitleListener(new BaseActivity.TitleListener() {
@@ -294,31 +327,34 @@ public class EventFragment extends BaseFragment /*implements View.OnClickListene
                 requestListRefresh();
             }
         });
-//        binding.tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
-//            @Override
-//            public void onTabSelected(TabLayout.Tab tab) {
-//                viewModel.eventStatus.set(tab.getText().toString());
-//                viewModel.eventStatusValue.set(tab.getTag().toString());
-//                requestListRefresh();
-//            }
-//
-//            @Override
-//            public void onTabUnselected(TabLayout.Tab tab) {
-//
-//            }
-//
-//            @Override
-//            public void onTabReselected(TabLayout.Tab tab) {
-//
-//            }
-//        });
+        binding.tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                viewModel.eventStatus.set(tab.getText().toString());
+                viewModel.eventStatusValue.set(tab.getTag().toString());
+                requestListRefresh();
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+
+            }
+        });
 
     }
 
     @Override
     public void loadData() {
-        viewModel.eventStatus.set(eventStatusNames[0]);
-        viewModel.eventStatusValue.set(eventStatusValues[0]);
+//        viewModel.eventStatus.set(eventStatusNames[0]);
+//        viewModel.eventStatusValue.set(eventStatusValues[0]);
+        viewModel.satrtTime.set("2011-05-26");
+        viewModel.endTime.set("2026-05-26");
+        viewModel.eventStatusValue.set("forest_event_status_7");
         requestListRefresh();
     }
 

app/src/main/java/com/sjkj/appthreefloor_tsgz/utils/ImmerseGroup.java

@@ -0,0 +1,28 @@
+package com.sjkj.appthreefloor_tsgz.utils;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+
+import androidx.annotation.Nullable;
+
+public class ImmerseGroup extends FrameLayout {
+
+    public ImmerseGroup(Context context) {
+        super(context);
+    }
+
+    public ImmerseGroup(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ImmerseGroup(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(), 0);
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+}

app/src/main/java/com/sjkj/appthreefloor_tsgz/utils/MyVideoView.java

@@ -10,7 +10,6 @@ import android.widget.RelativeLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.google.android.exoplayer2.DeviceInfo;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.MediaMetadata;
@@ -18,10 +17,9 @@ import com.google.android.exoplayer2.PlaybackException;
 import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.audio.AudioAttributes;
+import com.google.android.exoplayer2.device.DeviceInfo;
 import com.google.android.exoplayer2.metadata.Metadata;
-import com.google.android.exoplayer2.text.CueGroup;
 import com.google.android.exoplayer2.trackselection.TrackSelectionParameters;
 import com.google.android.exoplayer2.ui.PlayerView;
 import com.google.android.exoplayer2.video.VideoSize;
@@ -110,10 +108,6 @@ public class MyVideoView extends RelativeLayout {
                 Player.Listener.super.onMediaItemTransition(mediaItem, reason);
             }
 
-            @Override
-            public void onTracksChanged(@NonNull Tracks tracks) {
-                Player.Listener.super.onTracksChanged(tracks);
-            }
 
             @Override
             public void onMediaMetadataChanged(@NonNull MediaMetadata mediaMetadata) {
@@ -135,10 +129,6 @@ public class MyVideoView extends RelativeLayout {
                 Player.Listener.super.onAvailableCommandsChanged(availableCommands);
             }
 
-            @Override
-            public void onTrackSelectionParametersChanged(@NonNull TrackSelectionParameters parameters) {
-                Player.Listener.super.onTrackSelectionParametersChanged(parameters);
-            }
 
             @Override
             public void onPlaybackStateChanged(int playbackState) {
@@ -253,10 +243,6 @@ public class MyVideoView extends RelativeLayout {
                 Player.Listener.super.onSeekForwardIncrementChanged(seekForwardIncrementMs);
             }
 
-            @Override
-            public void onMaxSeekToPreviousPositionChanged(long maxSeekToPreviousPositionMs) {
-                Player.Listener.super.onMaxSeekToPreviousPositionChanged(maxSeekToPreviousPositionMs);
-            }
 
             @Override
             public void onAudioSessionIdChanged(int audioSessionId) {
@@ -303,10 +289,6 @@ public class MyVideoView extends RelativeLayout {
                 Player.Listener.super.onRenderedFirstFrame();
             }
 
-            @Override
-            public void onCues(@NonNull CueGroup cueGroup) {
-                Player.Listener.super.onCues(cueGroup);
-            }
 
             @Override
             public void onMetadata(@NonNull Metadata metadata) {

app/src/main/java/com/sjkj/appthreefloor_tsgz/utils/StatusBarUtil.java

@@ -0,0 +1,191 @@
+package com.sjkj.appthreefloor_tsgz.utils;
+
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.graphics.Color;
+import android.os.Build;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import com.readystatesoftware.systembartint.SystemBarTintManager;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+/**
+ * 状态栏工具类
+ */
+public class StatusBarUtil {
+    /**
+     * 修改状态栏为全透明
+     *
+     * @param activity
+     */
+    @TargetApi(19)
+    public static void transparencyBar(Activity activity) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = activity.getWindow();
+            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            window.setStatusBarColor(Color.TRANSPARENT);
+
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            Window window = activity.getWindow();
+            window.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,
+                    WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        }
+    }
+
+    /**
+     * 修改状态栏颜色，支持4.4以上版本
+     *
+     * @param activity
+     * @param colorId
+     */
+    public static void setStatusBarColor(Activity activity, int colorId) {
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = activity.getWindow();
+            window.setStatusBarColor(activity.getResources().getColor(colorId));
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            //使用SystemBarTint库使4.4版本状态栏变色，需要先将状态栏设置为透明
+            transparencyBar(activity);
+            SystemBarTintManager tintManager = new SystemBarTintManager(activity);
+            tintManager.setStatusBarTintEnabled(true);
+            tintManager.setStatusBarTintResource(colorId);
+        }
+    }
+
+    /**
+     * 状态栏亮色模式，设置状态栏黑色文字、图标，
+     * 适配4.4以上版本MIUIV、Flyme和6.0以上版本其他Android
+     *
+     * @param activity
+     * @return 1:MIUUI 2:Flyme 3:android6.0
+     */
+    public static int StatusBarLightMode(Activity activity) {
+        int result = 0;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            if (MIUISetStatusBarLightMode(activity, true)) {
+                result = 1;
+            } else if (FlymeSetStatusBarLightMode(activity.getWindow(), true)) {
+                result = 2;
+            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                activity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+                result = 3;
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 已知系统类型时，设置状态栏黑色文字、图标。
+     * 适配4.4以上版本MIUIV、Flyme和6.0以上版本其他Android
+     *
+     * @param activity
+     * @param type     1:MIUUI 2:Flyme 3:android6.0
+     */
+    public static void StatusBarLightMode(Activity activity, int type) {
+        if (type == 1) {
+            MIUISetStatusBarLightMode(activity, true);
+        } else if (type == 2) {
+            FlymeSetStatusBarLightMode(activity.getWindow(), true);
+        } else if (type == 3) {
+            activity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+        }
+
+    }
+
+    /**
+     * 状态栏暗色模式，清除MIUI、flyme或6.0以上版本状态栏黑色文字、图标
+     */
+    public static void StatusBarDarkMode(Activity activity, int type) {
+        if (type == 1) {
+            MIUISetStatusBarLightMode(activity, false);
+        } else if (type == 2) {
+            FlymeSetStatusBarLightMode(activity.getWindow(), false);
+        } else if (type == 3) {
+            activity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
+        }
+
+    }
+
+
+    /**
+     * 设置状态栏图标为深色和魅族特定的文字风格
+     * 可以用来判断是否为Flyme用户
+     *
+     * @param window 需要设置的窗口
+     * @param dark   是否把状态栏文字及图标颜色设置为深色
+     * @return boolean 成功执行返回true
+     */
+    public static boolean FlymeSetStatusBarLightMode(Window window, boolean dark) {
+        boolean result = false;
+        if (window != null) {
+            try {
+                WindowManager.LayoutParams lp = window.getAttributes();
+                Field darkFlag = WindowManager.LayoutParams.class
+                        .getDeclaredField("MEIZU_FLAG_DARK_STATUS_BAR_ICON");
+                Field meizuFlags = WindowManager.LayoutParams.class
+                        .getDeclaredField("meizuFlags");
+                darkFlag.setAccessible(true);
+                meizuFlags.setAccessible(true);
+                int bit = darkFlag.getInt(null);
+                int value = meizuFlags.getInt(lp);
+                if (dark) {
+                    value |= bit;
+                } else {
+                    value &= ~bit;
+                }
+                meizuFlags.setInt(lp, value);
+                window.setAttributes(lp);
+                result = true;
+            } catch (Exception e) {
+
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 需要MIUIV6以上
+     *
+     * @param activity
+     * @param dark     是否把状态栏文字及图标颜色设置为深色
+     * @return boolean 成功执行返回true
+     */
+    public static boolean MIUISetStatusBarLightMode(Activity activity, boolean dark) {
+        boolean result = false;
+        Window window = activity.getWindow();
+        if (window != null) {
+            Class clazz = window.getClass();
+            try {
+                int darkModeFlag = 0;
+                Class layoutParams = Class.forName("android.view.MiuiWindowManager$LayoutParams");
+                Field field = layoutParams.getField("EXTRA_FLAG_STATUS_BAR_DARK_MODE");
+                darkModeFlag = field.getInt(layoutParams);
+                Method extraFlagField = clazz.getMethod("setExtraFlags", int.class, int.class);
+                if (dark) {
+                    extraFlagField.invoke(window, darkModeFlag, darkModeFlag);//状态栏透明且黑色字体
+                } else {
+                    extraFlagField.invoke(window, 0, darkModeFlag);//清除黑色字体
+                }
+                result = true;
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    //开发版 7.7.13 及以后版本采用了系统API，旧方法无效但不会报错，所以两个方式都要加上
+                    if (dark) {
+                        activity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+                    } else {
+                        activity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
+                    }
+                }
+            } catch (Exception e) {
+            }
+        }
+        return result;
+    }
+}

app/src/main/res/drawable/bg_event.xml

@@ -0,0 +1,14 @@
+<!-- res/drawable/shape_with_border.xml -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="10dp"/>
+    <solid android:color="#FFFFFF" /> <!-- 背景色 -->
+    <stroke
+        android:width="1dp"
+        android:color="#FFFFFF" /> <!-- 内边框 -->
+    <padding
+        android:left="4dp"
+        android:top="4dp"
+        android:right="4dp"
+        android:bottom="4dp"/> <!-- 用于模拟外阴影 -->
+</shape>

app/src/main/res/drawable/bg_notice.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <stroke android:width="1dp" android:color="#ffffffff" />
-            <gradient android:type="linear" android:useLevel="true" android:startColor="#ffedf3f8" android:endColor="#fffafafa" android:angle="157" />
-            <corners android:topLeftRadius="8dp" android:topRightRadius="8dp" android:bottomLeftRadius="8dp" android:bottomRightRadius="8dp" />
-            <item android:name="android:shadowColor">#8000000</item>
-            <item android:name="android:shadowDx">0</item>
-            <item android:name="android:shadowDy">1</item>
-        </shape>
-    </item>
-</selector>

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

@@ -49,18 +49,18 @@
                 android:textColor="@color/main_blue_color" />
         </LinearLayout>
 
-<!--        <com.google.android.material.tabs.TabLayout-->
-<!--            android:id="@+id/tabLayout"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            app:tabIndicatorColor="@color/main_blue_color"-->
-<!--            app:tabIndicatorFullWidth="false"-->
-<!--            app:tabIndicatorHeight="2dp"-->
-<!--            app:tabMode="auto"-->
-<!--            app:tabRippleColor="@android:color/transparent"-->
-<!--            app:tabSelectedTextColor="@color/main_blue_color"-->
-<!--            app:tabTextAppearance="@style/TabLayoutStyle"-->
-<!--            app:tabTextColor="@color/color_gray_text" />-->
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tabLayout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:tabIndicatorColor="@color/main_blue_color"
+            app:tabIndicatorFullWidth="false"
+            app:tabIndicatorHeight="2dp"
+            app:tabMode="auto"
+            app:tabRippleColor="@android:color/transparent"
+            app:tabSelectedTextColor="@color/main_blue_color"
+            app:tabTextAppearance="@style/TabLayoutStyle"
+            app:tabTextColor="@color/color_gray_text" />
 
         <FrameLayout
             android:id="@+id/fragment_layout"

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

@@ -10,207 +10,241 @@
     </data>
 
     <LinearLayout
+        android:id="@+id/ll_title"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:background="@color/color_white"
+        android:background="@drawable/icon_envent_bg"
+        android:fadeScrollbars="true"
+        android:fitsSystemWindows="true"
         android:orientation="vertical">
 
-        <RelativeLayout
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:background="@color/colorPrimary">
+            android:layout_height="match_parent">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center_horizontal|center_vertical"
-                android:text="事件"
-                android:textColor="@color/white"
-                android:textSize="18dp" />
 
-            <TextView
-                android:layout_width="60dp"
-                android:layout_height="match_parent"
-                android:layout_alignParentRight="true"
-                android:layout_marginRight="15dp"
-                android:gravity="center_vertical|right"
-                android:text="上报"
-                android:id="@+id/report"
-                android:textColor="@color/white"
-                android:textSize="16dp">
-
-            </TextView>
-        </RelativeLayout>
-
-        <LinearLayout
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:padding="12dp">
-
-            <EditText
-                android:id="@+id/input_et"
+            <ImageView
                 android:layout_width="match_parent"
-                android:layout_height="30dp"
-                android:layout_weight="1"
-                android:background="@drawable/shape_bg_gray_input"
-                android:drawableLeft="@drawable/icon_search"
-                android:drawablePadding="5dp"
-                android:ellipsize="end"
-                android:hint="@string/input_content"
-                android:lines="1"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
-                android:singleLine="true"
-                android:textColor="@color/color_black_text"
-                android:textColorHint="@color/color_gray_light_text"
-                android:textSize="12dp" />
-
-            <TextView
-                android:id="@+id/search_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:text="@string/search"
-                android:textColor="@color/main_blue_color"
-                android:textSize="14dp" />
-        </LinearLayout>
+                android:layout_height="wrap_content"></ImageView>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="44dp"
-            android:background="@color/line_gray_1"
-
-            android:gravity="center_vertical">
-
-            <LinearLayout
-                android:id="@+id/ll_serch"
-                android:layout_width="0dp"
-                android:layout_height="30dp"
-                android:layout_marginLeft="15dp"
-                android:layout_weight="1"
-                android:background="@drawable/shape_background_white_5"
-                android:gravity="center_vertical|center_horizontal"
-                android:orientation="horizontal">
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="40dp">
 
                 <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center_horizontal|center_vertical"
+                    android:text="事件列表"
+                    android:textColor="@color/white"
+                    android:textSize="18dp" />
 
-
-                    android:id="@+id/tv_serch"
+                <ImageView
+                    android:id="@+id/iv_serch"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="15dp"
+                    android:background="@drawable/icon_serch"
+                    android:gravity="center_vertical"
+                    android:textSize="16dp">
 
+                </ImageView>
+            </RelativeLayout>
 
-                    android:gravity="center_vertical|center_horizontal"
-                    android:text="条件筛选"
-                    android:maxEms="4"
-                    android:singleLine="true"
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:padding="12dp"
+                android:visibility="gone">
+
+                <EditText
+                    android:id="@+id/input_et"
+                    android:layout_width="match_parent"
+                    android:layout_height="30dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/shape_bg_gray_input"
+                    android:drawableLeft="@drawable/icon_search"
+                    android:drawablePadding="5dp"
                     android:ellipsize="end"
-                    android:textColor="@color/black" />
+                    android:hint="@string/input_content"
+                    android:lines="1"
+                    android:paddingLeft="10dp"
+                    android:paddingRight="10dp"
+                    android:singleLine="true"
+                    android:textColor="@color/color_black_text"
+                    android:textColorHint="@color/color_gray_light_text"
+                    android:textSize="12dp" />
 
-                <ImageView
-                    android:id="@+id/iv_s"
+                <TextView
+                    android:id="@+id/search_tv"
                     android:layout_width="wrap_content"
-
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="5dp"
-                    android:background="@drawable/icon_arrow_right" />
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/search"
+                    android:textColor="@color/main_blue_color"
+                    android:textSize="14dp" />
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/ll_time"
+                android:layout_width="match_parent"
+                android:layout_height="44dp"
+                android:background="@color/line_gray_1"
+                android:gravity="center_vertical"
+
+                android:visibility="gone">
+
+                <LinearLayout
+                    android:id="@+id/ll_serch"
+                    android:layout_width="0dp"
+                    android:layout_height="30dp"
+                    android:layout_marginLeft="15dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/shape_background_white_5"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:orientation="horizontal">
 
-                android:layout_width="0dp"
-                android:layout_height="30dp"
-                android:layout_marginLeft="15dp"
-                android:layout_weight="1"
-                android:background="@drawable/shape_background_white_5"
-                android:gravity="center_vertical|center_horizontal"
-                android:orientation="horizontal">
+                    <TextView
 
-                <TextView
-                    android:id="@+id/tv_startTime"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
 
-                    android:gravity="center_vertical|center_horizontal"
-                    android:text="时间筛选"
-                    android:textColor="@color/black" />
+                        android:id="@+id/tv_serch"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
 
-                <ImageView
-                    android:id="@+id/iv_t"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="5dp"
-                    android:background="@drawable/icon_arrow_right" />
-            </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/ll_chongzhi"
-                android:layout_width="0dp"
-                android:layout_height="30dp"
+                        android:ellipsize="end"
+                        android:gravity="center_vertical|center_horizontal"
+                        android:maxEms="4"
+                        android:singleLine="true"
+                        android:text="条件筛选"
+                        android:textColor="@color/black" />
 
-                android:layout_marginLeft="15dp"
-                android:layout_marginRight="15dp"
-                android:layout_weight="1"
-                android:background="@drawable/shape_background_white_5"
-                android:gravity="center_vertical|center_horizontal"
-                android:orientation="horizontal">
+                    <ImageView
+                        android:id="@+id/iv_s"
+                        android:layout_width="wrap_content"
 
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="5dp"
+                        android:background="@drawable/icon_arrow_right" />
+                </LinearLayout>
 
-                <TextView
-                    android:id="@+id/tv_chongzhi"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
+                <LinearLayout
+                    android:id="@+id/ll_time"
 
+                    android:layout_width="0dp"
+                    android:layout_height="30dp"
+                    android:layout_marginLeft="15dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/shape_background_white_5"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/tv_startTime"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+
+                        android:gravity="center_vertical|center_horizontal"
+                        android:text="时间筛选"
+                        android:textColor="@color/black" />
+
+                    <ImageView
+                        android:id="@+id/iv_t"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="5dp"
+                        android:background="@drawable/icon_arrow_right" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_chongzhi"
+                    android:layout_width="0dp"
+                    android:layout_height="30dp"
+
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="15dp"
+                    android:layout_weight="1"
                     android:background="@drawable/shape_background_white_5"
                     android:gravity="center_vertical|center_horizontal"
-                    android:text="重置筛选"
-                    android:textColor="@color/black" />
+                    android:orientation="horizontal">
 
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
 
-                    android:layout_marginLeft="5dp"
-                    android:background="@drawable/icon_arrow_right" />
+                    <TextView
+                        android:id="@+id/tv_chongzhi"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+
+                        android:background="@drawable/shape_background_white_5"
+                        android:gravity="center_vertical|center_horizontal"
+                        android:text="重置筛选"
+                        android:textColor="@color/black" />
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+
+                        android:layout_marginLeft="5dp"
+                        android:background="@drawable/icon_arrow_right" />
+                </LinearLayout>
+
             </LinearLayout>
 
-        </LinearLayout>
-
-
-<!--        <com.google.android.material.tabs.TabLayout-->
-<!--            android:id="@+id/tabLayout"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            app:tabGravity="fill"-->
-<!--            app:tabIndicatorColor="@color/main_blue_color"-->
-<!--            app:tabIndicatorFullWidth="false"-->
-<!--            app:tabIndicatorHeight="2dp"-->
-<!--            app:tabMode="fixed"-->
-<!--            app:tabRippleColor="@android:color/transparent"-->
-<!--            app:tabSelectedTextColor="@color/main_blue_color"-->
-<!--            app:tabTextAppearance="@style/TabLayoutStyle"-->
-<!--            app:tabTextColor="@color/color_gray_text" />-->
-
-        <com.scwang.smartrefresh.layout.SmartRefreshLayout
-            android:id="@+id/smartRefreshLayout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/color_white">
 
-            <androidx.recyclerview.widget.RecyclerView android:overScrollMode="never"
-                android:id="@+id/recyclerView"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+
+                <com.google.android.material.tabs.TabLayout
+                    android:id="@+id/tabLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="50dp"
+                    app:tabGravity="fill"
+                    app:tabIndicatorColor="@color/white"
+                    app:tabIndicatorFullWidth="false"
+                    app:tabIndicatorHeight="4dp"
+                    app:tabMode="fixed"
+                    app:tabRippleColor="@android:color/transparent"
+                    app:tabSelectedTextColor="@color/white"
+                    app:tabTextAppearance="@style/TabLayoutStyle"
+                    app:tabTextColor="@color/color_tab_text" />
+
+                <com.scwang.smartrefresh.layout.SmartRefreshLayout
+                    android:id="@+id/smartRefreshLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    app:srlAccentColor="@android:color/white"
+                    app:srlPrimaryColor="@color/white">
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/recyclerView"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:overScrollMode="never" />
+                </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+            </LinearLayout>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end|bottom"
+                android:layout_marginRight="15dp"
+                android:layout_marginBottom="40dp"
+                android:background="@drawable/icon_submit"></ImageView>
+
+        </FrameLayout>
+
     </LinearLayout>
 
 

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

@@ -17,14 +17,15 @@
     <!--        android:scrollbars="none">-->
 
     <ScrollView
+
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
         <LinearLayout
-            android:background="#ECEDF4"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:background="#ECEDF4"
             android:orientation="vertical">
 
 
@@ -40,7 +41,9 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_marginBottom="10dp"
-                        android:background="@mipmap/bg_splash_tsgz" />
+                        android:adjustViewBounds="true"
+                        android:background="@drawable/icon_bg"
+                        android:scaleType="fitXY" />
 
                     <ImageView
                         android:layout_width="match_parent"
@@ -52,11 +55,12 @@
 
                 <LinearLayout
 
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginRight="15dp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginBottom="30dp"
                     android:layout_gravity="bottom"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="15dp"
                     android:background="@drawable/round_corner_top_letf_right"
                     android:orientation="vertical">
 
@@ -81,8 +85,8 @@
                             <ImageView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:padding="10dp"
-                                android:background="@drawable/icon_camera">
+                                android:background="@drawable/icon_camera"
+                                android:padding="10dp">
 
                             </ImageView>
 
@@ -109,8 +113,8 @@
                             <ImageView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:padding="10dp"
-                                android:background="@drawable/icon_sensor">
+                                android:background="@drawable/icon_sensor"
+                                android:padding="10dp">
 
                             </ImageView>
 
@@ -137,8 +141,8 @@
                             <ImageView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:padding="10dp"
-                                android:background="@drawable/icon_intake">
+                                android:background="@drawable/icon_intake"
+                                android:padding="10dp">
 
                             </ImageView>
 
@@ -165,8 +169,8 @@
                             <ImageView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:padding="10dp"
-                                android:background="@drawable/icon_water_crane">
+                                android:background="@drawable/icon_water_crane"
+                                android:padding="10dp">
 
                             </ImageView>
 
@@ -203,8 +207,8 @@
                             <ImageView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:padding="10dp"
-                                android:background="@drawable/icon_water_source">
+                                android:background="@drawable/icon_water_source"
+                                android:padding="10dp">
 
                             </ImageView>
 
@@ -230,8 +234,8 @@
                             <ImageView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:padding="10dp"
-                                android:background="@drawable/icon_zanding01">
+                                android:background="@drawable/icon_zanding01"
+                                android:padding="10dp">
 
                             </ImageView>
 
@@ -257,8 +261,8 @@
                             <ImageView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:padding="10dp"
-                                android:background="@drawable/icon_zanding02">
+                                android:background="@drawable/icon_zanding02"
+                                android:padding="10dp">
 
                             </ImageView>
 
@@ -284,8 +288,8 @@
                             <ImageView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:padding="10dp"
-                                android:background="@drawable/icon_more">
+                                android:background="@drawable/icon_more"
+                                android:padding="10dp">
 
                             </ImageView>
 
@@ -307,10 +311,10 @@
 
 
             <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="70dp"
                 android:layout_marginLeft="15dp"
                 android:layout_marginTop="10dp"
-                android:layout_width="match_parent"
                 android:layout_marginRight="15dp"
                 android:background="@drawable/icon_noticebg">
 
@@ -323,7 +327,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginLeft="30dp"
+                        android:layout_marginLeft="20dp"
                         android:background="@drawable/icon_notice">
 
                     </ImageView>
@@ -364,16 +368,16 @@
             </LinearLayout>
 
 
-                        <com.youth.banner.Banner
-                            android:id="@+id/banner"
-                            android:layout_width="match_parent"
-                            android:layout_marginLeft="15dp"
-                            android:layout_marginRight="15dp"
-                            android:layout_height="120dp"
-                            android:layout_marginTop="15dp"
-                            app:banner_radius="5dp"
-                            app:banner_indicator_normal_color="@color/divider"
-                            app:banner_indicator_selected_color="@color/white" />
+            <com.youth.banner.Banner
+                android:id="@+id/banner"
+                android:layout_width="match_parent"
+                android:layout_height="120dp"
+                android:layout_marginLeft="15dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginRight="15dp"
+                app:banner_indicator_normal_color="@color/divider"
+                app:banner_indicator_selected_color="@color/white"
+                app:banner_radius="5dp" />
 
 
             <RelativeLayout
@@ -384,11 +388,11 @@
 
                 <TextView
                     android:layout_width="match_parent"
-                    android:drawableLeft="@drawable/icon_title"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
                     android:layout_marginLeft="15dp"
                     android:layout_toLeftOf="@+id/tv_all"
+                    android:drawableLeft="@drawable/icon_title"
                     android:drawablePadding="10dp"
                     android:text="更多应用"
                     android:textColor="@color/black"
@@ -397,9 +401,9 @@
                 <TextView
                     android:id="@+id/tv_all"
                     android:layout_width="wrap_content"
-                    android:layout_centerVertical="true"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
                     android:layout_marginRight="15dp"
                     android:drawableRight="@drawable/icon_arrow_right"
 
@@ -409,17 +413,17 @@
             </RelativeLayout>
 
             <LinearLayout
-                android:layout_marginBottom="45dp"
-
-                android:layout_marginTop="10dp"
                 android:layout_width="match_parent"
+
                 android:layout_height="match_parent"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="45dp"
                 android:orientation="horizontal">
 
                 <LinearLayout
+                    android:layout_width="0dp"
                     android:layout_height="220dp"
                     android:layout_marginLeft="10dp"
-                    android:layout_width="0dp"
                     android:layout_marginRight="10dp"
                     android:layout_weight="1"
                     android:background="@drawable/icon_zanding03">
@@ -434,9 +438,9 @@
                     android:orientation="vertical">
 
                     <TextView
-                        android:layout_marginBottom="10dp"
                         android:layout_width="match_parent"
                         android:layout_height="0dp"
+                        android:layout_marginBottom="10dp"
                         android:layout_weight="1"
                         android:background="@drawable/icon_zanding04" />
 

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

@@ -7,39 +7,46 @@
         <variable
             name="model"
             type="com.sjkj.appthreefloor_tsgz.bean.EventBean" />
+
         <import type="android.view.View" />
     </data>
 
-    <LinearLayout
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="120dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginRight="15dp"
         android:gravity="center_vertical"
         android:orientation="horizontal"
-        android:paddingLeft="12dp"
-        android:paddingTop="10dp"
-        android:paddingRight="12dp"
-        android:paddingBottom="10dp">
-
-        <ImageView
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginRight="10dp"
-            android:error="@{@drawable/ic_baseline_event_note_24}"
-            android:imgUrl="@{model.img}"
-            android:placeholder="@{@drawable/ic_baseline_event_note_24}" />
-
-        <LinearLayout
+        app:cardBackgroundColor="#FFFFFF"
+        app:cardCornerRadius="10dp"
+        app:cardElevation="4dp">
+
+
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:orientation="vertical">
 
+
             <LinearLayout
+                android:id="@+id/ll_title"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="35dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
+
+                <ImageView
+
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="10dp"
+                    android:background="@drawable/icon_event_fire" />
+
                 <TextView
                     android:id="@+id/title_tv"
                     android:layout_width="0dp"
@@ -50,54 +57,89 @@
                     android:ellipsize="end"
                     android:lines="1"
                     android:text="@{model.title}"
-                    android:textColor="@color/color_black_text"
-                    android:textSize="14dp" />
+                    android:textColor="@color/color_notice"
+                    android:textSize="16dp" />
+
 
-                <TextView
-                    android:id="@+id/type_tv"
-                    android:layout_width="77dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:ellipsize="end"
-                    android:gravity="right"
-                    android:lines="1"
-                    android:text="@{model.eventSource}"
-                    android:textColor="@color/main_blue_color"
-                    android:textSize="12dp" />
             </LinearLayout>
 
-            <LinearLayout
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
+                android:layout_height="match_parent"
+                android:layout_below="@+id/ll_title">
 
-                <TextView
-                    android:id="@+id/content_tv"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginTop="4dp"
-                    android:layout_weight="1"
-                    android:ellipsize="end"
-                    android:maxLines="3"
-                    android:text="@{model.content}"
-                    android:textColor="@color/color_gray_text"
-                    android:textSize="12dp" />
 
-                <TextView
-                    android:id="@+id/tv_cui"
-                    android:layout_width="77dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:ellipsize="end"
-                    android:gravity="right"
-                    android:lines="1"
-                    android:text="催办"
-                    android:textColor="@color/color_red"
-                    android:textSize="12dp" />
-            </LinearLayout>
-        </LinearLayout>
+                <LinearLayout
+                    android:id="@+id/ll_conten"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_above="@+id/rl_bootm"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="10dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/content_tv"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:ellipsize="end"
+                        android:maxLines="3"
+                        android:text="@{model.title}"
+                        android:textColor="@color/color_gray_text"
+                        android:textSize="14dp" />
+
+
+                </LinearLayout>
+
+                <RelativeLayout
+                    android:layout_marginBottom="10dp"
+                    android:id="@+id/rl_bootm"
+                    android:layout_width="match_parent"
+                    android:layout_height="30dp"
+                    android:layout_alignParentBottom="true"
+                    android:orientation="vertical">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginTop="5dp"
+                        android:layout_marginRight="15dp"
+                        android:background="@color/gray3" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginTop="5dp"
+                        android:layout_marginRight="15dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:gravity="center_vertical|left"
+                            android:text='@{"上报人: "+model.eventSource}'
+                            android:textColor="@color/coler_evnet">
+
+                        </TextView>
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:gravity="center_vertical|right"
+                            android:text='@{model.time}'
+                            android:textColor="@color/coler_evnet">
+
+                        </TextView>
 
-    </LinearLayout>
+                    </LinearLayout>
+                </RelativeLayout>
+            </RelativeLayout>
+        </RelativeLayout>
+    </androidx.cardview.widget.CardView>
 </layout>

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

@@ -3,7 +3,6 @@
     android:layout_height="match_parent">
 
   <RelativeLayout
-      android:background="@color/color_white"
       android:layout_width="match_parent"
       android:layout_height="match_parent">
 

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#225298</color>
-    <color name="colorPrimaryDark">#225298</color>
+    <color name="colorPrimary">#084AFF</color>
+    <color name="colorPrimaryDark">#084AFF</color>
     <color name="colorAccent">#5394ff</color>
     <color name="color_input_red">#D81B60</color>
     <color name="green_color">#27be6d</color>
@@ -26,11 +26,12 @@
     <color name="color_black_text">#333333</color>
     <color name="color_black_text55">#555555</color>
     <color name="color_gray_text">#999999</color>
+    <color name="color_tab_text">#DCDADA</color>
     <color name="color_gray_light_text">#ffd2d2d2</color>
     <color name="transparent_click">#00000000</color>
     <color name="light_gray_10">#e1e1e1</color>
     <color name="light_gray_12">#EDEDED</color>
-    <drawable name="gray">#D8D8D8</drawable>
+    <color name="gray3">#D8D8D8</color>
     <color name="color_transparent00">#00000000</color>
     <color name="color_notice">#334960</color>
     <color name="C0">#FFFFFF</color>
@@ -63,5 +64,6 @@
     <color name="color_green">#1FD312</color>
     <color name="color_orange">#FF9800</color>
     <color name="color_bg_gray_input">#F6F6F6</color>
+    <color name="coler_evnet">#9E9E9E</color>
 
 </resources>

app/src/main/res/values/styles.xml

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:actionBarSize">50dp</item>
         <item name="android:windowContentOverlay">@null</item>
     </style>
 
@@ -190,4 +188,6 @@
     <style name="switch_text_color_white" parent="@android:style/TextAppearance.Small">
         <item name="android:textColor">@color/main_blue_color</item>
     </style>
+
+
 </resources>

base-lib/src/main/res/values/colors.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <color name="colorPrimary">#225298</color>
-    <color name="colorPrimaryDark">#225298</color>
+    <color name="colorPrimary">#084AFF</color>
+    <color name="colorPrimaryDark">#084AFF</color>
     <color name="colorAccent">#5394ff</color>
     <color name="main_blue_color">#5394ff</color>
     <color name="color_input_red">#D81B60</color>

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.3.0' apply false
-    id 'com.android.library' version '7.3.0' apply false
+    id 'com.android.application' version '7.1.2' apply false
+    id 'com.android.library' version '7.1.2' apply false
 }
 
 task clean(type: Delete) {

config.gradle

@@ -4,7 +4,7 @@ ext {
             applicationId    : "com.sjkj.appthreefloor_tsgz",
             minSdkVersion    : 21,
             targetSdkVersion : 31,
-            compileSdkVersion: 33,
+            compileSdkVersion: 30,
             versionCode      : 10403,
             versionName      : "1.4.3",
     ]