Kaynağa Gözat

调整页面 修复bug

zhanghongrui 1 hafta önce
ebeveyn
işleme
7678d2cbf1
25 değiştirilmiş dosya ile 1147 ekleme ve 43 silme
  1. 1 0
      app/build.gradle
  2. 10 0
      app/src/main/AndroidManifest.xml
  3. 141 8
      app/src/main/java/com/sjkj/appthreefloor_tsgz/activity/ResourceDetailsActivity.java
  4. 8 5
      app/src/main/java/com/sjkj/appthreefloor_tsgz/activity/viewModel/ResureDetailsViewModel.java
  5. 5 2
      app/src/main/java/com/sjkj/appthreefloor_tsgz/adapter/EventDetailsAdapter.java
  6. 38 0
      app/src/main/java/com/sjkj/appthreefloor_tsgz/adapter/ImagResourceDetailsAdapter.java
  7. 25 6
      app/src/main/java/com/sjkj/appthreefloor_tsgz/bean/ResureDetailsBean.java
  8. 0 1
      app/src/main/java/com/sjkj/appthreefloor_tsgz/fragment/EventDetailsFragment.java
  9. 4 3
      app/src/main/java/com/sjkj/appthreefloor_tsgz/fragment/EventNearByFragment.java
  10. 556 0
      app/src/main/java/com/sjkj/appthreefloor_tsgz/utils/Method.java
  11. BIN
      app/src/main/res/drawable-xxhdpi/icon_banner1.png
  12. BIN
      app/src/main/res/drawable-xxhdpi/icon_banner2.png
  13. BIN
      app/src/main/res/drawable-xxhdpi/icon_call.png
  14. BIN
      app/src/main/res/drawable-xxhdpi/icon_dxxz.png
  15. BIN
      app/src/main/res/drawable-xxhdpi/icon_location.png
  16. BIN
      app/src/main/res/drawable-xxhdpi/icon_next.png
  17. BIN
      app/src/main/res/drawable-xxhdpi/icon_resouce_bg.png
  18. 6 0
      app/src/main/res/drawable/circle_shape.xml
  19. 4 4
      app/src/main/res/drawable/rounded_leftbootom_rightbootom.xml
  20. 305 11
      app/src/main/res/layout/activity_resure_details.xml
  21. 2 0
      app/src/main/res/layout/fragment_event_details.xml
  22. 1 1
      app/src/main/res/layout/item_classify_right_ziyuan2.xml
  23. 2 2
      app/src/main/res/layout/item_details_list.xml
  24. 33 0
      app/src/main/res/layout/item_resource_details_list.xml
  25. 6 0
      app/src/main/res/layout/window_daohang.xml

+ 1 - 0
app/build.gradle

@@ -80,6 +80,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
     implementation 'org.greenrobot:eventbus:3.2.0'
+    implementation 'com.github.getActivity:EasyWindow:11.0'
 
 
 }

+ 10 - 0
app/src/main/AndroidManifest.xml

@@ -47,7 +47,9 @@
     <application
         android:name="com.sjkj.appthreefloor_tsgz.app.App"
         android:allowBackup="true"
+        android:resizeableActivity="true"
         android:hardwareAccelerated="true"
+        android:maxAspectRatio="2.4"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true"
@@ -59,6 +61,14 @@
         <meta-data
             android:name="android.max_aspect"
             android:value="2.4" />
+        <!--适配华为(huawei)刘海屏-->
+        <meta-data
+            android:name="android.notch_support"
+            android:value="true"/>
+        <!--适配小米(xiaomi)刘海屏-->
+        <meta-data
+            android:name="notch.config"
+            android:value="portrait|landscape" />
         <activity
             android:name="com.sjkj.appthreefloor_tsgz.activity.SplashActivity"
             android:noHistory="true"

+ 141 - 8
app/src/main/java/com/sjkj/appthreefloor_tsgz/activity/ResourceDetailsActivity.java

@@ -2,26 +2,46 @@ package com.sjkj.appthreefloor_tsgz.activity;
 
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
-import android.util.Log;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.ImageView;
 
 import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.gyf.immersionbar.ImmersionBar;
+import com.hjq.permissions.OnPermissionCallback;
+import com.hjq.permissions.Permission;
+import com.hjq.permissions.XXPermissions;
+import com.hjq.window.EasyWindow;
+import com.hjq.window.draggable.SpringBackDraggable;
 import com.sjkj.appthreefloor_tsgz.R;
 import com.sjkj.appthreefloor_tsgz.activity.viewModel.ResureDetailsViewModel;
+import com.sjkj.appthreefloor_tsgz.adapter.ImagResourceDetailsAdapter;
 import com.sjkj.appthreefloor_tsgz.app.App;
+import com.sjkj.appthreefloor_tsgz.bean.ImageBean;
 import com.sjkj.appthreefloor_tsgz.bean.ResureDetailsBean;
 import com.sjkj.appthreefloor_tsgz.databinding.ActivityResureDetailsBinding;
 import com.sjkj.appthreefloor_tsgz.net.ResureDetailsRequest;
+import com.sjkj.appthreefloor_tsgz.utils.Method;
+import com.sjkj.base_lib.app.AppManager;
 import com.sjkj.base_lib.entity.Params;
 import com.sjkj.base_lib.net.domain.interactor.ProcessErrorSubscriber;
+import com.sjkj.base_lib.utils.LocationUtils;
+import com.sjkj.base_lib.utils.ToastUtils;
 import com.sjkj.base_lib.view.BaseActivity;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 public class ResourceDetailsActivity extends BaseActivity {
     ActivityResureDetailsBinding binding;
     ResureDetailsViewModel viewModel;
     private ResureDetailsRequest resureDetailsRequest = new ResureDetailsRequest(App.getInstance());
+    private ImagResourceDetailsAdapter adapter;
 
     @Override
     protected int initLayout() {
@@ -36,12 +56,44 @@ public class ResourceDetailsActivity extends BaseActivity {
         binding.setLifecycleOwner(this);
     }
 
+    /**
+     * 显示全局弹窗
+     */
+    public void showGlobalWindow() {
+        SpringBackDraggable springBackDraggable = new SpringBackDraggable(SpringBackDraggable.ORIENTATION_HORIZONTAL);
+        springBackDraggable.setAllowMoveToScreenNotch(false);
+        EasyWindow.with(ResourceDetailsActivity.this)
+                .setContentView(R.layout.window_daohang)
+                .setGravity(Gravity.END | Gravity.BOTTOM)
+                .setYOffset(500)
+                .setXOffset(10)
+                // 设置指定的拖拽规则
+                .setDraggable(springBackDraggable)
+                .setOnClickListener(android.R.id.icon, new EasyWindow.OnClickListener<ImageView>() {
+
+                    @Override
+                    public void onClick(EasyWindow<?> easyWindow, ImageView view) {
+                        // 点击后跳转到拨打电话界面
+                        // Intent intent = new Intent(Intent.ACTION_DIAL);
+                        // intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        // toast.startActivity(intent);
+                        // 安卓 10 在后台跳转 Activity 需要额外适配
+                        // https://developer.android.google.cn/about/versions/10/privacy/changes#background-activity-starts
+                        if (viewModel.longitude.get() != 0 && viewModel.latitude.get() != 0) {
+                            LocationUtils.getInstance().mapNav(viewModel.latitude.get(), viewModel.longitude.get(), "");
+                        }
+
+                    }
+                })
+                .show();
+    }
+
     @Override
     public void initView() {
+
         super.initView();
         getTitleView().setText(getIntent().getStringExtra("tagValeText"));
         ImmersionBar.with(ResourceDetailsActivity.this)
-                .fitsSystemWindows(true)  //使用该属性,必须指定状态栏颜色
                 .statusBarDarkFont(true, 0.2f)
                 .statusBarColor(R.color.white)
                 .init();
@@ -53,15 +105,80 @@ public class ResourceDetailsActivity extends BaseActivity {
         }
         getSupportActionBar().setBackgroundDrawable(getResources().getDrawable(R.color.white));
 
+        LinearLayoutManager manager = new LinearLayoutManager(this);
+        manager.setOrientation(RecyclerView.VERTICAL);
+        binding.recyclerView.setLayoutManager(manager);
+        adapter = new ImagResourceDetailsAdapter(this);
+        binding.recyclerView.setAdapter(adapter);
+        showGlobalWindow();
+
+
+    }
+
+    private void CallPhone(String phone) {
+        if (TextUtils.isEmpty(phone)) {
+            ToastUtils.show("暂无联系方式");
+            return;
+        }
+
+        XXPermissions.with(AppManager.getAppManager().currentActivity())
+                .permission(Permission.CALL_PHONE)
+                .request(new OnPermissionCallback() {
+                    @Override
+                    public void onGranted(List<String> permissions, boolean all) {
+                        if (all) {
+                            Method.getPhoneNumber(ResourceDetailsActivity.this, phone);
+                        } else {
+                            ToastUtils.show("获取部分权限成功,但部分权限未正常授予");
+                        }
+                    }
+
+                    @Override
+                    public void onDenied(List<String> permissions, boolean never) {
+                        if (never) {
+                            ToastUtils.show("被永久拒绝授权,请手动授予权限");
+                            // 如果是被永久拒绝就跳转到应用权限系统设置页面
+                            XXPermissions.startPermissionActivity(AppManager.getAppManager().currentActivity(), permissions);
+                        } else {
+                            ToastUtils.show("获取权限失败");
+                        }
+                    }
+                });
+
+    }
+
+    @Override
+    public void initListener() {
+        super.initListener();
 
+        binding.tvCall.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                CallPhone(viewModel.phone.get());
+            }
+        });
+        binding.rlCall.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                CallPhone(viewModel.phone.get());
+            }
+        });
+        binding.ivCall.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                CallPhone(viewModel.phone.get());
+            }
+        });
     }
 
     @Override
     public void loadData() {
         super.loadData();
         Params params = new Params();
-        params.put("tag", getIntent().getStringExtra("tag"));
-        params.put("id", getIntent().getStringExtra("id"));
+//        params.put("tag", getIntent().getStringExtra("tag"));
+//        params.put("id", getIntent().getStringExtra("id"));
+        params.put("tag", "waterintake");
+        params.put("id", "1c6d2c6bb5a84077be00f1d96396c2b0");
         resureDetailsRequest.setParams(params);
         resureDetailsRequest.execute(new ProcessErrorSubscriber<ResureDetailsBean>() {
             @Override
@@ -72,11 +189,27 @@ public class ResourceDetailsActivity extends BaseActivity {
             @Override
             public void onNext(ResureDetailsBean bean) {
                 super.onNext(bean);
-                if (null != bean.getDetail().getUrl() && !TextUtils.isEmpty(bean.getDetail().getUrl())) {
-                    Log.d("zhr111", "ddd");
-                } else {
-                    Log.d("zhr111", "cccc");
+                if (bean.getDetail() != null) {
+                    viewModel.latitude.set(bean.getDetail().getLatitude());
+                    viewModel.longitude.set(bean.getDetail().getLongitude());
+                    viewModel.name.set(bean.getDetail().getName());
+                    viewModel.deptName.set(bean.getDetail().getDeptName());
+                    viewModel.deptNameAdm.set(bean.getDetail().getDeptNameAdm());
+                    viewModel.contact.set(bean.getDetail().getContact());
+                    viewModel.phone.set(bean.getDetail().getPhone());
+                    if (null != bean.getDetail().getUrl() && !TextUtils.isEmpty(bean.getDetail().getUrl())) {
+                        List<String> list = Arrays.asList(bean.getDetail().getUrl().split(","));
+                        List<ImageBean> imageBeanList = new ArrayList<>();
+                        for (int i = 0; i < list.size(); i++) {
+                            ImageBean imageBean = new ImageBean();
+                            imageBean.setRealUrl(list.get(i));
+                            imageBeanList.add(imageBean);
+
+                        }
+                        adapter.refreshList(imageBeanList);
+                    }
                 }
+
             }
         });
     }

+ 8 - 5
app/src/main/java/com/sjkj/appthreefloor_tsgz/activity/viewModel/ResureDetailsViewModel.java

@@ -1,21 +1,24 @@
 package com.sjkj.appthreefloor_tsgz.activity.viewModel;
 
-import androidx.databinding.ObservableArrayList;
 import androidx.databinding.ObservableField;
-import androidx.databinding.ObservableInt;
 
 import com.sjkj.appthreefloor_tsgz.bean.EventBean;
-import com.sjkj.appthreefloor_tsgz.map.MapMarkBean;
 import com.sjkj.base_lib.view.SingleLiveData;
 import com.sjkj.base_lib.vm.BaseViewModel;
 
-import java.util.List;
-
 public class ResureDetailsViewModel extends BaseViewModel {
 
     public ObservableField<String> tag = new ObservableField<>("");
     public ObservableField<String> tagText = new ObservableField<>("");
     public ObservableField<String> id = new ObservableField<>("");
+    public ObservableField<String> address = new ObservableField<>("");
+    public ObservableField<String> deptNameAdm = new ObservableField<>("");
+    public ObservableField<String> deptName = new ObservableField<>("");
+    public ObservableField<String> phone = new ObservableField<>("");
+    public ObservableField<String> contact = new ObservableField<>("");
+    public ObservableField<String> name = new ObservableField<>("");
+    public ObservableField<Double> longitude = new ObservableField<>(0.00);
+    public ObservableField<Double> latitude = new ObservableField<>(0.00);
 
     public SingleLiveData<EventBean> singleLiveData = new SingleLiveData<>();
 

+ 5 - 2
app/src/main/java/com/sjkj/appthreefloor_tsgz/adapter/EventDetailsAdapter.java

@@ -41,12 +41,15 @@ public class EventDetailsAdapter extends BaseRecAdapter<EventDetailsBean.DeptsBe
         } else if (bean.getStatus().equals("30")) {
             //处理中
             binding.tvStatus.setText("处理中");
+            binding.tvStatus.setTextColor(Color.parseColor("#409EFF"));
         } else if (bean.getStatus().equals("40")) {
-            //已完成
-            binding.tvStatus.setText("已完成");
+            //办结
+            binding.tvStatus.setText("办结");
+            binding.tvStatus.setTextColor(Color.parseColor("#FF6A00"));
         } else if (bean.getStatus().equals("50")) {
             //归档
             binding.tvStatus.setText("归档");
+            binding.tvStatus.setTextColor(Color.parseColor("#5D5DFF"));
         }
 
     }

+ 38 - 0
app/src/main/java/com/sjkj/appthreefloor_tsgz/adapter/ImagResourceDetailsAdapter.java

@@ -0,0 +1,38 @@
+package com.sjkj.appthreefloor_tsgz.adapter;
+
+import android.content.Context;
+import android.graphics.Color;
+
+import com.sjkj.appthreefloor_tsgz.R;
+import com.sjkj.appthreefloor_tsgz.bean.EventDetailsBean;
+import com.sjkj.appthreefloor_tsgz.bean.ImageBean;
+import com.sjkj.appthreefloor_tsgz.databinding.ItemDetailsListBinding;
+import com.sjkj.appthreefloor_tsgz.databinding.ItemResourceDetailsListBinding;
+import com.sjkj.base_lib.adapter.BaseRecAdapter;
+
+import java.util.List;
+
+public class ImagResourceDetailsAdapter extends BaseRecAdapter<ImageBean, ItemResourceDetailsListBinding> {
+
+    public ImagResourceDetailsAdapter(Context context) {
+        super(context);
+    }
+
+    public ImagResourceDetailsAdapter(Context context, List<ImageBean> list) {
+        super(context, list);
+    }
+
+    @Override
+    protected int getLayoutResId(int viewType) {
+        return R.layout.item_resource_details_list;
+    }
+
+    @Override
+    protected void onBindItem(ItemResourceDetailsListBinding binding, ImageBean bean, int position) {
+        binding.setModel(bean);
+        binding.executePendingBindings();
+
+    }
+
+
+}

+ 25 - 6
app/src/main/java/com/sjkj/appthreefloor_tsgz/bean/ResureDetailsBean.java

@@ -23,7 +23,7 @@ public class ResureDetailsBean {
         private String deptName;
         private String createBy;
         private String createTime;
-        private String latitude;
+        private Double latitude;
         private String deptId;
         private String name;
         private String deptNameAdm;
@@ -31,6 +31,25 @@ public class ResureDetailsBean {
         private String deptIdAdm;
         private String type;
         private String url;
+        private String contact;
+
+        public String getContact() {
+            return contact;
+        }
+
+        public void setContact(String contact) {
+            this.contact = contact;
+        }
+
+        public String getPhone() {
+            return phone;
+        }
+
+        public void setPhone(String phone) {
+            this.phone = phone;
+        }
+
+        private String phone;
 
         public String getUrl() {
             return url;
@@ -41,7 +60,7 @@ public class ResureDetailsBean {
         }
 
         private String createName;
-        private String longitude;
+        private Double longitude;
 
         public void setDeptName(String deptName) {
             this.deptName = deptName;
@@ -67,11 +86,11 @@ public class ResureDetailsBean {
             return createTime;
         }
 
-        public void setLatitude(String latitude) {
+        public void setLatitude(Double latitude) {
             this.latitude = latitude;
         }
 
-        public String getLatitude() {
+        public Double getLatitude() {
             return latitude;
         }
 
@@ -131,11 +150,11 @@ public class ResureDetailsBean {
             return createName;
         }
 
-        public void setLongitude(String longitude) {
+        public void setLongitude(Double longitude) {
             this.longitude = longitude;
         }
 
-        public String getLongitude() {
+        public Double getLongitude() {
             return longitude;
         }
 

+ 0 - 1
app/src/main/java/com/sjkj/appthreefloor_tsgz/fragment/EventDetailsFragment.java

@@ -84,7 +84,6 @@ public class EventDetailsFragment extends BaseFragment {
         binding.mapLocation.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Log.d("zhr111", viewModel.longitude.get() + "====" + viewModel.latitude.get());
                 if (viewModel.longitude.get() != 0 && viewModel.latitude.get() != 0) {
 //                    if (viewModel.markListBean.get() != null) {
 //                        MapActivity.open(EventDetailsActivity.this, viewModel.markListBean.get());

+ 4 - 3
app/src/main/java/com/sjkj/appthreefloor_tsgz/fragment/EventNearByFragment.java

@@ -385,13 +385,14 @@ public class EventNearByFragment extends BaseFragment {
         binding.ivLocation.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                binding.ivLocation.setBackground(getResources().getDrawable(R.drawable.icon_current_select));
-                binding.ivEventLocation.setBackground(getResources().getDrawable(R.drawable.icon_event_current));
+
                 LocationUtils.getInstance().startLocation(true, new LocationUtils.OnLocationListener() {
                     @Override
                     public void onLocationChanged(double lat, double lng, String address, int code) {
 
                         if (CommonUtils.checkLongitudeLatitude(lng + "", lat + "")) {
+                            binding.ivLocation.setBackground(getResources().getDrawable(R.drawable.icon_current_select));
+                            binding.ivEventLocation.setBackground(getResources().getDrawable(R.drawable.icon_event_current));
                             //根据当前经纬度
                             LoadRightList(leftAdapter.getSelectedPosition() == 0, tagVale, tagValeText, lat, lng, DistancelistChoose.get(rightAdapter.getCheckedPosition()).getName());
 
@@ -455,7 +456,7 @@ public class EventNearByFragment extends BaseFragment {
         options.snippet(id);
         options.infoWindowEnable(false);
         //options.title(bean.getName());
-        options.icon(BitmapDescriptorFactory.fromResource(R.drawable.icon_agriculture_cooperatives));//设置图标
+        options.icon(BitmapDescriptorFactory.fromResource(R.drawable.icon_location));//设置图标
         binding.mapView.getMap().addMarker(options);
 
 

+ 556 - 0
app/src/main/java/com/sjkj/appthreefloor_tsgz/utils/Method.java

@@ -0,0 +1,556 @@
+package com.sjkj.appthreefloor_tsgz.utils;
+
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.style.ForegroundColorSpan;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.TextView;
+
+import androidx.core.content.FileProvider;
+
+
+import com.sjkj.appthreefloor_tsgz.BuildConfig;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * CREATE BY liyang
+ * ON 2020-04-10
+ * SUPPLY : Thanks for watching
+ */
+public class Method {
+
+
+
+    /**
+     * 获取当前的时间戳
+     */
+    public static String getTimeStamp() {
+        long millis = System.currentTimeMillis();
+        return millis + "";
+    }
+
+    /*
+     * 将时间转换为时间戳
+     */
+    public static String dateToStamp(String s) {
+        String res;
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = null;
+        try {
+            date = simpleDateFormat.parse(s);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        long ts = date.getTime();
+        res = String.valueOf(ts);
+        return res;
+    }
+
+    /**
+     * 时间戳转字符串
+     */
+    public static String getStrTime(String timeStamp) {
+        String timeString = null;
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        long l = Long.valueOf(timeStamp);
+        timeString = sdf.format(new Date(l));//单位秒
+        return timeString;
+    }
+
+    /**
+     * 时间戳转字符串
+     */
+    public static String getStrTime1(String timeStamp) {
+        String timeString = null;
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        long l = Long.valueOf(timeStamp);
+        timeString = sdf.format(new Date(l));//单位秒
+        return timeString;
+    }
+
+    /**
+     * 时间戳转字符串
+     */
+    public static String getStrTime2(String timeStamp) {
+        String timeString = null;
+        SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
+        long l = Long.valueOf(timeStamp);
+        timeString = sdf.format(new Date(l));//单位秒
+        return timeString;
+    }
+
+    /**
+     * 时间戳转字符串
+     */
+    public static String getStrTime3(String timeStamp) {
+        String timeString = null;
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日 HH:mm");
+        long l = Long.valueOf(timeStamp);
+        timeString = sdf.format(new Date(l));//单位秒
+        return timeString;
+    }
+
+    /**
+     * 时间戳转字符串
+     */
+    public static String getStrTime4(String timeStamp) {
+        String timeString = null;
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日");
+        long l = Long.valueOf(timeStamp);
+        timeString = sdf.format(new Date(l));//单位秒
+        return timeString;
+    }
+
+    /**
+     * 时间戳转字符串
+     */
+    public static String getStrTime5(String timeStamp) {
+        String timeString = null;
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        long l = Long.valueOf(timeStamp);
+        timeString = sdf.format(new Date(l));//单位秒
+        return timeString;
+    }
+
+    /**
+     * 时间戳转字符串
+     */
+    public static String getStrTime6(String timeStamp) {
+        String timeString = null;
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+        long l = Long.valueOf(timeStamp);
+        timeString = sdf.format(new Date(l));//单位秒
+        return timeString;
+    }
+
+    /**
+     * 时间戳转字符串
+     */
+    public static String getStrTime7(String timeStamp) {
+        Calendar ca = Calendar.getInstance();
+        int month = ca.get(Calendar.MONTH) + 1;
+        return month + "";
+    }
+
+    /**
+     * @param firstDate
+     * @param lastDate
+     * @return result=0两个日期相等,result < 0表示firstDate 小与lastDate
+     */
+    public static int compareDate(String firstDate, String lastDate) {
+        java.text.DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Calendar c1 = Calendar.getInstance();
+        Calendar c2 = Calendar.getInstance();
+        try {
+            c1.setTime(df.parse(firstDate));
+            c2.setTime(df.parse(lastDate));
+        } catch (ParseException e) {
+            System.err.println("格式不正确");
+        }
+        int result = c1.compareTo(c2);
+        return result;
+    }
+
+    /**
+     * @param firstDate
+     * @param lastDate
+     * @return result=0两个日期相等,result < 0表示firstDate 小与lastDate
+     */
+    public static int compareDate2(String firstDate, String lastDate) {
+        java.text.DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        Calendar c1 = Calendar.getInstance();
+        Calendar c2 = Calendar.getInstance();
+        try {
+            c1.setTime(df.parse(firstDate));
+            c2.setTime(df.parse(lastDate));
+        } catch (ParseException e) {
+            System.err.println("格式不正确");
+        }
+        int result = c1.compareTo(c2);
+        return result;
+    }
+
+    /**
+     * 格式化日期时间 返回数据格式 12月27日 星期日
+     */
+    public static String formatDate2(String date) throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat sdf2 = new SimpleDateFormat("E");
+        Date date_util = sdf.parse(date); // 转换为util.date
+        String week = sdf2.format(date_util);
+        String monthString = "";
+        String dayString = "";
+        if ("Sunday".equals(week)) {
+            week = "日";
+        } else if ("Monday".equals(week)) {
+            week = "一";
+        } else if ("Tuesday".equals(week)) {
+            week = "二";
+        } else if ("Wednesday".equals(week)) {
+            week = "三";
+        } else if ("Thursday".equals(week)) {
+            week = "四";
+        } else if ("Friday".equals(week)) {
+            week = "五";
+        } else if ("Saturday".equals(week)) {
+            week = "六";
+        }
+        String showTimeString = "";
+        int years = Integer.parseInt(date.substring(0, date.indexOf("-")));
+        int month = Integer.parseInt(date.substring(date.indexOf("-") + 1, date.lastIndexOf("-")));
+        int day = Integer.parseInt(date.substring(date.length() - 2, date.length()));
+        monthString = month + "";
+        dayString = day + "";
+        if (month < 10) {
+            monthString = "0" + month;
+        }
+
+        if (day < 10) {
+            dayString = "0" + day;
+        }
+        showTimeString = years + "年" + monthString + "月" + dayString + "日 " + week;
+        return showTimeString;
+
+    }
+
+    /**
+     * 计算年月日
+     *
+     * @param year
+     * @param month
+     * @param day
+     * @return
+     */
+    public static String getStrDate(int year, int month, int day) {
+        String date = null;
+        if (month + 1 < 10) {
+            if (day < 10) {
+                date = new StringBuffer().append(year).append("-").append("0").
+                        append(month + 1).append("-").append("0").append(day).toString();
+            } else {
+                date = new StringBuffer().append(year).append("-").append("0").
+                        append(month + 1).append("-").append(day).toString();
+            }
+
+        } else {
+            if (day < 10) {
+                date = new StringBuffer().append(year).append("-").
+                        append(month + 1).append("-").append("0").append(day).toString();
+            } else {
+                date = new StringBuffer().append(year).append("-").
+                        append(month + 1).append("-").append(day).toString();
+            }
+        }
+        return date;
+    }
+
+    public static String completionDate(int number) {
+        String num = "";
+        if (number < 10) {
+            num = new StringBuffer().append("0").append(number).toString();
+        } else {
+            num = number + "";
+        }
+        return num;
+    }
+
+    public static String differDuration(String firstDate, String lastDate) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date first = null;
+        Date last = null;
+        try {
+            first = simpleDateFormat.parse(firstDate);
+            last = simpleDateFormat.parse(lastDate);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        long fs = first.getTime();
+        long lt = last.getTime();
+
+        if ((lt - fs) / 1000 / 60 / 60 > 0)
+            return (lt - fs) / 1000 / 60 / 60 + "小时";
+        else
+            return (lt - fs) / 1000 / 60 + "分钟";
+    }
+
+    /**
+     * 创建文件
+     */
+    public static void createFile(String filePath) {
+        File dir = new File(filePath);
+        if (!dir.exists()) {
+            dir.mkdirs();
+        }
+    }
+
+    /**
+     * 循环文件夹文件
+     *
+     * @return list
+     */
+    public static LinkedList<File> folderFiles(String filePath) {
+        LinkedList<File> list = new LinkedList<>();
+        File docFile = new File(filePath);
+        File[] fileArray = docFile.listFiles();
+        for (File f : fileArray) {
+            if (f.isFile()) {
+                list.add(f);
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 拷贝文件到新的地址
+     */
+    public static boolean copyFile(String path, String copyPath) {
+        try {
+            Method.createFile(copyPath);
+            File oldfile = new File(path);
+            File newFile = new File(copyPath + "/" + oldfile.getName());
+            if (!newFile.exists()) {
+                newFile.createNewFile();
+            }
+            try {
+                //获得原文件流
+                FileInputStream inputStream = new FileInputStream(oldfile);
+                byte[] data = new byte[1024];
+                //输出流
+                FileOutputStream outputStream = new FileOutputStream(newFile);
+                //开始处理流
+                while (inputStream.read(data) != -1) {
+                    outputStream.write(data);
+                }
+                inputStream.close();
+                outputStream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+                return false;
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+    /**
+     * 后缀判断当前文件是哪里类型,并且截取
+     *
+     * @param fileName
+     * @return
+     */
+    public static String expandName(String fileName) {
+        try {
+            /* 依扩展名的类型决定MimeType */
+            if (fileName.contains("m4a") || fileName.contains("mp3") || fileName.contains("mid") || fileName.contains("xmf")
+                    || fileName.contains("ogg") || fileName.contains("wav") || fileName.contains("3gp") || fileName.contains("mp4")
+                    || fileName.contains("jpg") || fileName.contains("gif") || fileName.contains("png") || fileName.contains("jpeg")
+                    || fileName.contains("bmp") || fileName.contains("apk") || fileName.contains("ppt") || fileName.contains("xls")
+                    || fileName.contains("xlsx") || fileName.contains("doc") || fileName.contains("docx") || fileName.contains("pdf") || fileName.contains("chm") || fileName.contains("txt")) {
+                /* 截取后缀名字全城 */
+                String end = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase(Locale.getDefault());
+                if (end.contains("(")) {
+                    String expand = end.substring(0, end.indexOf("(")).toLowerCase(Locale.getDefault());
+                    return fileName.substring(0, fileName.lastIndexOf(".") + 1) + expand;
+                } else {
+                    return fileName;
+                }
+            } else {
+                return fileName;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return fileName;
+        }
+    }
+
+    /**
+     * 判断是否存在文件
+     *
+     * @param fileName
+     * @return
+     */
+
+    public static boolean isExist(String fileName) {
+        if (new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/Download/" + fileName).exists())
+            return true;
+        else return false;
+    }
+
+    /**
+     * 点击确定软键盘收回
+     */
+    public static void KeyboardBack(Activity activity) {
+        View v = activity.getWindow().peekDecorView();
+        if (v != null && v.getWindowToken() != null) {
+            InputMethodManager imm = (InputMethodManager) activity.getSystemService(activity.INPUT_METHOD_SERVICE);
+            imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
+        }
+    }
+
+    /**
+     * 丰文
+     *
+     * @param content
+     * @param start
+     * @param end
+     * @param color
+     * @param textView
+     */
+    public static void isSpannable(String content, int start, int end, String color, TextView textView) {
+        SpannableStringBuilder stringBuilder = new SpannableStringBuilder(content);
+        ForegroundColorSpan foregroundColorSpan = new ForegroundColorSpan(Color.parseColor(color));
+        stringBuilder.setSpan(foregroundColorSpan, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        textView.setText(stringBuilder);
+    }
+
+    /**
+     * 颜色标记
+     *
+     * @param year
+     * @param month
+     * @param day
+     * @param color
+     * @param text
+     * @return
+     */
+    public static com.haibin.calendarview.Calendar getSchemeCalendar(int year, int month, int day, int color, String text) {
+        com.haibin.calendarview.Calendar calendar = new com.haibin.calendarview.Calendar();
+        calendar.setYear(year);
+        calendar.setMonth(month);
+        calendar.setDay(day);
+        calendar.setSchemeColor(color);//如果单独标记颜色、则会使用这个颜色
+        calendar.setScheme(text);
+        return calendar;
+    }
+
+    /**
+     * @return
+     */
+    public static List<String> isWindDirection() {
+        List<String> list = new ArrayList<>();
+        list.add("东风");
+        list.add("南风");
+        list.add("西风");
+        list.add("北风");
+        list.add("东北风");
+        list.add("西北风");
+        list.add("东南风");
+        list.add("西南风");
+        return list;
+    }
+
+    /**
+     * file --> uri
+     *
+     * @param context
+     * @param file
+     * @return
+     */
+    public static Uri getUriFromFile(Context context, File file) {
+        if (context == null || file == null) {
+            throw new NullPointerException();
+        }
+        Uri uri;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            uri = FileProvider.getUriForFile(context.getApplicationContext(), BuildConfig.APPLICATION_ID+".fileprovider", file);
+        } else {
+            uri = Uri.fromFile(file);
+        }
+        return uri;
+    }
+
+
+    /**
+     * 判断字符串是否为空
+     */
+
+    public static boolean isEmpty(String content) {
+        if ("".equals(content) || "null".equals(content) || null == content) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * 时间戳转字符串
+     */
+    public static String getDialogueTime(String timeStamp) {
+        String timeString = null;
+        SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日 HH:mm");
+        long l = Long.valueOf(timeStamp);
+        timeString = sdf.format(new Date(l));//单位秒
+        return timeString;
+    }
+
+
+
+    /**
+     * 获取当前本地apk的版本
+     */
+    public static int getVersionCode(Context mContext) {
+        int versionCode = 0;
+        try {
+            //获取软件版本号,对应AndroidManifest.xml下android:versionCode
+            versionCode = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionCode;
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        return versionCode;
+    }
+
+
+    public static String FormetFileSize(long fileS) {
+        DecimalFormat df = new DecimalFormat("#.00");
+        String fileSizeString = "";
+        String wrongSize = "0m";
+        if (fileS == 0) {
+            return wrongSize;
+        }
+        if (fileS < 1000) {
+            fileSizeString = df.format((double) fileS) + "m";
+        } else {
+            fileSizeString = df.format((double) fileS / 1000) + "km";
+        }
+        return fileSizeString;
+    }
+
+
+    /**
+     * 跳转拨打电话
+     *
+     * @param number
+     */
+    public static void getPhoneNumber(Context context,String number) {
+        Intent intent = new Intent(Intent.ACTION_DIAL, Uri.parse("tel:" + number));
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(intent);
+    }
+
+}

BIN
app/src/main/res/drawable-xxhdpi/icon_banner1.png


BIN
app/src/main/res/drawable-xxhdpi/icon_banner2.png


BIN
app/src/main/res/drawable-xxhdpi/icon_call.png


BIN
app/src/main/res/drawable-xxhdpi/icon_dxxz.png


BIN
app/src/main/res/drawable-xxhdpi/icon_location.png


BIN
app/src/main/res/drawable-xxhdpi/icon_next.png


BIN
app/src/main/res/drawable-xxhdpi/icon_resouce_bg.png


+ 6 - 0
app/src/main/res/drawable/circle_shape.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/recyclerview_lefttext_select"/> <!-- 设置圆的颜色 -->
+    <size android:width="10dp" android:height="10dp"/> <!-- 设置圆的大小 -->
+</shape>

+ 4 - 4
app/src/main/res/drawable/rounded_leftbootom_rightbootom.xml

@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@color/white"/> <!-- 背景颜色 -->
     <corners
-        android:topLeftRadius="0dp"
-        android:topRightRadius="0dp"
-        android:bottomLeftRadius="10dp"
-        android:bottomRightRadius="10dp"/>
+        android:topLeftRadius="20dp"
+        android:topRightRadius="20dp"
+        android:bottomLeftRadius="20dp"
+        android:bottomRightRadius="20dp"/>
 </shape>

+ 305 - 11
app/src/main/res/layout/activity_resure_details.xml

@@ -3,30 +3,324 @@
 
     <data>
 
+        <import type="android.text.TextUtils" />
+
         <variable
             name="viewModel"
             type="com.sjkj.appthreefloor_tsgz.activity.viewModel.ResureDetailsViewModel" />
+
+
     </data>
 
-    <LinearLayout
+
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:orientation="vertical">
+        android:fillViewport="true">
 
         <LinearLayout
+            android:layout_height="match_parent"
+            android:background="#ECEDF4"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:fitsSystemWindows="true"
             android:orientation="vertical">
 
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+
+                <LinearLayout
+
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginTop="15dp"
+                    android:layout_marginRight="15dp"
+                    android:background="@drawable/icon_resouce_bg"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="20dp"
+                        android:layout_marginTop="50dp"
+                        android:layout_marginRight="150dp"
+                        android:text="@{viewModel.name}"
+                        android:textColor="#181818"
+                        android:textSize="18dp">
+
+                    </TextView>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="25dp"
+                        android:layout_marginRight="140dp"
+                        android:orientation="horizontal">
+
+                        <View
+
+                            android:layout_width="5dp"
+                            android:layout_height="5dp"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="20dp"
+                            android:background="@drawable/circle_shape">
+
+                        </View>
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+
+                            android:layout_marginLeft="5dp"
+                            android:text='@{"经度: "+viewModel.longitude}'
+                            android:textColor="#4D4D4D"
+                            android:textSize="12dp">
+
+                        </TextView>
+                    </LinearLayout>
+
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="25dp"
+                        android:layout_marginRight="140dp"
+                        android:orientation="horizontal">
+
+                        <View
+
+                            android:layout_width="5dp"
+                            android:layout_height="5dp"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="20dp"
+                            android:background="@drawable/circle_shape">
+
+                        </View>
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="5dp"
+                            android:text='@{"维度: "+viewModel.latitude}'
+                            android:textColor="#4D4D4D"
+                            android:textSize="12dp">
+
+                        </TextView>
+                    </LinearLayout>
+                </LinearLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginRight="15dp"
+                    android:background="@drawable/round_corner_top_letf_right"
+                    android:minHeight="44dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:padding="10dp"
+
+                        android:text="地址:"
+                        android:textColor="@color/coler_evnet"
+                        android:textSize="12dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="20dp"
+                        android:layout_marginRight="10dp"
+                        android:layout_toRightOf="@+id/tv"
+                        android:gravity="right"
+                        android:text='@{(TextUtils.isEmpty(viewModel.address)?"":viewModel.address)}'
+                        android:textColor="#181818"
+                        android:textSize="12dp" />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginRight="15dp"
+                    android:background="@drawable/round_corner_top_letf_right"
+                    android:minHeight="44dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/tv1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:padding="10dp"
+
+                        android:text="联系人:"
+                        android:textColor="@color/coler_evnet"
+                        android:textSize="12dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="20dp"
+                        android:layout_marginRight="10dp"
+                        android:layout_toRightOf="@+id/tv1"
+                        android:gravity="right"
+                        android:text='@{(TextUtils.isEmpty(viewModel.contact)?"":viewModel.contact)}'
+                        android:textColor="#181818"
+                        android:textSize="12dp" />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/rl_call"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginRight="15dp"
+                    android:background="@drawable/round_corner_top_letf_right"
+                    android:minHeight="44dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/tv2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:padding="10dp"
+
+                        android:text="联系方式:"
+                        android:textColor="@color/coler_evnet"
+                        android:textSize="12dp" />
+
+                    <TextView
+                        android:id="@+id/tv_call"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="20dp"
+                        android:layout_marginRight="10dp"
+                        android:layout_toLeftOf="@+id/iv_call"
+                        android:layout_toRightOf="@+id/tv2"
+                        android:gravity="right"
+                        android:text='@{(TextUtils.isEmpty(viewModel.phone)?"":viewModel.phone)}'
+                        android:textColor="#181818"
+                        android:textSize="12dp" />
+
+                    <ImageView
+                        android:id="@+id/iv_call"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginRight="15dp"
+                        android:background="@drawable/icon_call" />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginRight="15dp"
+                    android:background="@drawable/round_corner_top_letf_right"
+                    android:minHeight="44dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/tv3"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:padding="10dp"
+
+                        android:text="行政单位:"
+                        android:textColor="@color/coler_evnet"
+                        android:textSize="12dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="20dp"
+                        android:layout_marginRight="10dp"
+                        android:layout_toRightOf="@+id/tv3"
+                        android:gravity="right"
+                        android:text='@{(TextUtils.isEmpty(viewModel.deptName)?"":viewModel.deptName)}'
+                        android:textColor="#181818"
+                        android:textSize="12dp" />
+
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginRight="15dp"
+                    android:background="@drawable/round_corner_top_letf_right"
+                    android:minHeight="44dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/tv4"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:padding="10dp"
+
+                        android:text="行管单位:"
+                        android:textColor="@color/coler_evnet"
+                        android:textSize="12dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="20dp"
+                        android:layout_marginRight="10dp"
+                        android:layout_toRightOf="@+id/tv4"
+                        android:gravity="right"
+                        android:text='@{(TextUtils.isEmpty(viewModel.deptNameAdm)?"":viewModel.deptNameAdm)}'
+                        android:textColor="#181818"
+                        android:textSize="12dp" />
+                </RelativeLayout>
+
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recyclerView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_margin="15dp">
+
+                </androidx.recyclerview.widget.RecyclerView>
+
+
+            </LinearLayout>
+
+
         </LinearLayout>
-        </androidx.core.widget.NestedScrollView>
-    </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+
 
 </layout>

+ 2 - 0
app/src/main/res/layout/fragment_event_details.xml

@@ -164,6 +164,8 @@
                     android:background="@drawable/round_corner_top_letf_right">
 
                     <androidx.recyclerview.widget.RecyclerView
+                        android:layout_marginTop="5dp"
+                        android:layout_marginBottom="5dp"
                         android:id="@+id/recyclerView"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"

+ 1 - 1
app/src/main/res/layout/item_classify_right_ziyuan2.xml

@@ -54,7 +54,7 @@
             android:layout_centerVertical="true"
             android:layout_gravity="center_vertical"
             android:layout_marginRight="15dp"
-            android:background="@drawable/icon_back"
+            android:background="@drawable/icon_next"
             android:checked="false" />
     </RelativeLayout>
 

+ 2 - 2
app/src/main/res/layout/item_details_list.xml

@@ -18,10 +18,10 @@
         android:orientation="horizontal">
 
         <TextView
-            android:layout_marginLeft="10dp"
+            android:paddingLeft="15dp"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1.3"
+            android:layout_weight="1"
             android:gravity="left"
             android:text="@{model.deptName}"
             android:textColor="#181818"

+ 33 - 0
app/src/main/res/layout/item_resource_details_list.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+        <variable
+            name="model"
+            type="com.sjkj.appthreefloor_tsgz.bean.ImageBean" />
+
+        <import type="android.view.View" />
+    </data>
+
+    <LinearLayout
+        android:layout_marginTop="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="250dp"
+        android:background="@drawable/round_corner_top_letf_right"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+
+        <ImageView
+            android:error="@{@drawable/icon_default_image}"
+            android:imgUrl="@{model.realUrl}"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_margin="15dp"
+            android:scaleType="fitXY" />
+
+
+    </LinearLayout>
+
+</layout>

+ 6 - 0
app/src/main/res/layout/window_daohang.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/icon"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/icon_event_daohang" />