新增白色toolbar 加入menu

app/src/main/java/com/qhclh/ytzh/work/carsmannage/BaseActivity1.java

@@ -0,0 +1,98 @@
+package com.qhclh.ytzh.work.carsmannage;
+
+import android.os.Bundle;
+import android.support.annotation.IdRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.qhclh.ytzh.R;
+import com.qhclh.ytzh.utils.ActivityCollector;
+import com.umeng.analytics.MobclickAgent;
+
+import butterknife.ButterKnife;
+
+
+/**
+ * Created by 青花瓷 on 2017/7/19.
+ */
+
+public abstract class BaseActivity1 extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(setLayoutId());
+        ButterKnife.bind(this);
+        ActivityCollector.addActivity(this);
+        initView();
+        initData();
+        initOper();
+    }
+
+    protected abstract int setLayoutId();
+    protected abstract void initView();
+    protected abstract void initData();
+    protected abstract void initOper();
+    ///< toolbar设置
+    public void initToolbar(Toolbar toolbar, String title, View.OnClickListener listener) {
+        if (toolbar == null) {
+            return;
+        }
+        TextView tvTitle = findById(toolbar, R.id.tv_toolbar_title1);
+        if (tvTitle != null) {
+            tvTitle.setText(title == null ? "" : title);
+        }
+        setSupportActionBar(toolbar);
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayShowTitleEnabled(false);
+        }
+        if (listener != null) {
+            toolbar.setNavigationIcon(R.drawable.fanhui1_3x);
+            toolbar.setNavigationOnClickListener(listener);
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        try {
+            MobclickAgent.onResume(this);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        try {
+            MobclickAgent.onPause(this);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        ActivityCollector.removeActivity(this);
+    }
+
+    public void finishAll(){ActivityCollector.finishAll();}
+
+    public void showToast(String str) {
+        Toast.makeText(this, str, Toast.LENGTH_SHORT).show();
+    }
+
+    protected <T extends View> T findById(@NonNull View view, @IdRes int resId) {
+        return ButterKnife.findById(view, resId);
+    }
+}

app/src/main/java/com/qhclh/ytzh/work/carsmannage/CarsManageActivity.java

@@ -2,11 +2,12 @@ package com.qhclh.ytzh.work.carsmannage;
 
 import android.support.v4.app.FragmentTransaction;
 import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
 
 import com.qhclh.ytzh.R;
-import com.qhclh.ytzh.base.BaseActivity;
 
 import butterknife.BindView;
 import butterknife.OnClick;
@@ -15,8 +16,8 @@ import butterknife.OnClick;
  * Created by 青花瓷 on 2017/11/30.
  */
 
-public class CarsManageActivity extends BaseActivity {
-    @BindView(R.id.toolbar)
+public class CarsManageActivity extends BaseActivity1 {
+    @BindView(R.id.toolbar1)
     Toolbar mToolbar;
     @BindView(R.id.chicks)
     TextView chicks;
@@ -176,4 +177,20 @@ public class CarsManageActivity extends BaseActivity {
             transaction.hide(feedFragment);
         }
     }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.screen, menu);
+        menu.findItem(R.id.screenr).setVisible(true);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.screenr:
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
 }

app/src/main/java/com/qhclh/ytzh/work/scan/ScanResultActivity.java

@@ -114,6 +114,7 @@ public class ScanResultActivity extends BaseActivity {
         IntentResult result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
         if (result != null) {
             if (result.getContents() == null) {
+                showToast("取消扫描");
                 finish();
             } else {
                 scanStr = result.getContents();

app/src/main/res/layout/act_carsmanage.xml

@@ -4,7 +4,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <include layout="@layout/include_tool_bar"></include>
+    <include layout="@layout/include_tool_bar_white"></include>
+    <include layout="@layout/include_line"></include>
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/layout/include_tool_bar_white.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- toolbar-->
+<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+                                   xmlns:app="http://schemas.android.com/apk/res-auto"
+                                   android:id="@+id/toolbar1"
+                                   android:layout_width="match_parent"
+                                   android:layout_height="?attr/actionBarSize"
+                                   android:background="@color/white"
+                                   android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+                                   android:elevation="@dimen/dp_2"
+                                   app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
+
+    <TextView
+        android:id="@+id/tv_toolbar_title1"
+        style="@style/TextView_18_black_2828281"
+        android:layout_gravity="center"/>
+</android.support.v7.widget.Toolbar>

app/src/main/res/menu/screen.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/screenr"
+        android:title="screen"
+        android:icon="@drawable/shaixuan_3x"
+        android:orderInCategory="70"
+        app:showAsAction="always" />
+</menu>

app/src/main/res/values/styles.xml

@@ -31,6 +31,13 @@
         <item name="android:textSize">@dimen/text_size_20</item>
     </style>
 
+    <style name="TextView_18_black_2828281">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:textColor">@color/black303030</item>
+        <item name="android:textSize">@dimen/text_size_20</item>
+    </style>
+
     <style name="TabLayout">
         <item name="android:paddingTop">@dimen/tab_layout_padding</item>
         <item name="android:paddingBottom">@dimen/dp_3</item>