调整页面 修复bug

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

@@ -2,6 +2,7 @@ package com.sjkj.appthreefloor_tsgz.fragment;
 
 import android.os.Bundle;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -161,9 +162,16 @@ public class EventDetailsFragment extends BaseFragment {
                         //待签收
                         binding.tvCompleted.setVisibility(View.VISIBLE);
                         binding.tvRefuse.setVisibility(View.VISIBLE);
+                        binding.tvTime.setGravity(Gravity.RIGHT|Gravity.CENTER_VERTICAL);
                     } else if (bean.getStatus().equals("30")) {
                         //处理中
                         binding.tvFinish.setVisibility(View.VISIBLE);
+                        binding.tvTime.setGravity(Gravity.RIGHT|Gravity.CENTER_VERTICAL);
+                    } else {
+                        binding.tvCompleted.setVisibility(View.GONE);
+                        binding.tvRefuse.setVisibility(View.GONE);
+                        binding.tvFinish.setVisibility(View.GONE);
+                        binding.tvTime.setGravity(Gravity.LEFT|Gravity.CENTER_VERTICAL);
                     }
                 }
             }

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

@@ -188,16 +188,16 @@ public class EventNearByFragment extends BaseFragment {
     public void initView() {
         requestPermissionsLocation();
         distanceList.clear();
+        distanceList.add("1");
+        distanceList.add("2");
+        distanceList.add("3");
+        distanceList.add("4");
         distanceList.add("5");
+        distanceList.add("6");
+        distanceList.add("7");
+        distanceList.add("8");
+        distanceList.add("9");
         distanceList.add("10");
-        distanceList.add("15");
-        distanceList.add("20");
-        distanceList.add("25");
-        distanceList.add("30");
-        distanceList.add("35");
-        distanceList.add("40");
-        distanceList.add("45");
-        distanceList.add("50");
 
         for (int i = 0; i < distanceList.size(); i++) {
             commonDateBean = new CommonDateBean();
@@ -221,7 +221,7 @@ public class EventNearByFragment extends BaseFragment {
 
         rightAdapter = new RecycleviewRightAdapter(getActivity(), DistancelistChoose);
         binding.recyclerViewRight.setAdapter(rightAdapter);
-        rightAdapter.setCheckedPosition(0);
+        rightAdapter.setCheckedPosition(4);
         rightAdapter.setOnItemClickListener(new RecycleviewRightAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(CommonDateBean bean, int position, int type) {

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

@@ -3,6 +3,10 @@
 
     <data>
 
+        <import type="android.view.View" />
+
+        <import type="android.text.TextUtils" />
+
         <variable
             name="viewModel"
             type="com.sjkj.appthreefloor_tsgz.fragment.viewModel.EventFargmentViewModel" />
@@ -29,8 +33,11 @@
                 <LinearLayout
                     android:id="@+id/ll_title"
                     android:layout_width="match_parent"
-                    android:layout_height="110dp"
-                    android:layout_margin="15dp"
+                    android:layout_height="90dp"
+                    android:layout_marginStart="15dp"
+                    android:layout_marginTop="15dp"
+                    android:layout_marginEnd="15dp"
+                    android:layout_marginBottom="15dp"
                     android:background="@drawable/round_corner_top_letf_right"
                     android:orientation="vertical">
 
@@ -57,7 +64,6 @@
                         android:gravity="center_vertical">
 
                         <TextView
-                            android:visibility="gone"
                             android:id="@+id/tv_completed"
                             android:layout_width="70dp"
                             android:layout_height="30dp"
@@ -65,12 +71,12 @@
                             android:background="@drawable/bg_event_completed"
                             android:gravity="center_horizontal|center_vertical"
                             android:text="签收"
-                            android:textColor="#04BF60">
+                            android:textColor="#04BF60"
+                            android:visibility="gone">
 
                         </TextView>
 
                         <TextView
-                            android:visibility="gone"
                             android:id="@+id/tv_refuse"
                             android:layout_width="70dp"
                             android:layout_height="30dp"
@@ -78,33 +84,35 @@
                             android:background="@drawable/bg_event_refuse"
                             android:gravity="center_horizontal|center_vertical"
                             android:text="拒签"
-                            android:textColor="#FD6350">
+                            android:textColor="#FD6350"
+                            android:visibility="gone">
 
                         </TextView>
 
                         <TextView
-                            android:visibility="gone"
                             android:id="@+id/tv_finish"
                             android:layout_width="70dp"
                             android:layout_height="30dp"
                             android:background="@drawable/bg_event_finish"
                             android:gravity="center_horizontal|center_vertical"
                             android:text="办结"
-                            android:textColor="#EDAC00">
+                            android:textColor="#EDAC00"
+                            android:visibility="gone">
 
                         </TextView>
 
                         <TextView
+                            android:id="@+id/tv_time"
                             android:layout_width="match_parent"
-                            android:text="@{viewModel.time}"
                             android:layout_height="30dp"
-                            android:gravity="right|center_vertical"
+                            android:text="@{viewModel.time}"
                             android:textColor="@color/coler_evnet" />
                     </LinearLayout>
                 </LinearLayout>
 
                 <LinearLayout
 
+                    android:visibility="gone"
                     android:id="@+id/ll_head"
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
@@ -153,7 +161,7 @@
                     android:layout_below="@+id/ll_head"
                     android:layout_marginLeft="15dp"
                     android:layout_marginRight="15dp"
-                    android:background="@drawable/rounded_leftbootom_rightbootom">
+                    android:background="@drawable/round_corner_top_letf_right">
 
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/recyclerView"
@@ -165,10 +173,10 @@
 
 
                 <LinearLayout
+                    android:visibility="@{TextUtils.isEmpty(viewModel.remark)?View.GONE:View.VISIBLE}"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/ll_conten"
-                    android:minHeight="120dp"
                     android:layout_marginLeft="15dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginRight="15dp"
@@ -176,10 +184,12 @@
 
                     <TextView
 
-                        android:text="@{viewModel.remark}"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:lineSpacingExtra="2dp"
+                        android:padding="15dp"
+                        android:text="@{viewModel.remark}"
+                        android:textSize="14dp"
                         android:textColor="#767676">
 
                     </TextView>

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

@@ -29,9 +29,8 @@
             android:orientation="vertical"
 
             app:behavior_hideable="true"
-            app:behavior_middleHeight="400dp"
-
-            app:behavior_peekHeight="200dp"
+            app:behavior_middleHeight="300dp"
+            app:behavior_peekHeight="300dp"
             app:layout_behavior=".utils.GaoDeBottomSheetBehavior">
 
             <RelativeLayout

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

@@ -18,10 +18,11 @@
         android:orientation="horizontal">
 
         <TextView
+            android:layout_marginLeft="10dp"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center_horizontal"
+            android:layout_weight="1.3"
+            android:gravity="left"
             android:text="@{model.deptName}"
             android:textColor="#181818"
             android:textSize="14dp">
@@ -32,17 +33,18 @@
             android:id="@+id/tv_status"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:layout_weight="0.5"
             android:textSize="14dp"
             android:gravity="center_horizontal">
 
         </TextView>
 
         <TextView
+            android:layout_marginRight="10dp"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center_horizontal"
+            android:layout_weight="1.5"
+            android:gravity="right"
             android:text="@{model.createTime}"
             android:textColor="#181818"
             android:textSize="14dp">

base-lib/src/main/java/com/sjkj/base_lib/weight/LoadingDialog.java

@@ -38,13 +38,12 @@ public class LoadingDialog extends Dialog {
         DisplayMetrics outMetrics = new DisplayMetrics();
         wm.getDefaultDisplay().getMetrics(outMetrics);
 
-        // Log.d("zhr111", outMetrics.heightPixels + "===" + ImmersionBar.getStatusBarHeight(mContext));
         win.getDecorView().setPadding(0, 0, 0, 0);
         win.setGravity(Gravity.RELATIVE_LAYOUT_DIRECTION | Gravity.CENTER);
         WindowManager.LayoutParams lp = win.getAttributes();
         lp.width = WindowManager.LayoutParams.MATCH_PARENT;
         if (ImmersionBar.getStatusBarHeight(mContext) != 0 && outMetrics.heightPixels != 0) {
-            lp.height = ImmersionBar.getStatusBarHeight(mContext) - outMetrics.heightPixels;
+            lp.height = outMetrics.heightPixels-ImmersionBar.getStatusBarHeight(mContext);
         } else {
             lp.height = WindowManager.LayoutParams.MATCH_PARENT;
         }