add most activity back button

app/app.iml

@@ -59,13 +59,6 @@
       <sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -73,7 +66,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
@@ -88,7 +87,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
@@ -144,13 +142,5 @@
     <orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
     <orderEntry type="module" module-name="uikit" exported="" />
-    <orderEntry type="library" exported="" name="java-json" level="project" />
-    <orderEntry type="library" exported="" name="renderscript-v8" level="project" />
-    <orderEntry type="library" exported="" name="glide-3.7.0" level="project" />
-    <orderEntry type="library" exported="" name="nim-avchat-4.0.0" level="project" />
-    <orderEntry type="library" exported="" name="constraint-layout-solver-1.0.2" level="project" />
-    <orderEntry type="library" exported="" name="nim-basesdk-4.0.0" level="project" />
-    <orderEntry type="library" exported="" name="fastjson-1.1.34.android" level="project" />
-    <orderEntry type="library" exported="" name="nim-lucene-4.0.0" level="project" />
   </component>
 </module>

app/res/layout/area_group_create_group.xml

@@ -9,8 +9,7 @@
         android:id="@+id/toolbar"
         style="@style/fullToolbarStyle"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/action_bar_height"
-        android:title="创建群组" />
+        android:layout_height="@dimen/action_bar_height"/>
 
 
     <LinearLayout

app/res/layout/base_toolbar.xml

@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:gravity="center_horizontal|center">
 
     <android.support.v7.widget.Toolbar
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
         style="@style/fullToolbarStyle"
+        android:id="@+id/sub_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
         android:background="@color/colorPrimary"
-        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-        app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
-        <ImageView
-            android:id="@+id/toolbar_location_ico"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/location"
-            android:visibility="gone"/>
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+
         <FrameLayout
             android:id="@+id/toolbar_layout"
             android:layout_width="match_parent"
@@ -24,50 +21,42 @@
             android:background="@color/colorPrimary"
             android:gravity="center">
 
-            <TextView
-                android:id="@+id/toolbar_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:textColor="@color/white"
-                android:textSize="18sp"
-                android:textStyle="bold"
-                android:layout_gravity="center"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp"/>
-
-            <TextView
-                android:id="@+id/toolbar_left"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical|start"
-                android:textColor="@color/white"
-                android:textSize="16sp"
-                android:layout_gravity="center_vertical|start"
-                android:padding="8dp"/>
-
-
+            <LinearLayout
+                android:id="@+id/toolbar_left_items"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="left|center_vertical"
+                android:orientation="horizontal">
 
-            <TextView
-                android:id="@+id/toolbar_right"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/white"
-                android:gravity="center_vertical|start"
-                android:textSize="16sp"
-                android:layout_gravity="center_vertical|end"
-                android:padding="8dp"/>
+            </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/toolbar_ico_layout"
-                android:layout_width="wrap_content"
+                android:id="@+id/toolbar_right_items"
+                android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:visibility="gone"
-                android:orientation="horizontal"
-                android:layout_gravity="end"
-                android:gravity="center"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp" />
+                android:layout_marginRight="10dp"
+                android:gravity="right|center_vertical"
+                android:orientation="horizontal">
+
+            </LinearLayout>
+
         </FrameLayout>
+
     </android.support.v7.widget.Toolbar>
-</LinearLayout>
+
+
+    <TextView
+        android:id="@+id/toolbar_title_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:background="@null"
+        android:ems="10"
+        android:enabled="false"
+        android:inputType="none"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="18sp" />
+
+
+</RelativeLayout>

app/res/layout/black_list_activity.xml

@@ -12,15 +12,20 @@
         android:theme="@style/AppTheme.AppBarOverlay"
         app:elevation="0dp">
 
-        <android.support.v7.widget.Toolbar
+        <!--<android.support.v7.widget.Toolbar-->
+            <!--android:id="@+id/toolbar"-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="?attr/actionBarSize"-->
+            <!--android:background="?attr/colorPrimary"-->
+            <!--app:titleTextColor="@color/white"-->
+            <!--app:titleTextAppearance="@style/Toolbar.TitleText">-->
+
+            <!--<include layout="@layout/nim_action_bar_right_clickable_tv" />-->
+        <!--</android.support.v7.widget.Toolbar>-->
+        <com.sheishuo.app.common.views.BaseToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:titleTextAppearance="@style/Toolbar.TitleText">
-
-            <include layout="@layout/nim_action_bar_right_clickable_tv" />
-        </android.support.v7.widget.Toolbar>
+            android:layout_height="@dimen/action_bar_height"/>
     </android.support.design.widget.AppBarLayout>
 
     <include

app/res/layout/circle_details.xml

@@ -12,8 +12,7 @@
         <com.sheishuo.app.common.views.BaseToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/action_bar_height"
-            app:title="详情" />
+            android:layout_height="@dimen/action_bar_height"/>
     </android.support.design.widget.AppBarLayout>
 
     <ScrollView

app/res/layout/circle_new_tweeting.xml

@@ -20,10 +20,7 @@
             android:id="@+id/new_tweet_toolbar"
             style="@style/fullToolbarStyle"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:left_text="返回"
-            app:right_text="确定"
-            app:title="发布" />
+            android:layout_height="wrap_content"/>
     </android.support.design.widget.AppBarLayout>
 
 

app/res/layout/friends_add_new_friend.xml

@@ -3,7 +3,6 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
     <com.sheishuo.app.common.views.BaseToolbar
-        android:title="添加好友"
         android:layout_width="match_parent"
         android:layout_height="@dimen/action_bar_height"
         style="@style/fullToolbarStyle"/>

app/res/layout/group_list_activity.xml

@@ -12,12 +12,11 @@
         android:theme="@style/AppTheme.AppBarOverlay"
         app:elevation="0dp">
 
-        <android.support.v7.widget.Toolbar
+        <com.sheishuo.app.common.views.BaseToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:titleTextAppearance="@style/Toolbar.TitleText"></android.support.v7.widget.Toolbar>
+            android:layout_height="wrap_content"
+            style="@style/fullToolbarStyle"/>
     </android.support.design.widget.AppBarLayout>
 
     <ListView

app/res/layout/location_select_activity.xml

@@ -8,30 +8,31 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:title="地区选择"
-        app:right_text="确定"
         style="@style/fullToolbarStyle"/>
+
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
+        android:layout_height="match_parent"
         android:gravity="center"
-        android:padding="8dp">
+        android:orientation="horizontal">
+
         <com.sheishuo.app.common.views.WheelView
             android:id="@+id/location_select_province"
-            android:layout_weight="1"
-            android:layout_width="128dp"
-            android:layout_height="wrap_content"/>
+            android:layout_width="10dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
         <com.sheishuo.app.common.views.WheelView
             android:id="@+id/location_select_city"
-            android:layout_weight="1"
-            android:layout_width="128dp"
-            android:layout_height="wrap_content"/>
+            android:layout_width="10dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
         <com.sheishuo.app.common.views.WheelView
             android:id="@+id/location_select_area"
-            android:layout_weight="1"
-            android:layout_width="128dp"
-            android:layout_height="wrap_content"/>
+            android:layout_width="10dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
     </LinearLayout>
 
 

app/res/layout/mine_account_and_security_activity.xml

@@ -10,6 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
         <com.sheishuo.app.common.views.BaseToolbar
+            android:id="@id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="@dimen/action_bar_height"
             android:title="账户与安全"

app/res/layout/mine_feedback_activity.xml

@@ -22,17 +22,11 @@
         android:layout_height="match_parent"
         android:padding="16dp"
         android:orientation="vertical">
+
         <EditText
             android:id="@+id/mine_feedback_ET"
             android:layout_width="match_parent"
-            android:layout_height="300dp" />
+            android:layout_height="200dp" />
 
-        <Button
-            android:id="@+id/mine_feedback_submit_btn"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/btn1_selector"
-            android:text="提交"
-            android:textColor="@color/white"/>
     </LinearLayout>
 </LinearLayout>

app/res/layout/mine_fragment.xml

@@ -29,10 +29,10 @@
                 android:id="@+id/mine_fragment_personal_settings"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_margin="16dp"
                 android:src="@drawable/mine_settings_white"
                 app:layout_anchor="@id/mine_fragment_banner"
-                app:layout_anchorGravity="top|end"
-                android:layout_margin="16dp"/>
+                app:layout_anchorGravity="top|right" />
 
             <com.netease.nim.uikit.common.ui.imageview.HeadImageView
                 android:id="@+id/mine_fragment_avatar"

app/res/layout/system_notification_message_activity.xml

@@ -14,13 +14,11 @@
         android:theme="@style/AppTheme.AppBarOverlay"
         app:elevation="0dp">
 
-        <android.support.v7.widget.Toolbar
+        <com.sheishuo.app.common.views.BaseToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:titleTextAppearance="@style/Toolbar.TitleText">
-        </android.support.v7.widget.Toolbar>
+            android:layout_height="wrap_content"
+            style="@style/fullToolbarStyle"/>
     </android.support.design.widget.AppBarLayout>
 
     <FrameLayout

app/src/com/sheishuo/app/common/ui/viewpager/SlidingTabPagerAdapter.java

@@ -18,7 +18,7 @@ public abstract class SlidingTabPagerAdapter extends FragmentPagerAdapter implem
 
 	public abstract int getCacheCount();
 
-	private int lastPostion = 0;
+	private int lastPostion = -1;
 
 	public SlidingTabPagerAdapter(FragmentManager fm, int count, Context context, ViewPager pager) {
 		super(fm);
@@ -72,6 +72,9 @@ public abstract class SlidingTabPagerAdapter extends FragmentPagerAdapter implem
 	}
 
 	private void onLeave(int position) {
+		if(position == lastPostion)
+			return;
+
 		TabFragment fragment = getFragmentByPosition(lastPostion);
 		lastPostion = position;
 		// INSTANCE

app/src/com/sheishuo/app/common/util/pay/UnityTool.java

@@ -1,75 +0,0 @@
-package com.sheishuo.app.common.util.pay;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
-import android.os.Handler;
-import android.os.Message;
-
-import com.alipay.sdk.app.PayTask;
-
-import java.util.Map;
-
-public class UnityTool
-{
-    private static final int SDK_PAY_FLAG = 1;
-    private static final String RESULT_SUCCESS = "9000";
-    private static final String TIP_PAY_SUCCESS = "支付成功";
-    private static final String TIP_PAY_FAILED = "支付失败";
-    private Context context;
-    private String responseGameObject;
-
-    public void init(Context context){
-        this.context = context;
-    }
-
-
-    // 支付结果回调，仅作参考，以服务端确认为准!
-    @SuppressLint("HandlerLeak")
-    private Handler mHandler = new Handler()
-    {
-        @SuppressWarnings("unused")
-        public void handleMessage(Message msg)
-        {
-            switch (msg.what)
-            {
-                case SDK_PAY_FLAG:
-                {
-                    @SuppressWarnings("unchecked")
-                    PayResult payResult = new PayResult((Map<String, String>) msg.obj);
-                    String resultInfo = payResult.getResult();
-                    String resultStatus = payResult.getResultStatus();
-                    break;
-                }
-                default:
-                    break;
-            }
-        }
-
-        ;
-    };
-
-
-
-    // Unity中调用
-    public void pay(final String orderInfo)
-    {
-        Runnable payRunnable = new Runnable()
-        {
-
-            @Override
-            public void run()
-            {
-                PayTask alipay = new PayTask((Activity) context);
-                Map<String, String> result = alipay.payV2(orderInfo, true);
-                Message msg = new Message();
-                msg.what = SDK_PAY_FLAG;
-                msg.obj = result;
-                mHandler.sendMessage(msg);
-            }
-        };
-
-        Thread payThread = new Thread(payRunnable);
-        payThread.start();
-    }
-}

app/src/com/sheishuo/app/common/views/BaseToolbar.java

@@ -1,18 +1,24 @@
 package com.sheishuo.app.common.views;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.Toolbar;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.netease.nim.uikit.common.util.sys.ScreenUtil;
 import com.sheishuo.app.R;
 import com.sheishuo.app.common.util.img.ImgUtil;
 
@@ -25,14 +31,14 @@ import java.util.List;
 
 public class BaseToolbar extends Toolbar {
 
-    private final String TITLE = "title",LEFT_TEXT = "left_text",RIGHT_TEXT = "right_text";
     private static Context context;
     private FrameLayout toolbarLayout;
-    private String titleStr = "",leftStr = "",rightStr = "";
-    private TextView titleTV,leftTV,rightTV;
-    private LinearLayout icoLayout;
-    private ImageView indexIco;
 
+    private Toolbar sub_toolbar;
+    private TextView titleTxt;
+    private Button toolbarBtn;
+    private LinearLayout leftLayout;
+    private LinearLayout rightLayout;
 
     public interface IcoBtnClickListener{
         void onClick(View view);
@@ -44,183 +50,105 @@ public class BaseToolbar extends Toolbar {
         this.context = context;
         View view = LayoutInflater.from(context).inflate(R.layout.base_toolbar,this,true);
         findViews(view);
-        assert attrs != null;
-        int count = attrs.getAttributeCount();
-        for (int index = 0; index < count; index++) {
-            String attributeName = attrs.getAttributeName(index);
-            switch (attributeName){
-                case TITLE:
-                    if (attrs.getAttributeValue(index) != null)
-                        titleTV.setText(titleStr = attrs.getAttributeValue(index));
-                    break;
-                case LEFT_TEXT:
-                    if (attrs.getAttributeValue(index) != null)
-                        leftTV.setText(leftStr = attrs.getAttributeValue(index));
-                    break;
-                case RIGHT_TEXT:
-                    if (attrs.getAttributeValue(index) != null)
-                        rightTV.setText(rightStr = attrs.getAttributeValue(index));
-                    break;
-
-            }
-        }
+        clearItems();
     }
 
 
     private void findViews(View view){
-        titleTV = (TextView) view.findViewById(R.id.toolbar_title);
-        leftTV = (TextView) view.findViewById(R.id.toolbar_left);
-        rightTV = (TextView) view.findViewById(R.id.toolbar_right);
-        icoLayout = (LinearLayout) view.findViewById(R.id.toolbar_ico_layout);
         toolbarLayout = (FrameLayout) view.findViewById(R.id.toolbar_layout);
-        indexIco = (ImageView) view.findViewById(R.id.toolbar_location_ico);
-    }
 
-
-    public FrameLayout getToolbarLayout() {
-        return toolbarLayout;
-    }
-
-    public ImageView getIndexIco(){
-        return indexIco;
-    }
-    public TextView getTitleTV() {
-        return titleTV;
+        sub_toolbar = (Toolbar) findViewById(R.id.sub_toolbar);
+        leftLayout = (LinearLayout) findViewById(R.id.toolbar_left_items);
+        rightLayout = (LinearLayout) findViewById(R.id.toolbar_right_items);
+        titleTxt = (TextView) findViewById(R.id.toolbar_title_text);
     }
 
-    public TextView getLeftTV() {
-        return leftTV;
-    }
-
-    public TextView getRightTV() {
-        return rightTV;
+    public void clearItems()
+    {
+        leftLayout.removeAllViewsInLayout();
+        rightLayout.removeAllViewsInLayout();
     }
 
+    public void setBackOnClickListener(OnClickListener listener)
+    {
+        if(listener != null)
+        {
+            ImageView backIcon = new ImageView(getContext());
+            backIcon.setImageResource(R.drawable.nim_actionbar_white_back_icon);
+            backIcon.setOnClickListener(listener);
+            setLeftItems(new View[]{backIcon});
+        }
+        else
+        {
+            setLeftItems(new View[0]);
+        }
 
-    public void init(){
-        this.setVisibility(VISIBLE);
-        indexIco.setVisibility(GONE);
-        titleTV.setVisibility(INVISIBLE);
-        leftTV.setVisibility(INVISIBLE);
-        rightTV.setVisibility(INVISIBLE);
-        icoLayout.removeAllViews();
-        icoLayout.setVisibility(GONE);
-        titleTV.setOnClickListener(null);
-        leftTV.setOnClickListener(null);
-        rightTV.setOnClickListener(null);
-        this.setLogo(null);
     }
 
-
-
-
-
-
-
     public void setTitle(String title){
-        getTitleTV().setText(title);
-        titleTV.setVisibility(VISIBLE);
-    }
-
-    public void setTitle(int resId){
-        String title = getResources().getString(resId);
-        getTitleTV().setText(title);
-        titleTV.setVisibility(VISIBLE);
-    }
-
-    public void setLeftText(String leftStr){
-        getLeftTV().setText(leftStr);
-        leftTV.setVisibility(VISIBLE);
-
-    }
-
-    public void setRightText(String rightStr){
-        getRightTV().setText(rightStr);
-        rightTV.setVisibility(VISIBLE);
-
+        titleTxt.setText(title);
     }
 
-    public LinearLayout getIcoLayout() {
-        return icoLayout;
+    public TextView getTitleTxt()
+    {
+        return titleTxt;
     }
 
-    public void setIcoLayout(LinearLayout icoLayout) {
-        this.icoLayout = icoLayout;
-    }
-
-
+    public void setLeftItems(View[] views)
+    {
+        leftLayout.removeAllViewsInLayout();
 
-
-    /**************用于为BaseToolbar增加额外功能***************/
-
-
-    public static class Builder implements OnClickListener{
-
-        BaseToolbar toolbar;
-        private List<Integer> icoIds = new ArrayList<>();
-        IcoBtnClickListener listener;
-        Context context;
-
-        public Builder create(Context context,@Nullable BaseToolbar toolbar){
-            if (toolbar == null){
-                this.toolbar = new BaseToolbar(context,null);
-            }else {
-                this.toolbar = toolbar;
+        for(int i=0; i<views.length; i++)
+        {
+            View view = views[i];
+            if(view instanceof ImageView)
+            {
+                ImageView imageView = (ImageView) view;
+                imageView.setLayoutParams(new ViewGroup.LayoutParams(ScreenUtil.dip2px(24), ScreenUtil.dip2px(24)));
+                imageView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
             }
-
-            this.context = context;
-
-            return this;
-        }
-
-
-
-
-
-        /**
-         * 为Toolbar添加一个图标按钮
-         *
-         * 为了保证布局显示正常，若添加ico按钮则自动隐藏Right_Text
-         * @param resId
-         */
-        public BaseToolbar.Builder addIcoButton(int resId){
-                toolbar.rightTV.setVisibility(GONE);
-                toolbar.icoLayout.setVisibility(VISIBLE);
-                ImageView icoView = new ImageView(context);
-                icoView.setAdjustViewBounds(true);
-                int dpToPixel = (int) ImgUtil.convertDpToPixel(24,context);
-                Glide.with(context)
-                        .load(resId)
-                        .override(dpToPixel,dpToPixel)
-                        .into(icoView);
-                toolbar.icoLayout.addView(icoView);
-                icoIds.add(resId);
-                return this;
-        }
-
-
-        public BaseToolbar.Builder addIcoButtonClickListener(int index,IcoBtnClickListener listener){
-                this.listener = listener;
-                toolbar.getIcoLayout().getChildAt(index).setOnClickListener(this);
-                Log.e("BaseToolbar",toolbar.getIcoLayout().getChildCount() + "   index " + index);
-                return this;
-        }
-
-
-
-        public BaseToolbar build(){
-                return toolbar;
+            else if(view instanceof TextView)
+            {
+                TextView txtView = (TextView) view;
+                txtView.setTextColor(Color.WHITE);
+                txtView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
+                txtView.setLayoutParams(new ViewGroup.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
+            }
+            else
+            {
+                view.setLayoutParams(new ViewGroup.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
+            }
+            leftLayout.addView(view);
         }
+    }
 
+    public void setRightItems(View[] views)
+    {
+        rightLayout.removeAllViewsInLayout();
 
-
-        @Override
-        public void onClick(View v) {
-            if (listener != null) listener.onClick(v);
+        for(int i=0; i<views.length; i++)
+        {
+            View view = views[i];
+            if(view instanceof ImageView)
+            {
+                ImageView imageView = (ImageView) view;
+                imageView.setLayoutParams(new ViewGroup.LayoutParams(ScreenUtil.dip2px(24), ScreenUtil.dip2px(24)));
+                imageView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+            }
+            else if(view instanceof TextView)
+            {
+                TextView txtView = (TextView) view;
+                txtView.setTextColor(Color.WHITE);
+                txtView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
+                txtView.setLayoutParams(new ViewGroup.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
+            }
+            else
+            {
+                view.setLayoutParams(new ViewGroup.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
+            }
+            rightLayout.addView(view);
         }
     }
 
 
-
-
 }

app/src/com/sheishuo/app/contact/activity/BlackListActivity.java

@@ -5,11 +5,13 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.sheishuo.app.R;
+import com.sheishuo.app.common.views.BaseToolbar;
 import com.sheishuo.app.contact.viewholder.BlackListViewHolder;
 import com.netease.nim.uikit.NimUIKit;
 import com.netease.nim.uikit.cache.NimUserInfoCache;
@@ -54,9 +56,9 @@ public class BlackListActivity extends UI implements TAdapterDelegate {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.black_list_activity);
 
-        ToolBarOptions options = new ToolBarOptions();
-        options.titleId = R.string.black_list;
-        setToolBar(R.id.toolbar, options);
+//        ToolBarOptions options = new ToolBarOptions();
+//        options.titleId = R.string.black_list;
+//        setToolBar(R.id.toolbar, options);
 
         initData();
         findViews();
@@ -104,9 +106,19 @@ public class BlackListActivity extends UI implements TAdapterDelegate {
     }
 
     private void initActionbar() {
-        TextView toolbarView = findView(R.id.action_bar_right_clickable_textview);
-        toolbarView.setText(R.string.add);
-        toolbarView.setOnClickListener(new View.OnClickListener() {
+
+        BaseToolbar toolbar = findView(R.id.toolbar);
+        toolbar.setTitle("黑名单");
+        toolbar.setBackOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        ImageView addIcon = new ImageView(getBaseContext());
+        addIcon.setImageResource(R.drawable.friends_add_ico);
+        addIcon.setOnClickListener(new View.OnClickListener(){
             @Override
             public void onClick(View v) {
                 ContactSelectActivity.Option option = new ContactSelectActivity.Option();
@@ -122,6 +134,26 @@ public class BlackListActivity extends UI implements TAdapterDelegate {
                 NimUIKit.startContactSelect(BlackListActivity.this, option, REQUEST_CODE_BLACK);
             }
         });
+        toolbar.setRightItems(new View[]{addIcon});
+
+//        TextView toolbarView = findView(R.id.action_bar_right_clickable_textview);
+//        toolbarView.setText(R.string.add);
+//        toolbarView.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                ContactSelectActivity.Option option = new ContactSelectActivity.Option();
+//                option.title = "选择黑名单";
+//                option.maxSelectNum = 1;
+//                ArrayList<String> excludeAccounts = new ArrayList<>();
+//                for (UserInfoProvider.UserInfo user : data) {
+//                    if (user != null) {
+//                        excludeAccounts.add(user.getAccount());
+//                    }
+//                }
+//                option.itemFilter = new ContactIdFilter(excludeAccounts, true);
+//                NimUIKit.startContactSelect(BlackListActivity.this, option, REQUEST_CODE_BLACK);
+//            }
+//        });
     }
 
     private void findViews() {

app/src/com/sheishuo/app/core_module/circle/activity/CircleDetailsActivity.java

@@ -64,6 +64,8 @@ public class CircleDetailsActivity extends SheishuoUI {
 
 
     void findViews(){
+
+        toolbar = findView(R.id.toolbar);
         avatar = findView(R.id.circle_details_avatar);
         nameTV = findView(R.id.circle_details_name);
         dateTV = findView(R.id.circle_details_date);
@@ -81,6 +83,15 @@ public class CircleDetailsActivity extends SheishuoUI {
 
 
     void init(){
+
+        toolbar.setTitle("详情");
+        toolbar.setBackOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
         //加载头像
         if (getUserInfo(bean.getUser_id()).getAvatar() != null){
             Glide.with(context)

app/src/com/sheishuo/app/core_module/circle/activity/NewTweetingActivity.java

@@ -99,25 +99,24 @@ public class NewTweetingActivity extends SheishuoUI {
 
         presenter = new NewTweetPresenter(this);
 
-        //初始化Toolbar
-        toolbar.getLeftTV().setOnClickListener(new View.OnClickListener() {
+        toolbar.setTitle("发布");
+        toolbar.setBackOnClickListener(new View.OnClickListener(){
             @Override
             public void onClick(View v) {
                 finish();
             }
         });
 
-
-
+        TextView rightTxt = new TextView(this.getBaseContext());
+        rightTxt.setText("发布");
         //发布按钮监听事件
-        toolbar.getRightTV().setOnClickListener(new View.OnClickListener() {
+        rightTxt.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (NetStatus.IS_BUSY){
                     showToast("内容发布中,请稍后...");
                 }else {
                     showToast("内容发布中...");
-                    toolbar.getRightTV().setEnabled(false);
                     getHandler().postDelayed(new Runnable() {
                         @Override
                         public void run() {
@@ -127,6 +126,7 @@ public class NewTweetingActivity extends SheishuoUI {
                 }
             }
         });
+        toolbar.setRightItems(new View[]{rightTxt});
 
 
         //初始化定位
@@ -259,7 +259,7 @@ public class NewTweetingActivity extends SheishuoUI {
         getHandler().post(new Runnable() {
             @Override
             public void run() {
-                toolbar.getRightTV().setEnabled(true);
+                //toolbar.getRightTV().setEnabled(true);
             }
         });
     }

app/src/com/sheishuo/app/core_module/friends/activity/AddNewFriendActivity.java

@@ -49,6 +49,15 @@ public class AddNewFriendActivity extends SheishuoUI {
 
 
     void init(){
+
+        toolbar.setTitle("添加好友");
+        toolbar.setBackOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
         addFriendBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

app/src/com/sheishuo/app/core_module/friends/activity/ContactsListActivity.java

@@ -64,8 +64,14 @@ public class ContactsListActivity extends SheishuoUI {
 
 
     private void initToolbar() {
-        toolbar.init();
-        toolbar.setTitle("联系人");
+        toolbar.setTitle("通讯录");
+        toolbar.setBackOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View view)
+            {
+                finish();
+            }
+        });
     }
 
     private void addContactFragment() {

app/src/com/sheishuo/app/core_module/friends/activity/PhoneContactsActivity.java

@@ -72,6 +72,15 @@ public class PhoneContactsActivity extends SheishuoUI {
 
     void init(){
 
+        toolbar.setTitle("手机联系人");
+        toolbar.setBackOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View view)
+            {
+                finish();
+            }
+        });
+
         //查找手机中所有联系人信息
         net.getPhoneContactRelationship(getContacts(), new ResponseCallback() {
             @Override

app/src/com/sheishuo/app/core_module/location/LocationSelectActivity.java

@@ -4,7 +4,11 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
+import com.netease.nim.uikit.common.util.sys.ScreenUtil;
 import com.sheishuo.app.R;
 import com.sheishuo.app.common.util.location.CityDataHelper;
 import com.sheishuo.app.common.views.BaseToolbar;
@@ -46,7 +50,18 @@ public class LocationSelectActivity extends SheishuoUI {
     }
 
     void init(){
-        toolbar.getRightTV().setOnClickListener(new View.OnClickListener() {
+
+        toolbar.setTitle("请选择城市");
+        toolbar.setBackOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        TextView textView = new TextView(getBaseContext());
+        textView.setText("保存");
+        textView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Bundle data = new Bundle();
@@ -59,6 +74,14 @@ public class LocationSelectActivity extends SheishuoUI {
                 finish();
             }
         });
+        toolbar.setRightItems(new View[]{textView});
+
+        int width = ScreenUtil.screenWidth / 3;
+        LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(width, LinearLayout.LayoutParams.MATCH_PARENT);
+        provinceSp.setLayoutParams(layoutParams);
+        citySp.setLayoutParams(layoutParams);
+        areaSp.setLayoutParams(layoutParams);
+
         provinceSp.setOffset(1);
         citySp.setOffset(1);
         areaSp.setOffset(1);

app/src/com/sheishuo/app/core_module/mine/view/ui/activity/AboutActivity.java

@@ -44,7 +44,8 @@ public class AboutActivity extends SheishuoUI {
 
     void init(){
 
-        toolbar.setOnClickListener(new View.OnClickListener() {
+        toolbar.setTitle("关于谁说");
+        toolbar.setBackOnClickListener(new View.OnClickListener(){
             @Override
             public void onClick(View v) {
                 finish();

app/src/com/sheishuo/app/core_module/mine/view/ui/activity/AboutWebViewActivity.java

@@ -61,12 +61,6 @@ public class AboutWebViewActivity extends SheishuoUI{
 
     void init(){
         toolbar.setTitle(title);
-        toolbar.getLeftTV().setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
 
         webView.loadUrl(url);
 

app/src/com/sheishuo/app/core_module/mine/view/ui/activity/AccountAndSecurityActivity.java

@@ -3,12 +3,14 @@ package com.sheishuo.app.core_module.mine.view.ui.activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.sheishuo.app.R;
 import com.sheishuo.app.cache.AccountCache;
+import com.sheishuo.app.common.views.BaseToolbar;
 import com.sheishuo.app.impl.SheishuoUI;
 
 /**
@@ -21,7 +23,6 @@ public class AccountAndSecurityActivity extends SheishuoUI {
     private String TAG = this.getClass().getSimpleName();
     private Context context = this;
 
-
     private TextView idTV,mobileTV;
 
     private LinearLayout changePwdLayout;
@@ -44,6 +45,17 @@ public class AccountAndSecurityActivity extends SheishuoUI {
     }
 
     void init(){
+
+        BaseToolbar toolbar = findView(R.id.toolbar);
+        toolbar.setTitle("账户安全");
+        toolbar.setBackOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+
         idTV.setText(AccountCache.getAccount().getId());
         mobileTV.setText(AccountCache.getAccount().getMobile());
         changePwdLayout.setOnClickListener(new View.OnClickListener() {

app/src/com/sheishuo/app/core_module/mine/view/ui/activity/ChangePwdActivity.java

@@ -12,6 +12,7 @@ import com.sheishuo.app.common.util.data.SPHelper;
 import com.sheishuo.app.common.util.net.INet;
 import com.sheishuo.app.common.util.net.NetImpl;
 import com.sheishuo.app.common.util.net.ResponseCallback;
+import com.sheishuo.app.common.views.BaseToolbar;
 import com.sheishuo.app.impl.SheishuoUI;
 
 /**
@@ -48,6 +49,16 @@ public class ChangePwdActivity extends SheishuoUI {
 
 
     void init(){
+
+        BaseToolbar toolbar = findView(R.id.toolbar);
+        toolbar.setTitle("修改密码");
+        toolbar.setBackOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
         submitBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

app/src/com/sheishuo/app/core_module/mine/view/ui/activity/FeedbackActivity.java

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import com.sheishuo.app.R;
 import com.sheishuo.app.common.views.BaseToolbar;
@@ -39,13 +40,23 @@ public class FeedbackActivity extends SheishuoUI {
 
     void findViews(){
         feedbackET = findView(R.id.mine_feedback_ET);
-        submibtBtn = findView(R.id.mine_feedback_submit_btn);
     }
 
 
     void init(){
 
-        submibtBtn.setOnClickListener(new View.OnClickListener() {
+        BaseToolbar toolbar = findView(R.id.toolbar);
+        toolbar.setTitle("帮助与反馈");
+        toolbar.setBackOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        TextView submitTxt = new TextView(getBaseContext());
+        submitTxt.setText("提交");
+        submitTxt.setOnClickListener(new View.OnClickListener(){
             @Override
             public void onClick(View v) {
                 String feedback = feedbackET.getText().toString();

app/src/com/sheishuo/app/core_module/mine/view/ui/activity/HobbySelectActivity.java

@@ -21,6 +21,8 @@ import com.sheishuo.app.common.util.net.ResponseCallback;
 import com.sheishuo.app.common.views.BaseToolbar;
 import com.sheishuo.app.impl.SheishuoUI;
 
+import org.w3c.dom.Text;
+
 import java.util.List;
 
 /**
@@ -58,14 +60,10 @@ public class HobbySelectActivity extends SheishuoUI {
     }
 
     void init(){
-        toolbar.getLeftTV().setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
 
-        toolbar.getRightTV().setOnClickListener(new View.OnClickListener() {
+        TextView rightTxt = new TextView(getBaseContext());
+        rightTxt.setText("HobbySelectActivity");
+        rightTxt.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent();
@@ -74,6 +72,9 @@ public class HobbySelectActivity extends SheishuoUI {
                 finish();
             }
         });
+        toolbar.setRightItems(new View[]{rightTxt});
+
+
 
 
         //初始化兴趣缓存

app/src/com/sheishuo/app/core_module/mine/view/ui/activity/MineTradeActivity.java

@@ -6,6 +6,7 @@ import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.view.View;
 
 import com.sheishuo.app.R;
 import com.sheishuo.app.common.beans.TradeBean;
@@ -58,6 +59,15 @@ public class MineTradeActivity extends SheishuoUI {
     }
 
     void init(){
+
+        toolbar.setTitle("我的快讯");
+        toolbar.setBackOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
         tabLayout.addTab(tabLayout.newTab().setText("我的发布"));
         tabLayout.addTab(tabLayout.newTab().setText("我的关注"));
         recyclerView.setLayoutManager(layoutManager);

app/src/com/sheishuo/app/core_module/mine/view/ui/activity/MineUploadPhotoActivity.java

@@ -10,6 +10,7 @@ import android.widget.FrameLayout;
 import android.widget.GridLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.netease.nim.uikit.common.media.picker.PickImageHelper;
@@ -28,6 +29,8 @@ import com.sheishuo.app.common.util.net.ResponseCallback;
 import com.sheishuo.app.common.views.BaseToolbar;
 import com.sheishuo.app.impl.SheishuoUI;
 
+import org.w3c.dom.Text;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -43,6 +46,7 @@ public class MineUploadPhotoActivity extends SheishuoUI {
     private Context context = this;
 
     private BaseToolbar toolbar;
+    private TextView toolbarRightTxt;
 
     private GridLayout gridLayout;
 
@@ -88,20 +92,15 @@ public class MineUploadPhotoActivity extends SheishuoUI {
      * 初始化Toolbar
      */
     void initToolbar(){
-        toolbar.getLeftTV().setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
 
-
-        toolbar.getRightTV().setOnClickListener(new View.OnClickListener() {
+        toolbar.setTitle("添加照片");
+        toolbar.setBackOnClickListener(new View.OnClickListener(){
             @Override
             public void onClick(View v) {
                 finish();
             }
         });
+
     }
 
     /**
@@ -160,8 +159,8 @@ public class MineUploadPhotoActivity extends SheishuoUI {
         super.onActivityResult(requestCode, resultCode, data);
         if (Activity.RESULT_OK == resultCode){
             if (ADD_PHOTOS_CODE == requestCode){
-                toolbar.getRightTV().setEnabled(false);
-                toolbar.setRightText("上传中...");
+                toolbarRightTxt.setEnabled(false);
+                toolbarRightTxt.setText("上传中...");
 
                 Bundle result = data.getExtras();
                 List<PhotoInfo> photoInfoList = (List<PhotoInfo>) result.getSerializable("photo_list");
@@ -207,13 +206,7 @@ public class MineUploadPhotoActivity extends SheishuoUI {
                             createAddPhotoBtn();
 
                             //解锁完成按钮
-                            toolbar.setRightText("完成");
-                            toolbar.getRightTV().setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    finish();
-                                }
-                            });
+                            toolbarRightTxt.setText("完成");
                         }
                     });
 

app/src/com/sheishuo/app/core_module/mine/view/ui/activity/NearbyPeopleActivity.java

@@ -54,10 +54,12 @@ public class NearbyPeopleActivity extends SheishuoUI{
     }
 
     void init(){
-        toolbar.getLeftTV().setOnClickListener(new View.OnClickListener() {
+
+        toolbar.setTitle("附近的人");
+        toolbar.setBackOnClickListener(new View.OnClickListener(){
             @Override
             public void onClick(View v) {
-                NearbyPeopleActivity.this.finish();
+                finish();
             }
         });
 

app/src/com/sheishuo/app/core_module/mine/view/ui/activity/NotificationSettingActivity.java

@@ -48,7 +48,8 @@ public class NotificationSettingActivity extends SheishuoUI {
 
     void init(){
 
-        toolbar.getLeftTV().setOnClickListener(new View.OnClickListener() {
+        toolbar.setTitle("消息通知");
+        toolbar.setBackOnClickListener(new View.OnClickListener(){
             @Override
             public void onClick(View v) {
                 finish();

app/src/com/sheishuo/app/core_module/mine/view/ui/activity/PersonalSettingsActivity.java

@@ -125,13 +125,6 @@ public class PersonalSettingsActivity extends SheishuoUI {
 
     void init() {
 
-        toolbar.getLeftTV().setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                PersonalSettingsActivity.this.finish();
-            }
-        });
-
         //初始化回调
         callback = new ResponseCallback() {
             @Override

app/src/com/sheishuo/app/core_module/mine/view/ui/activity/PrivacyActivity.java

@@ -14,6 +14,7 @@ import com.sheishuo.app.common.beans.SocialInfoBean;
 import com.sheishuo.app.common.util.net.INet;
 import com.sheishuo.app.common.util.net.NetImpl;
 import com.sheishuo.app.common.util.net.ResponseCallback;
+import com.sheishuo.app.common.views.BaseToolbar;
 import com.sheishuo.app.contact.activity.BlackListActivity;
 import com.sheishuo.app.impl.SheishuoUI;
 
@@ -60,6 +61,16 @@ public class PrivacyActivity extends SheishuoUI {
 
     void init(){
 
+        BaseToolbar toolbar = (BaseToolbar)findView(R.id.toolbar);
+        toolbar.setTitle("隐私");
+        toolbar.setBackOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+
         SocialInfoBean bean = SocialInfoCache.get(AccountCache.getAccount().getId());
         //加载各个switch状态
         initSwitches(bean);

app/src/com/sheishuo/app/core_module/mine/view/ui/activity/SettingsActivity.java

@@ -62,15 +62,15 @@ public class SettingsActivity extends SheishuoUI {
     }
 
     void init(){
-        //初始化Toolbar
-        toolbar.getLeftTV().setOnClickListener(new View.OnClickListener() {
+
+        toolbar.setTitle("设置");
+        toolbar.setBackOnClickListener(new View.OnClickListener(){
             @Override
             public void onClick(View v) {
                 finish();
             }
         });
 
-
         //初始化退出登录按钮
         quitBtn.setOnClickListener(new View.OnClickListener() {
             @Override

app/src/com/sheishuo/app/core_module/mine/view/ui/activity/UserInfoSettingActivity.java

@@ -63,12 +63,6 @@ public class UserInfoSettingActivity extends SheishuoUI {
 
 
     void init(){
-        toolbar.getLeftTV().setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
 
         //MuteSwitch
         if (NIMClient.getService(FriendService.class).isNeedMessageNotify(userId)){

app/src/com/sheishuo/app/core_module/sheishuo/view/ui/CreateNewGroupActivity.java

@@ -87,7 +87,13 @@ public class CreateNewGroupActivity extends SheishuoUI {
 
 
     void initToolbar() {
-
+        toolbar.setTitle("创建群聊");
+        toolbar.setBackOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
     }
 
     void initCreateBtn() {

app/src/com/sheishuo/app/core_module/sheishuo/view/ui/NearbyGroupActivity.java

@@ -62,14 +62,6 @@ public class NearbyGroupActivity extends SheishuoUI {
 
 
     void init(){
-        toolbar.getLeftTV().setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
-
-
         loadNearbyGroups();
     }
 

app/src/com/sheishuo/app/core_module/sheishuo/view/ui/SettingTextEditActivity.java

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.text.InputType;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import com.sheishuo.app.R;
 import com.sheishuo.app.common.views.BaseToolbar;
@@ -54,9 +55,9 @@ public class SettingTextEditActivity extends SheishuoUI {
             editText.setInputType(InputType.TYPE_CLASS_NUMBER);
         }
 
-        toolbar.setRightText("确定");
-
-        toolbar.getRightTV().setOnClickListener(new View.OnClickListener() {
+        TextView rightTxt = new TextView(getBaseContext());
+        rightTxt.setText("确定");
+        rightTxt.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent intent  =  new Intent();
@@ -65,5 +66,6 @@ public class SettingTextEditActivity extends SheishuoUI {
                 finish();
             }
         });
+        toolbar.setRightItems(new View[]{rightTxt});
     }
 }

app/src/com/sheishuo/app/core_module/trade/view/ui/activity/TradeChangePriorityActivity.java

@@ -45,7 +45,12 @@ public class TradeChangePriorityActivity extends SheishuoUI {
     }
 
     void init(){
-        toolbar.getRightTV().setOnClickListener(new View.OnClickListener() {
+
+        toolbar.setTitle("修改置顶");
+
+        TextView rightTxt = new TextView(getBaseContext());
+        rightTxt.setText("确定");
+        rightTxt.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent();
@@ -57,6 +62,7 @@ public class TradeChangePriorityActivity extends SheishuoUI {
                 finish();
             }
         });
+        toolbar.setRightItems(new View[]{rightTxt});
 
         switch (priorityType){
             case TradeItemAdapter.PRIORITY_DISTRICT:

app/src/com/sheishuo/app/impl/SheishuoTeamMessageActivity.java

@@ -130,7 +130,8 @@ public class SheishuoTeamMessageActivity extends TeamMessageActivity {
             inflater.inflate(R.menu.system_team_chat_menu, menu);
             MenuItemCompat.setShowAsAction(menu.findItem(R.id.team_chat_menu_search), MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
             MenuItemCompat.setShowAsAction(menu.findItem(R.id.team_chat_menu_clear_chat_history), MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
-            toolbar.getTitleTV().setOnClickListener(new View.OnClickListener() {
+
+            toolbar.getTitleTxt().setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     String teamId = team.getId();

app/src/com/sheishuo/app/impl/SheishuoUI.java

@@ -60,6 +60,7 @@ public class SheishuoUI extends UI {
         toolbar.setTitleTextColor(getResources().getColor(options.titleColor));
         //setTransparentStatusBar();
 
+
     }
 
 

app/src/com/sheishuo/app/main/activity/MainActivity.java

@@ -9,11 +9,13 @@ import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
+import android.widget.Toolbar;
 
 import com.netease.nim.uikit.LoginSyncDataStatusObserver;
 import com.netease.nim.uikit.common.ui.dialog.DialogMaker;
 import com.netease.nim.uikit.common.util.log.LogUtil;
 import com.netease.nim.uikit.contact_selector.activity.ContactSelectActivity;
+import com.netease.nim.uikit.model.ToolBarOptions;
 import com.netease.nim.uikit.permission.MPermission;
 import com.netease.nim.uikit.permission.annotation.OnMPermissionDenied;
 import com.netease.nim.uikit.permission.annotation.OnMPermissionGranted;
@@ -28,6 +30,7 @@ import com.sheishuo.app.R;
 import com.sheishuo.app.avchat.AVChatProfile;
 import com.sheishuo.app.avchat.activity.AVChatActivity;
 import com.sheishuo.app.chatroom.helper.ChatRoomHelper;
+import com.sheishuo.app.common.views.BaseToolbar;
 import com.sheishuo.app.config.preference.UserPreferences;
 import com.sheishuo.app.core_module.location.LocationSelectActivity;
 import com.sheishuo.app.core_module.trade.view.ui.activity.TradeChangePriorityActivity;

app/src/com/sheishuo/app/main/activity/SystemMessageActivity.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -12,6 +13,7 @@ import android.widget.Toast;
 
 import com.sheishuo.app.cache.AccountCache;
 import com.sheishuo.app.common.util.net.NetImpl;
+import com.sheishuo.app.common.views.BaseToolbar;
 import com.sheishuo.app.main.adapter.SystemMessageAdapter;
 import com.sheishuo.app.main.viewholder.SystemMessageViewHolder;
 import com.sheishuo.app.R;
@@ -115,9 +117,15 @@ public class SystemMessageActivity extends UI implements TAdapterDelegate,
 
         setContentView(R.layout.system_notification_message_activity);
 
-        ToolBarOptions options = new ToolBarOptions();
-        options.titleId = R.string.verify_reminder;
-        setToolBar(R.id.toolbar, options);
+        BaseToolbar toolbar = (BaseToolbar) findViewById(R.id.toolbar);
+        toolbar.setTitle("新的朋友");
+        toolbar.setBackOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View view)
+            {
+                finish();
+            }
+        });
 
         initAdapter();
         initListView();

app/src/com/sheishuo/app/main/activity/TeamListActivity.java

@@ -3,12 +3,14 @@ package com.sheishuo.app.main.activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import com.sheishuo.app.common.views.BaseToolbar;
 import com.sheishuo.app.impl.SheishuoUIKit;
 import com.sheishuo.app.session.SessionHelper;
 import com.sheishuo.app.R;
@@ -62,9 +64,14 @@ public class TeamListActivity extends UI implements AdapterView.OnItemClickListe
 
         setContentView(R.layout.group_list_activity);
 
-        ToolBarOptions options = new ToolBarOptions();
-        options.titleId = itemType == ItemTypes.TEAMS.ADVANCED_TEAM ? R.string.advanced_team : R.string.normal_team;
-        setToolBar(R.id.toolbar, options);
+        BaseToolbar toolbar = (BaseToolbar) findViewById(R.id.toolbar);
+        toolbar.setTitle("我的群组");
+        toolbar.setBackOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
 
         lvContacts = (ListView) findViewById(R.id.group_list);
 

app/src/com/sheishuo/app/main/fragment/AreaGroupsFragment.java

@@ -6,6 +6,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -48,6 +49,7 @@ public class AreaGroupsFragment extends MainTabFragment {
     private String TAG = this.getClass().getSimpleName();
     private Context context = getActivity();
     private BaseToolbar toolbar;
+    private TextView toolbarLeftTxt;
     private MainActivity parent;
 
     private RecyclerView areaGroupsRecyclerview, recentGroupsRecyclerview;
@@ -105,31 +107,46 @@ public class AreaGroupsFragment extends MainTabFragment {
 
     //初始化Toolbar
     void initToolbar() {
-        toolbar.init();
-        toolbar.getIndexIco().setVisibility(View.VISIBLE);
 
+        toolbar.setVisibility(View.VISIBLE);
         toolbar.setTitle("谁说");
+
         LoginBean.DBean account = AccountCache.getAccount();
-        toolbar.setLeftText(account.getCity() + account.getDistrict());
-        toolbar.setRightText("创建");
-        toolbar.getRightTV().setOnClickListener(new View.OnClickListener() {
+
+        ImageView leftIcon = new ImageView(getContext());
+        leftIcon.setImageResource(R.drawable.location_white);
+        leftIcon.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-//                ContactSelectActivity.startActivityForResult(getActivity(), TeamHelper.getContactSelectOption(null), MainActivity.REQUEST_CODE_ADVANCED);
-                startActivity(new Intent(getActivity(), CreateNewGroupActivity.class));
-
+                Intent intent = new Intent(getActivity(), LocationSelectActivity.class);
+                startActivityForResult(intent, 0);
             }
         });
 
-
-        toolbar.setLeftText(location);
-        toolbar.getLeftTV().setOnClickListener(new View.OnClickListener() {
+        toolbarLeftTxt = new TextView(getContext());
+        toolbarLeftTxt.setText(location);
+        toolbarLeftTxt.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent(getActivity(), LocationSelectActivity.class);
                 startActivityForResult(intent, 0);
             }
         });
+
+        toolbar.setLeftItems(new View[]{leftIcon, toolbarLeftTxt});
+
+
+        TextView rightTxt = new TextView(getContext());
+        rightTxt.setText("创建");
+        rightTxt.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+//                ContactSelectActivity.startActivityForResult(getActivity(), TeamHelper.getContactSelectOption(null), MainActivity.REQUEST_CODE_ADVANCED);
+                startActivity(new Intent(getActivity(), CreateNewGroupActivity.class));
+
+            }
+        });
+        toolbar.setRightItems(new View[]{rightTxt});
     }
 
 
@@ -148,7 +165,7 @@ public class AreaGroupsFragment extends MainTabFragment {
                             location = location.substring(0, 6) + "...";
                         }
 
-                        toolbar.setLeftText(location);
+                        toolbarLeftTxt.setText(location);
                     }
                 });
             }
@@ -404,7 +421,7 @@ public class AreaGroupsFragment extends MainTabFragment {
                 location = location.substring(0, 6) + "...";
             }
 
-            toolbar.setLeftText(location);
+            toolbarLeftTxt.setText(location);
         }
     }
 }

app/src/com/sheishuo/app/main/fragment/CircleOfFriendsFragment.java

@@ -109,39 +109,45 @@ public class CircleOfFriendsFragment extends MainTabFragment{
 
     //初始化toolbar
     void initToolbar(){
-        toolbar.init();
+        toolbar.setVisibility(View.VISIBLE);
         toolbar.setTitle("动态");
-        toolbar.setRightText("发表");
 
-        //打开发布Activity
-        toolbar.getRightTV().setOnClickListener(new View.OnClickListener() {
+        TextView rightTxt = new TextView(getContext());
+        rightTxt.setText("发表");
+        rightTxt.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Log.e(TAG,"start NewTweetActivity");
-                NewTweetingActivity.startActivityForResult(getActivity(),null);
+                Log.d(TAG,"start NewTweetActivity");
+                startNewTweening();
             }
         });
-
+        toolbar.setRightItems(new View[]{rightTxt});
+        toolbar.setLeftItems(new View[0]);
 
         //双击标题返回顶部
-        toolbar.getTitleTV().setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                long nowTime = System.currentTimeMillis();
-                long interval = lastTime - nowTime;
-                if (interval < 1000){
-                    lastTime = nowTime;
-                    if (recyclerView!=null){
-                        recyclerView.smoothScrollToPosition(0);
-                    }
-                }
-
-                lastTime = nowTime;
-            }
-        });
+        //添加点击会造成左右两侧按钮无法点击，暂时不开启该功能
+//        toolbar.setToolbarOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                long nowTime = System.currentTimeMillis();
+//                long interval = lastTime - nowTime;
+//                if (interval < 1000){
+//                    lastTime = nowTime;
+//                    if (recyclerView!=null){
+//                        recyclerView.smoothScrollToPosition(0);
+//                    }
+//                }
+//
+//                lastTime = nowTime;
+//            }
+//        });
 
     }
 
+    private void startNewTweening()
+    {
+        NewTweetingActivity.startActivityForResult(getActivity(),null);
+    }
 
     @Override
     public void setUserVisibleHint(boolean isVisibleToUser) {

app/src/com/sheishuo/app/main/fragment/HomeFragment.java

@@ -102,8 +102,9 @@ public class HomeFragment extends TFragment implements OnPageChangeListener, Rem
         getHandler().postDelayed(new Runnable() {
             @Override
             public void run() {
-                pager.setCurrentItem(1);
-                pager.setCurrentItem(0);
+//                pager.setCurrentItem(1);
+//                pager.setCurrentItem(0);
+                onPageSelected(0);
             }
         }, 300);
 
@@ -225,20 +226,20 @@ public class HomeFragment extends TFragment implements OnPageChangeListener, Rem
         super.onResume();
         enableMsgNotification(false);
         //quitOtherActivities();
-        for (Fragment fragment : getFragmentManager().getFragments()) {
-            if (fragment instanceof SessionListFragment)
-                fragment.setUserVisibleHint(true);
-        }
+//        for (Fragment fragment : getFragmentManager().getFragments()) {
+//            if (fragment instanceof SessionListFragment)
+//                fragment.setUserVisibleHint(true);
+//        }
     }
 
     @Override
     public void onPause() {
         super.onPause();
         enableMsgNotification(true);
-        for (Fragment fragment : getFragmentManager().getFragments()) {
-            if (fragment instanceof SessionListFragment)
-                fragment.setUserVisibleHint(false);
-        }
+//        for (Fragment fragment : getFragmentManager().getFragments()) {
+//            if (fragment instanceof SessionListFragment)
+//                fragment.setUserVisibleHint(false);
+//        }
     }
 
     @Override

app/src/com/sheishuo/app/main/fragment/MineFragment.java

@@ -132,7 +132,6 @@ public class MineFragment extends MainTabFragment implements View.OnClickListene
 
 
     private void initToolbar(){
-        toolbar.init();
         toolbar.setVisibility(View.GONE);
     }
 

app/src/com/sheishuo/app/main/fragment/SessionListFragment.java

@@ -6,6 +6,7 @@ import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.util.Log;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -152,16 +153,12 @@ public class SessionListFragment extends MainTabFragment {
     //初始化toolbar
     public void initToolbar(){
         if (toolbar != null){
-            toolbar.init();
+            toolbar.setVisibility(View.VISIBLE);
             toolbar.setTitle("朋友");
-            toolbar = new BaseToolbar.Builder()
-                    .create(getActivity(),toolbar)
-                    .addIcoButton(R.drawable.friends_contacts_list_ico)
-                    .addIcoButton(R.drawable.friends_add_ico)
-                    .build();
 
-
-            toolbar.getIcoLayout().getChildAt(0).setOnClickListener(new View.OnClickListener() {
+            ImageView listIcon = new ImageView(getContext());
+            listIcon.setImageResource(R.drawable.friends_contacts_list_ico);
+            listIcon.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     startActivity(new Intent(getActivity(),ContactsListActivity.class));
@@ -169,12 +166,18 @@ public class SessionListFragment extends MainTabFragment {
                 }
             });
 
-            toolbar.getIcoLayout().getChildAt(1).setOnClickListener(new View.OnClickListener() {
+            ImageView addIcon = new ImageView(getContext());
+            addIcon.setImageResource(R.drawable.friends_add_ico);
+            addIcon.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     startActivity(new Intent(getActivity(), AddNewFriendActivity.class));
                 }
             });
+
+            toolbar.setRightItems(new View[]{listIcon, addIcon});
+            toolbar.setLeftItems(new View[0]);
+
             parent.setSupportActionBar(toolbar);
         }
     }

app/src/com/sheishuo/app/main/fragment/TradeListFragment.java

@@ -1,5 +1,6 @@
 package com.sheishuo.app.main.fragment;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
@@ -13,12 +14,18 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.netease.nim.uikit.common.ui.popupmenu.PopupMenuItem;
+import com.netease.nim.uikit.common.util.sys.ScreenUtil;
+import com.netease.nim.uikit.session.activity.BaseMessageActivity;
+import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
 import com.sheishuo.app.R;
+import com.sheishuo.app.SheishuoCache;
 import com.sheishuo.app.cache.AccountCache;
 import com.sheishuo.app.common.beans.TradeBean;
 import com.sheishuo.app.common.views.BaseToolbar;
@@ -79,10 +86,10 @@ public class TradeListFragment extends MainTabFragment {
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         this.menu = menu;
-        inflater.inflate(R.menu.trade_menu,menu);
-        for (int i = 0 ; i < menu.getItem(1).getSubMenu().size() ; i++){
-            menuItems.add(menu.getItem(1).getSubMenu().getItem(i));
-        }
+//        inflater.inflate(R.menu.trade_menu,menu);
+//        for (int i = 0 ; i < menu.getItem(1).getSubMenu().size() ; i++){
+//            menuItems.add(menu.getItem(1).getSubMenu().getItem(i));
+//        }
         super.onCreateOptionsMenu(menu, inflater);
     }
 
@@ -176,12 +183,45 @@ public class TradeListFragment extends MainTabFragment {
     }
 
     private void initToolbar(){
-        toolbar.init();
-        toolbar.setTitle("                    快讯");
 
-        toolbar.getIndexIco().setVisibility(View.VISIBLE);
-        toolbar.setLeftText(AccountCache.getAccount().getCity() + AccountCache.getAccount().getDistrict());
-        toolbar.getRightTV().setVisibility(GONE);
+        toolbar.setVisibility(View.VISIBLE);
+        toolbar.setTitle("快讯");
+
+        ImageView searchIcon = new ImageView(getContext());
+        searchIcon.setBackgroundResource(R.drawable.ic_action_search);
+        ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(ScreenUtil.dip2px(30), ScreenUtil.dip2px(30));
+        searchIcon.setLayoutParams(lp);
+        searchIcon.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(getActivity(), TradeSearchActivity.class);
+                startActivityForResult(intent,0);
+            }
+        });
+
+        TextView textView = new TextView(getContext());
+        textView.setText("筛选");
+        textView.setOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v){
+                Log.d("haha", "2");
+            }
+        });
+
+        toolbar.setRightItems(new View[]{searchIcon, textView});
+        toolbar.setLeftItems(new View[0]);
+    }
+
+    private static List<PopupMenuItem> getSortMenuItems(Context context, String sessionId, SessionTypeEnum sessionTypeEnum) {
+//        List<PopupMenuItem> moreMenuItems = new ArrayList<PopupMenuItem>();
+//        moreMenuItems.add(new PopupMenuItem(context, ACTION_HISTORY_QUERY, sessionId,
+//                sessionTypeEnum, SheishuoCache.getContext().getString(R.string.message_history_query)));
+//        moreMenuItems.add(new PopupMenuItem(context, ACTION_SEARCH_MESSAGE, sessionId,
+//                sessionTypeEnum, SheishuoCache.getContext().getString(R.string.message_search_title)));
+//        moreMenuItems.add(new PopupMenuItem(context, ACTION_CLEAR_MESSAGE, sessionId,
+//                sessionTypeEnum, SheishuoCache.getContext().getString(R.string.message_clear)));
+//        return moreMenuItems;
+        return null;
     }
 
 

uikit/src/com/netease/nim/uikit/model/ToolBarOptions.java

@@ -22,7 +22,8 @@ public class ToolBarOptions {
     /**
      * toolbar的返回按钮资源id，默认开启的资源nim_actionbar_dark_back_icon
      */
-    public int navigateId = R.drawable.nim_actionbar_dark_back_icon;
+    //public int navigateId = R.drawable.nim_actionbar_dark_back_icon;
+    public int navigateId = R.drawable.nim_actionbar_white_back_icon;
     /**
      * toolbar的返回按钮，默认开启
      */