From 6d89086472d209532fcd5527ce3f3b7aae3da5f0 Mon Sep 17 00:00:00 2001 From: jinyuer <454386664@qq.com> Date: Thu, 28 Jan 2021 10:19:14 +0800 Subject: [PATCH] 1 --- .../com/sl/house_property/MainFragment.java | 4 +- .../discovery/AddDiscoveryActivity.java | 38 +++++++++--------- .../discovery/DiscoveryFragment.java | 5 ++- .../discovery/HistoryRecordActivity.java | 7 ++-- .../discovery/HistoryRecordFragment.java | 39 ++++++++++++------- .../discovery/LikeFragment.java | 4 +- .../activity_image_preview_and_delete.xml | 1 + .../res/layout/fragment_history_record.xml | 21 +++++++--- app/src/main/res/layout/fragment_like.xml | 37 +++++++++--------- .../main/res/layout/layout_history_record.xml | 28 +++++++++---- 10 files changed, 110 insertions(+), 74 deletions(-) diff --git a/app/src/main/java/com/sl/house_property/MainFragment.java b/app/src/main/java/com/sl/house_property/MainFragment.java index bcc3f57..3ba7bf3 100644 --- a/app/src/main/java/com/sl/house_property/MainFragment.java +++ b/app/src/main/java/com/sl/house_property/MainFragment.java @@ -362,6 +362,7 @@ public class MainFragment extends BaseFragment implements V Intent intent = new Intent(getContext(), HistoryRecordActivity.class); intent.putExtra("userId", user.getUserid()); intent.putExtra("userName", user.getNickname()); + intent.putExtra("title", "物业服务"); startActivity(intent); } }); @@ -740,6 +741,7 @@ public class MainFragment extends BaseFragment implements V Intent intent = new Intent(getContext(), HistoryRecordActivity.class); intent.putExtra("userId", discoveryListEntity.getUserid()); intent.putExtra("userName", discoveryListEntity.getNickname()); + intent.putExtra("title", discoveryListEntity.getNickname()); startActivity(intent); } }); @@ -765,7 +767,7 @@ public class MainFragment extends BaseFragment implements V } - } else { + } else if (!TextUtils.isEmpty(discoveryListEntity.getThumb())){ ImageInfo imageInfo = new ImageInfo(); imageInfo.setType(1); imageInfo.setBigImageUrl(discoveryListEntity.getThumb()); diff --git a/app/src/main/java/com/sl/house_property/discovery/AddDiscoveryActivity.java b/app/src/main/java/com/sl/house_property/discovery/AddDiscoveryActivity.java index f94434f..8fa2240 100644 --- a/app/src/main/java/com/sl/house_property/discovery/AddDiscoveryActivity.java +++ b/app/src/main/java/com/sl/house_property/discovery/AddDiscoveryActivity.java @@ -1,16 +1,12 @@ package com.sl.house_property.discovery; -import android.Manifest; import android.content.Intent; import android.content.pm.ActivityInfo; -import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.drawable.BitmapDrawable; -import android.os.Build; import android.os.Bundle; import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; import android.support.v7.widget.GridLayoutManager; import android.text.TextUtils; import android.util.Log; @@ -114,8 +110,8 @@ public class AddDiscoveryActivity extends BaseActivity granted, boolean isAll) { - if (isAll){ + if (isAll) { selectImage(requestCode, max); } } @@ -292,14 +288,14 @@ public class AddDiscoveryActivity extends BaseActivity denied, boolean quick) { if (quick) - new XPopup.Builder(AddDiscoveryActivity.this).asConfirm( - "提示", "需要相册和相机权限才可以正常使用" - , new OnConfirmListener() { - @Override - public void onConfirm() { - XXPermissions.gotoPermissionSettings(AddDiscoveryActivity.this); - } - }).show(); + new XPopup.Builder(AddDiscoveryActivity.this).asConfirm( + "提示", "需要相册和相机权限才可以正常使用" + , new OnConfirmListener() { + @Override + public void onConfirm() { + XXPermissions.gotoPermissionSettings(AddDiscoveryActivity.this); + } + }).show(); } }); // if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { @@ -334,9 +330,11 @@ public class AddDiscoveryActivity extends BaseActivity im Intent intent = new Intent(getContext(), HistoryRecordActivity.class); intent.putExtra("userId", discoveryListEntity.getUserid()); intent.putExtra("userName", discoveryListEntity.getNickname()); + intent.putExtra("title", discoveryListEntity.getNickname()); startActivity(intent); } }); @@ -502,7 +503,7 @@ public class DiscoveryFragment extends BaseFragment im } - } else { + } else if (!TextUtils.isEmpty(discoveryListEntity.getThumb())) { ImageInfo imageInfo = new ImageInfo(); imageInfo.setType(1); imageInfo.setBigImageUrl(discoveryListEntity.getThumb()); @@ -797,7 +798,7 @@ public class DiscoveryFragment extends BaseFragment im dis_content1.add(dis_content); discoveryListEntity.setDis_content(dis_content1); - adapter.upDateOne(position,discoveryListEntity); + adapter.upDateOne(position, discoveryListEntity); // BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter(); // if (discoveryListEntities.get(position).getDis_content().isEmpty()) { // DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content(); diff --git a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivity.java b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivity.java index 03b511c..9ea919b 100644 --- a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivity.java +++ b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivity.java @@ -78,7 +78,8 @@ public class HistoryRecordActivity extends BaseActivity(); - fragments.add(HistoryRecordFragment.newInstance(1, userId)); - fragments.add(HistoryRecordFragment.newInstance(2, userId)); + fragments.add(HistoryRecordFragment.newInstance(1, userId,0)); + fragments.add(HistoryRecordFragment.newInstance(2, userId,0)); MyViewPagerAdapter myViewPagerAdapter = new MyViewPagerAdapter(getSupportFragmentManager()); mDataBinding.fl.setAdapter(myViewPagerAdapter); mDataBinding.tb.setupWithViewPager(mDataBinding.fl); diff --git a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java index 900eefa..9a92a0c 100644 --- a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java +++ b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java @@ -9,7 +9,6 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.support.v4.app.FragmentActivity; import android.support.v7.widget.LinearLayoutManager; import android.text.TextUtils; import android.util.Log; @@ -74,17 +73,19 @@ public class HistoryRecordFragment extends BaseFragment discoveryListEntities = new ArrayList<>(); + private int pageType; @Override protected int getLayoutId() { return R.layout.fragment_history_record; } - public static HistoryRecordFragment newInstance(int param1, String param2) { + public static HistoryRecordFragment newInstance(int param1, String param2,int num) { HistoryRecordFragment fragment = new HistoryRecordFragment(); Bundle args = new Bundle(); args.putInt("param1", param1); args.putString("param2", param2); + args.putInt("pageType",num); fragment.setArguments(args); return fragment; } @@ -94,7 +95,7 @@ public class HistoryRecordFragment extends BaseFragment>() { }.getType(); if (page == 1) { - String fengmian = jsonObject.getString("fengmian"); - String avatar = jsonObject.getString("avatar"); - Picasso.with(context).load(fengmian) - .placeholder(R.mipmap.icon_default_rectangle) - .into(target); - Picasso.with(context).load(avatar) - .placeholder(R.mipmap.icon_default_rectangle) - .transform(new PicassoRoundTransform()) - .into(mDataBinding.head); + if (pageType == 1) { + mDataBinding.rl1.setVisibility(View.GONE); + } else { + mDataBinding.rl1.setVisibility(View.VISIBLE); + String fengmian = jsonObject.getString("fengmian"); + String avatar = jsonObject.getString("avatar"); + Picasso.with(context).load(fengmian) + .placeholder(R.mipmap.icon_default_rectangle) + .into(target); + Picasso.with(context).load(avatar) + .placeholder(R.mipmap.icon_default_rectangle) + .transform(new PicassoRoundTransform()) + .into(mDataBinding.head); + } + ArrayList o = new Gson().fromJson(array.toString(), type); discoveryListEntities.clear(); discoveryListEntities.addAll(o); diff --git a/app/src/main/java/com/sl/house_property/discovery/LikeFragment.java b/app/src/main/java/com/sl/house_property/discovery/LikeFragment.java index 657402a..93b48a4 100644 --- a/app/src/main/java/com/sl/house_property/discovery/LikeFragment.java +++ b/app/src/main/java/com/sl/house_property/discovery/LikeFragment.java @@ -87,8 +87,8 @@ public class LikeFragment extends BaseFragment { userId = "0"; } - fragments.add(HistoryRecordFragment.newInstance(1, userId)); - fragments.add(HistoryRecordFragment.newInstance(2, userId)); + fragments.add(HistoryRecordFragment.newInstance(1, userId,1)); + fragments.add(HistoryRecordFragment.newInstance(2, userId,1)); MyViewPagerAdapter myViewPagerAdapter = new MyViewPagerAdapter(getChildFragmentManager()); mDataBinding.fl.setAdapter(myViewPagerAdapter); mDataBinding.tb.setupWithViewPager(mDataBinding.fl); diff --git a/app/src/main/res/layout/activity_image_preview_and_delete.xml b/app/src/main/res/layout/activity_image_preview_and_delete.xml index b5ec9c9..058e9ac 100644 --- a/app/src/main/res/layout/activity_image_preview_and_delete.xml +++ b/app/src/main/res/layout/activity_image_preview_and_delete.xml @@ -6,6 +6,7 @@ android:id="@+id/ll_image_viewer_root" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/fragment_history_record.xml b/app/src/main/res/layout/fragment_history_record.xml index 3ea034f..f49b5ce 100644 --- a/app/src/main/res/layout/fragment_history_record.xml +++ b/app/src/main/res/layout/fragment_history_record.xml @@ -34,6 +34,7 @@ android:orientation="vertical"> @@ -42,15 +43,23 @@ android:id="@+id/v" android:layout_width="match_parent" android:layout_height="230dp" /> - - + android:layout_marginRight="16dp" + android:layout_width="wrap_content" + android:background="@color/white" + android:layout_height="wrap_content"> + + + - - - + android:gravity="center" + android:textSize="16sp" + android:id="@+id/tv_title" + android:text="我的点赞" + android:textColor="@color/white" /> + + + - + android:gravity="center" + android:textSize="16sp" + android:id="@+id/tv_title" + android:text="哈哈" + android:textColor="@color/white" /> + +