From 665f8d8d893aef989fa7523b5140af75ae95b6ce Mon Sep 17 00:00:00 2001
From: renjianbo0118 <18133922183>
Date: Sun, 28 Feb 2021 01:30:13 +0800
Subject: [PATCH] d

---
 .../user/MyPropertyActivity.java              | 122 ++++++++++--------
 .../main/res/layout/myhousrmessageitem.xml    |  45 +++++++
 2 files changed, 112 insertions(+), 55 deletions(-)

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 f87b115..9d9f042 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
@@ -159,13 +159,13 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
                     homeGridAdapterItemBinding.qu.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
-                            if (homegridentityvArrayList.get(position).isString9()){
-                                Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class);
-                                intent.putExtra("usertitile", "授权家庭");
-                                intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
-                                startActivityForResult(intent, 0);
-                                return;
-                            }
+//                            if (homegridentityvArrayList.get(position).isString9()){
+//                                Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class);
+//                                intent.putExtra("usertitile", "授权家庭");
+//                                intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
+//                                startActivityForResult(intent, 0);
+//                                return;
+//                            }
                             RegisterUser user =
                                     Config.getInstance(MyPropertyActivity.this).getUser();
                             Map<String, String> map = new HashMap<>();
@@ -184,13 +184,13 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
                     homeGridAdapterItemBinding.lou.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
-                            if (homegridentityvArrayList.get(position).isString9()){
-                                Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class);
-                                intent.putExtra("usertitile", "授权家庭");
-                                intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
-                                startActivityForResult(intent, 0);
-                                return;
-                            }
+//                            if (homegridentityvArrayList.get(position).isString9()){
+//                                Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class);
+//                                intent.putExtra("usertitile", "授权家庭");
+//                                intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
+//                                startActivityForResult(intent, 0);
+//                                return;
+//                            }
                             if (homegridentityvArrayList.get(position).getString5() == null ||
                                     homegridentityvArrayList.get(position).getString5().equals("")) {
                                 setToast("请选择小区");
@@ -217,13 +217,13 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
                     homeGridAdapterItemBinding.dan.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
-                            if (homegridentityvArrayList.get(position).isString9()){
-                                Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class);
-                                intent.putExtra("usertitile", "授权家庭");
-                                intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
-                                startActivityForResult(intent, 0);
-                                return;
-                            }
+//                            if (homegridentityvArrayList.get(position).isString9()){
+//                                Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class);
+//                                intent.putExtra("usertitile", "授权家庭");
+//                                intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
+//                                startActivityForResult(intent, 0);
+//                                return;
+//                            }
                             if (homegridentityvArrayList.get(position).getString5() == null ||
                                     homegridentityvArrayList.get(position).getString5().equals("")) {
                                 setToast("请选择小区");
@@ -255,13 +255,13 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
                     homeGridAdapterItemBinding.fang.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
-                            if (homegridentityvArrayList.get(position).isString9()){
-                                Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class);
-                                intent.putExtra("usertitile", "授权家庭");
-                                intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
-                                startActivityForResult(intent, 0);
-                                return;
-                            }
+//                            if (homegridentityvArrayList.get(position).isString9()){
+//                                Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class);
+//                                intent.putExtra("usertitile", "授权家庭");
+//                                intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
+//                                startActivityForResult(intent, 0);
+//                                return;
+//                            }
 
                             if (homegridentityvArrayList.get(position).getString5() == null ||
                                     homegridentityvArrayList.get(position).getString5().equals("")) {
@@ -302,13 +302,13 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
                     homeGridAdapterItemBinding.xie.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
-                            if (homegridentityvArrayList.get(position).isString9()){
-                                Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class);
-                                intent.putExtra("usertitile", "授权家庭");
-                                intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
-                                startActivityForResult(intent, 0);
-                                return;
-                            }
+//                            if (homegridentityvArrayList.get(position).isString9()){
+//                                Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class);
+//                                intent.putExtra("usertitile", "授权家庭");
+//                                intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
+//                                startActivityForResult(intent, 0);
+//                                return;
+//                            }
 
                             RegisterUser user =
                                     Config.getInstance(MyPropertyActivity.this).getUser();
@@ -362,13 +362,13 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
                     homeGridAdapterItemBinding.hu.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {
-                            if (homegridentityvArrayList.get(position).isString9()){
-                                Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class);
-                                intent.putExtra("usertitile", "授权家庭");
-                                intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
-                                startActivityForResult(intent, 0);
-                                return;
-                            }
+//                            if (homegridentityvArrayList.get(position).isString9()){
+//                                Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class);
+//                                intent.putExtra("usertitile", "授权家庭");
+//                                intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
+//                                startActivityForResult(intent, 0);
+//                                return;
+//                            }
                             new XPopup.Builder(MyPropertyActivity.this).asInputConfirm("", "", "请输入户主姓名", new OnInputConfirmListener() {
                                 @Override
                                 public void onConfirm(String text) {
@@ -380,13 +380,13 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
                     homeGridAdapterItemBinding.shen.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {
-                            if (homegridentityvArrayList.get(position).isString9()){
-                                Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class);
-                                intent.putExtra("usertitile", "授权家庭");
-                                intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
-                                startActivityForResult(intent, 0);
-                                return;
-                            }
+//                            if (homegridentityvArrayList.get(position).isString9()){
+//                                Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class);
+//                                intent.putExtra("usertitile", "授权家庭");
+//                                intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
+//                                startActivityForResult(intent, 0);
+//                                return;
+//                            }
                             new XPopup.Builder(MyPropertyActivity.this).asInputConfirm("", "", "请输入身份证号", new OnInputConfirmListener() {
                                 @Override
                                 public void onConfirm(String text) {
@@ -401,6 +401,18 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
                         }
                     });
 
+                    homeGridAdapterItemBinding.llJt.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            if (homegridentityvArrayList.get(position).isString9()){
+                                Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class);
+                                intent.putExtra("usertitile", "授权家庭");
+                                intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
+                                startActivityForResult(intent, 0);
+                                return;
+                            }
+                        }
+                    });
                 }
 
             }
@@ -409,12 +421,12 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
             @Override
             public void onItemClick(View itemView, int position) {
 
-                if (homegridentityvArrayList.get(position).isString9()){
-                    Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class);
-                    intent.putExtra("usertitile", "授权家庭");
-                    intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
-                    startActivityForResult(intent, 0);
-                }
+//                if (homegridentityvArrayList.get(position).isString9()){
+//                    Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class);
+//                    intent.putExtra("usertitile", "授权家庭");
+//                    intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
+//                    startActivityForResult(intent, 0);
+//                }
 
             }
         });
diff --git a/app/src/main/res/layout/myhousrmessageitem.xml b/app/src/main/res/layout/myhousrmessageitem.xml
index 3c74d60..edf8774 100644
--- a/app/src/main/res/layout/myhousrmessageitem.xml
+++ b/app/src/main/res/layout/myhousrmessageitem.xml
@@ -329,6 +329,51 @@
                 android:paddingBottom="7dp"/>
         </LinearLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dip"
+            android:layout_marginLeft="15dip"
+            android:layout_marginRight="15dip"
+            android:background="@color/lighteeeeee" />
+
+        <LinearLayout
+            android:id="@+id/ll_jt"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginStart="15dip"
+            android:layout_marginEnd="15dip"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:text="家庭成员"
+                android:textColor="#333333"
+                android:textSize="16sp" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:layout_marginLeft="20dip"
+                android:visibility="invisible"
+                android:layout_weight="1"
+                android:background="@null"
+                android:hint="成员"
+                android:text="@{myentity.string11}"
+                android:textColor="#333333"
+                android:textSize="16sp" />
+
+            <ImageView
+                android:layout_width="8dp"
+                android:layout_height="14dp"
+                android:layout_marginLeft="20dip"
+                android:layout_gravity="center_vertical"
+                android:background="@mipmap/returnme"
+                android:paddingBottom="7dp"/>
+        </LinearLayout>
+
         <TextView
             android:id="@+id/tv_family"
             android:text="+添加家庭成员"