From be162c769428cfb300bfaf74c80ce07ce4c122d4 Mon Sep 17 00:00:00 2001
From: jianbo <263303411@qq.com>
Date: Mon, 1 Mar 2021 10:09:55 +0800
Subject: [PATCH 1/6] d

---
 .idea/jarRepositories.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 8d8034e..68cf444 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -86,5 +86,20 @@
       <option name="name" value="C:\Users\jinli\AppData\Local\Android\Sdk\extras\m2repository" />
       <option name="url" value="file:/$USER_HOME$/AppData/Local/Android/Sdk/extras/m2repository" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="E:\AndroidSDK\extras\google\m2repository" />
+      <option name="name" value="E:\AndroidSDK\extras\google\m2repository" />
+      <option name="url" value="file:/$PROJECT_DIR$/../../AndroidSDK/extras/google/m2repository/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="E:\AndroidSDK\extras\m2repository" />
+      <option name="name" value="E:\AndroidSDK\extras\m2repository" />
+      <option name="url" value="file:/$PROJECT_DIR$/../../AndroidSDK/extras/m2repository/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="E:\AndroidSDK\extras\android\m2repository" />
+      <option name="name" value="E:\AndroidSDK\extras\android\m2repository" />
+      <option name="url" value="file:/$PROJECT_DIR$/../../AndroidSDK/extras/android/m2repository/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file

From 6b3c57285b0d6a3d9f40cbb23b4572f27ccdf6fd Mon Sep 17 00:00:00 2001
From: jianbo <263303411@qq.com>
Date: Mon, 1 Mar 2021 18:14:14 +0800
Subject: [PATCH 2/6] d

---
 .../user/MyAuthorizedFamilyHistory.java       | 68 ++++++++++++++++---
 .../user/MyPropertyActivity.java              |  2 +-
 .../res/layout/familynumberpermission.xml     | 14 +++-
 3 files changed, 72 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java b/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java
index 3f61912..baf9717 100644
--- a/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java
+++ b/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java
@@ -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,58 @@ 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);
+                }
+                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);
+    }
 
 }
 
diff --git a/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java b/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java
index 03c10f9..cd37cfa 100644
--- a/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java
+++ b/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java
@@ -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));
diff --git a/app/src/main/res/layout/familynumberpermission.xml b/app/src/main/res/layout/familynumberpermission.xml
index 033bb7f..c6ab397 100644
--- a/app/src/main/res/layout/familynumberpermission.xml
+++ b/app/src/main/res/layout/familynumberpermission.xml
@@ -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>
\ No newline at end of file

From edcc6a060d27f44ae143b434aa3d052d9c582f98 Mon Sep 17 00:00:00 2001
From: jinyuera <454386664@qq.com>
Date: Mon, 1 Mar 2021 18:15:05 +0800
Subject: [PATCH 3/6] 1111

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../com/sl/house_property/Main4Fragment.java  |  9 ++++-
 .../discovery/HistoryRecordFragment.java      |  7 ++++
 .../discovery/LikeActivity.java               | 37 +++++++++++++++++++
 .../discovery/LikeFragment.java               |  7 ++++
 .../user/MyAuthorizedFamilyHistory.java       |  2 +-
 app/src/main/res/layout/activity_like.xml     |  9 +++++
 app/src/main/res/layout/fragment_like.xml     | 13 ++++++-
 8 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/com/sl/house_property/discovery/LikeActivity.java
 create mode 100644 app/src/main/res/layout/activity_like.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b978ce8..b65e589 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -283,6 +283,7 @@
             android:launchMode="singleTop"
             android:theme="@style/wxPayTheme"
             android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
+        <activity android:name=".discovery.LikeActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/sl/house_property/Main4Fragment.java b/app/src/main/java/com/sl/house_property/Main4Fragment.java
index 77b9e3d..ee2ad87 100644
--- a/app/src/main/java/com/sl/house_property/Main4Fragment.java
+++ b/app/src/main/java/com/sl/house_property/Main4Fragment.java
@@ -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;
@@ -213,7 +214,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) {
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 2827a3d..a1da699 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
@@ -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());
+
                 }
 
             }
diff --git a/app/src/main/java/com/sl/house_property/discovery/LikeActivity.java b/app/src/main/java/com/sl/house_property/discovery/LikeActivity.java
new file mode 100644
index 0000000..3dabdf6
--- /dev/null
+++ b/app/src/main/java/com/sl/house_property/discovery/LikeActivity.java
@@ -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);
+    }
+}
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 186180e..520912c 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
@@ -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();
+            }
+        });
     }
 }
diff --git a/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java b/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java
index 3f61912..1f467d0 100644
--- a/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java
+++ b/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java
@@ -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));
diff --git a/app/src/main/res/layout/activity_like.xml b/app/src/main/res/layout/activity_like.xml
new file mode 100644
index 0000000..14b230f
--- /dev/null
+++ b/app/src/main/res/layout/activity_like.xml
@@ -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>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_like.xml b/app/src/main/res/layout/fragment_like.xml
index 1555089..352f162 100644
--- a/app/src/main/res/layout/fragment_like.xml
+++ b/app/src/main/res/layout/fragment_like.xml
@@ -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"

From c58c0d2cef0f5e3df33239b54f9b315030185637 Mon Sep 17 00:00:00 2001
From: jianbo <263303411@qq.com>
Date: Mon, 1 Mar 2021 18:18:22 +0800
Subject: [PATCH 4/6] d

---
 .../com/sl/house_property/user/MyAuthorizedFamilyHistory.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java b/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java
index baf9717..ab357c6 100644
--- a/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java
+++ b/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java
@@ -302,6 +302,7 @@ public class MyAuthorizedFamilyHistory extends BaseActivity<ActivityMyAuthorized
                 progressDialog.dismiss();
                 if (!(resultcode.status == 0)) {
                     setToast( resultcode.msg);
+                    getlist();
                 }
                 if (resultcode.status == 0) {
                     if (requstecode == 0) {

From 365bd04ca3d9b7df081d82016e065a2cd512156f Mon Sep 17 00:00:00 2001
From: jianbo <263303411@qq.com>
Date: Mon, 1 Mar 2021 18:19:24 +0800
Subject: [PATCH 5/6] d

---
 .../com/sl/house_property/user/MyAuthorizedFamilyHistory.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java b/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java
index ab357c6..488ba62 100644
--- a/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java
+++ b/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java
@@ -302,6 +302,7 @@ public class MyAuthorizedFamilyHistory extends BaseActivity<ActivityMyAuthorized
                 progressDialog.dismiss();
                 if (!(resultcode.status == 0)) {
                     setToast( resultcode.msg);
+                    page=1;
                     getlist();
                 }
                 if (resultcode.status == 0) {

From 3094caa87538e936cb3c658669a93c4c717b3298 Mon Sep 17 00:00:00 2001
From: jinyuera <454386664@qq.com>
Date: Mon, 1 Mar 2021 18:32:44 +0800
Subject: [PATCH 6/6] 1111

---
 app/src/main/res/layout/dialog_select_create_type.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/layout/dialog_select_create_type.xml b/app/src/main/res/layout/dialog_select_create_type.xml
index 9e5c5dd..85001b6 100644
--- a/app/src/main/res/layout/dialog_select_create_type.xml
+++ b/app/src/main/res/layout/dialog_select_create_type.xml
@@ -14,6 +14,7 @@
 
 
     <Button
+        android:visibility="gone"
         android:id="@+id/btn_1"
         style="?android:attr/borderlessButtonStyle"
         android:layout_width="match_parent"