Merge branch 'master' of http://10.8.230.114:3000/kemllor/small_sheep_android

.idea/modules.xml

@@ -2,12 +2,10 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/SamllSheepPlugin.iml" filepath="$PROJECT_DIR$/SamllSheepPlugin.iml" />
+      <module fileurl="file://D:\Dlg\AndroidStudioProjects\small_sheep_android\SamllSheepPlugin.iml" filepath="D:\Dlg\AndroidStudioProjects\small_sheep_android\SamllSheepPlugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://D:/Dlg/AndroidStudioProjects/small_sheep_android/.idea/modules/app/app.iml" filepath="D:/Dlg/AndroidStudioProjects/small_sheep_android/.idea/modules/app/app.iml" />
-      <module fileurl="file://D:/Dlg/AndroidStudioProjects/small_sheep_android/app/app.iml" filepath="D:/Dlg/AndroidStudioProjects/small_sheep_android/app/app.iml" />
+      <module fileurl="file://D:\Dlg\AndroidStudioProjects\small_sheep_android\.idea\modules\app\app.iml" filepath="D:\Dlg\AndroidStudioProjects\small_sheep_android\.idea\modules\app\app.iml" />
       <module fileurl="file://$PROJECT_DIR$/small_sheep_android.iml" filepath="$PROJECT_DIR$/small_sheep_android.iml" />
-      <module fileurl="file://D:/Dlg/AndroidStudioProjects/small_sheep_android/small_sheep_android.iml" filepath="D:/Dlg/AndroidStudioProjects/small_sheep_android/small_sheep_android.iml" />
     </modules>
   </component>
 </project>

app/src/main/java/com/sheep/jiuyan/samllsheep/page/BindWxActivity.java

@@ -1,6 +1,5 @@
 package com.sheep.jiuyan.samllsheep.page;
 
-import android.content.Intent;
 import android.support.design.widget.TextInputEditText;
 import android.text.TextUtils;
 import android.view.View;
@@ -33,8 +32,8 @@ public class BindWxActivity extends BaseActivity implements View.OnClickListener
     public void initView() {
         mEtWx =(TextInputEditText) findViewById(R.id.et_wx);
         mTvWx = (TextView) findViewById(R.id.tv_wx);
-        mBack = (ImageView) findViewById(R.id.img_back);
-        mTitle = (TextView) findViewById(R.id.tv_title);
+        mBack = (ImageView) findViewById(R.id.img_baseactivity_title);
+        mTitle = (TextView) findViewById(R.id.txt_baseactivity_title);
         mRobot = (TextView) findViewById(R.id.tv_robot);
         mTitle.setText("绑定微信");
     }
@@ -60,7 +59,7 @@ public class BindWxActivity extends BaseActivity implements View.OnClickListener
     @Override
     public void onClick(View v) {
         int i = v.getId();
-        if (i == R.id.img_back) {
+        if (i == R.id.img_baseactivity_title) {
             finish();
 
         } else if (i == R.id.tv_wx) {

app/src/main/java/com/sheep/jiuyan/samllsheep/page/DownloadActivity.java

@@ -104,8 +104,8 @@ public class DownloadActivity extends BaseActivity {
         mPbDownload = (ProgressBar) findViewById(R.id.pb_download);
         mImgIcon = (ImageView) findViewById(R.id.img_icon);
         mTvTime = (TextView) findViewById(R.id.tv_time);
-        mTvTitle = (TextView) findViewById(R.id.tv_title);
-        mBack = findViewById(R.id.img_back);
+        mTvTitle = (TextView) findViewById(R.id.txt_baseactivity_title);
+        mBack = findViewById(R.id.img_baseactivity_title);
     }
 
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/InputWXAccountActivity.java

@@ -2,7 +2,6 @@ package com.sheep.jiuyan.samllsheep.page;
 
 import android.content.Intent;
 import android.support.design.widget.TextInputEditText;
-import android.support.v7.widget.AppCompatButton;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -14,11 +13,9 @@ import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.net.NetManager;
 import com.sheep.jiuyan.samllsheep.net.SheepCallback;
 import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.page.entry.WXAccount;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import java.util.HashMap;
-import java.util.List;
 
 /**
  * Created by Administrator on 2018/1/6.
@@ -55,14 +52,14 @@ public class InputWXAccountActivity extends BaseActivity implements View.OnClick
     @Override
     public void initView() {
 
-        mTitle=(TextView) findViewById(R.id.tv_title);
+        mTitle=(TextView) findViewById(R.id.txt_baseactivity_title);
         mLl1=(LinearLayout)findViewById(R.id.ll_1);
         mLl2=(LinearLayout)findViewById(R.id.ll_2);
         mLl3=(LinearLayout)findViewById(R.id.ll_3);
         mLl4=(LinearLayout)findViewById(R.id.ll_4);
 
 
-        img_back=(ImageView) findViewById(R.id.img_back);
+        img_back=(ImageView) findViewById(R.id.img_baseactivity_title);
 
         et_account_1=(TextInputEditText)findViewById(R.id.et_account_1);
         et_account_2=(TextInputEditText)findViewById(R.id.et_account_2);
@@ -145,7 +142,7 @@ public class InputWXAccountActivity extends BaseActivity implements View.OnClick
         if (i == R.id.tv_wx) {
             upload();
 
-        }else if(i==R.id.img_back){
+        }else if(i==R.id.img_baseactivity_title){
             finish();
         }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/MainActivity.java

@@ -25,7 +25,6 @@ import com.jcodecraeer.xrecyclerview.XRecyclerView;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.floatwindow.FloatService;
 import com.sheep.jiuyan.samllsheep.floatwindow.FloatWindow;
 import com.sheep.jiuyan.samllsheep.net.NetManager;
 import com.sheep.jiuyan.samllsheep.net.SheepCallback;
@@ -34,15 +33,11 @@ import com.sheep.jiuyan.samllsheep.page.adapter.TaskAdapter;
 import com.sheep.jiuyan.samllsheep.page.entry.TaskPublish;
 import com.sheep.jiuyan.samllsheep.page.entry.User;
 import com.sheep.jiuyan.samllsheep.page.entry.WXTask;
-import com.sheep.jiuyan.samllsheep.page.weight.MutiProgress;
 import com.sheep.jiuyan.samllsheep.utils.DeviceInfo;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.PremissUtils;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -342,7 +337,7 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
         mDown = head.findViewById(R.id.img_down);
 
         mImgIcon = (ImageView) head.findViewById(R.id.img_icon);
-        mTvTitle = (TextView) head.findViewById(R.id.tv_title);
+        mTvTitle = (TextView) head.findViewById(R.id.txt_baseactivity_title);
         mTvTime = (TextView) head.findViewById(R.id.tv_time);
         mTvCount = (TextView) head.findViewById(R.id.tv_count);
         mTvMoney = (TextView) head.findViewById(R.id.tv_money);

app/src/main/java/com/sheep/jiuyan/samllsheep/page/MoneyHistroyActivity.java

@@ -37,8 +37,8 @@ public class MoneyHistroyActivity extends BaseActivity {
     @Override
     public void initView() {
         mLv = (ListView) findViewById(R.id.lv);
-        mTitle = (TextView) findViewById(R.id.tv_title);
-        mImgBack = (ImageView) findViewById(R.id.img_back);
+        mTitle = (TextView) findViewById(R.id.txt_baseactivity_title);
+        mImgBack = (ImageView) findViewById(R.id.img_baseactivity_title);
 
     }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/TaskRecordActivity.java

@@ -48,8 +48,8 @@ public class TaskRecordActivity extends BaseActivity {
     public void initView() {
         mLvTask = (ListView) findViewById(R.id.lv_task);
         mLvTask.setDividerHeight(0);
-        mTvTitle = (TextView) findViewById(R.id.tv_title);
-        mBack = findViewById(R.id.img_back);
+        mTvTitle = (TextView) findViewById(R.id.txt_baseactivity_title);
+        mBack = findViewById(R.id.img_baseactivity_title);
 
     }
 
@@ -187,7 +187,7 @@ public class TaskRecordActivity extends BaseActivity {
                             String time = tmp1[1] + "/" + tmp1[2].split(" ")[0] + "\n" + tmp2[0] + ":" + tmp2[1];
                             viewHolder.setText(R.id.tv_time, time);
                             getState(viewHolder.<TextView>getView(R.id.tv_state), item.getStatus());
-                            viewHolder.setText(R.id.tv_title, "完成试玩->" + item.getTask().getTitle());
+                            viewHolder.setText(R.id.txt_baseactivity_title, "完成试玩->" + item.getTask().getTitle());
                             Glide.with(TaskRecordActivity.this)
                                     .load(item.getTask().getIcon())
                                     .placeholder(R.drawable.icon)

app/src/main/java/com/sheep/jiuyan/samllsheep/page/UserCenterActivity.java

@@ -13,9 +13,7 @@ import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.net.NetManager;
 import com.sheep.jiuyan.samllsheep.net.SheepCallback;
 import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.page.entry.MoneyHistroy;
 import com.sheep.jiuyan.samllsheep.page.entry.User;
-import com.sheep.jiuyan.samllsheep.page.entry.WXAccount;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import java.util.HashMap;
@@ -101,8 +99,8 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
         mTvWithdraw = (TextView) findViewById(R.id.tv_withdraw);
         mTvTask = (TextView) findViewById(R.id.tv_task);
         mTvWithdrawHostroy = (TextView) findViewById(R.id.tv_withdraw_hostroy);
-        mBack = (ImageView) findViewById(R.id.img_back);
-        mTitle = (TextView) findViewById(R.id.tv_title);
+        mBack = (ImageView) findViewById(R.id.img_baseactivity_title);
+        mTitle = (TextView) findViewById(R.id.txt_baseactivity_title);
         tv_wx_aacount = (TextView) findViewById(R.id.tv_wx_aacount);
 
         mLlMoneyHostroy = (LinearLayout) findViewById(R.id.ll_money_hostroy);
@@ -155,7 +153,7 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
             }
 
 
-        } else if (i == R.id.img_back) {
+        } else if (i == R.id.img_baseactivity_title) {
             finish();
 
         }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/WXAccountActivity.java

@@ -36,8 +36,8 @@ public class WXAccountActivity extends BaseActivity {
     @Override
     public void initView() {
         mLv = (ListView) findViewById(R.id.lv);
-        mTitle = (TextView) findViewById(R.id.tv_title);
-        mImgBack = (ImageView) findViewById(R.id.img_back);
+        mTitle = (TextView) findViewById(R.id.txt_baseactivity_title);
+        mImgBack = (ImageView) findViewById(R.id.img_baseactivity_title);
 
     }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/WebActivity.java

@@ -2,7 +2,6 @@ package com.sheep.jiuyan.samllsheep.page;
 
 import android.content.Intent;
 import android.view.View;
-import android.view.ViewParent;
 import android.webkit.WebChromeClient;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
@@ -31,8 +30,8 @@ public class WebActivity extends BaseActivity {
     @Override
     public void initView() {
         mWeb = (WebView) findViewById(R.id.web);
-        mTitle = (TextView) findViewById(R.id.tv_title);
-        mBack = findViewById(R.id.img_back);
+        mTitle = (TextView) findViewById(R.id.txt_baseactivity_title);
+        mBack = findViewById(R.id.img_baseactivity_title);
         mWeb.setWebChromeClient(new WebChromeClient() {
 
         });

app/src/main/java/com/sheep/jiuyan/samllsheep/page/WithdrawActivity.java

@@ -3,7 +3,6 @@ package com.sheep.jiuyan.samllsheep.page;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
@@ -66,8 +65,8 @@ public class WithdrawActivity extends BaseActivity implements View.OnClickListen
 
     @Override
     public void initView() {
-        mBack = (ImageView) findViewById(R.id.img_back);
-        mTitle = (TextView) findViewById(R.id.tv_title);
+        mBack = (ImageView) findViewById(R.id.img_baseactivity_title);
+        mTitle = (TextView) findViewById(R.id.txt_baseactivity_title);
         mMoney = (TextView) findViewById(R.id.tv_money);
         mTvWx = (TextView) findViewById(R.id.tv_wx);
         mGvMoney = (GridView) findViewById(R.id.gv_money);
@@ -79,7 +78,7 @@ public class WithdrawActivity extends BaseActivity implements View.OnClickListen
     @Override
     public void onClick(View v) {
         int i = v.getId();
-        if (i == R.id.img_back) {
+        if (i == R.id.img_baseactivity_title) {
             finish();
 
         } else if (i == R.id.tv_wx) {

app/src/main/java/com/sheep/jiuyan/samllsheep/page/WithdrawRecordActivity.java

@@ -37,8 +37,8 @@ public class WithdrawRecordActivity extends BaseActivity {
     @Override
     public void initView() {
         mLvRecord = (ListView) findViewById(R.id.lv_record);
-        mTvTitle = (TextView) findViewById(R.id.tv_title);
-        mImgBack = (ImageView) findViewById(R.id.img_back);
+        mTvTitle = (TextView) findViewById(R.id.txt_baseactivity_title);
+        mImgBack = (ImageView) findViewById(R.id.img_baseactivity_title);
     }
 
     @Override

app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/TaskAdapter.java

@@ -107,7 +107,7 @@ public class TaskAdapter extends RecyclerView.Adapter<TaskAdapter.ViewHolder> {
             super(view);
             mRootView = view;
             mImgIcon = (ImageView) view.findViewById(R.id.img_icon);
-            mTvTitle = (TextView) view.findViewById(R.id.tv_title);
+            mTvTitle = (TextView) view.findViewById(R.id.txt_baseactivity_title);
             mTvTime = (TextView) view.findViewById(R.id.tv_time);
             mTvCount = (TextView) view.findViewById(R.id.tv_count);
             mTvGuide = (TextView) view.findViewById(R.id.tv_guide);

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/TitleBarUtils.java

@@ -0,0 +1,213 @@
+package com.sheep.jiuyan.samllsheep.utils;
+
+import android.app.Activity;
+import android.graphics.drawable.ColorDrawable;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.sheep.jiuyan.samllsheep.R;
+
+
+/**
+ * @ Created by Dlg
+ * @ <p>TiTle:  TitleBarUtils</p>
+ * @ <p>Description:通用标题栏处理工具</p>
+ * @ date:  2017/11/10 10:30
+ * @ QQ:    315096953
+ */
+
+public class TitleBarUtils {
+
+
+    private static TitleBarUtils mTitleBarUtils;
+
+    public synchronized static TitleBarUtils getInstance() {
+        if (mTitleBarUtils == null) {
+            mTitleBarUtils = new TitleBarUtils();
+        }
+        return mTitleBarUtils;
+    }
+
+
+    /**
+     * 设置标题
+     *
+     * @param activity
+     * @param title
+     * @return
+     */
+    public TitleBarUtils setTitle(Activity activity, String title) {
+        TextView titleView = (TextView) activity.findViewById(R.id.txt_baseactivity_title);
+        titleView.setVisibility(View.VISIBLE);
+        titleView.setText(title == null ? "" : title);
+        return mTitleBarUtils;
+    }
+
+    /**
+     * 设置Title文本的颜色
+     *
+     * @param activity
+     * @param color    颜色值
+     * @return
+     */
+    public TitleBarUtils setTitleColor(Activity activity, int color) {
+        TextView titleView = (TextView) activity.findViewById(R.id.txt_baseactivity_title);
+        titleView.setTextColor(color);
+        return mTitleBarUtils;
+    }
+
+
+    /**
+     * 设置点击Title时结束activity
+     *
+     * @param activity
+     * @return
+     */
+    public TitleBarUtils setTitleFinish(final Activity activity) {
+        activity.findViewById(R.id.img_baseactivity_title)
+                .setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                activity.finish();
+            }
+        });
+        return mTitleBarUtils;
+    }
+
+
+    /**
+     * 设置最左边的Title监听
+     *
+     * @param activity
+     * @param drawableID      如果为0显示透明，如果写-1表示资源不变。-2为Gone，其它为显示该值资源
+     * @param onClickListener 如果为null,不改监听
+     */
+    public void setTitleListen(Activity activity, int drawableID, View.OnClickListener onClickListener) {
+        TextView titleView = (TextView) activity.findViewById(R.id.txt_baseactivity_title);
+        ImageView imageView= (ImageView) activity.findViewById(R.id.img_baseactivity_title);
+        if (drawableID == 0) {
+            imageView.setVisibility(View.INVISIBLE);
+        } else if (drawableID == -2) {
+            imageView.setVisibility(View.GONE);
+            return;
+        } else if (drawableID != -1) {
+            imageView.setImageResource(drawableID);
+        }
+
+        if (onClickListener != null) {
+            imageView.setOnClickListener(onClickListener);
+        }
+    }
+
+
+    /**
+     * 设置最右边的普通按钮状态
+     *
+     * @param activity
+     * @param btnText              设置文本
+     * @param backgroundColorResId 设置背景,0为透明，-1不变，-2为Gone,其它为ResID
+     * @param onClickListener      点击时的操作。
+     */
+    public void setRightBotton(Activity activity, String btnText, int backgroundColorResId,
+                               View.OnClickListener onClickListener) {
+        Button button = (Button) activity.findViewById(R.id.btn_baseactivity_right);
+        ImageButton imageButton = (ImageButton) activity.findViewById(R.id.ibtn_baseactivity_right);
+        button.setVisibility(View.VISIBLE);
+        imageButton.setVisibility(View.GONE);
+        if (backgroundColorResId == 0) {
+            button.setBackgroundColor(0x00000000);
+        } else if (backgroundColorResId == -2) {
+            button.setVisibility(View.GONE);
+            return;
+        } else if (backgroundColorResId != -1) {
+            button.setBackgroundColor(backgroundColorResId);
+        }
+
+        if (btnText != null) {
+            button.setText(btnText);
+        }
+        //执行回调
+        if (onClickListener != null) {
+            button.setOnClickListener(onClickListener);
+        }
+    }
+
+
+    /**
+     * 设置最右边的普通按钮状态
+     *
+     * @param activity
+     * @param backgroundImgResId 设置背景的ResID,为零透明，-1不变,-2为Gone，其它是资源
+     * @param onClickListener    点击时的操作。
+     */
+    public void setRightImgBotton(Activity activity, int backgroundImgResId, View.OnClickListener onClickListener) {
+        Button button = (Button) activity.findViewById(R.id.btn_baseactivity_right);
+        ImageButton imageButton = (ImageButton) activity.findViewById(R.id.ibtn_baseactivity_right);
+
+        button.setVisibility(View.GONE);
+        imageButton.setVisibility(View.VISIBLE);
+        if (backgroundImgResId == 0) {
+            imageButton.setImageDrawable(new ColorDrawable(0x00000000));
+        } else if (backgroundImgResId == -2) {
+            imageButton.setVisibility(View.GONE);
+            return;
+        } else if (backgroundImgResId != -1) {
+            imageButton.setImageResource(backgroundImgResId);
+        }
+        if (onClickListener != null) {
+            imageButton.setOnClickListener(onClickListener);
+        }
+    }
+
+    /**
+     * 设置右边按钮显示状态
+     *
+     * @param activity
+     * @param visibility
+     */
+    public void setRightBtnVisibility(Activity activity, int visibility) {
+        activity.findViewById(R.id.btn_baseactivity_right).setVisibility(visibility);
+    }
+
+    /**
+     * 设置右边图片按钮显示状态
+     *
+     * @param activity
+     * @param visibility
+     */
+    public void setRightImgBtnVisibility(Activity activity, int visibility) {
+        activity.findViewById(R.id.ibtn_baseactivity_right).setVisibility(visibility);
+    }
+
+    /**
+     * 获取右边按钮实例
+     *
+     * @param activity
+     * @return
+     */
+    public Button getRightBtn(Activity activity) {
+        return activity.findViewById(R.id.btn_baseactivity_right);
+    }
+
+    /**
+     * 获取右边图片按钮实例
+     *
+     * @param activity
+     * @return
+     */
+    public ImageButton getRightImgBtn(Activity activity) {
+        return activity.findViewById(R.id.ibtn_baseactivity_right);
+    }
+
+
+    /**
+     * 隐藏标题栏所有组件，GONE或VISIBLE
+     */
+    public void setShowOrHide(Activity activity, boolean isShow) {
+        activity.findViewById(R.id.layout_navigationBar)
+                .setVisibility(isShow ? View.VISIBLE : View.GONE);
+    }
+}

app/src/main/res/drawable/ic_arrow_back_24dp.xml

@@ -0,0 +1,4 @@
+<!--<vector xmlns:android="http://schemas.android.com/apk/res/android"--><!--android:width="24dp"--><!--android:height="24dp"--><!--android:viewportHeight="24.0"--><!--android:viewportWidth="24.0">--><!--<path--><!--android:fillColor="@color/B"--><!--android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />--><!--</vector>-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@mipmap/narrow_black" />
+</selector>

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

@@ -29,7 +29,7 @@
             android:orientation="vertical">
 
             <TextView
-                android:id="@+id/tv_title"
+                android:id="@+id/txt_baseactivity_title"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
                 android:layout_marginLeft="5dp"

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

@@ -45,7 +45,7 @@
             android:textSize="14sp"/>
 
         <TextView
-            android:id="@+id/tv_title"
+            android:id="@+id/txt_baseactivity_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBottom="@id/img_icon"

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

@@ -1,26 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="35dp"
-                android:background="@color/theme_bule"
-                android:orientation="vertical">
+    android:id="@+id/layout_navigationBar"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/layout_heigh_default"
+    android:background="@color/colorPrimary">
 
     <ImageView
-        android:id="@+id/img_back"
-        android:layout_width="25dp"
-        android:padding="5dp"
-        android:layout_marginLeft="5dp"
-        android:layout_height="20dp"
+        android:id="@+id/img_baseactivity_title"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
         android:layout_centerVertical="true"
-        android:src="@drawable/back"/>
+        android:gravity="center_vertical"
+        android:minWidth="@dimen/layout_heigh_default"
+        android:scaleType="centerInside"
+        android:src="@drawable/ic_arrow_back_24dp" />
 
     <TextView
-        android:id="@+id/tv_title"
+        android:id="@+id/txt_baseactivity_title"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_centerInParent="true"
-        android:text="title"
-        android:textColor="@color/white"
-        android:textSize="18sp"/>
+        android:gravity="center"
+        android:text="@string/app_name"
+        android:textColor="@color/black_text_deep"
+        android:textSize="@dimen/text_size_4" />
+
 
+    <!--右边按钮-->
+    <Button
+        android:id="@+id/btn_baseactivity_right"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="5dp"
+        android:background="@color/translate"
+        android:gravity="center"
+        android:minWidth="@dimen/layout_heigh_default"
+        android:textColor="@color/black_text_deep"
+        android:textSize="@dimen/text_size_3" />
+
+
+    <!--右边图片按钮-->
+    <ImageButton
+        android:id="@+id/ibtn_baseactivity_right"
+        android:layout_width="@dimen/layout_heigh_default"
+        android:layout_height="match_parent"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:gravity="center"
+        android:minWidth="@dimen/layout_heigh_default"
+        android:visibility="gone" />
 </RelativeLayout>

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

@@ -25,6 +25,10 @@
     <dimen name="text_size_7">26sp</dimen>
     <dimen name="text_size_8">30sp</dimen>
 
+    <!--一般layout的高度-->
+    <dimen name="layout_heigh_default">48dp</dimen>
+    <dimen name="layout_heigh_small">32dp</dimen>
+
     <!--下载按钮的style-->
     <style name="style_btn" parent="android:Widget.Material.Light.Button.Borderless.Small">
         <item name="android:minHeight">12dp</item>