This commit is contained in:
renjianbo0118
2021-02-28 23:44:32 +08:00
parent c12adbe261
commit fce732a659
6 changed files with 91 additions and 50 deletions

View File

@@ -86,5 +86,20 @@
<option name="name" value="C:\Users\jinli\AppData\Local\Android\Sdk\extras\m2repository" /> <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" /> <option name="url" value="file:/$USER_HOME$/AppData/Local/Android/Sdk/extras/m2repository" />
</remote-repository> </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:/E:/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:/E:/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:/E:/AndroidSDK/extras/android/m2repository/" />
</remote-repository>
</component> </component>
</project> </project>

View File

@@ -245,15 +245,16 @@ public class MyAuthorizedFamilyHistory extends BaseActivity<ActivityMyAuthorized
public void onBindViewHolder(Object b, final int position) { public void onBindViewHolder(Object b, final int position) {
if (!(position >= simpleEntities.size())) { if (!(position >= simpleEntities.size())) {
final FamilynumberpermissionBinding homeGridAdapterItemBinding = (FamilynumberpermissionBinding) b; final FamilynumberpermissionBinding homeGridAdapterItemBinding = (FamilynumberpermissionBinding) b;
simpleEntities.get(position).setString12(position+1+"");
homeGridAdapterItemBinding.setMyentity(simpleEntities.get(position)); homeGridAdapterItemBinding.setMyentity(simpleEntities.get(position));
homeGridAdapterItemBinding.edit.setOnClickListener(new View.OnClickListener() { // homeGridAdapterItemBinding.edit.setOnClickListener(new View.OnClickListener() {
@Override // @Override
public void onClick(View view) { // public void onClick(View view) {
Intent intet = new Intent(MyAuthorizedFamilyHistory.this, AddAnewFamilyNumberPermissionActivity.class); // Intent intet = new Intent(MyAuthorizedFamilyHistory.this, AddAnewFamilyNumberPermissionActivity.class);
intet.putExtra("stringentity", simpleEntities.get(position)); // intet.putExtra("stringentity", simpleEntities.get(position));
startActivityForResult(intet,1); // startActivityForResult(intet,1);
} // }
}); // });
} }
} }

View File

@@ -160,10 +160,10 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
@Override @Override
public void onClick(View view) { public void onClick(View view) {
if (homegridentityvArrayList.get(position).isString9()){ if (homegridentityvArrayList.get(position).isString9()){
Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); // Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
intent.putExtra("usertitile", "授权家庭"); // intent.putExtra("usertitile", "授权家庭");
intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); // intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
startActivityForResult(intent, 0); // startActivityForResult(intent, 0);
return; return;
} }
RegisterUser user = RegisterUser user =
@@ -185,10 +185,10 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
@Override @Override
public void onClick(View view) { public void onClick(View view) {
if (homegridentityvArrayList.get(position).isString9()){ if (homegridentityvArrayList.get(position).isString9()){
Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); // Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
intent.putExtra("usertitile", "授权家庭"); // intent.putExtra("usertitile", "授权家庭");
intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); // intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
startActivityForResult(intent, 0); // startActivityForResult(intent, 0);
return; return;
} }
if (homegridentityvArrayList.get(position).getString5() == null || if (homegridentityvArrayList.get(position).getString5() == null ||
@@ -218,10 +218,10 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
@Override @Override
public void onClick(View view) { public void onClick(View view) {
if (homegridentityvArrayList.get(position).isString9()){ if (homegridentityvArrayList.get(position).isString9()){
Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); // Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
intent.putExtra("usertitile", "授权家庭"); // intent.putExtra("usertitile", "授权家庭");
intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); // intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
startActivityForResult(intent, 0); // startActivityForResult(intent, 0);
return; return;
} }
if (homegridentityvArrayList.get(position).getString5() == null || if (homegridentityvArrayList.get(position).getString5() == null ||
@@ -256,10 +256,10 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
@Override @Override
public void onClick(View view) { public void onClick(View view) {
if (homegridentityvArrayList.get(position).isString9()){ if (homegridentityvArrayList.get(position).isString9()){
Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); // Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
intent.putExtra("usertitile", "授权家庭"); // intent.putExtra("usertitile", "授权家庭");
intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); // intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
startActivityForResult(intent, 0); // startActivityForResult(intent, 0);
return; return;
} }
@@ -303,10 +303,10 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
@Override @Override
public void onClick(View view) { public void onClick(View view) {
if (homegridentityvArrayList.get(position).isString9()){ if (homegridentityvArrayList.get(position).isString9()){
Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); // Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
intent.putExtra("usertitile", "授权家庭"); // intent.putExtra("usertitile", "授权家庭");
intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); // intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
startActivityForResult(intent, 0); // startActivityForResult(intent, 0);
return; return;
} }
@@ -363,10 +363,10 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (homegridentityvArrayList.get(position).isString9()){ if (homegridentityvArrayList.get(position).isString9()){
Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); // Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
intent.putExtra("usertitile", "授权家庭"); // intent.putExtra("usertitile", "授权家庭");
intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); // intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
startActivityForResult(intent, 0); // startActivityForResult(intent, 0);
return; return;
} }
new XPopup.Builder(MyPropertyActivity.this).asInputConfirm("", "", "请输入户主姓名", new OnInputConfirmListener() { new XPopup.Builder(MyPropertyActivity.this).asInputConfirm("", "", "请输入户主姓名", new OnInputConfirmListener() {
@@ -381,10 +381,10 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (homegridentityvArrayList.get(position).isString9()){ if (homegridentityvArrayList.get(position).isString9()){
Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); // Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
intent.putExtra("usertitile", "授权家庭"); // intent.putExtra("usertitile", "授权家庭");
intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); // intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
startActivityForResult(intent, 0); // startActivityForResult(intent, 0);
return; return;
} }
new XPopup.Builder(MyPropertyActivity.this).asInputConfirm("", "", "请输入身份证号", new OnInputConfirmListener() { new XPopup.Builder(MyPropertyActivity.this).asInputConfirm("", "", "请输入身份证号", new OnInputConfirmListener() {
@@ -400,6 +400,18 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
}).show(); }).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;
}
}
});
} }

View File

@@ -62,7 +62,7 @@ public class SimpleEntity extends BaseObservable implements Serializable {
public void setString12(String string12) { public void setString12(String string12) {
this.string12 = string12; this.string12 = string12;
notifyPropertyChanged(BR.string10); notifyPropertyChanged(BR.string12);
} }
@Bindable @Bindable
@@ -155,4 +155,5 @@ public class SimpleEntity extends BaseObservable implements Serializable {
this.string5 = string5; this.string5 = string5;
notifyPropertyChanged(BR.string5); notifyPropertyChanged(BR.string5);
} }
} }

View File

@@ -19,11 +19,11 @@
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="10dip" android:layout_height="2dip"
android:background="@color/f7" /> android:background="@color/f7" />
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp"> android:layout_height="50dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -31,24 +31,34 @@
android:paddingLeft="12dp" android:paddingLeft="12dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:background="@color/white" android:background="@color/white"
android:orientation="vertical"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:gravity="center_vertical"
android:layout_weight="1" android:text="家庭成员"
android:textColor="#333333"
android:textSize="19sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="@{myentity.string12}"
android:textColor="#333333"
android:textSize="19sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@{myentity.string1}" android:text="@{myentity.string1}"
android:textColor="#333333" android:textColor="#333333"
android:textSize="19sp" /> android:textSize="19sp" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_marginLeft="10dp"
android:layout_marginBottom="6dp"
android:gravity="center_vertical"
android:text="@{myentity.string2}" android:text="@{myentity.string2}"
android:textColor="@color/lightlittleGrey" android:textColor="@color/lightlittleGrey"
android:textSize="15sp" /> android:textSize="15sp" />
@@ -69,6 +79,7 @@
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:layout_marginBottom="15dp" android:layout_marginBottom="15dp"
android:layout_marginStart="24dip" android:layout_marginStart="24dip"
android:visibility="gone"
android:layout_marginEnd="24dip" android:layout_marginEnd="24dip"
android:background="@mipmap/xie" /> android:background="@mipmap/xie" />
</RelativeLayout> </RelativeLayout>

View File

@@ -139,6 +139,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="10dip" android:layout_margin="10dip"
android:visibility="gone"
android:layout_weight="1" android:layout_weight="1"
android:background="@mipmap/garage"> android:background="@mipmap/garage">