diff --git a/app/src/main/java/com/qhclh/ytzh/index/shangpin/InHouseActivity.java b/app/src/main/java/com/qhclh/ytzh/index/shangpin/InHouseActivity.java index e0abfc2..449dc73 100644 --- a/app/src/main/java/com/qhclh/ytzh/index/shangpin/InHouseActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/index/shangpin/InHouseActivity.java @@ -8,7 +8,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.qhclh.ytzh.R; -import com.qhclh.ytzh.base.BaseActivity; +import com.qhclh.ytzh.work.carsmannage.BaseActivity1; import butterknife.BindView; import butterknife.OnClick; @@ -17,8 +17,8 @@ import butterknife.OnClick; * Created by 青花瓷 on 2017/12/28. */ -public class InHouseActivity extends BaseActivity { - @BindView(R.id.toolbar) +public class InHouseActivity extends BaseActivity1 { + @BindView(R.id.toolbar1) Toolbar mToolbar; @BindView(R.id.iv_inhouse_all) @@ -118,21 +118,21 @@ public class InHouseActivity extends BaseActivity { clearAllTabState(); switch (tabPosition) { case TAB_POSITION_ALL: { - iv_inhouse_all.setImageResource(R.drawable.shouye_3x); - tv_inhouse_all.setTextColor(getResources().getColor(R.color.colorPrimary)); + iv_inhouse_all.setImageResource(R.drawable.quanbu); + tv_inhouse_all.setTextColor(getResources().getColor(R.color.white)); ll_inhouse_all.setBackgroundResource(R.drawable.shape_kuang2); break; } case TAB_POSITION_NO: { - iv_inhouse_no.setImageResource(R.drawable.gongzuo_3x); - tv_inhouse_no.setTextColor(getResources().getColor(R.color.colorPrimary)); + iv_inhouse_no.setImageResource(R.drawable.weishen); + tv_inhouse_no.setTextColor(getResources().getColor(R.color.white)); ll_inhouse_no.setBackgroundResource(R.drawable.shape_kuang2); break; } case TAB_POSITION_YES: { - iv_inhouse_yes.setImageResource(R.drawable.wode_3x); - tv_inhouse_yes.setTextColor(getResources().getColor(R.color.colorPrimary)); + iv_inhouse_yes.setImageResource(R.drawable.yishen1); + tv_inhouse_yes.setTextColor(getResources().getColor(R.color.white)); ll_inhouse_yes.setBackgroundResource(R.drawable.shape_kuang2); break; } @@ -142,15 +142,15 @@ public class InHouseActivity extends BaseActivity { private void clearAllTabState() { ///< all - iv_inhouse_all.setImageResource(R.drawable.shouye1_3x); + iv_inhouse_all.setImageResource(R.drawable.quanbu1); tv_inhouse_all.setTextColor(getResources().getColor(R.color.grey_767c82)); ll_inhouse_all.setBackgroundResource(R.drawable.shape_kuang1); ///< no - iv_inhouse_no.setImageResource(R.drawable.gongzuo1_3x); + iv_inhouse_no.setImageResource(R.drawable.weishen1); tv_inhouse_no.setTextColor(getResources().getColor(R.color.grey_767c82)); ll_inhouse_no.setBackgroundResource(R.drawable.shape_kuang1); ///< yes - iv_inhouse_yes.setImageResource(R.drawable.wode1_3x); + iv_inhouse_yes.setImageResource(R.drawable.yishen); tv_inhouse_yes.setTextColor(getResources().getColor(R.color.grey_767c82)); ll_inhouse_yes.setBackgroundResource(R.drawable.shape_kuang1); } diff --git a/app/src/main/res/drawable-xhdpi/infos.png b/app/src/main/res/drawable-xhdpi/infos.png new file mode 100644 index 0000000..b994da0 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/infos.png differ diff --git a/app/src/main/res/drawable-xhdpi/inhouse.png b/app/src/main/res/drawable-xhdpi/inhouse.png new file mode 100644 index 0000000..698ba1c Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/inhouse.png differ diff --git a/app/src/main/res/drawable-xhdpi/quanbu.png b/app/src/main/res/drawable-xhdpi/quanbu.png new file mode 100644 index 0000000..9822174 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/quanbu.png differ diff --git a/app/src/main/res/drawable-xhdpi/quanbu1.png b/app/src/main/res/drawable-xhdpi/quanbu1.png new file mode 100644 index 0000000..dd2e390 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/quanbu1.png differ diff --git a/app/src/main/res/drawable-xhdpi/weishen.png b/app/src/main/res/drawable-xhdpi/weishen.png new file mode 100644 index 0000000..52d7e5a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/weishen.png differ diff --git a/app/src/main/res/drawable-xhdpi/weishen1.png b/app/src/main/res/drawable-xhdpi/weishen1.png new file mode 100644 index 0000000..1c24f8c Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/weishen1.png differ diff --git a/app/src/main/res/drawable-xhdpi/yishen.png b/app/src/main/res/drawable-xhdpi/yishen.png new file mode 100644 index 0000000..7421dc4 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/yishen.png differ diff --git a/app/src/main/res/drawable-xhdpi/yishen1.png b/app/src/main/res/drawable-xhdpi/yishen1.png new file mode 100644 index 0000000..66f012c Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/yishen1.png differ diff --git a/app/src/main/res/drawable/shape_kuang2.xml b/app/src/main/res/drawable/shape_kuang2.xml index 03fd286..8a2d202 100644 --- a/app/src/main/res/drawable/shape_kuang2.xml +++ b/app/src/main/res/drawable/shape_kuang2.xml @@ -1,11 +1,8 @@ - + - diff --git a/app/src/main/res/layout/act_inhouse.xml b/app/src/main/res/layout/act_inhouse.xml index fbfe946..6657b41 100644 --- a/app/src/main/res/layout/act_inhouse.xml +++ b/app/src/main/res/layout/act_inhouse.xml @@ -3,7 +3,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> - + diff --git a/app/src/main/res/menu/shangpinmenu.xml b/app/src/main/res/menu/shangpinmenu.xml index 9c1adfa..5cd7b0c 100644 --- a/app/src/main/res/menu/shangpinmenu.xml +++ b/app/src/main/res/menu/shangpinmenu.xml @@ -3,10 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 80b861f..bba6149 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -50,8 +50,7 @@