1.0.4
This commit is contained in:
parent
ca7b2a6d11
commit
500c89420a
@ -88,10 +88,19 @@ public class UserBean implements Serializable {
|
||||
private String userId;
|
||||
private String phone;
|
||||
private String signName;
|
||||
private String nickName;
|
||||
private String phonenumber;
|
||||
private String userName;
|
||||
private String sign;
|
||||
|
||||
public String getNickName() {
|
||||
return nickName;
|
||||
}
|
||||
|
||||
public void setNickName(String nickName) {
|
||||
this.nickName = nickName;
|
||||
}
|
||||
|
||||
public String getUserName() {
|
||||
return userName;
|
||||
}
|
||||
|
@ -52,8 +52,8 @@ class ExamineDetailActivity : BaseActivity(), View.OnClickListener {
|
||||
tvJb.text = """国家A级: ${bean.nationalClassA}"""
|
||||
tvCls.text = bean.vehiclesNumber
|
||||
tvXqs.text = bean.numberOfPassesRequired
|
||||
tvFzr.text = """负责人: ${bean.enterpriseContact}"""
|
||||
tvPhone.text = """电话: ${bean.enterpriseContactPhone}"""
|
||||
tvFzr.text = """通行证管理人: ${bean.enterpriseContact}"""
|
||||
tvPhone.text = """管理人电话: ${bean.enterpriseContactPhone}"""
|
||||
|
||||
|
||||
DataManager.getInstance().appUser(bean.userId)
|
||||
@ -63,8 +63,8 @@ class ExamineDetailActivity : BaseActivity(), View.OnClickListener {
|
||||
super.onSuccess(t)
|
||||
val data = t.data
|
||||
tvZcdz.text = data.placeOfRegistration
|
||||
tvBgdz.text = data.companyAddress
|
||||
tvCqdz.text = data.plantAddress
|
||||
tvBgdz.text = data.plantAddress
|
||||
tvCqdz.text = data.companyAddress
|
||||
}
|
||||
}))
|
||||
}
|
||||
@ -119,7 +119,7 @@ class ExamineDetailActivity : BaseActivity(), View.OnClickListener {
|
||||
return
|
||||
}
|
||||
|
||||
if (tvStartTime.text.isNullOrEmpty()||tvEndTime.text.isNullOrEmpty()){
|
||||
if (tvStartTime.text.isNullOrEmpty()){
|
||||
showToast("请选择时间")
|
||||
return
|
||||
}
|
||||
@ -127,7 +127,7 @@ class ExamineDetailActivity : BaseActivity(), View.OnClickListener {
|
||||
applyBean.infoId = bean.infoId
|
||||
applyBean.numberOfPasses = etCount.text.toString()
|
||||
applyBean.passUsageStartTime = tvStartTime.text.toString()
|
||||
applyBean.passUsageEndTime = tvEndTime.text.toString()
|
||||
// applyBean.passUsageEndTime = tvEndTime.text.toString()
|
||||
applyBean.status = "1"
|
||||
DataManager.getInstance().appleEdit(applyBean)
|
||||
.compose(DataManager.setThread())
|
||||
|
@ -31,7 +31,7 @@ class MineFragment : BaseFragment(), View.OnClickListener {
|
||||
val userInfo = SPUtils.getUserInfo(mContext).userInfo
|
||||
if (null==userInfo)
|
||||
return
|
||||
tvName.text = userInfo.signName
|
||||
tvName.text = userInfo.nickName
|
||||
tvPhone.text = userInfo.userName
|
||||
}
|
||||
|
||||
|
@ -157,7 +157,7 @@
|
||||
android:ellipsize="end"
|
||||
android:maxLength="11"
|
||||
android:maxLines="1"
|
||||
android:text="负责人:王宗亮"
|
||||
android:text="通行证管理人:王宗亮"
|
||||
android:textColor="@color/black"></TextView>
|
||||
|
||||
|
||||
@ -183,7 +183,7 @@
|
||||
android:ellipsize="end"
|
||||
android:maxLength="11"
|
||||
android:maxLines="1"
|
||||
android:text="电话:13000000005"
|
||||
android:text="管理人电话:13000000005"
|
||||
android:textColor="@color/black"></TextView>
|
||||
|
||||
|
||||
@ -215,12 +215,14 @@
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:visibility="gone"
|
||||
android:id="@+id/tvZcdz"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text=""></TextView>
|
||||
|
||||
<LinearLayout
|
||||
android:visibility="gone"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="40dp"
|
||||
android:gravity="center_vertical"
|
||||
@ -270,7 +272,7 @@
|
||||
android:ellipsize="end"
|
||||
android:maxLength="11"
|
||||
android:maxLines="1"
|
||||
android:text="厂区地址"
|
||||
android:text="公司园区所在地"
|
||||
android:textColor="@color/black"></TextView>
|
||||
|
||||
|
||||
@ -350,6 +352,7 @@
|
||||
android:textSize="12dp"></TextView>
|
||||
|
||||
<View
|
||||
android:visibility="gone"
|
||||
android:layout_width="20dp"
|
||||
android:layout_height="2dp"
|
||||
android:layout_marginLeft="10dp"
|
||||
@ -357,6 +360,7 @@
|
||||
android:background="@color/black"></View>
|
||||
|
||||
<TextView
|
||||
android:visibility="gone"
|
||||
android:id="@+id/tvEndTime"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="36dp"
|
||||
|
@ -64,6 +64,7 @@
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:visibility="gone"
|
||||
android:layout_marginTop="6dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="20dp"
|
||||
|
@ -154,6 +154,7 @@
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:visibility="gone"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="20dp"
|
||||
android:layout_marginTop="4dp"
|
||||
|
@ -56,6 +56,7 @@
|
||||
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:visibility="gone"
|
||||
android:layout_marginTop="4dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
@ -21,6 +21,7 @@
|
||||
<TextView
|
||||
android:layout_marginTop="3dp"
|
||||
android:id="@+id/tvTitle"
|
||||
android:layout_weight="1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:drawableLeft="@drawable/icon_bill"
|
||||
@ -30,6 +31,7 @@
|
||||
android:textSize="16dp"
|
||||
android:textStyle="bold"></TextView>
|
||||
<TextView
|
||||
android:visibility="gone"
|
||||
android:id="@+id/tvType"
|
||||
android:layout_weight="1"
|
||||
android:layout_width="wrap_content"
|
||||
|
@ -28,6 +28,7 @@
|
||||
android:textStyle="bold"></TextView>
|
||||
|
||||
<TextView
|
||||
android:visibility="gone"
|
||||
android:id="@+id/tvType"
|
||||
android:layout_alignParentRight="true"
|
||||
android:gravity="center"
|
||||
|
@ -35,6 +35,7 @@
|
||||
android:layout_marginTop="4dp"
|
||||
>
|
||||
<TextView
|
||||
android:visibility="gone"
|
||||
android:id="@+id/tvType"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
Loading…
Reference in New Issue
Block a user