diff --git a/app/src/main/java/com/qhclh/ytzh/index/planorder/CarsActivity.java b/app/src/main/java/com/qhclh/ytzh/index/planorder/CarsActivity.java index ab4a3c7..f43684e 100644 --- a/app/src/main/java/com/qhclh/ytzh/index/planorder/CarsActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/index/planorder/CarsActivity.java @@ -1,5 +1,8 @@ package com.qhclh.ytzh.index.planorder; +import android.support.v7.widget.Toolbar; +import android.view.View; +import android.widget.AdapterView; import android.widget.GridView; import android.widget.LinearLayout; @@ -17,6 +20,8 @@ import butterknife.BindView; */ public class CarsActivity extends BaseActivity { + @BindView(R.id.toolbar) + Toolbar mToolbar; @BindView(R.id.gv_cars) GridView gv_cars; private List carsBeanList; @@ -28,14 +33,19 @@ public class CarsActivity extends BaseActivity { @Override protected void initView() { - + initToolbar(mToolbar, "车辆", new View.OnClickListener() { + @Override + public void onClick(View view) { + finish(); + } + }); } @Override protected void initData() { carsBeanList = new ArrayList<>(); for (int i=0;i<10;i++){ - carsBeanList.add(new CarsBean(i,"aa"+i,"bb"+i)); + carsBeanList.add(new CarsBean(i+11,"aa"+i,"bb"+i)); } carsAdapter = new CarsAdapter(this,carsBeanList); gv_cars.setAdapter(carsAdapter); @@ -43,6 +53,12 @@ public class CarsActivity extends BaseActivity { @Override protected void initOper() { - + gv_cars.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView adapterView, View view, int i, long l) { + showToast(l+""); + } + }); } + } diff --git a/app/src/main/java/com/qhclh/ytzh/index/planorder/CarsAdapter.java b/app/src/main/java/com/qhclh/ytzh/index/planorder/CarsAdapter.java index f34ccc3..d3f489b 100644 --- a/app/src/main/java/com/qhclh/ytzh/index/planorder/CarsAdapter.java +++ b/app/src/main/java/com/qhclh/ytzh/index/planorder/CarsAdapter.java @@ -38,7 +38,7 @@ public class CarsAdapter extends BaseAdapter { @Override public long getItemId(int i) { - return i; + return carsBeen.get(i).getId(); } @Override @@ -62,6 +62,6 @@ public class CarsAdapter extends BaseAdapter { class ViewHolder { public TextView time; - public Button name; + public TextView name; } } diff --git a/app/src/main/res/drawable/shape_bg.xml b/app/src/main/res/drawable/shape_bg.xml index 70a4036..ce0e9ce 100644 --- a/app/src/main/res/drawable/shape_bg.xml +++ b/app/src/main/res/drawable/shape_bg.xml @@ -7,10 +7,10 @@ android:width="@dimen/dp_1" android:color="@color/grey888888" /> + android:bottomLeftRadius="@dimen/dp_3" + android:bottomRightRadius="@dimen/dp_3" + android:topLeftRadius="@dimen/dp_3" + android:topRightRadius="@dimen/dp_3" /> diff --git a/app/src/main/res/drawable/shape_bg1.xml b/app/src/main/res/drawable/shape_bg1.xml new file mode 100644 index 0000000..f10956f --- /dev/null +++ b/app/src/main/res/drawable/shape_bg1.xml @@ -0,0 +1,17 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/act_cars.xml b/app/src/main/res/layout/act_cars.xml index 1288625..1dd4ede 100644 --- a/app/src/main/res/layout/act_cars.xml +++ b/app/src/main/res/layout/act_cars.xml @@ -1,20 +1,30 @@ + android:layout_height="match_parent" + android:background="@color/greyf4f4f4" + android:orientation="vertical"> + + + - + android:horizontalSpacing="10dp" + android:numColumns="auto_fit" + android:stretchMode="columnWidth" + android:padding="@dimen/dp_10" + android:verticalSpacing="15dp"> \ No newline at end of file diff --git a/app/src/main/res/layout/item_cars.xml b/app/src/main/res/layout/item_cars.xml index 3dc37d1..6b65dc5 100644 --- a/app/src/main/res/layout/item_cars.xml +++ b/app/src/main/res/layout/item_cars.xml @@ -1,16 +1,25 @@ -