admin/HouseProperty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
jinyuer
2021-01-28 10:19:14 +08:00
parent 0ee1f2589f
commit 6d89086472
10 changed files with 110 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/sl/house_property/MainFragment.java
View File

@@ -362,6 +362,7 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
Intent intent = new Intent(getContext(), HistoryRecordActivity.class); Intent intent = new Intent(getContext(), HistoryRecordActivity.class);
intent.putExtra("userId", user.getUserid()); intent.putExtra("userId", user.getUserid());
intent.putExtra("userName", user.getNickname()); intent.putExtra("userName", user.getNickname());
intent.putExtra("title", "物业服务");
startActivity(intent); startActivity(intent);
} }
}); });
@@ -740,6 +741,7 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
Intent intent = new Intent(getContext(), HistoryRecordActivity.class); Intent intent = new Intent(getContext(), HistoryRecordActivity.class);
intent.putExtra("userId", discoveryListEntity.getUserid()); intent.putExtra("userId", discoveryListEntity.getUserid());
intent.putExtra("userName", discoveryListEntity.getNickname()); intent.putExtra("userName", discoveryListEntity.getNickname());
intent.putExtra("title", discoveryListEntity.getNickname());
startActivity(intent); startActivity(intent);
} }
}); });
@@ -765,7 +767,7 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
} }
} else { } else if (!TextUtils.isEmpty(discoveryListEntity.getThumb())){
ImageInfo imageInfo = new ImageInfo(); ImageInfo imageInfo = new ImageInfo();
imageInfo.setType(1); imageInfo.setType(1);
imageInfo.setBigImageUrl(discoveryListEntity.getThumb()); imageInfo.setBigImageUrl(discoveryListEntity.getThumb());

6
app/src/main/java/com/sl/house_property/discovery/AddDiscoveryActivity.java
View File

@@ -1,16 +1,12 @@
package com.sl.house_property.discovery; package com.sl.house_property.discovery;
import android.Manifest;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.GridLayoutManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
@@ -334,10 +330,12 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
map.put("sign", Md5.md5("Goods" + "AddGoodsInfo" + Md5.secret)); map.put("sign", Md5.md5("Goods" + "AddGoodsInfo" + Md5.secret));
map.put("type", type + 1 + ""); map.put("type", type + 1 + "");
if (type == 1) {
if (additionImageWrapper.getImageList().size() < 1) { if (additionImageWrapper.getImageList().size() < 1) {
setToast("请添加图片或视频"); setToast("请添加图片或视频");
return; return;
} }
}
for (int i = 0; i < additionImageWrapper.getImageList().size(); i++) { for (int i = 0; i < additionImageWrapper.getImageList().size(); i++) {
if (additionImageWrapper.getImageList().get(i) != null) { if (additionImageWrapper.getImageList().get(i) != null) {
map.put("pic" + i, additionImageWrapper.getImageList().get(i)); map.put("pic" + i, additionImageWrapper.getImageList().get(i));

3
app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java
View File

@@ -477,6 +477,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
Intent intent = new Intent(getContext(), HistoryRecordActivity.class); Intent intent = new Intent(getContext(), HistoryRecordActivity.class);
intent.putExtra("userId", discoveryListEntity.getUserid()); intent.putExtra("userId", discoveryListEntity.getUserid());
intent.putExtra("userName", discoveryListEntity.getNickname()); intent.putExtra("userName", discoveryListEntity.getNickname());
intent.putExtra("title", discoveryListEntity.getNickname());
startActivity(intent); startActivity(intent);
} }
}); });
@@ -502,7 +503,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
} }
} else { } else if (!TextUtils.isEmpty(discoveryListEntity.getThumb())) {
ImageInfo imageInfo = new ImageInfo(); ImageInfo imageInfo = new ImageInfo();
imageInfo.setType(1); imageInfo.setType(1);
imageInfo.setBigImageUrl(discoveryListEntity.getThumb()); imageInfo.setBigImageUrl(discoveryListEntity.getThumb());

7
app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivity.java
View File

@@ -78,7 +78,8 @@ public class HistoryRecordActivity extends BaseActivity<LayoutHistoryRecordBindi
// | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) //软键盘自动弹出 // | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) //软键盘自动弹出
.init(); .init();
userId = getIntent().getStringExtra("userId"); userId = getIntent().getStringExtra("userId");
String title = getIntent().getStringExtra("title");
mDataBinding.tvTitle.setText(title);
// mDataBinding.tvTitle.setText(userName); // mDataBinding.tvTitle.setText(userName);
mDataBinding.left.setOnClickListener(new View.OnClickListener() { mDataBinding.left.setOnClickListener(new View.OnClickListener() {
@Override @Override
@@ -90,8 +91,8 @@ public class HistoryRecordActivity extends BaseActivity<LayoutHistoryRecordBindi
strings[0] = "说说"; strings[0] = "说说";
strings[1] = "商品"; strings[1] = "商品";
fragments = new ArrayList<>(); fragments = new ArrayList<>();
fragments.add(HistoryRecordFragment.newInstance(1, userId)); fragments.add(HistoryRecordFragment.newInstance(1, userId,0));
fragments.add(HistoryRecordFragment.newInstance(2, userId)); fragments.add(HistoryRecordFragment.newInstance(2, userId,0));
MyViewPagerAdapter myViewPagerAdapter = new MyViewPagerAdapter(getSupportFragmentManager()); MyViewPagerAdapter myViewPagerAdapter = new MyViewPagerAdapter(getSupportFragmentManager());
mDataBinding.fl.setAdapter(myViewPagerAdapter); mDataBinding.fl.setAdapter(myViewPagerAdapter);
mDataBinding.tb.setupWithViewPager(mDataBinding.fl); mDataBinding.tb.setupWithViewPager(mDataBinding.fl);

17
app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java
View File

@@ -9,7 +9,6 @@ import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v4.app.FragmentActivity;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
@@ -74,17 +73,19 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
private String userId; private String userId;
private Loader loader; private Loader loader;
private ArrayList<DiscoveryListEntity> discoveryListEntities = new ArrayList<>(); private ArrayList<DiscoveryListEntity> discoveryListEntities = new ArrayList<>();
private int pageType;
@Override @Override
protected int getLayoutId() { protected int getLayoutId() {
return R.layout.fragment_history_record; 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(); HistoryRecordFragment fragment = new HistoryRecordFragment();
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putInt("param1", param1); args.putInt("param1", param1);
args.putString("param2", param2); args.putString("param2", param2);
args.putInt("pageType",num);
fragment.setArguments(args); fragment.setArguments(args);
return fragment; return fragment;
} }
@@ -94,7 +95,7 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
type = getArguments().getInt("param1"); type = getArguments().getInt("param1");
userId = getArguments().getString("param2"); userId = getArguments().getString("param2");
pageType = getArguments().getInt("pageType", 0);
} }
@Override @Override
@@ -319,7 +320,7 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
} }
} else { } else if (!TextUtils.isEmpty(discoveryListEntity.getThumb())){
ImageInfo imageInfo = new ImageInfo(); ImageInfo imageInfo = new ImageInfo();
imageInfo.setType(1); imageInfo.setType(1);
imageInfo.setBigImageUrl(discoveryListEntity.getThumb()); imageInfo.setBigImageUrl(discoveryListEntity.getThumb());
@@ -412,7 +413,9 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
} }
}); });
} }
private int commentPosition = -1; private int commentPosition = -1;
private void comment(String goodsId, final int position, String reply_id, final String content) { private void comment(String goodsId, final int position, String reply_id, final String content) {
final RegisterUser user = final RegisterUser user =
Config.getInstance(getContext()).getUser(); Config.getInstance(getContext()).getUser();
@@ -697,6 +700,10 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
Type type = new TypeToken<ArrayList<DiscoveryListEntity>>() { Type type = new TypeToken<ArrayList<DiscoveryListEntity>>() {
}.getType(); }.getType();
if (page == 1) { if (page == 1) {
if (pageType == 1) {
mDataBinding.rl1.setVisibility(View.GONE);
} else {
mDataBinding.rl1.setVisibility(View.VISIBLE);
String fengmian = jsonObject.getString("fengmian"); String fengmian = jsonObject.getString("fengmian");
String avatar = jsonObject.getString("avatar"); String avatar = jsonObject.getString("avatar");
Picasso.with(context).load(fengmian) Picasso.with(context).load(fengmian)
@@ -706,6 +713,8 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
.placeholder(R.mipmap.icon_default_rectangle) .placeholder(R.mipmap.icon_default_rectangle)
.transform(new PicassoRoundTransform()) .transform(new PicassoRoundTransform())
.into(mDataBinding.head); .into(mDataBinding.head);
}
ArrayList<DiscoveryListEntity> o = new Gson().fromJson(array.toString(), type); ArrayList<DiscoveryListEntity> o = new Gson().fromJson(array.toString(), type);
discoveryListEntities.clear(); discoveryListEntities.clear();
discoveryListEntities.addAll(o); discoveryListEntities.addAll(o);

4
app/src/main/java/com/sl/house_property/discovery/LikeFragment.java
View File

@@ -87,8 +87,8 @@ public class LikeFragment extends BaseFragment<FragmentLikeBinding> {
userId = "0"; userId = "0";
} }
fragments.add(HistoryRecordFragment.newInstance(1, userId)); fragments.add(HistoryRecordFragment.newInstance(1, userId,1));
fragments.add(HistoryRecordFragment.newInstance(2, userId)); fragments.add(HistoryRecordFragment.newInstance(2, userId,1));
MyViewPagerAdapter myViewPagerAdapter = new MyViewPagerAdapter(getChildFragmentManager()); MyViewPagerAdapter myViewPagerAdapter = new MyViewPagerAdapter(getChildFragmentManager());
mDataBinding.fl.setAdapter(myViewPagerAdapter); mDataBinding.fl.setAdapter(myViewPagerAdapter);
mDataBinding.tb.setupWithViewPager(mDataBinding.fl); mDataBinding.tb.setupWithViewPager(mDataBinding.fl);

1
app/src/main/res/layout/activity_image_preview_and_delete.xml
View File

@@ -6,6 +6,7 @@
android:id="@+id/ll_image_viewer_root" android:id="@+id/ll_image_viewer_root"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical"> android:orientation="vertical">

21
app/src/main/res/layout/fragment_history_record.xml
View File

@@ -34,6 +34,7 @@
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
android:id="@+id/rl1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@@ -42,15 +43,23 @@
android:id="@+id/v" android:id="@+id/v"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="230dp" /> android:layout_height="230dp" />
<FrameLayout
<ImageView
android:id="@+id/head"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_below="@id/v" android:layout_below="@id/v"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginTop="-30dp" android:layout_marginTop="-30dp"
android:layout_marginRight="16dp" /> android:layout_marginRight="16dp"
android:layout_width="wrap_content"
android:background="@color/white"
android:layout_height="wrap_content">
<ImageView
android:layout_margin="1dp"
android:id="@+id/head"
android:layout_width="59dp"
android:layout_height="59dp"
/>
</FrameLayout>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout

37
app/src/main/res/layout/fragment_like.xml
View File

@@ -14,28 +14,29 @@
android:layout_marginTop="@dimen/mystatusbar" android:layout_marginTop="@dimen/mystatusbar"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <TextView
android:visibility="gone" android:layout_width="match_parent"
android:id="@+id/left" android:layout_height="match_parent"
android:layout_width="wrap_content" android:layout_centerHorizontal="true"
android:layout_height="wrap_content" android:gravity="center"
android:layout_gravity="center" android:textSize="16sp"
android:paddingLeft="16dp" android:id="@+id/tv_title"
android:paddingTop="5dp" android:text="我的点赞"
android:paddingBottom="5dp" android:textColor="@color/white" />
android:layout_marginTop="5dp"
android:layout_centerVertical="true"
android:paddingRight="5dp" </RelativeLayout>
android:src="@mipmap/fanhui" />
<android.support.design.widget.TabLayout <android.support.design.widget.TabLayout
android:id="@+id/tb" android:id="@+id/tb"
android:layout_width="wrap_content" android:background="@color/white"
android:layout_height="match_parent" android:layout_width="match_parent"
android:layout_centerHorizontal="true" android:layout_height="wrap_content"
app:tabIndicatorColor="#FE5200"
app:tabSelectedTextColor="#FE5200"
app:tabIndicatorFullWidth="false"
app:tabTextColor="#000"
android:gravity="center_horizontal" /> android:gravity="center_horizontal" />
</RelativeLayout>
<android.support.v4.view.ViewPager <android.support.v4.view.ViewPager
android:id="@+id/fl" android:id="@+id/fl"
android:layout_width="match_parent" android:layout_width="match_parent"

28
app/src/main/res/layout/layout_history_record.xml
View File

@@ -18,25 +18,39 @@
android:id="@+id/left" android:id="@+id/left"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="5dp"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:paddingBottom="5dp"
android:layout_marginTop="5dp"
android:layout_centerVertical="true"
android:paddingRight="5dp" android:paddingRight="5dp"
android:paddingBottom="5dp"
android:src="@mipmap/fanhui" /> android:src="@mipmap/fanhui" />
<android.support.design.widget.TabLayout <TextView
android:id="@+id/tb" android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:gravity="center_horizontal" /> android:gravity="center"
android:textSize="16sp"
android:id="@+id/tv_title"
android:text="哈哈"
android:textColor="@color/white" />
</RelativeLayout> </RelativeLayout>
<android.support.design.widget.TabLayout
android:id="@+id/tb"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center_horizontal"
app:tabIndicatorColor="#FE5200"
app:tabSelectedTextColor="#FE5200"
app:tabIndicatorFullWidth="false"
app:tabTextColor="#000" />
<android.support.v4.view.ViewPager <android.support.v4.view.ViewPager
android:id="@+id/fl" android:id="@+id/fl"
android:layout_width="match_parent" android:layout_width="match_parent"