From fce732a659608d58e84462431e719cfadf2f687e Mon Sep 17 00:00:00 2001
From: renjianbo0118 <18133922183>
Date: Sun, 28 Feb 2021 23:44:32 +0800
Subject: [PATCH] d
---
.idea/jarRepositories.xml | 15 ++++
.../user/MyAuthorizedFamilyHistory.java | 17 ++---
.../user/MyPropertyActivity.java | 68 +++++++++++--------
app/src/main/java/entity/SimpleEntity.java | 3 +-
.../res/layout/familynumberpermission.xml | 37 ++++++----
app/src/main/res/layout/fragment_main.xml | 1 +
6 files changed, 91 insertions(+), 50 deletions(-)
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 8d8034e..0748d83 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -86,5 +86,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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 0a3bc6d..3f61912 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
@@ -245,15 +245,16 @@ public class MyAuthorizedFamilyHistory extends BaseActivity= simpleEntities.size())) {
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) {
+// Intent intet = new Intent(MyAuthorizedFamilyHistory.this, AddAnewFamilyNumberPermissionActivity.class);
+// intet.putExtra("stringentity", simpleEntities.get(position));
+// startActivityForResult(intet,1);
+// }
+// });
}
}
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 84afee7..03c10f9 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
@@ -160,10 +160,10 @@ public class MyPropertyActivity extends BaseActivity
@Override
public void onClick(View view) {
if (homegridentityvArrayList.get(position).isString9()){
- Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
- intent.putExtra("usertitile", "授权家庭");
- intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
- startActivityForResult(intent, 0);
+// Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
+// intent.putExtra("usertitile", "授权家庭");
+// intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
+// startActivityForResult(intent, 0);
return;
}
RegisterUser user =
@@ -185,10 +185,10 @@ public class MyPropertyActivity extends BaseActivity
@Override
public void onClick(View view) {
if (homegridentityvArrayList.get(position).isString9()){
- Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
- intent.putExtra("usertitile", "授权家庭");
- intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
- startActivityForResult(intent, 0);
+// Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
+// intent.putExtra("usertitile", "授权家庭");
+// intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
+// startActivityForResult(intent, 0);
return;
}
if (homegridentityvArrayList.get(position).getString5() == null ||
@@ -218,10 +218,10 @@ public class MyPropertyActivity extends BaseActivity
@Override
public void onClick(View view) {
if (homegridentityvArrayList.get(position).isString9()){
- Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
- intent.putExtra("usertitile", "授权家庭");
- intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
- startActivityForResult(intent, 0);
+// Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
+// intent.putExtra("usertitile", "授权家庭");
+// intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
+// startActivityForResult(intent, 0);
return;
}
if (homegridentityvArrayList.get(position).getString5() == null ||
@@ -256,10 +256,10 @@ public class MyPropertyActivity extends BaseActivity
@Override
public void onClick(View view) {
if (homegridentityvArrayList.get(position).isString9()){
- Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
- intent.putExtra("usertitile", "授权家庭");
- intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
- startActivityForResult(intent, 0);
+// Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
+// intent.putExtra("usertitile", "授权家庭");
+// intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
+// startActivityForResult(intent, 0);
return;
}
@@ -303,10 +303,10 @@ public class MyPropertyActivity extends BaseActivity
@Override
public void onClick(View view) {
if (homegridentityvArrayList.get(position).isString9()){
- Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
- intent.putExtra("usertitile", "授权家庭");
- intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
- startActivityForResult(intent, 0);
+// Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
+// intent.putExtra("usertitile", "授权家庭");
+// intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
+// startActivityForResult(intent, 0);
return;
}
@@ -363,10 +363,10 @@ public class MyPropertyActivity extends BaseActivity
@Override
public void onClick(View v) {
if (homegridentityvArrayList.get(position).isString9()){
- Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
- intent.putExtra("usertitile", "授权家庭");
- intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
- startActivityForResult(intent, 0);
+// Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
+// intent.putExtra("usertitile", "授权家庭");
+// intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
+// startActivityForResult(intent, 0);
return;
}
new XPopup.Builder(MyPropertyActivity.this).asInputConfirm("", "", "请输入户主姓名", new OnInputConfirmListener() {
@@ -381,10 +381,10 @@ public class MyPropertyActivity extends BaseActivity
@Override
public void onClick(View v) {
if (homegridentityvArrayList.get(position).isString9()){
- Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
- intent.putExtra("usertitile", "授权家庭");
- intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
- startActivityForResult(intent, 0);
+// Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
+// intent.putExtra("usertitile", "授权家庭");
+// intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
+// startActivityForResult(intent, 0);
return;
}
new XPopup.Builder(MyPropertyActivity.this).asInputConfirm("", "", "请输入身份证号", new OnInputConfirmListener() {
@@ -400,6 +400,18 @@ public class MyPropertyActivity extends BaseActivity
}).show();
}
});
+ homeGridAdapterItemBinding.llJt.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ if (homegridentityvArrayList.get(position).isString9()){
+ Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
+ intent.putExtra("usertitile", "授权家庭");
+ intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
+ startActivityForResult(intent, 0);
+ return;
+ }
+ }
+ });
}
diff --git a/app/src/main/java/entity/SimpleEntity.java b/app/src/main/java/entity/SimpleEntity.java
index 0c77916..ca19c82 100644
--- a/app/src/main/java/entity/SimpleEntity.java
+++ b/app/src/main/java/entity/SimpleEntity.java
@@ -62,7 +62,7 @@ public class SimpleEntity extends BaseObservable implements Serializable {
public void setString12(String string12) {
this.string12 = string12;
- notifyPropertyChanged(BR.string10);
+ notifyPropertyChanged(BR.string12);
}
@Bindable
@@ -155,4 +155,5 @@ public class SimpleEntity extends BaseObservable implements Serializable {
this.string5 = string5;
notifyPropertyChanged(BR.string5);
}
+
}
diff --git a/app/src/main/res/layout/familynumberpermission.xml b/app/src/main/res/layout/familynumberpermission.xml
index d82d03b..033bb7f 100644
--- a/app/src/main/res/layout/familynumberpermission.xml
+++ b/app/src/main/res/layout/familynumberpermission.xml
@@ -19,11 +19,11 @@
android:orientation="vertical">
+ android:layout_height="50dp">
-
+ android:orientation="horizontal">
+
+
@@ -69,6 +79,7 @@
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:layout_marginStart="24dip"
+ android:visibility="gone"
android:layout_marginEnd="24dip"
android:background="@mipmap/xie" />
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 1336cd9..6b1c8ba 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -139,6 +139,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dip"
+ android:visibility="gone"
android:layout_weight="1"
android:background="@mipmap/garage">