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

Merge branch 'master' of https://gitee.com/renjianbo0118/HouseProperty

Browse Source
This commit is contained in:
renjianbo0118
2021-03-02 23:19:23 +08:00
parent 6487f02bd1 3094caa875
commit 48e8f1f04b
11 changed files with 156 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View File

@@ -283,6 +283,7 @@
android:launchMode="singleTop"
android:theme="@style/wxPayTheme"
android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
<activity android:name=".discovery.LikeActivity" />
</application>
</manifest>

9
app/src/main/java/com/sl/house_property/Main4Fragment.java
View File

@@ -20,6 +20,7 @@ import com.cutil.SizeUtils;
import com.cutil.StringUtils;
import com.sl.house_property.cart.AddressListActivity;
import com.sl.house_property.databinding.FragmentMain4Binding;
import com.sl.house_property.discovery.LikeActivity;
import com.sl.house_property.f1.UserdlistActivity;
import com.sl.house_property.order.OrderActivity;
import com.sl.house_property.user.MyAuthorizedFamilyHistory;
@@ -222,7 +223,13 @@ public class Main4Fragment extends BaseFragment<FragmentMain4Binding> implements
}
});
mDataBinding.ll1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Intent intent = new Intent(getActivity(), LikeActivity.class);
startActivityForResult(intent, 0);
}
});
// mDataBinding.llGeren.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {

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

@@ -107,6 +107,8 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
activity.registerMyOnTouchListener(this);
} else if (getActivity() instanceof HistoryRecordActivity) {
((HistoryRecordActivity) getActivity()).registerMyOnTouchListener(this);
}else if (getActivity() instanceof LikeActivity){
((LikeActivity) getActivity()).registerMyOnTouchListener(this);
}
}
@@ -409,6 +411,11 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
mDataBinding.llComment.setVisibility(View.GONE);
comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, "", mDataBinding.etComment.getText().toString());
}else if (getActivity() instanceof LikeActivity){
CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment);
mDataBinding.llComment.setVisibility(View.GONE);
comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, "", mDataBinding.etComment.getText().toString());
}
}

37
app/src/main/java/com/sl/house_property/discovery/LikeActivity.java Normal file
View File

@@ -0,0 +1,37 @@
package com.sl.house_property.discovery;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import com.sl.house_property.BaseActivity;
import com.sl.house_property.MainTabActivity;
import com.sl.house_property.R;
import com.sl.house_property.databinding.ActivityLikeBinding;
import java.util.ArrayList;
public class LikeActivity extends BaseActivity<ActivityLikeBinding> {
@Override
protected int getLayoutResId() {
return R.layout.activity_like;
}
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Fragment likeFragment = LikeFragment.newInstance();
getSupportFragmentManager().beginTransaction().replace(R.id.fl,likeFragment).commitAllowingStateLoss();
}
//2. 保存MyOnTouchListener接口的列表
private ArrayList<MainTabActivity.MyOnTouchListener> onTouchListeners = new ArrayList<MainTabActivity.MyOnTouchListener>();
//4.提供给Fragment通过getActivity()方法来注册自己的触摸事件的方法
public void registerMyOnTouchListener(MainTabActivity.MyOnTouchListener myOnTouchListener) {
onTouchListeners.add(myOnTouchListener);
}
//5.提供给Fragment通过getActivity()方法来注销自己的触摸事件的方法
public void unregisterMyOnTouchListener(MainTabActivity.MyOnTouchListener myOnTouchListener) {
onTouchListeners.remove(myOnTouchListener);
}
}

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

@@ -5,6 +5,7 @@ import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import android.view.LayoutInflater;
import android.view.View;
import com.gyf.immersionbar.ImmersionBar;
import com.sl.house_property.BaseFragment;
@@ -92,5 +93,11 @@ public class LikeFragment extends BaseFragment<FragmentLikeBinding> {
MyViewPagerAdapter myViewPagerAdapter = new MyViewPagerAdapter(getChildFragmentManager());
mDataBinding.fl.setAdapter(myViewPagerAdapter);
mDataBinding.tb.setupWithViewPager(mDataBinding.fl);
mDataBinding.left.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
getActivity().finish();
}
});
}
}

70
app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java
View File

@@ -137,7 +137,7 @@ public class MyAuthorizedFamilyHistory extends BaseActivity<ActivityMyAuthorized
map.put("app", "Cas");
map.put("class", "FamilyMemberList");
if (!TextUtils.isEmpty(homeId)){
map.put("home_id",homeId);
map.put("user_home_id",homeId);
}
map.put("sign", Md5.md5("Cas" + "FamilyMemberList" + Md5.secret));
@@ -247,14 +247,12 @@ public class MyAuthorizedFamilyHistory extends BaseActivity<ActivityMyAuthorized
final FamilynumberpermissionBinding homeGridAdapterItemBinding = (FamilynumberpermissionBinding) b;
simpleEntities.get(position).setString12(position+1+"");
homeGridAdapterItemBinding.setMyentity(simpleEntities.get(position));
// homeGridAdapterItemBinding.edit.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View view) {
// Intent intet = new Intent(MyAuthorizedFamilyHistory.this, AddAnewFamilyNumberPermissionActivity.class);
// intet.putExtra("stringentity", simpleEntities.get(position));
// startActivityForResult(intet,1);
// }
// });
homeGridAdapterItemBinding.edit.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
DelFamilyMember(simpleEntities.get(position).getString3());
}
});
}
}
@@ -276,6 +274,60 @@ public class MyAuthorizedFamilyHistory extends BaseActivity<ActivityMyAuthorized
}
}
private void DelFamilyMember(String f_id) {
RegisterUser user =
Config.getInstance(MyAuthorizedFamilyHistory.this).getUser();
Map<String, String> map = new HashMap<>();
if (user != null) {
map.put("userid", user.getUserid());
} else {
map.put("userid", 0 + "");
}
map.put("app", "Cas");
map.put("class", "DelFamilyMember");
map.put("f_id", f_id);
map.put("sign", Md5.md5("Cas" + "DelFamilyMember" + Md5.secret));
DelFamily(ApiConfig.BASE_URL, map, getResources().getString(R.string.loading), 0);
}
private void DelFamily(String myurl, Map<String, String> map, String msg, final int requstecode) {
mGankLoader = new Loader();
Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
@Override
public void call(Resultcode resultcode) {
progressDialog.dismiss();
if (!(resultcode.status == 0)) {
setToast( resultcode.msg);
page=1;
getlist();
}
if (resultcode.status == 0) {
if (requstecode == 0) {
Gson gs = new Gson();
ArrayList<LinkedTreeMap> adta = (ArrayList<LinkedTreeMap>) resultcode.data;
String s = gs.toJson(adta);
}
}
}
}, new Action1<Throwable>() {
@Override
public void call(Throwable throwable) {
progressDialog.dismiss();
setToast( getString(R.string.getdatafailure));
throwable.printStackTrace();
}
});
addSubscription(subscription);
}
}

2
app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java
View File

@@ -459,7 +459,7 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
}
map.put("app", "Cas");
map.put("class", "AddFamilyMember");
map.put("home_id", homeId);
map.put("user_home_id", homeId);
map.put("phone", phone);
map.put("username", uername);
map.put("sign", Md5.md5("Cas" + "AddFamilyMember" + Md5.secret));

9
app/src/main/res/layout/activity_like.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<layout>
<FrameLayout
android:id="@+id/fl"
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
android:layout_height="match_parent">
</FrameLayout>
</layout>

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

@@ -14,6 +14,7 @@
<Button
android:visibility="gone"
android:id="@+id/btn_1"
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"

14
app/src/main/res/layout/familynumberpermission.xml
View File

@@ -79,9 +79,19 @@
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:layout_marginStart="24dip"
android:visibility="gone"
android:layout_marginEnd="24dip"
android:background="@mipmap/xie" />
android:background="@mipmap/delx" />
<!-- <ImageView-->
<!-- android:id="@+id/edit"-->
<!-- android:layout_width="28dp"-->
<!-- android:layout_height="28dp"-->
<!-- android:layout_alignParentRight="true"-->
<!-- android:layout_centerVertical="true"-->
<!-- android:layout_marginTop="15dp"-->
<!-- android:layout_marginBottom="15dp"-->
<!-- android:layout_marginStart="24dip"-->
<!-- android:layout_marginEnd="24dip"-->
<!-- android:background="@mipmap/xie" />-->
</RelativeLayout>
</LinearLayout>
</layout>

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

@@ -13,7 +13,18 @@
android:layout_height="45dp"
android:layout_marginTop="@dimen/mystatusbar"
android:orientation="horizontal">
<ImageView
android:id="@+id/left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_gravity="center"
android:layout_marginTop="5dp"
android:paddingLeft="16dp"
android:paddingTop="5dp"
android:paddingRight="5dp"
android:paddingBottom="5dp"
android:src="@mipmap/fanhui" />
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"