Commit b4c6eb7d authored by jianglx's avatar jianglx

修改出承认的样式,修改营地详情预定营地删除的问题

parent ca6ebcc7
...@@ -8,8 +8,8 @@ android { ...@@ -8,8 +8,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
flavorDimensions "default" flavorDimensions "default"
versionCode 153 versionCode 154
versionName "1.5.3" versionName "1.5.4"
multiDexEnabled true multiDexEnabled true
......
...@@ -211,7 +211,7 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> { ...@@ -211,7 +211,7 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
public void onViewClicked(View view) { public void onViewClicked(View view) {
int id = view.getId(); int id = view.getId();
if (id == R.id.tv_scheduled_camp) { if (id == R.id.tv_scheduled_camp) {
if (data.getData() != null && data.getData().getPhone() != null) { if (data != null && data.getData() != null && data.getData().getPhone() != null) {
Intent intent = new Intent(Intent.ACTION_DIAL); Intent intent = new Intent(Intent.ACTION_DIAL);
Uri uri = Uri.parse("tel:" + data.getData().getPhone()); Uri uri = Uri.parse("tel:" + data.getData().getPhone());
intent.setData(uri); intent.setData(uri);
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<string name="rv_personal_safety">保人身安全</string> <string name="rv_personal_safety">保人身安全</string>
<string name="rv_reservation_know">预定须知</string> <string name="rv_reservation_know">预定须知</string>
<string name="rv_inviter_phone">邀请人</string> <string name="rv_inviter_phone">内部邀请人</string>
<string name="rv_agreed_reservation_know">同意预定须知和</string> <string name="rv_agreed_reservation_know">同意预定须知和</string>
<string name="rv_contract_agreement">《合同协议》</string> <string name="rv_contract_agreement">《合同协议》</string>
<string name="rv_driving">驾驶人</string> <string name="rv_driving">驾驶人</string>
......
...@@ -469,7 +469,7 @@ ...@@ -469,7 +469,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_weight="1" android:layout_weight="1"
android:text="邀请人" android:text="内部邀请人"
android:textColor="@color/textMain" android:textColor="@color/textMain"
android:textSize="@dimen/text_16" /> android:textSize="@dimen/text_16" />
...@@ -482,7 +482,7 @@ ...@@ -482,7 +482,7 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:background="@color/colorWrite" android:background="@color/colorWrite"
android:gravity="center_vertical" android:gravity="center_vertical|right"
android:hint="请输入邀请人手机号" android:hint="请输入邀请人手机号"
android:textColor="@color/text_Gray" android:textColor="@color/text_Gray"
android:textSize="@dimen/text_12" /> android:textSize="@dimen/text_12" />
......
...@@ -23,7 +23,6 @@ public class InviterPhoneDialog extends BaseDialog { ...@@ -23,7 +23,6 @@ public class InviterPhoneDialog extends BaseDialog {
public InviterPhoneDialog(@NonNull final Context context, String phone, final InputListener listener) { public InviterPhoneDialog(@NonNull final Context context, String phone, final InputListener listener) {
super(context); super(context);
setCancelable(false);
setDialogParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER); setDialogParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER);
edtInviterPhone = findViewById(R.id.edt_inviter_phone); edtInviterPhone = findViewById(R.id.edt_inviter_phone);
ivClose = findViewById(R.id.iv_close); ivClose = findViewById(R.id.iv_close);
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<EditText <EditText
android:id="@+id/edt_inviter_phone" android:id="@+id/edt_inviter_phone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/size_45" android:layout_height="@dimen/dp_40"
android:layout_marginTop="@dimen/size_22" android:layout_marginTop="@dimen/size_22"
android:background="@drawable/shape_rv_bg_inviter_phone" android:background="@drawable/shape_rv_bg_inviter_phone"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
......
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:background="@color/colorWrite" android:background="@color/colorWrite"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="请填写邀请人" android:text="内部邀请人"
android:textColor="@color/text_Gray" android:textColor="@color/text_Gray"
android:textSize="@dimen/text_12" /> android:textSize="@dimen/text_12" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment