Skip to content

R
RvApp
Commit d60a99c5 authored by jianglx's avatar jianglx
Browse files
Options

Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im

parents 6e3e83af cb304190
Hide whitespace changes
Inline Side-by-side
Showing with 285 additions and 269 deletions
module_home/src/main/java/com/rv/home/rv/module/ui/login/RegisteredActivity.java
View file @ d60a99c5
...@@ -120,6 +120,7 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> { ...@@ -120,6 +120,7 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
@Override @Override
public void onClick(View widget) { public void onClick(View widget) {
avoidHintColor(widget);
ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW) ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
.withString("title", "用户协议") .withString("title", "用户协议")
.withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE) .withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
...@@ -142,11 +143,13 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> { ...@@ -142,11 +143,13 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
@Override @Override
public void onClick(View widget) { public void onClick(View widget) {
avoidHintColor(widget);
ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW) ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
.withString("title", "隐私政策") .withString("title", "隐私政策")
.withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE) .withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
.withInt("type", 19) .withInt("type", 19)
.navigation(); .navigation();
} }
@Override @Override
...@@ -163,6 +166,12 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> { ...@@ -163,6 +166,12 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
tvAgreement.setText(ssb, TextView.BufferType.SPANNABLE); tvAgreement.setText(ssb, TextView.BufferType.SPANNABLE);
} }
private void avoidHintColor(View view) {
if (view instanceof TextView)
((TextView) view).setHighlightColor(getResources().getColor(android.R.color.transparent));
}
@Override @Override
public void onShowResult(int requestType, BaseBean result) { public void onShowResult(int requestType, BaseBean result) {
switch (requestType) { switch (requestType) {
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/SelectShopActivity.java
View file @ d60a99c5
...@@ -95,6 +95,8 @@ public class SelectShopActivity extends BaseStatusActivity<CommonPresenter> impl ...@@ -95,6 +95,8 @@ public class SelectShopActivity extends BaseStatusActivity<CommonPresenter> impl
titleView.setTitle("选择取车公司"); titleView.setTitle("选择取车公司");
} else if (shopType == 2) { } else if (shopType == 2) {
titleView.setTitle("选择还车公司"); titleView.setTitle("选择还车公司");
} else if (shopType == 3) {
titleView.setTitle("选择预约公司");
} }
titleView.setImageResource(R.id.iv_title_left, R.drawable.rv_common_icon_back_dark); titleView.setImageResource(R.id.iv_title_left, R.drawable.rv_common_icon_back_dark);
Drawable drawable = getResources().getDrawable(R.drawable.icon_position); Drawable drawable = getResources().getDrawable(R.drawable.icon_position);
......
plugin_carpurchase/src/main/java/com/xxrv/carpurchase/activity/ReservationInformationActivity.java
View file @ d60a99c5
...@@ -91,7 +91,7 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha ...@@ -91,7 +91,7 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
private double latLatitude = 0; private double latLatitude = 0;
private double lonLongitude; private double lonLongitude;
private String nowCity = ""; private String nowCity = "";
private int company_id; private int company_id;
public static Intent getIntent(Context context, String id, String icon, String name, String keyword, int score, double buyPrice) { public static Intent getIntent(Context context, String id, String icon, String name, String keyword, int score, double buyPrice) {
return new Intent(context, ReservationInformationActivity.class) return new Intent(context, ReservationInformationActivity.class)
...@@ -135,12 +135,12 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha ...@@ -135,12 +135,12 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
@Override @Override
public void onShowResult(int requestType, BaseBean result) { public void onShowResult(int requestType, BaseBean result) {
switch (requestType){ switch (requestType) {
case 1: case 1:
showToast("预约成功！"); showToast("预约成功！");
finish(); finish();
break; break;
} }
} }
@OnClick({R2.id.ll_item_select_date, R2.id.ll_item_select_branch_office, R2.id.tv_item_submit}) @OnClick({R2.id.ll_item_select_date, R2.id.ll_item_select_branch_office, R2.id.tv_item_submit})
...@@ -152,10 +152,11 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha ...@@ -152,10 +152,11 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
} else if (id == R.id.ll_item_select_branch_office) { } else if (id == R.id.ll_item_select_branch_office) {
ARouter.getInstance() ARouter.getInstance()
.build(Constance.ACTIVITY_URL_SELECTSHOP) .build(Constance.ACTIVITY_URL_SELECTSHOP)
.withDouble("mLat",latLatitude) .withDouble("mLat", latLatitude)
.withDouble("mLon",lonLongitude) .withDouble("mLon", lonLongitude)
.withString("cityName",nowCity) .withString("cityName", nowCity)
.navigation(mActivity,122); .withInt("shopType", 3)
.navigation(mActivity, 122);
} else if (id == R.id.tv_item_submit) { } else if (id == R.id.tv_item_submit) {
upDate(); upDate();
} }
...@@ -183,16 +184,16 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha ...@@ -183,16 +184,16 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
} }
String date = tvDate.getText().toString(); String date = tvDate.getText().toString();
if (TextUtils.isEmpty(date)){ if (TextUtils.isEmpty(date)) {
showToast("预约时间不能为空！"); showToast("预约时间不能为空！");
return; return;
} }
// String branchoffice = tvBranchOfficeName.getText().toString(); String branchoffice = tvBranchOfficeName.getText().toString();
// if (TextUtils.isEmpty(branchoffice)){ if (TextUtils.isEmpty(branchoffice)){
// showToast("分公司不能为空！"); showToast("分公司不能为空！");
// return; return;
// } }
Map<String, Object> headMap = new LinkedHashMap<>(); Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null) if (OkGoUtil.getToken() != null)
...@@ -206,7 +207,7 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha ...@@ -206,7 +207,7 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
map.put("modelId", id); map.put("modelId", id);
map.put("remark", etRemark.getText().toString().trim()); map.put("remark", etRemark.getText().toString().trim());
mPresenter.postBodyData(RvFrameConfig.HOST, 1, CarPurchaseApi.HTTP_URL_BUYVEHICLEFORM, BaseBean.class, map,headMap, true); mPresenter.postBodyData(RvFrameConfig.HOST, 1, CarPurchaseApi.HTTP_URL_BUYVEHICLEFORM, BaseBean.class, map, headMap, true);
} }
...@@ -281,7 +282,6 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha ...@@ -281,7 +282,6 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
} }
/** /**
* 定位权限处理 * 定位权限处理
*/ */
...@@ -300,7 +300,7 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha ...@@ -300,7 +300,7 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
if (aBoolean == true) { if (aBoolean == true) {
initGps(); initGps();
} else { } else {
finish(); finish();
} }
} }
}); });
......
plugin_carpurchase/src/main/res/layout/activity_reservation_information.xml
View file @ d60a99c5
...@@ -8,337 +8,342 @@ ...@@ -8,337 +8,342 @@
android:orientation="vertical" android:orientation="vertical"
tools:context=".activity.ReservationInformationActivity"> tools:context=".activity.ReservationInformationActivity">
<LinearLayout <android.support.v4.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1">
android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5" android:orientation="vertical">
android:layout_marginBottom="@dimen/size_5"
android:background="@color/colorWrite" <LinearLayout
android:orientation="horizontal"
android:padding="@dimen/size_15">
<ImageView
android:id="@+id/iv_car_goods"
android:layout_width="@dimen/size_120"
android:layout_height="@dimen/size_100"
android:scaleType="centerCrop" />
<RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_5"> android:layout_marginTop="@dimen/size_5"
android:layout_marginBottom="@dimen/size_5"
<TextView android:background="@color/colorWrite"
android:id="@+id/tv_car_name" android:orientation="horizontal"
android:layout_width="wrap_content" android:padding="@dimen/size_15">
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:text="2222222222222"
android:textColor="@color/textMain"
android:textSize="@dimen/text_16" />
<ImageView
android:id="@+id/iv_car_goods"
android:layout_width="@dimen/size_120"
android:layout_height="@dimen/size_100"
android:scaleType="centerCrop" />
<LinearLayout <RelativeLayout
android:id="@+id/ll_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/tv_car_name" android:layout_marginLeft="@dimen/size_5">
android:layout_marginTop="@dimen/size_10"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView <TextView
android:id="@+id/tv_car_context" android:id="@+id/tv_car_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="end"
android:maxLines="1"
android:text="2222222222222"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/tv_point"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:text="2222" android:text=""
android:textColor="@color/textGray" android:textColor="@color/textMain"
android:textSize="@dimen/text_12" /> android:textSize="@dimen/text_16" />
<com.frame.base.view.StarBar
android:id="@+id/starbar1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
ratingbar:isClick="true"
ratingbar:starCount="5"
ratingbar:starDistance="3dp"
ratingbar:starEmpty="@drawable/rv_vehicle_icon_star_gray"
ratingbar:starFill="@drawable/rv_vehicle_icon_star_light"
ratingbar:starSize="@dimen/size_12" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/ll_content"
android:layout_marginTop="@dimen/size_30"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView <LinearLayout
android:id="@+id/tv_car_price" android:id="@+id/ll_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_below="@id/tv_car_name"
android:text="22222222" android:layout_marginTop="@dimen/size_10"
android:textColor="@color/colorAuxiliaryRed" android:gravity="center_vertical"
android:textSize="@dimen/text_16" android:orientation="horizontal">
android:textStyle="bold" />
</LinearLayout> <TextView
android:id="@+id/tv_car_context"
</RelativeLayout> android:layout_width="match_parent"
</LinearLayout> android:layout_height="wrap_content"
android:layout_weight="1"
<LinearLayout android:ellipsize="end"
android:layout_width="match_parent" android:maxLines="1"
android:layout_height="wrap_content" android:text=""
android:layout_marginTop="@dimen/size_15" android:textColor="@color/textGray"
android:background="@color/colorWrite" android:textSize="@dimen/text_12" />
android:orientation="vertical"
android:paddingLeft="@dimen/size_15" <TextView
android:paddingRight="@dimen/size_15"> android:id="@+id/tv_point"
android:layout_width="wrap_content"
<TextView android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_marginLeft="@dimen/size_10"
android:layout_height="wrap_content" android:ellipsize="end"
android:layout_marginTop="@dimen/size_15" android:maxLines="1"
android:text="预约人信息" android:text="2222"
android:textColor="@color/colorMain" android:textColor="@color/textGray"
android:textSize="@dimen/text_16" /> android:textSize="@dimen/text_12" />
<com.frame.base.view.StarBar
android:id="@+id/starbar1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
ratingbar:isClick="true"
ratingbar:starCount="5"
ratingbar:starDistance="3dp"
ratingbar:starEmpty="@drawable/rv_vehicle_icon_star_gray"
ratingbar:starFill="@drawable/rv_vehicle_icon_star_light"
ratingbar:starSize="@dimen/size_12" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/ll_content"
android:layout_marginTop="@dimen/size_30"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_car_price"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text=""
android:textColor="@color/colorAuxiliaryRed"
android:textSize="@dimen/text_16"
android:textStyle="bold" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/size_50" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_15" android:layout_marginTop="@dimen/size_15"
android:orientation="horizontal"> android:background="@color/colorWrite"
android:orientation="vertical"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="姓名" android:layout_marginTop="@dimen/size_15"
android:text="预约人信息"
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" /> android:textSize="@dimen/text_16" />
<EditText <LinearLayout
android:id="@+id/et_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="@dimen/size_50"
android:layout_marginLeft="@dimen/size_25" android:layout_marginTop="@dimen/size_15"
android:background="@null" android:orientation="horizontal">
android:gravity="left|center_vertical"
android:hint="请输入姓名"
android:maxLength="8"
android:text=""
android:textColor="@color/colorMain"
android:textColorHint="@color/colorGray"
android:textSize="@dimen/text_14" />
</LinearLayout>
<include layout="@layout/common_line" /> <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="姓名"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
<LinearLayout <EditText
android:layout_width="match_parent" android:id="@+id/et_name"
android:layout_height="@dimen/size_50" android:layout_width="match_parent"
android:orientation="horizontal"> android:layout_height="match_parent"
android:layout_marginLeft="@dimen/size_25"
android:background="@null"
android:gravity="left|center_vertical"
android:hint="请输入姓名"
android:maxLength="8"
android:text=""
android:textColor="@color/colorMain"
android:textColorHint="@color/colorGray"
android:textSize="@dimen/text_14" />
</LinearLayout>
<TextView <include layout="@layout/common_line" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="电话"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
<EditText <LinearLayout
android:id="@+id/et_phone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="@dimen/size_50"
android:layout_marginLeft="@dimen/size_25" android:orientation="horizontal">
android:background="@null"
android:gravity="left|center_vertical"
android:hint="请输入电话"
android:inputType="number|phone"
android:maxLength="11"
android:text=""
android:textColor="@color/colorMain"
android:textColorHint="@color/colorGray"
android:textSize="@dimen/text_14" />
</LinearLayout>
<include layout="@layout/common_line" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_15"
android:background="@color/colorWrite"
android:orientation="vertical"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_15"
android:text="看车预约"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" />
<LinearLayout
android:id="@+id/ll_item_select_date"
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="时间" android:text="电话"
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" /> android:textSize="@dimen/text_14" />
<TextView <EditText
android:id="@+id/tv_date" android:id="@+id/et_phone"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/size_20" android:layout_marginLeft="@dimen/size_25"
android:layout_weight="1" android:background="@null"
android:hint="请选择看车时间" android:gravity="left|center_vertical"
android:text="" android:hint="请输入电话"
android:textColor="@color/colorMain" android:inputType="number|phone"
android:textColorHint="@color/colorGray" android:maxLength="11"
android:textSize="@dimen/text_14" /> android:text=""
android:textColor="@color/colorMain"
android:textColorHint="@color/colorGray"
android:textSize="@dimen/text_14" />
</LinearLayout>
<ImageView <include layout="@layout/common_line" />
android:layout_width="@dimen/size_15"
android:layout_height="@dimen/size_15"
android:src="@drawable/common_icon_rig_gray" />
</LinearLayout> </LinearLayout>
<include layout="@layout/common_line" />
<LinearLayout <LinearLayout
android:id="@+id/ll_item_select_branch_office"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/size_50" android:layout_height="wrap_content"
android:gravity="center_vertical" android:layout_marginTop="@dimen/size_15"
android:orientation="horizontal"> android:background="@color/colorWrite"
android:orientation="vertical"
android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="分公司" android:layout_marginTop="@dimen/size_15"
android:text="看车预约"
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" /> android:textSize="@dimen/text_16" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:id="@+id/ll_item_select_date"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_marginLeft="@dimen/size_20" android:layout_height="@dimen/size_50"
android:layout_weight="1" android:gravity="center_vertical"
android:orientation="vertical"> android:orientation="horizontal">
<TextView <TextView
android:id="@+id/tv_branch_office_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="请选择分公司" android:text="时间"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_date"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_20"
android:layout_weight="1"
android:hint="请选择看车时间"
android:text="" android:text=""
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textColorHint="@color/colorGray" android:textColorHint="@color/colorGray"
android:textSize="@dimen/text_14" /> android:textSize="@dimen/text_14" />
<ImageView
android:layout_width="@dimen/size_15"
android:layout_height="@dimen/size_15"
android:src="@drawable/common_icon_rig_gray" />
</LinearLayout>
<include layout="@layout/common_line" />
<LinearLayout
android:id="@+id/ll_item_select_branch_office"
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView <TextView
android:id="@+id/tv_branch_office_address"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_3" android:text="分公司"
android:text="" android:textColor="@color/colorMain"
android:textColor="@color/gray_707070" android:textSize="@dimen/text_14" />
android:textSize="@dimen/text_10" />
</LinearLayout>
<ImageView <LinearLayout
android:layout_width="@dimen/size_15" android:layout_width="0dp"
android:layout_height="@dimen/size_15" android:layout_height="wrap_content"
android:src="@drawable/common_icon_rig_gray" /> android:layout_marginLeft="@dimen/size_20"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/tv_branch_office_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:hint="请选择分公司"
android:text=""
android:textColor="@color/colorMain"
android:textColorHint="@color/colorGray"
android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_branch_office_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_3"
android:text=""
android:textColor="@color/gray_707070"
android:textSize="@dimen/text_10" />
</LinearLayout>
<ImageView
android:layout_width="@dimen/size_15"
android:layout_height="@dimen/size_15"
android:src="@drawable/common_icon_rig_gray" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/size_50" android:layout_height="@dimen/size_50"
android:layout_marginTop="@dimen/size_15" android:layout_marginTop="@dimen/size_15"
android:background="@color/colorWrite" android:background="@color/colorWrite"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="@dimen/size_15" android:paddingLeft="@dimen/size_15"
android:paddingRight="@dimen/size_15"> android:paddingRight="@dimen/size_15">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="备注" android:text="备注"
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" /> android:textSize="@dimen/text_14" />
<EditText <EditText
android:id="@+id/et_remark" android:id="@+id/et_remark"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/size_25" android:layout_marginLeft="@dimen/size_25"
android:background="@null" android:background="@null"
android:paddingTop="@dimen/size_5" android:gravity="left|center_vertical"
android:paddingBottom="@dimen/size_5" android:hint="请输入备注信息"
android:gravity="left|center_vertical" android:paddingTop="@dimen/size_5"
android:hint="请输入备注信息" android:paddingBottom="@dimen/size_5"
android:text="" android:text=""
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textColorHint="@color/colorGray" android:textColorHint="@color/colorGray"
android:textSize="@dimen/text_14" /> android:textSize="@dimen/text_14" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </android.support.v4.widget.NestedScrollView>
<LinearLayout <LinearLayout
android:background="@color/colorWrite"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/size_70"> android:layout_height="@dimen/size_70"
android:background="@color/colorWrite">
<TextView <TextView
android:id="@+id/tv_item_submit" android:id="@+id/tv_item_submit"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center"
android:layout_margin="@dimen/size_12" android:layout_margin="@dimen/size_12"
android:background="@drawable/shape_rv_bg_shallow_dark_yellow_circle" android:background="@drawable/shape_rv_bg_shallow_dark_yellow_circle"
android:gravity="center"
android:text="提交"
android:textColor="@color/colorWrite" android:textColor="@color/colorWrite"
android:textSize="@dimen/text_16" android:textSize="@dimen/text_16" />
android:text="提交"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
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