Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature

# Conflicts:
#	WeiChat/version.properties

WeiChat/src/main/AndroidManifest.xml

@@ -115,7 +115,7 @@
         android:label="@string/app_name"
         android:largeHeap="true"
         android:persistent="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/MainBaseTheme">
         <meta-data
             android:name="UMENG_CHANNEL"
             android:value="${UMENG_CHANNEL_VALUE}" />
@@ -292,8 +292,7 @@
             </intent-filter>
         </activity>
         <!-- 消息模块 -->
-        <activity android:name=".ui.message.ChatActivity"
-            android:theme="@style/AppTheme.NoActionBar">
+        <activity android:name=".ui.message.ChatActivity">
             <intent-filter>
                 <action android:name="com.modular.message.ChatActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -372,8 +371,7 @@
 
         <activity android:name=".video.VideoRecordActivity" />
         <activity
-            android:name="com.uas.appme.other.activity.CardcastActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+            android:name="com.uas.appme.other.activity.CardcastActivity"/>
         <activity
             android:name="com.uas.appme.other.activity.BasicInfoEditActivity"
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
@@ -441,8 +439,7 @@
             android:name="com.ipaulpro.afilechooser.FileChooserActivity"
             android:exported="true"
             android:icon="@drawable/ic_chooser"
-            android:label="@string/choose_file"
-            android:theme="@style/ChooserTheme">
+            android:label="@string/choose_file">
             <intent-filter>
                 <action android:name="android.intent.action.GET_CONTENT" />
 
@@ -555,8 +552,7 @@
         </receiver>
 
         <activity
-            android:name=".video.VideoActivity"
-            android:theme="@style/Theme.AppCompat.NoActionBar" />
+            android:name=".video.VideoActivity" />
         <activity
             android:name=".ui.erp.activity.CompanyActivity"
             android:hardwareAccelerated="true" />
@@ -578,7 +574,6 @@
             android:name=".ui.erp.activity.oa.OutofficeActivity"
             android:configChanges="orientation|keyboardHidden"
             android:label="@string/oaoutplan_title"
-            android:theme="@style/OAThemeOutOffice"
             android:windowSoftInputMode="adjustUnspecified|stateHidden">
             <intent-filter>
                 <action android:name="com.modualr.appworks.OutofficeActivity" />
@@ -588,8 +583,7 @@
 
         <activity
             android:name=".ui.erp.activity.oa.OARegisterActivity"
-            android:label="@string/meet_signin"
-            android:theme="@style/OAThemeMeet">
+            android:label="@string/meet_signin">
             <intent-filter>
                 <action android:name="com.modular.metting.appworks.OARegisterActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -599,7 +593,6 @@
         <activity
             android:name=".ui.erp.activity.crm.VisitReportAddActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:theme="@style/CrmThemeTask"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity
             android:name=".ui.erp.activity.crm.TaskAddActivity"
@@ -613,7 +606,6 @@
         <activity
             android:name=".ui.erp.activity.crm.VisitReportPlanActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:theme="@style/CrmThemeTask"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
 
         <!--
@@ -628,21 +620,18 @@
             android:label="@string/unoffice" />
         <activity
             android:name=".ui.erp.activity.oa.AlarmaActivity"
-            android:label="@string/signin_setting"
-            android:theme="@style/OAThemeSignin" />
+            android:label="@string/signin_setting" />
 
         <activity
             android:name=".ui.message.SubscripSetActivity"
             android:label="申请订阅" />
         <activity
             android:name=".ui.erp.activity.oa.OutofficeSetActivity"
-            android:label="@string/signin_setting"
-            android:theme="@style/OAThemeOutOffice" />
+            android:label="@string/signin_setting"/>
         <activity android:name=".ui.erp.activity.oa.TestActivity" />
         <activity
             android:name=".ui.erp.activity.oa.OutSigninOKActivity"
-            android:label="@string/signin_detail"
-            android:theme="@style/OAThemeOutOffice" />
+            android:label="@string/signin_detail" />
         <activity
             android:name=".ui.erp.activity.crm.ContactManAddActivity"
             android:configChanges="orientation|keyboardHidden"
@@ -650,8 +639,7 @@
 
         <activity
             android:name=".ui.erp.activity.oa.OutLogListActivity"
-            android:label="@string/my_mission"
-            android:theme="@style/OAThemeOutOffice" />
+            android:label="@string/my_mission" />
         <activity android:name=".ui.erp.activity.crm.SubsActivity" />
         <activity android:name="com.uas.appme.other.activity.UpdateSingleTextActivity" />
         <activity android:name="com.uas.appme.other.activity.UpdateSexActivity" />

WeiChat/src/main/java/com/ipaulpro/afilechooser/FileReceiverActivity.java

@@ -83,7 +83,7 @@ public class FileReceiverActivity extends ActionBackActivity {
 
     private void initView() {
         mLvReceiver = (ListView) findViewById(R.id.lv_file_receiver);
-        getSupportActionBar().setTitle("ReceiverFile");
+        setTitle("ReceiverFile");
     }
 
     private class FileReceiverAdapter extends BaseAdapter {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ApplySubscribeActivity.java

@@ -48,7 +48,7 @@ public class ApplySubscribeActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_apply_subscribe);
-        getSupportActionBar().setTitle("申请订阅");
+        setTitle("申请订阅");
         initView();
         initEvent();
         initData();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -213,6 +213,11 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
         }
     };
 
+    @Override
+    public boolean needCommonToolBar() {
+        return false;
+    }
+
     /**
      * 启动返回
      * by gongpm

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/UserCheckedActivity.java

@@ -8,19 +8,19 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.core.base.ActivityStack;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
+import com.core.base.ActivityStack;
+import com.core.base.BaseActivity;
+import com.core.utils.helper.LoginHelper;
 import com.core.utils.sp.UserSp;
 import com.modular.login.activity.LoginActivity;
-import com.core.app.ActionBackActivity;
-import com.core.utils.helper.LoginHelper;
+import com.xzjmyk.pm.activity.R;
 
 
 /**
  * 进入到此界面的Activity只可能是4中用户状态 STATUS_USER_TOKEN_OVERDUE //本地Token过期 STATUS_USER_NO_UPDATE //数据不完整
  */
-public class UserCheckedActivity extends ActionBackActivity {
+public class UserCheckedActivity extends BaseActivity {
 
 	private TextView mTitleTv;
 	private TextView mDesTv;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/DataDownloadActivity.java

@@ -151,7 +151,7 @@ public class DataDownloadActivity extends BaseActivity {
         UserSp.getInstance(DataDownloadActivity.this).setUpdate(false);// 进入下载资料界面，就将该值赋值false
         mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         //mHandler = new Handler();
-        getSupportActionBar().setTitle(R.string.data_update);
+        setTitle(R.string.data_update);
         initView();
         manager=DBManager.getInstance(); 
         startDownload();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/RegisterActivity.java

@@ -50,7 +50,7 @@ public class RegisterActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_register);
-        getSupportActionBar().setTitle(R.string.register_step_one);
+        setTitle(R.string.register_step_one);
         initView();
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/RegisterPasswordActivity.java

@@ -35,7 +35,7 @@ public class RegisterPasswordActivity extends ActionBackActivity {
 			mPhoneNum = getIntent().getStringExtra(RegisterActivity.EXTRA_PHONE_NUMBER);
 		}
 		setContentView(R.layout.activity_register_password);
-		getSupportActionBar().setTitle(R.string.register_step_two);
+		setTitle(R.string.register_step_two);
 		initView();
 	}
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/RegisterUserBasicInfoActivity.java

@@ -82,7 +82,7 @@ public class RegisterUserBasicInfoActivity extends BaseActivity implements View.
 			mPassword = getIntent().getStringExtra(RegisterActivity.EXTRA_PASSWORD);
 		}
 		setContentView(R.layout.activity_register_user_basic_info);
-		getSupportActionBar().setTitle(R.string.register_step_three);
+		setTitle(R.string.register_step_three);
 		mProgressDialog = ProgressDialogUtil.init(mContext, null, getString(R.string.please_wait));
 		initView();
 	}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/base/BaseActivity.java

@@ -1,199 +0,0 @@
-package com.xzjmyk.pm.activity.ui.base;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-
-import com.android.volley.Request;
-import com.android.volley.RetryPolicy;
-import com.common.preferences.PreferenceUtils;
-import com.core.app.MyApplication;
-import com.core.net.http.ViewUtil;
-import com.core.net.volley.FastVolley;
-import com.umeng.analytics.MobclickAgent;
-import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
-import com.xzjmyk.pm.activity.util.im.Constants;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
-
-import java.lang.reflect.Field;
-import java.util.Locale;
-
-/**
- * 带网络请求的Activity继承
- *
- * @author Dean Tao
- */ 
-public abstract class BaseActivity extends ActionBackActivity {
-
-    private FastVolley mFastVolley;
-    private String HASHCODE;
-    public CustomProgressDialog progressDialog;
-    public Context ct;
-    public Activity activity;
-
-    public void preOnCreacte() {
-    }
-
-    public BaseActivity() {
-        super();
-        HASHCODE = Integer.toHexString(this.hashCode()) + "@";// 加上@符号，将拼在一起的两个HashCode分开
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        MobclickAgent.onResume(this);
-        // getRootView().setFitsSystemWindows(true);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        MobclickAgent.onPause(this);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        initStyle();
-        super.onCreate(savedInstanceState);
-        if (android.os.Build.VERSION.SDK_INT > 108) {
-            Window window = getWindow();
-            window.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,
-                    WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-            window.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION,
-                    WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-            //设置根布局的内边距
-//            RelativeLayout relativeLayout = (RelativeLayout)
-//                    findViewById(R.id.layout);
-//            relativeLayout.setPadding(0, getActionBarHeight() + getStatusBarHeight(), 0,
-//                    0);
-        }
-        preOnCreacte();
-        ct = this;
-        activity = this;
-        setNotTouchEvent(true);
-        mFastVolley = MyApplication.getInstance().getFastVolley();
-        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//竖屏
-        progressDialog = CustomProgressDialog.createDialog(this);
-        //重启之后恢复到之前的语言
-        switchLanguage(PreferenceUtils.getString(this, "language", "rCN"));
-        // SystemUtil.setSystemBarTint(this);
-    }
-
-    private void initStyle() {
-        if (getIntent() == null || getIntent().getIntExtra("style", -1) == -1) return;
-        try {
-            int theme = getSharedPreferences("cons", MODE_PRIVATE).
-                    getInt("theme", getIntent().getIntExtra("style", -1));
-            setTheme(theme);
-        } catch (Exception e) {
-        }
-    }
-
-    public View getRootView() {
-        return ((ViewGroup) findViewById(android.R.id.content)).getChildAt(0);
-    }
-
-    public int getStatusBarHeight() {
-        Class c = null;
-        Object obj = null;
-        Field field = null;
-        int x = 0, statusBarHeight = 0;
-        try {
-            c = Class.forName("com.android.internal.R$dimen");
-            obj = c.newInstance();
-            field = c.getField("status_bar_height");
-            x = Integer.parseInt(field.get(obj).toString());
-            statusBarHeight = getResources().getDimensionPixelSize(x);
-        } catch (Exception e1) {
-            e1.printStackTrace();
-        }
-        return statusBarHeight;
-    }
-
-    public int getActionBarHeight() {
-        TypedValue tv = new TypedValue();
-        int actionBarHeight = 0;
-        if (getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true))// 如果资源是存在的、有效的
-        {
-            actionBarHeight = TypedValue.complexToDimensionPixelSize(tv.data, getResources().getDisplayMetrics());
-        }
-        return actionBarHeight;
-    }
-
-    public void setTouch(boolean b) {
-        setNotTouchEvent(b);
-    }
-
-    @Override
-    protected void onDestroy() {
-        mFastVolley.cancelAll(HASHCODE);
-        Crouton.cancelAllCroutons();
-        super.onDestroy();
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        PreferenceUtils.putBoolean(this, Constants.IS_NOTIFICATION, false);//不进行通知
-    }
-
-    public void addDefaultRequest(Request<?> request) {
-        mFastVolley.addDefaultRequest(HASHCODE, request);
-    }
-
-    public void addShortRequest(Request<?> request) {
-        mFastVolley.addShortRequest(HASHCODE, request);
-    }
-
-    public void addRequest(Request<?> request, RetryPolicy retryPolicy) {
-        mFastVolley.addRequest(HASHCODE, request, retryPolicy);
-    }
-
-    public void cancelAll(Object tag) {
-        mFastVolley.cancelAll(HASHCODE, tag);
-    }
-
-    public void cancelAll() {
-        mFastVolley.cancelAll(HASHCODE);
-    }
-
-    public boolean isNetworkActive() {
-        return MyApplication.getInstance().isNetworkActive();
-    }
-
-    public void ToastMessage(String message) {
-        ViewUtil.ToastMessage(this, message);
-    }
-
-    protected void switchLanguage(String language) {
-        Resources resources = getResources();
-        Configuration config = resources.getConfiguration();
-        DisplayMetrics dm = resources.getDisplayMetrics();
-        if (language.equals("en")) {
-            config.locale = Locale.ENGLISH;
-        } else if (language.equals("rCN")) {
-            config.locale = Locale.SIMPLIFIED_CHINESE;
-        } else if (language.equals("rTW")) {
-            config.locale = Locale.TRADITIONAL_CHINESE;
-        } else if (language.equals("sys")) {
-            config.locale = Locale.getDefault();
-        }
-        resources.updateConfiguration(config, dm);
-        PreferenceUtils.putString("language", language);
-    }
-}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BusinessCircleActivity.java

@@ -325,16 +325,16 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
 
     private void initTopTitleBar() {
         if (isMyBusiness()) {
-            getSupportActionBar().setTitle(getString(R.string.user_firend_cirle));
+            setTitle(getString(R.string.user_firend_cirle));
         } else {
             if (isMySpace()) {
-                getSupportActionBar().setTitle(R.string.umeng_socialize_text_ucenter);
+                setTitle(R.string.umeng_socialize_text_ucenter);
             } else {
                 qzonename = FriendDao.getInstance().getRemarkName(mLoginUserId, mUserId);
                 if (TextUtils.isEmpty(qzonename)) {
                     qzonename = mNickName;
                 }
-                getSupportActionBar().setTitle(qzonename);
+                setTitle(qzonename);
             }
         }
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BusinessCircleFragment.java

@@ -319,11 +319,11 @@ public class BusinessCircleFragment extends EasyFragment implements showCEView {
 
 	/*
 	 * private void initTopTitleBar() { if (isMyBusiness()) {
-	 * getSupportActionBar().setTitle(R.string.my_business_circle); } else { if
-	 * (isMySpace()) { getSupportActionBar().setTitle(R.string.my_space); } else
+	 * setTitle(R.string.my_business_circle); } else { if
+	 * (isMySpace()) { setTitle(R.string.my_space); } else
 	 * { String name = FriendDao.getInstance().getRemarkName(mLoginUserId,
 	 * mUserId); if (TextUtils.isEmpty(name)) { name = mNickName; }
-	 * getSupportActionBar().setTitle(name); } } }
+	 * setTitle(name); } } }
 	 */
 	private void initCoverView() {
 		Log.d("wang", "初始化View");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/PMsgDetailActivity.java

@@ -21,6 +21,8 @@ import android.widget.TextView;
 import com.android.volley.Response;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
 import com.core.model.Friend;
 import com.core.model.User;
 import com.core.net.volley.ArrayResult;
@@ -34,11 +36,9 @@ import com.core.utils.helper.AvatarHelper;
 import com.core.xmpp.dao.FriendDao;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.view.DMsgVideoHeaderView;
 import com.xzjmyk.pm.activity.ui.circle.view.PMsgAudioHeaderView;
 import com.xzjmyk.pm.activity.ui.circle.view.PMsgDetailHeaderView;
@@ -108,7 +108,7 @@ public class PMsgDetailActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        getSupportActionBar().setTitle(R.string.qzone_message_detail);
+        setTitle(R.string.qzone_message_detail);
         mPublicMessage = (PublicMessage) getIntent().getSerializableExtra("public_message");
         if (mPublicMessage == null) {// 容错处理
             return;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/PersonalQzoneActivity.java

@@ -319,16 +319,16 @@ public class PersonalQzoneActivity extends BaseActivity implements showCEView {
 
     private void initTopTitleBar() {
         if (isMyBusiness()) {
-            getSupportActionBar().setTitle("个人中心");
+            setTitle("个人中心");
         } else {
             if (isMySpace()) {
-                getSupportActionBar().setTitle(R.string.my_space);
+                setTitle(R.string.my_space);
             } else {
                 String name = FriendDao.getInstance().getRemarkName(mLoginUserId, mUserId);
                 if (TextUtils.isEmpty(name)) {
                     name = mNickName;
                 }
-                getSupportActionBar().setTitle(name);
+                setTitle(name);
             }
         }
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendAudioActivity.java

@@ -68,7 +68,7 @@ public class SendAudioActivity extends BaseActivity {
 	}
 
 	private void initView() {
-		getSupportActionBar().setTitle(R.string.send_audio);
+		setTitle(R.string.send_audio);
 		// find view
 		mTextEdit = (EditText) findViewById(R.id.text_edit);
 		mImageView = (ImageView) findViewById(R.id.image_view);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendShuoshuoActivity.java

@@ -108,9 +108,9 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
 		String address = MyApplication.getInstance().getBdLocationHelper().getAddress();
 
 		if (mType == 0) {
-			getSupportActionBar().setTitle(R.string.qzone_send_word);
+			setTitle(R.string.qzone_send_word);
 		} else {
-			getSupportActionBar().setTitle(R.string.qzone_send_picture);
+			setTitle(R.string.qzone_send_picture);
 		}
 
 //        if (!TextUtils.isEmpty(MyApplication.getInstance().getBdLocationHelper().getCityName())

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendVideoActivity.java

@@ -81,7 +81,7 @@ public class SendVideoActivity extends BaseActivity {
 	}
 
 	private void initView() {
-		getSupportActionBar().setTitle(R.string.qzone_send_video);
+		setTitle(R.string.qzone_send_video);
 		// find view
 		mTextEdit = (EditText) findViewById(R.id.text_edit);
 		mImageView = (ImageView) findViewById(R.id.image_view);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/view/CardInfoActivity.java

@@ -376,10 +376,10 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
             return;
         }
         if (isMyInfo) {
-            getSupportActionBar().setTitle(R.string.my_data);
+            setTitle(R.string.my_data);
             showMenu = false;
         } else {
-            getSupportActionBar().setTitle(R.string.basic_info);
+            setTitle(R.string.basic_info);
             // 在这里查询出本地好友的状态
             initFriendMoreAction();
         }
@@ -472,7 +472,7 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
     }
 
     private void initView() {
-        getSupportActionBar().setTitle(R.string.basic_info);
+        setTitle(R.string.basic_info);
 
         phone_tv.setOnClickListener(new View.OnClickListener() {
             @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/AddTaskActivity.java

@@ -238,7 +238,7 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
         ViewUtils.inject(this);
         ct = this;
         TAG = "AddTaskActivity";
-        getSupportActionBar().setTitle("添加任务");
+       setTitle("添加任务");
         String people = getIntent().getStringExtra("people") == null ? "未填写" : getIntent().getStringExtra("people");
         bt_task_add.setOnClickListener(this);
         task_startime_rl.setOnTouchListener(new OnTouchListener() {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/ApproveDisplayActivity.java

@@ -40,7 +40,7 @@ public class ApproveDisplayActivity extends BaseActivity implements OnClickListe
 	public void initView() {
 		  setContentView(R.layout.act_log_approve_view);
 	      ViewUtils.inject(this);
-		  getSupportActionBar().setTitle("审批日志");
+		  setTitle("审批日志");
 		mEmptyLayout=new EmptyLayout(this,lv_logs_approve);
 	}
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/ErpMenActivity.java

@@ -64,7 +64,7 @@ public class ErpMenActivity extends BaseActivity {
 //    }
 
     private void initData() {
-        getSupportActionBar().setTitle("考勤单据");
+        setTitle("考勤单据");
         menus = new ArrayList<String>();
        // menus.add("销售订单");
        // menus.add("报价单");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/ExtraLeaveActivity.java

@@ -351,7 +351,7 @@ public class ExtraLeaveActivity extends BaseActivity implements OnClickListener
 		ViewUtils.inject(this);
 		ct=this;
 		progressDialog = CustomProgressDialog.createDialog(this);
-		getSupportActionBar().setTitle("特殊考勤");
+		setTitle("特殊考勤");
 		et_extra_date.setKeyListener(null);
 		et_extra_time.setKeyListener(null);
 		et_extra_resaon.setKeyListener(null);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/InformActivity.java

@@ -89,7 +89,7 @@ public class InformActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.informed_listview);
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle("我的知会");
+        setTitle("我的知会");
         String  mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         // 表示已读
         FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_ZHIHUI);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/LeaveActivity.java

@@ -605,7 +605,7 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
         et_leave_man.setText(CommonUtil.getSharedPreferences(this, "erp_emname"));
 
 
-        getSupportActionBar().setTitle("请假单");
+        setTitle("请假单");
         et_leave_man.setOnClickListener(this);
         startDate.setOnClickListener(this);
         endDate.setOnClickListener(this);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/LogsDisplayActivty.java

@@ -1,25 +1,25 @@
 package com.xzjmyk.pm.activity.ui.erp.activity;
 
-import java.text.SimpleDateFormat;
-import java.util.List;
-
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.core.base.BaseActivity;
+import com.core.widget.EmptyLayout;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.ui.erp.model.LogsEntity;
-import com.core.widget.EmptyLayout;
 import com.xzjmyk.pm.activity.R;
-import com.core.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.model.LogsEntity;
+
+import java.text.SimpleDateFormat;
+import java.util.List;
 
 /**
  * @author :LiuJie 2015年6月17日 下午5:23:22
@@ -54,7 +54,7 @@ public class LogsDisplayActivty extends BaseActivity implements OnClickListener
         setContentView(R.layout.act_log_list_view);
         ViewUtils.inject(this);
         ct = this;
-        getSupportActionBar().setTitle("操作日志");
+        setTitle("操作日志");
         mEmptyLayout = new EmptyLayout(this, lv_logs);
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/NewsDetailActivity.java

@@ -58,7 +58,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener
         ViewUtils.inject(this);
 		ct=this;
         TAG="NewsDetailActivity";
-		getSupportActionBar().setTitle("新闻详情");
+		setTitle("新闻详情");
         tv_next.setText("下一条");
         tv_pre.setText("上一条");
         
@@ -133,10 +133,10 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener
 			    String content=	JSON.parseObject(result).getString("content");
 				tv_content.setText(Html.fromHtml(content));
 				if (type==1) {
-					getSupportActionBar().setTitle("通知");
+					setTitle("通知");
 				}
 				if (type==2) {
-					getSupportActionBar().setTitle("公告");
+					setTitle("公告");
 				}
 				tv_next.setVisibility(View.GONE);
 				tv_pre.setVisibility(View.GONE);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/NewsTwoActivity.java

@@ -87,7 +87,7 @@ public class NewsTwoActivity extends BaseActivity {
         mEmptyLayout.setShowEmptyButton(false);
         mEmptyLayout.setShowErrorButton(false);
         mEmptyLayout.setShowLoadingButton(false);
-        getSupportActionBar().setTitle("新闻");
+        setTitle("新闻");
         mlist.setMode(PullToRefreshBase.Mode.BOTH);
         mlist.getRefreshableView().setOnItemClickListener(new OnItemClickListener() {
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/NoticeMenuActivity.java

@@ -36,7 +36,7 @@ public class NoticeMenuActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_notice_menu);
-        getSupportActionBar().setTitle("通知公告");
+      setTitle("通知公告");
         init();
         initView();
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/NoticesActivity.java

@@ -71,7 +71,7 @@ public class NoticesActivity extends BaseActivity {
     public void initView() {
         TAG = "NoticesActivity";
         ct = this;
-        getSupportActionBar().setTitle("通知");
+        setTitle("通知");
 
         mNoticeData = new ArrayList<>();
         adapter = new CardItemAdapter(this,mNoticeData);
@@ -157,13 +157,13 @@ public class NoticesActivity extends BaseActivity {
         param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         if (getIntent().getIntExtra("type", 0) == 1) {
             url = CommonUtil.getAppBaseUrl(ct) + "common/desktop/note/inform.action";
-            getSupportActionBar().setTitle("通知");
+            setTitle("通知");
             String mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
             // 表示已读
             FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_NOTICE);
         } else {
             url = CommonUtil.getAppBaseUrl(ct) + "common/desktop/note/notice.action";
-            getSupportActionBar().setTitle("公告");
+            setTitle("公告");
             String mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
             // 表示已读
             FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_GONGGAO);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/QueryActivity.java

@@ -51,7 +51,7 @@ public class QueryActivity extends BaseActivity {
         super.onCreate(arg0);
         setContentView(R.layout.fragment_tab_simple);
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle("查询");
+        setTitle("查询");
         activity = this;
         initView();
     }
@@ -83,7 +83,7 @@ public class QueryActivity extends BaseActivity {
                 QueryGridFragment queryGridFragment = new QueryGridFragment();
                 fragmentTransaction = fragmentManager.beginTransaction();
                 fragmentTransaction.replace(R.id.fm_content, queryGridFragment);
-                getSupportActionBar().setTitle("查询");
+                setTitle("查询");
                 fragmentTransaction.commit();
             }
 
@@ -96,7 +96,7 @@ public class QueryActivity extends BaseActivity {
                 ChartListFragment queryGridFragment = new ChartListFragment();
                 fragmentTransaction = fragmentManager.beginTransaction();
                 fragmentTransaction.replace(R.id.fm_content, queryGridFragment);
-                getSupportActionBar().setTitle("统计");
+                setTitle("统计");
                 fragmentTransaction.commit();
             }
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/SaleChartActivity.java

@@ -204,7 +204,7 @@ public class SaleChartActivity extends BaseActivity implements OnClickListener{
 		ct=this;
 		TAG="SaleChartActivity";
 		progressDialog = CustomProgressDialog.createDialog(this);
-	    getSupportActionBar().setTitle("统计分析");
+	    setTitle("统计分析");
 
         calendar = Calendar.getInstance(); // 设置当前日期
 
@@ -378,7 +378,7 @@ public class SaleChartActivity extends BaseActivity implements OnClickListener{
 		String xKey=(String) rMap.get("keyField");
 		String yKey=(String) rMap.get("valueField");
 		String title=(String)rMap.get("title");
-		getSupportActionBar().setTitle(title);
+		setTitle(title);
 		dlist=(List<HashMap<String, Object>>) rMap.get("data");
 		
 		
@@ -494,7 +494,7 @@ public class SaleChartActivity extends BaseActivity implements OnClickListener{
 		String xKey=(String) rMap.get("keyField");
 		String yKey=(String) rMap.get("valueField");
 		String title=(String)rMap.get("title");
-		getSupportActionBar().setTitle(title);
+		setTitle(title);
 		
 		ArrayList<String> list = new ArrayList<String>();/**@注释：初始化表格  */
         list.add("");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/SaleDetailActivity.java

@@ -173,7 +173,7 @@ public class SaleDetailActivity extends BaseActivity implements OnClickListener
 	}
 
 	public void initData() {
-		getSupportActionBar().setTitle("订单明细");
+		setTitle("订单明细");
 		ly_panel_data.removeAllViews();
 		Intent intent = getIntent();
 		caller = intent.getStringExtra("caller");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/SaleSelectActivity.java

@@ -193,7 +193,7 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
         String master = CommonUtil.getSharedPreferences(
                 SaleSelectActivity.this, "master");
         key = user + master + caller;
-        getSupportActionBar().setTitle(intent.getStringExtra("title"));
+       setTitle(intent.getStringExtra("title"));
         calendar = Calendar.getInstance();
         sBroadcast = new StateBroadcast();
         IntentFilter intentFilter = new IntentFilter();
@@ -360,24 +360,24 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
             @Override
             public void onClick(View v) {
                 Intent it_detail = null;
-                if ("请假单查询".equals(getSupportActionBar().getTitle())) {
+                if ("请假单查询".equals(getToolBarTitle().toString())) {
                     it_detail = new Intent(SaleSelectActivity.this,
                             LeaveActivity.class);
                 }
-                if ("出差单查询".equals(getSupportActionBar().getTitle())) {
+                if ("出差单查询".equals(getToolBarTitle().toString())) {
                     it_detail = new Intent(SaleSelectActivity.this,
                             TravelActivity.class);
 
                 }
-                if ("加班申请查询".equals(getSupportActionBar().getTitle())) {
+                if ("加班申请查询".equals(getToolBarTitle().toString())) {
                     it_detail = new Intent(SaleSelectActivity.this,
                             WorkExtraActivity.class);
                 }
-                if ("特殊考勤查询".equals(getSupportActionBar().getTitle())) {
+                if ("特殊考勤查询".equals(getToolBarTitle().toString())) {
                     it_detail = new Intent(SaleSelectActivity.this,
                             ExtraLeaveActivity.class);
                 }
-                if ("请假单2查询".equals(getSupportActionBar().getTitle())) {
+                if ("请假单2查询".equals(getToolBarTitle().toString())) {
                     it_detail = new Intent(SaleSelectActivity.this,
                             LeaveActivity.class);
                 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/ScheduleActivity.java

@@ -87,7 +87,7 @@ public class ScheduleActivity extends BaseActivity {
         setContentView(R.layout.schedule_listview);
         ViewUtils.inject(this);
         listview_main = (PullToRefreshListView) findViewById(R.id.listview_schedult);
-        getSupportActionBar().setTitle("待审批流");
+      setTitle("待审批流");
         String mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         // 表示已读
         FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_PROCESS);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/TravelActivity.java

@@ -449,7 +449,7 @@ public class TravelActivity extends BaseActivity implements OnClickListener, Rec
         ViewUtils.inject(this);
         ct = this;
         progressDialog = CustomProgressDialog.createDialog(this);
-//        getSupportActionBar().setTitle("出差申请");
+//        setTitle("出差申请");
 
         et_trave_type.setKeyListener(null);
         et_extra_sign.setKeyListener(null);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/WebViewCommActivity.java

@@ -141,7 +141,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         isCookie = intent.getBooleanExtra("cookie", false);
         String msg_title = intent.getStringExtra("title");
         if (!StringUtil.isEmpty(msg_title)) {
-            getSupportActionBar().setTitle(msg_title);
+            setTitle(msg_title);
         }
         String StartApp = intent.getStringExtra("isStartApp");//参数账套
 //        if (intent.getBooleanExtra("orientation",false)){
@@ -187,7 +187,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         } catch (Exception e) {
         }
         if (p != null) {
-            getSupportActionBar().setTitle(p);
+            setTitle(p);
         }
         if (StringUtil.isEmpty(url)) {//为空时默认为b2b平台的
             url = "http://www.baidu.com";
@@ -297,7 +297,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         if (mPosition < 0 || mPosition > mSubscriptionMessages.size()) return;
         if (mSubscriptionMessages != null) {
             mReadSubs.add(mPosition);
-            getSupportActionBar().setTitle(mSubscriptionMessages.get(mPosition).getTitle());
+            setTitle(mSubscriptionMessages.get(mPosition).getTitle());
             if (mPosition == 0) {
                 mPreTv.setVisibility(View.GONE);
                 mNextTv.setVisibility(View.VISIBLE);
@@ -552,7 +552,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
 
                                 new ShareAction(activity)
                                         .setPlatform(share_media)
-                                        .withTitle(getSupportActionBar().getTitle().toString())
+                                        .withTitle(getToolBarTitle().toString())
                                         .withText("UU互联 Android客户端" + SystemUtil.getVersionName(mContext))
                                         .withMedia(new UMImage(activity, "http://img.my.csdn.net/uploads/201609/30/1475204542_1365.png"))
                                         .withTargetUrl(url)

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/WebViewLoadActivity.java

@@ -116,13 +116,13 @@ public class WebViewLoadActivity extends BaseActivity {
         title = "";// 动态改变文字显示
         title = intent.getStringExtra("p");
         if (title != null) {
-            getSupportActionBar().setTitle(title);
+          setTitle(title);
         }
         if ("UAS".equals(title)) {
-            getSupportActionBar().setTitle("UAS管理系统");
+            setTitle("UAS管理系统");
         }
         if ("Record".equals(title)) {
-            getSupportActionBar().setTitle("业务拜访记录");
+            setTitle("业务拜访记录");
         }
         webView.getRefreshableView().getSettings().setJavaScriptEnabled(true);
         webView.getRefreshableView().getSettings().setSupportZoom(true);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/ClientActivity.java

@@ -215,7 +215,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
     }
 
     private void initView() {
-        getSupportActionBar().setTitle(R.string.sales_statistics);
+        setTitle(R.string.sales_statistics);
         initBarChart();
         initSaleBarChart();
         initListener();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/ContactManAddActivity.java

@@ -74,7 +74,7 @@ public class ContactManAddActivity extends BaseActivity implements View.OnClickL
 
     private void initView() {
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle("新增联系人");
+       setTitle("新增联系人");
         tv_birthday_login.setOnKeyListener(null);
         tv_birthday_login.setFocusable(false);
         

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/SubsActivity.java

@@ -46,7 +46,7 @@ public class SubsActivity extends BaseActivity {
             title = "我的下属";
             top.setVisibility(View.VISIBLE);
         }
-        getSupportActionBar().setTitle(title);
+       setTitle(title);
         String chche = getIntent().getStringExtra("data");
         if (!StringUtil.isEmpty(chche) && JSONUtil.validate(chche)) {
             JSONArray array = JSON.parseArray(chche);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/TaskAddActivity.java

@@ -100,15 +100,15 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         String bc_custname = getIntent().getStringExtra("bc_custname");
         isBusiness = getIntent().getBooleanExtra("business", false);
         if (type == 0) {
-            getSupportActionBar().setTitle("创建任务");
+            setTitle("创建任务");
             tv_type.setText("任务");
         } else if (type == 1) {
-            getSupportActionBar().setTitle("创建日程");
+           setTitle("创建日程");
             tv_type.setText("日程");
             tv_name.setText(bc_custname);
             tv_executive.setText(bc_doman);
         } else if (type == 2) {
-            getSupportActionBar().setTitle("创建会议任务");
+          setTitle("创建会议任务");
             tv_type.setText("会议任务");
             tv_name.setText(getIntent().getStringExtra("meetname"));
             tv_name.setFocusable(false);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportAddActivity.java

@@ -40,6 +40,7 @@ import com.core.api.wxapi.ApiUtils;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.base.view.AndroidBug5497Workaround;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonInterface;
@@ -60,7 +61,6 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectAimActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectRemarkActivity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -127,6 +127,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_visit_report_add);
+        AndroidBug5497Workaround.assistActivity(this);
         ViewUtils.inject(this);
         initData();
         initView();
@@ -175,7 +176,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     }
 
     private void initView() {
-        getSupportActionBar().setTitle(getString(R.string.visitrecord));
+        setTitle(getString(R.string.visitrecord));
         findViewById(R.id.voice_search_iv).setOnClickListener(this);
         if (isB2b) {
             findViewById(R.id.stage_rl).setVisibility(View.GONE);
@@ -464,22 +465,22 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
 
     private boolean canSubmit() {
         if (!CommonUtil.isNetWorkConnected(ct)) {
-            Crouton.makeText(ct, R.string.networks_out);
+            showToast( R.string.networks_out);
             return false;
         }
         String start = tv_date_start.getText().toString().trim();
         String end = tv_date_end.getText().toString().trim();
         String time = TimeUtils.f_long_2_str(System.currentTimeMillis());
         if (!StringUtil.isEmpty(start) && time.compareTo(start) < 0) {
-            Crouton.makeText(ct, getString(R.string.startT_cannott_big_sT));
+            showToast(  getString(R.string.startT_cannott_big_sT));
             return false;
         }
         if (!StringUtil.isEmpty(end) && time.compareTo(end) < 0) {
-            Crouton.makeText(ct, getString(R.string.endT_cannott_big_sT));
+            showToast(  getString(R.string.endT_cannott_big_sT));
             return false;
         }
         if (!StringUtil.isEmpty(end) && !StringUtil.isEmpty(start) && start.compareTo(end) >= 0) {
-            Crouton.makeText(ct, R.string.not_time_start_biger_end);
+            showToast(  R.string.not_time_start_biger_end);
             return false;
         }
         if (!isB2b && (TextUtils.isEmpty(phone_tv.getText())
@@ -488,7 +489,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             return false;
         }
         if (TextUtils.isEmpty(tv_visit_content.getText())) {
-            Crouton.makeText(ct, getString(R.string.input_vist_context));
+            showToast(  getString(R.string.input_vist_context));
             return false;
         }
         if (!validatorInput()) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportPlanActivity.java

@@ -104,7 +104,7 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
 
     private void initView() {
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle("拜访计划");
+      setTitle("拜访计划");
         tv_date_select.setText(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
 
         tv_date_select.setKeyListener(null);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AddVisitReportActivity.java

@@ -73,7 +73,7 @@ public class AddVisitReportActivity extends OABaseActivity implements IAddVisitR
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_add_visiting_report);
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle(R.string.visitrecord);
+       setTitle(R.string.visitrecord);
         initData();
         initEvent();
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AskForLeaveActivity.java

@@ -15,15 +15,14 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.andreabaccega.widget.FormEditText;
-import com.xzjmyk.pm.activity.R;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.SaleSelectActivity;
 import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
 import com.core.utils.FlexJsonUtil;
-import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.core.widget.SingleDialog;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.erp.activity.SaleSelectActivity;
+import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -48,7 +47,7 @@ public class AskForLeaveActivity extends BaseActivity implements View.OnTouchLis
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_ask_for_leave);
-        getSupportActionBar().setTitle("请假申请");
+        setTitle("请假申请");
 
         initViews();
         initEvents();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/FlihtsTimeActivity.java

@@ -47,7 +47,7 @@ public class FlihtsTimeActivity extends OABaseActivity implements View.OnClickLi
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_flihts_time);
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle(R.string.work_time_setting);
+        setTitle(R.string.work_time_setting);
         initView();
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/LocationMapActivity.java

@@ -65,7 +65,7 @@ public class LocationMapActivity extends BaseActivity implements OnGetPoiSearchR
 
         String qzone_select_add = getIntent().getStringExtra("qzone_select_add");
         if (!TextUtils.isEmpty(qzone_select_add) && qzone_select_add.equals("qzone_select_add")) {
-            getSupportActionBar().setTitle(R.string.select_locaton);
+            setTitle(R.string.select_locaton);
         }
         init();
         initView();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OvertimeApplyActivity.java

@@ -29,7 +29,7 @@ public class OvertimeApplyActivity extends BaseActivity implements View.OnTouchL
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_overtime_apply);
-        getSupportActionBar().setTitle("加班申请");
+        setTitle("加班申请");
 
         initViews();
         initEvents();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectAimActivity.java

@@ -63,7 +63,7 @@ public class SelectAimActivity extends OABaseActivity implements ISelectAim {
             type = intent.getIntExtra("type", 0);
             String title = intent.getStringExtra("title");
             if (!StringUtil.isEmpty(title))
-                getSupportActionBar().setTitle(title);
+              setTitle(title);
         }
         presenter = new SelectAimPresenter(this);
         presenter.start(type);
@@ -114,7 +114,7 @@ public class SelectAimActivity extends OABaseActivity implements ISelectAim {
     }
 
     private void initView() {
-        getSupportActionBar().setTitle(R.string.activity_select_aims);
+      setTitle(R.string.activity_select_aims);
         BaiduMapUtil.getInstence().setMapViewPoint(mapView, MyApplication.getInstance().getBdLocationHelper().getLocation());
         listview.setLayoutManager(new LinearLayoutManager(this));
         RecycleViewDivider viewDivider = new RecycleViewDivider(this, LinearLayout.HORIZONTAL, 1, getResources().getColor(R.color.gray_light));

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectCollisionActivity.java

@@ -15,6 +15,8 @@ import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.base.OABaseActivity;
 import com.core.model.OAConfig;
+import com.core.model.SelectCollisionTurnBean;
+import com.core.model.SelectEmUser;
 import com.core.utils.sortlist.BaseSortModel;
 import com.core.utils.sortlist.SideBar;
 import com.core.widget.EmptyLayout;
@@ -22,8 +24,6 @@ import com.core.widget.VoiceSearchView;
 import com.core.widget.listener.EditChangeListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.core.model.SelectCollisionTurnBean;
-import com.core.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.SelectCollisionAdapter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.SelectCollisionPresenter;
@@ -54,6 +54,7 @@ public class SelectCollisionActivity extends OABaseActivity implements ISelectAc
     private boolean isClickCb = true;
     private EmptyLayout emptyLayout;
     private SelectCollisionTurnBean selectBean;
+    private RelativeLayout rl_empty;
 
 
     @Override
@@ -66,11 +67,8 @@ public class SelectCollisionActivity extends OABaseActivity implements ISelectAc
     }
 
     private void initView() {
-        emptyLayout = new EmptyLayout(ct, listView);
-        emptyLayout.setShowLoadingButton(false);
-        emptyLayout.setShowEmptyButton(false);
-        emptyLayout.setShowErrorButton(false);
-        emptyLayout.setEmptyViewRes(R.layout.view_empty);
+        rl_empty = findViewById(R.id.rl_empty);
+        rl_empty.setVisibility(View.GONE);
         sidebar.setTextView(text_dialog);
         presenter = new SelectCollisionPresenter(this);
         if (getIntent() != null) {
@@ -79,7 +77,7 @@ public class SelectCollisionActivity extends OABaseActivity implements ISelectAc
                 LogUtil.i("selectBean == null");
                 new NullPointerException("selectBean cannot be Null");
             } else if (!StringUtil.isEmpty(selectBean.getTitle()))
-                getSupportActionBar().setTitle(selectBean.getTitle());
+                setTitle(selectBean.getTitle());
             select_rl.setVisibility(selectBean.isSingleAble() ? View.GONE : View.VISIBLE);
         } else {
             LogUtil.i("selectBean == null");
@@ -165,10 +163,11 @@ public class SelectCollisionActivity extends OABaseActivity implements ISelectAc
     public void showModel(List<BaseSortModel<SelectEmUser>> models) {
         adapter = new SelectCollisionAdapter(models);
         if (ListUtils.isEmpty(models)) {
-            emptyLayout.showEmpty();
+            rl_empty.setVisibility(View.VISIBLE);
             sidebar.setVisibility(View.GONE);
             select_rl.setVisibility(View.GONE);
         } else {
+            rl_empty.setVisibility(View.GONE);
             if (selectBean.getTitle().equals(getString(R.string.select_share_friend))){
                 sidebar.setVisibility(View.GONE);
                 adapter.setBaseSortEnable(false);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectRemarkActivity.java

@@ -150,13 +150,13 @@ public class SelectRemarkActivity extends BaseActivity implements OnHttpResultLi
         isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
         isRemark = getIntent() == null || !getIntent().getBooleanExtra("isContact", false);
         String title = getIntent() == null ? "" : getIntent().getStringExtra("title");
-        if (!StringUtil.isEmpty(title)) getSupportActionBar().setTitle(title);
+       setTitle(title);
         beanList = new ArrayList<>();
         if (isRemark) {
             loadLocalData();
             loadBusinessRemark();
         } else {
-            getSupportActionBar().setTitle(R.string.common_Contact_person);
+          setTitle(R.string.common_Contact_person);
             contact = getIntent().getStringExtra("contact");
             loadContact(getIntent().getStringExtra("cuname"));
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SpecialAttendanceActivity.java

@@ -24,7 +24,7 @@ public class SpecialAttendanceActivity extends BaseActivity implements View.OnTo
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_special_attendance);
-        getSupportActionBar().setTitle("特殊考勤");
+       setTitle("特殊考勤");
 
         initViews();
         initEvents();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/TravelRequestActivity.java

@@ -61,7 +61,7 @@ public class TravelRequestActivity extends BaseActivity implements View.OnTouchL
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_travel_request);
-        getSupportActionBar().setTitle("出差申请");
+       setTitle("出差申请");
 
         initViews();
         initEvents();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WaittingWorksActivity.java

@@ -60,7 +60,7 @@ public class WaittingWorksActivity extends BaseActivity implements View.OnClickL
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.waitting_works);
-        getSupportActionBar().setTitle(msg_title);
+        setTitle(msg_title);
         ViewUtils.inject(this);
         initView();
         initMsgsData();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingAddActivity.java

@@ -87,7 +87,7 @@ public class BookingAddActivity extends SupportToolBarActivity implements  View.
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_book_add);
-        getSupportActionBar().setTitle(getString(R.string.booking_add));
+       setTitle(getString(R.string.booking_add));
         tvBookObject =findViewById(R.id.tv_book_object);
         companyAddRl =findViewById(R.id.company_add_rl);
         tvBookTimes =findViewById(R.id.tv_book_times);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingDetailActivity.java

@@ -120,7 +120,7 @@ public class BookingDetailActivity extends OABaseActivity implements HttpImp,Vie
         }
     };
     private void initView() {
-        getSupportActionBar().setTitle(getString(R.string.booking_title));
+        setTitle(getString(R.string.booking_title));
         
         rvTop = (RelativeLayout) findViewById(R.id.rv_top);
         llLeft = (LinearLayout) findViewById(R.id.ll_left);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingListActivity.java

@@ -103,7 +103,7 @@ public class BookingListActivity extends SupportToolBarActivity implements  View
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_booking_list);
-        getSupportActionBar().setTitle(getString(R.string.booking_menu));
+        setTitle(getString(R.string.booking_menu));
         ViewUtils.inject(this);
         initView();
         initEvent();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/SelectPContactsActivity.java

@@ -175,7 +175,7 @@ public class SelectPContactsActivity extends OABaseActivity implements ISelectAc
                 LogUtil.i("selectBean == null");
                 new NullPointerException("selectBean cannot be Null");
             } else if (!StringUtil.isEmpty(selectBean.getTitle()))
-                getSupportActionBar().setTitle(selectBean.getTitle());
+               setTitle(selectBean.getTitle());
             select_rl.setVisibility(selectBean.isSingleAble() ? View.GONE : View.VISIBLE);
         } else {
             LogUtil.i("selectBean == null");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/ChartListFragment.java

@@ -151,7 +151,7 @@ public class ChartListFragment extends Fragment implements OnClickListener {
 				m_list.setAdapter(adapter);
 				if (adapter.getGroupCount() == 0) {
 					mEmptyLayout.setShowEmptyButton(false);
-					mEmptyLayout.setEmptyMessage("暂时没有数据！");
+					mEmptyLayout.setEmptyMessage("暂无数据！");
 					mEmptyLayout.showEmpty();
 				} else {
 					// iv_refesh.setVisibility(View.GONE);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/UUFriendFragment.java

@@ -90,9 +90,9 @@ public class UUFriendFragment extends EasyFragment {
     protected void onCreateView(Bundle savedInstanceState, boolean createView) {
 
         if (isPeculiar)
-            ((BaseActivity) getActivity()).getSupportActionBar().setTitle("常用联系人");
+            ((BaseActivity) getActivity()).setTitle("常用联系人");
         else
-            ((BaseActivity) getActivity()).getSupportActionBar().setTitle("UU好友");
+            ((BaseActivity) getActivity()).setTitle("UU好友");
         mSortFriends = new ArrayList<>();
         allFriends = new ArrayList<>();
         mBaseComparator = new BaseComparator<>();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/SelectContactsActivity.java

@@ -141,7 +141,7 @@ public class SelectContactsActivity extends BaseActivity {
     }
 
     private void initView() {
-        getSupportActionBar().setTitle(R.string.select_contacts);
+        setTitle(R.string.select_contacts);
         mListView = (RecyclerView) findViewById(R.id.list_view);
         mHorizontalListView = (HorizontalListView) findViewById(R.id.horizontal_list_view);
         mOkBtn = (Button) findViewById(R.id.ok_btn);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/LocalVideoActivity.java

@@ -70,7 +70,7 @@ public class LocalVideoActivity extends BaseActivity {
 	}
 
 	private void initView() {
-		getSupportActionBar().setTitle(R.string.local_video);
+		setTitle(R.string.local_video);
 		mPullToRefreshListView = (PullToRefreshSlideListView) findViewById(R.id.pull_refresh_list);
 
 		View emptyView = LayoutInflater.from(mContext).inflate(R.layout.layout_list_empty_view, null);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -14,6 +14,7 @@ import android.os.Handler;
 import android.os.Message;
 import android.support.annotation.NonNull;
 import android.support.v4.content.LocalBroadcastManager;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -24,6 +25,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.AdapterView;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
@@ -48,12 +50,14 @@ import com.core.api.wxapi.ApiUtils;
 import com.core.app.AppConstant;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.fragment.SupportToolBarFragment;
+import com.core.base.EasyFragment;
 import com.core.broadcast.MsgBroadcast;
 import com.core.net.http.ViewUtil;
 import com.core.net.utils.NetUtils;
 import com.core.utils.DialogUtils;
 import com.core.utils.FlexJsonUtil;
+import com.core.utils.StatusBarUtil;
+import com.core.utils.ToastUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
@@ -82,14 +86,16 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import de.hdodenhof.circleimageview.CircleImageView;
+
 import static com.xzjmyk.pm.activity.util.oa.CommonUtil.getSharedPreferencesBoolean;
 
 
-public class MeFragment extends SupportToolBarFragment implements View.OnClickListener, OnPlayListener {
+public class MeFragment extends EasyFragment implements View.OnClickListener, OnPlayListener {
     private final String TAG = "MeFragment";
 
     private final int REQUEST_CODE = 11;
-    private ImageView mAvatarImg;
+    private CircleImageView mAvatarImg;
     private TextView mNickNameTv;
     private TextView mPhoneNumTv;
     private RelativeLayout my_qr_code_rl;
@@ -132,7 +138,7 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
                                 Master.class);
                         getChMaster(mList);
                     } else {
-                        showToact( "获取账套信息失败!");
+                        showToact("获取账套信息失败!");
                     }
                     break;
                 case 2://切换账套
@@ -140,16 +146,16 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
                     Map<Object, Object> resultsMap = FlexJsonUtil.fromJson(result);
                     List<Master> mList = FlexJsonUtil.fromJsonArray(FlexJsonUtil.toJson(resultsMap.get("masters")), Master.class);
                     CommonUtil.setSharedPreferences(ct, "erp_masterlist", JSON.toJSONString(resultsMap.get("masters")));
-                    List<ItemsSelectType1> selectType1s=new ArrayList<>();
+                    List<ItemsSelectType1> selectType1s = new ArrayList<>();
                     if (!ListUtils.isEmpty(mList)) {
                         for (int i = 0; i < mList.size(); i++) {
-                            ItemsSelectType1 itemsSelectType1=new ItemsSelectType1();
+                            ItemsSelectType1 itemsSelectType1 = new ItemsSelectType1();
                             itemsSelectType1.setName(mList.get(i).getMa_function());
                             itemsSelectType1.setEn_name(mList.get(i).getMa_user());
                             selectType1s.add(itemsSelectType1);
                         }
                     }
-                    showPopDialog(ct,selectType1s);
+                    showPopDialog(getActivity(), selectType1s);
 //                    if (CommonUtil.isDialogShowing(mDialog)) {
 //                        return;
 //                    }
@@ -183,7 +189,7 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
                         intent.putExtra("falg", "home");
                         LocalBroadcastManager.getInstance(ct).sendBroadcast(intent);
                     } else {
-                        showToact(  R.string.user_master_fai);
+                        showToact(R.string.user_master_fai);
                     }
                     break;
             }
@@ -198,10 +204,12 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
         }
     };
     private Boolean platform;
+    private FrameLayout vg;
 
     public MeFragment() {
     }
 
+
     @Override
     public void onResume() {
         if (!mReceiverTag) {     //在注册广播接受者的时候 判断是否已被注册,避免重复多次注册广播
@@ -271,11 +279,17 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
     }
 
     private void initView() {
-        android.support.v7.widget.Toolbar toolbar = getCommonToolBar();
-        if (toolbar != null) {
-            toolbar.setBackgroundResource(R.drawable.common_toolbar_me_bg);
+        android.support.v7.widget.Toolbar meToolbar = findViewById(R.id.meToolbar);
+        TextView meTitleTv = findViewById(R.id.meTitleTv);
+        vg = findViewById(R.id.vg);
+
+        if (meToolbar != null) {
+            StatusBarUtil.immersive(getActivity(), 0x00000000, 0.0f);
+            ((AppCompatActivity) ct).setSupportActionBar(meToolbar);
+            ((AppCompatActivity) ct).getSupportActionBar().setDisplayShowTitleEnabled(false);
+            StatusBarUtil.setPaddingSmart(ct, meToolbar);
         }
-        setTitle(R.string.me);
+        meTitleTv.setText(R.string.me);
         //编辑
         findViewById(R.id.editInfoIv).setOnClickListener(this);
         findViewById(R.id.my_data_rl).setOnClickListener(this);
@@ -319,7 +333,7 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
         CommonUtil.clearSharedPreferences(ct, "seting");
         CommonUtil.clearSharedPreferences(ct, "seting_1");
         doHITask(); // TODO 测试按钮
-        UserRoleUtils.checkUserRole(this, getContentView());
+        UserRoleUtils.checkUserRole(this, getmRootView());
         iv_remain.post(new Runnable() {
             @Override
             public void run() {
@@ -454,7 +468,7 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
 
     private void turn2CaptureActivity() {
         Intent intent = new Intent(getActivity(), CaptureActivity.class);
-        ct.startActivityForResult(intent, REQUEST_CODE);
+        getActivity().startActivityForResult(intent, REQUEST_CODE);
     }
 
     @Override
@@ -462,7 +476,7 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
         int id = v.getId();
         switch (id) {
             case R.id.rl_company_change://公司切换
-                if (!NetUtils.isNetWorkConnected(ct)){
+                if (!NetUtils.isNetWorkConnected(ct)) {
                     showToact(R.string.networks_out);
                     return;
                 }
@@ -540,8 +554,8 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
                 Master master = mList.get(i);
                 if (master.getMa_user().equals(en_master)) {
                     master_tv.setText(master.getMa_function());
-                    if (adapter!=null) {
-                        selectId=i;
+                    if (adapter != null) {
+                        selectId = i;
                     }
                     CommonUtil.setSharedPreferences(ct, "Master_ch", master.getMa_function());
                 }
@@ -573,10 +587,10 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
             List<ItemsSelectType1>   selectType1s=new ArrayList<>();
             if (!ListUtils.isEmpty(mList)) {
                 for (int i = 0; i < mList.size(); i++) {
-                    String masterCN=CommonUtil.getSharedPreferences(MyApplication.getInstance(),"Master_ch");
-                    if (!StringUtil.isEmpty(masterCN)){
-                        if (masterCN.equals(mList.get(i).getMa_function())){
-                            selectId=i;
+                    String masterCN = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "Master_ch");
+                    if (!StringUtil.isEmpty(masterCN)) {
+                        if (masterCN.equals(mList.get(i).getMa_function())) {
+                            selectId = i;
                         }
                     }
                     ItemsSelectType1 itemsSelectType1=new ItemsSelectType1();
@@ -585,7 +599,7 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
                     selectType1s.add(itemsSelectType1);
                 }
             }
-            showPopDialog(ct,selectType1s);
+            showPopDialog(getActivity(), selectType1s);
 //            if (CommonUtil.isDialogShowing(mDialog)) {
 //                return;
 //            }
@@ -675,29 +689,39 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
 
     @Override
     public void onSuccess(String resultStatus, String resultInfo) {
-        showToact(  "支付成功");
+        showToact("支付成功");
     }
 
     @Override
     public void onFailure(String resultStatus, String resultInfo) {
-        showToact(  "支付失败");
+        showToact("支付失败");
     }
 
+    public void showToact(int resId) {
+        ToastUtil.showToast(ct, resId, vg);
+    }
+
+    public void showToact(CharSequence message) {
+        ToastUtil.showToast(ct, message, vg);
+    }
+
+
 
     public PopupWindow popupWindow = null;
-    public int selectId=0;
+    public int selectId = 0;
     public ItemPopListAdapter adapter;
-    public void  showPopDialog(final Activity ct, List<ItemsSelectType1> itemsSelectType1s){
+
+    public void showPopDialog(final Activity ct, List<ItemsSelectType1> itemsSelectType1s) {
         View view = null;
-        popupWindow=null;
-        WindowManager windowManager = (WindowManager)ct. getSystemService(Context.WINDOW_SERVICE);
+        popupWindow = null;
+        WindowManager windowManager = (WindowManager) ct.getSystemService(Context.WINDOW_SERVICE);
         if (popupWindow == null) {
             LayoutInflater layoutInflater = (LayoutInflater) ct.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             view = layoutInflater.inflate(com.core.app.R.layout.pop_dialog_list, null);
             ListView plist = view.findViewById(com.core.app.R.id.mList);
-            TextView tv_title=view.findViewById(R.id.tv_title);
+            TextView tv_title = view.findViewById(R.id.tv_title);
             tv_title.setText("账套选择");
-            List<ItemsSelectType1> datas =itemsSelectType1s;
+            List<ItemsSelectType1> datas = itemsSelectType1s;
             adapter = new ItemPopListAdapter(ct, datas);
             adapter.setSelectId(selectId);
             plist.setAdapter(adapter);
@@ -711,14 +735,15 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
                     selectId = position;
                     adapter.setSelectId(selectId);
                     adapter.notifyDataSetChanged();
-                    ItemPopListAdapter.ViewHolder viewHolder= (ItemPopListAdapter.ViewHolder) view.getTag();
-                    ItemsSelectType1 model=viewHolder.model;
-                    Master master=new Master();
+                    ItemPopListAdapter.ViewHolder viewHolder = (ItemPopListAdapter.ViewHolder) view.getTag();
+                    ItemsSelectType1 model = viewHolder.model;
+                    Master master = new Master();
                     master.setMa_user(model.getEn_name());
                     master.setMa_function(model.getName());
                     Login(master);
-                }});
-            popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth()- DensityUtil.dp2px(50), LinearLayout.LayoutParams.WRAP_CONTENT);
+                }
+            });
+            popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth() - DensityUtil.dp2px(50), LinearLayout.LayoutParams.WRAP_CONTENT);
         }
         popupWindow.setFocusable(true);
         popupWindow.setOutsideTouchable(true);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/SpeechrecognitionActivity.java

@@ -29,7 +29,7 @@ public class SpeechrecognitionActivity extends BaseActivity implements Recognize
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.speech_recognition);
-        getSupportActionBar().setTitle("语音识别");
+        setTitle("语音识别");
 
         identify_words_et = (EditText) findViewById(R.id.sr_identify_words_et);
         speak_start_bt = (Button) findViewById(R.id.sr_speak_start_bt);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/AddContactsActivity.java

@@ -185,7 +185,7 @@ public class AddContactsActivity extends BaseActivity {
     }
 
     private void initView() {
-        getSupportActionBar().setTitle(R.string.select_contact);
+        setTitle(R.string.select_contact);
         mListView = (ListView) findViewById(R.id.list_view);
         mHorizontalListView = (HorizontalListView) findViewById(R.id.horizontal_list_view);
         mOkBtn = (Button) findViewById(R.id.ok_btn);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/ChatActivity.java

@@ -249,10 +249,10 @@ public class ChatActivity extends SupportToolBarActivity
     private void initView() {
         String remarkName = mFriend.getRemarkName();
         if (remarkName == null) {
-           // getSupportActionBar().setTitle(mFriend.getNickName());
+           // setTitle(mFriend.getNickName());
             setTitle(mFriend.getNickName());
         } else {
-            //getSupportActionBar().setTitle(mFriend.getRemarkName());
+            //setTitle(mFriend.getRemarkName());
             setTitle(mFriend.getRemarkName());
         }
         findViewById(R.id.root_view);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/InstantMessageActivity.java

@@ -65,7 +65,7 @@ public class InstantMessageActivity extends BaseActivity implements OnClickListe
     }
 
     private void initView() {
-        getSupportActionBar().setTitle("选择");
+        setTitle("选择");
         mCreateChat = (TextView) findViewById(R.id.tv_create_newmessage);
         mLvRecentlyMessage = (ListView) findViewById(R.id.lv_recently_message);
         mCreateChat.setOnClickListener(this);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -194,7 +194,7 @@ public class MessageFragment extends SupportToolBarFragment implements IMessageV
         mSignRefreshLayout = findViewById(R.id.mSignRefreshLayout);
         mRecyclerView = findViewById(R.id.mRecyclerView);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(ct));
-        mRecyclerView.addItemDecoration(new LinearItemDecoration());
+        mRecyclerView.addItemDecoration(new LinearItemDecoration(ct));
         presenter = new MessagePresenter(mContext, this, unReaderListener);
         signView = mSignRefreshLayout.getSignView();
         if (signView != null) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SelectCardActivity.java

@@ -82,7 +82,7 @@ public class SelectCardActivity extends BaseActivity {
     }
 
     private void initView() {
-        getSupportActionBar().setTitle(R.string.select_contacts);
+        setTitle(R.string.select_contacts);
         mListView = (ListView) findViewById(R.id.list_view);
 //        mHorizontalListView = (HorizontalListView) findViewById(R.id.horizontal_list_view);
         mOkBtn = (Button) findViewById(R.id.ok_btn);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SelectNewContactsActivity.java

@@ -72,7 +72,7 @@ public class SelectNewContactsActivity extends BaseActivity implements OnClickLi
     }
 
     private void initView() {
-        getSupportActionBar().setTitle(R.string.select_contact);
+        setTitle(R.string.select_contact);
         mPullToRefreshListView = (PullToRefreshListView) findViewById(R.id.pull_refresh_list);
         View headView = View.inflate(this, R.layout.item_headview_creategroup_chat, null);
         mPullToRefreshListView.getRefreshableView().addHeaderView(headView);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/uas/B2bMsgActivity.java

@@ -76,7 +76,7 @@ public class B2bMsgActivity extends BaseActivity {
 
     private void initView() {
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle("商务消息");
+        setTitle("商务消息");
         registerReceiver(mUpdateReceiver, new IntentFilter(MsgBroadcast.ACTION_MSG_UI_UPDATE));
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/activity/ChangeDealManActivity.java

@@ -168,7 +168,7 @@ public class ChangeDealManActivity extends BaseActivity implements RecognizerDia
 
         LogUtil.d("detail_id,single_man_emcode,single_man_name", detail_id + "," + single_man_emcode + "," + single_man_name);
         if (!StringUtil.isEmpty(single_man_name))
-            getSupportActionBar().setTitle("变更给" + single_man_name);
+            setTitle("变更给" + single_man_name);
         else {
             Toast.makeText(getApplicationContext(), "变更人数据未获取成功", Toast.LENGTH_LONG).show();
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/FormDetailActivity.java

@@ -214,7 +214,7 @@ public class FormDetailActivity extends BaseActivity {
 
 
     private void initEAndAView() {
-        getSupportActionBar().setTitle(doc_type + "详情");
+        setTitle(doc_type + "详情");
         resanddel_ll.setVisibility(View.GONE);
         mForm.setVisibility(View.GONE);
         mDetail.setVisibility(View.GONE);
@@ -587,7 +587,7 @@ public class FormDetailActivity extends BaseActivity {
             common_docui_sv.setVisibility(View.VISIBLE);
             dataJson = intent.getStringExtra("data");
             detailJson = intent.getStringExtra("detail");
-            getSupportActionBar().setTitle(intent.getStringExtra("title"));
+            setTitle(intent.getStringExtra("title"));
             doc_type = intent.getStringExtra("title");
             mkeyValue = intent.getIntExtra("mkeyValue", -1);
             formwhere = intent.getStringExtra("ADDUI");
@@ -663,7 +663,7 @@ public class FormDetailActivity extends BaseActivity {
         if (intent != null) {
             dataJson = intent.getStringExtra("data");
             detailJson = intent.getStringExtra("detail");
-            getSupportActionBar().setTitle(intent.getStringExtra("title"));
+            setTitle(intent.getStringExtra("title"));
             mkeyValue = intent.getIntExtra("mkeyValue", -1);
             if (MyApplication.getInstance().isNetworkActive()) {
                 if (mkeyValue != -1 || mkeyValue != 0) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/LeavePageActivity.java

@@ -128,7 +128,7 @@ public class LeavePageActivity extends BaseActivity {
         Intent intent = getIntent();
         formwhere = intent.getStringExtra("ADDUI");
         setContentView(R.layout.act_sale_select_list);
-//        getSupportActionBar().setTitle("请假单");
+//        setTitle("请假单");
         ViewUtils.inject(this);
         mEmptyLayout = new EmptyLayout(this, mlistview.getRefreshableView());
         mEmptyLayout.setShowEmptyButton(false);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddB2BActivity.java

@@ -268,7 +268,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
         chaosonren_rl.setVisibility(View.GONE);  // 抄送人接口暂无参数时
         ct = this;
         TAG = "AddTaskActivity";
-        getSupportActionBar().setTitle(getString(R.string.task_add));
+        setTitle(getString(R.string.task_add));
         String people = getIntent().getStringExtra("people") == null ? "" : getIntent().getStringExtra("people");
         bt_task_add.setOnClickListener(this);
         if (!StringUtil.isEmpty(people)) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskB2BActivity.java

@@ -306,7 +306,7 @@ public class TaskB2BActivity extends SupportToolBarActivity implements View.OnCl
         super.onCreate(savedInstanceState);
         context = TaskB2BActivity.this;
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle("待办工作");
+        setTitle("待办工作");
         String mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
 
         FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_TASK);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskDetailB2BActivity.java

@@ -183,7 +183,7 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
         setContentView(R.layout.act_task_detail);
         ViewUtils.inject(this);
         ct = this;
-        getSupportActionBar().setTitle(getString(R.string.taskdetail_title));
+        setTitle(getString(R.string.taskdetail_title));
         TAG = "DetailTask";
         bt_task_bohui.setOnClickListener(this);
         bt_task_huifu.setOnClickListener(this);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/tool/SelectConstantActivity.java

@@ -52,7 +52,7 @@ public class SelectConstantActivity extends ActionBackActivity {
 	}
 
 	private void initView() {
-		getSupportActionBar().setTitle(getFullTitle());
+		setTitle(getFullTitle());
 		mListView = (ListView) findViewById(R.id.list_view);
 
 		if (mSubConstants == null) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/tool/SelectConstantSectionActivity.java

@@ -48,7 +48,7 @@ public class SelectConstantSectionActivity extends ActionBackActivity {
 	}
 
 	private void initView() {
-		getSupportActionBar().setTitle(getFullTitle());
+		setTitle(getFullTitle());
 		mListView = (PinnedSectionListView) findViewById(R.id.list_view);
 
 		List<Item> items = generateDataset(mId);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/tool/WebViewActivity.java

@@ -33,7 +33,7 @@ public class WebViewActivity extends ActionBackActivity {
 		}
 		setContentView(R.layout.activity_web_view);
 		if (!TextUtils.isEmpty(mTitle)) {
-			getSupportActionBar().setTitle(mTitle);
+			setTitle(mTitle);
 		}
 		initView();
 	}

WeiChat/src/main/java/com/xzjmyk/pm/activity/wxapi/WXPayEntryActivity.java

@@ -67,7 +67,7 @@ public class WXPayEntryActivity extends AppCompatActivity implements View.OnClic
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_pay_test);
-        getSupportActionBar().setTitle("支付测试");
+        setTitle("支付测试");
         findViewById(R.id.btn_wxPay).setOnClickListener(this);
         findViewById(R.id.btn_wxRefund).setOnClickListener(this);
         lvWxPay = findViewById(R.id.lv_wxPay);

WeiChat/src/main/res/layout/activity_add_flihts.xml

@@ -25,6 +25,14 @@
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="*"
+            android:layout_toRightOf="@id/rule_name_tag"
+            android:layout_marginTop="@dimen/padding"
+            android:textColor="@color/red"/>
+
         <EditText
             android:id="@+id/rule_name_et"
             android:layout_width="wrap_content"
@@ -54,7 +62,13 @@
             android:text="@string/work_time"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
-
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="*"
+            android:layout_toRightOf="@id/time_tag"
+            android:layout_marginTop="@dimen/padding"
+            android:textColor="@color/red"/>
         <TextView
             android:id="@+id/time_tv"
             android:layout_width="wrap_content"
@@ -87,7 +101,13 @@
             android:text="@string/work_day"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
-
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="*"
+            android:layout_toRightOf="@id/date_tag"
+            android:layout_marginTop="@dimen/padding"
+            android:textColor="@color/red"/>
         <LinearLayout
             android:id="@+id/calender_select_ll"
             android:layout_width="wrap_content"