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

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/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/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

@@ -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/SaleSelectActivity.java

@@ -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/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

@@ -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/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();
@@ -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/oa/OAActivity.java

@@ -2,7 +2,6 @@ package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
@@ -192,6 +191,8 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
     private TextView oamain_more_menu_hd_tv;
     private TextView mWorkReport;
     boolean isPlatform = ApiUtils.getApiModel() instanceof ApiPlatform;
+    private View otherEmptyView;
+    private View meEmptyEView;
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
@@ -435,7 +436,10 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
         emptyLayout.setShowLoadingButton(false);
         emptyLayout.setShowEmptyButton(false);
         emptyLayout.setShowErrorButton(false);
-        emptyLayout.setEmptyViewRes(R.layout.oa_empty_list);
+        ViewGroup view= (ViewGroup) LayoutInflater.from(ct).inflate(R.layout.oa_empty_list,null);
+        otherEmptyView = view.findViewById(R.id.otherView);
+        meEmptyEView = view.findViewById(R.id.meView);
+        emptyLayout.setEmptyView(view);
         adapter = new OAAdapter(ct, util, new ArrayList<OAModel>());
         oa_listview.setAdapter(adapter);
         curDate = new Date(System.currentTimeMillis());
@@ -741,11 +745,21 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
         setAdapterBeans(isMe ? meModels : otherModels);
     }
 
+    private void showEmpty(){
+        if (isMe){
+            meEmptyEView.setVisibility(View.VISIBLE);
+            otherEmptyView.setVisibility(View.GONE);
+        }else{
+            meEmptyEView.setVisibility(View.GONE);
+            otherEmptyView.setVisibility(View.VISIBLE);
+        }
+        emptyLayout.showEmpty();
+    }
     private void setAdapterBeans(List<OAModel> showModel) {
         if (ListUtils.isEmpty(showModel)) {
             adapter.setModels(showModel);
             adapter.notifyDataSetChanged();
-            emptyLayout.showEmpty();
+            showEmpty();
             CommonUtil.textSpanForStyle(all_task_num, getString(R.string.work_calender) + "   " + 0, 0 + "", getResources().getColor(R.color.approval_select_tab));
             CommonUtil.textSpanForStyle(ok_task_num, getString(R.string.done) + "   " + 0, 0 + "", getResources().getColor(R.color.approval_select_tab));
             CommonUtil.textSpanForStyle(uok_task_num, getString(R.string.undone) + "   " + 0, 0 + "", getResources().getColor(R.color.approval_select_tab));
@@ -761,8 +775,9 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
                     ok++;
             }
         }
-        if (ListUtils.isEmpty(filterModels))
-            emptyLayout.showEmpty();
+        if (ListUtils.isEmpty(filterModels)){
+            showEmpty();
+        }
         CommonUtil.textSpanForStyle(all_task_num, getString(R.string.work_calender) + "   " + size, size + "", getResources().getColor(R.color.approval_select_tab));
         CommonUtil.textSpanForStyle(ok_task_num, getString(R.string.done) + "   " + ok, ok + "", getResources().getColor(R.color.approval_select_tab));
         CommonUtil.textSpanForStyle(uok_task_num, getString(R.string.undone) + "   " + (size - ok), (size - ok) + "", getResources().getColor(R.color.approval_select_tab));
@@ -785,7 +800,7 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
         if (popupWindow == null) {
             LayoutInflater layoutInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             view = layoutInflater.inflate(R.layout.pop_crm_list, null);
-            ListView plist = (ListView) view.findViewById(R.id.mList);
+            ListView plist =  view.findViewById(R.id.mList);
             SimpleAdapter adapter = new SimpleAdapter(ct, getPopData(),
                     R.layout.item_pop_list, new String[]{"item_name"}, new int[]{R.id.tv_item_name});
             plist.setAdapter(adapter);
@@ -825,8 +840,11 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
                         startActivityForResult(intent, 0x20);
                 }
             });
-            popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth() / 3, windowManager.getDefaultDisplay().getHeight() / 3);
-        }
+            popupWindow =new PopupWindow(view);
+//                    new PopupWindow(view, windowManager.getDefaultDisplay().getWidth() / 3, windowManager.getDefaultDisplay().getHeight() / 3);
+            popupWindow.setWidth(DisplayUtil.dip2px(ct,140));
+            popupWindow.setHeight(DisplayUtil.dip2px(ct,150));
+            }
         // 使其聚集
         popupWindow.setFocusable(true);
         // 设置允许在外点击消失
@@ -837,12 +855,12 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
                 DisplayUtil.backgroundAlpha(OAActivity.this, 1f);
             }
         });
-        DisplayUtil.backgroundAlpha(this, 1f);
+        DisplayUtil.backgroundAlpha(this, 0.5f);
         // 这个是为了点击“返回Back”也能使其消失，并且并不会影响你的背景
-        popupWindow.setBackgroundDrawable(new BitmapDrawable());
-        popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+        popupWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.top_bubble));
+//        popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
         // 显示的位置为:屏幕的宽度的一半-PopupWindow的高度的一半
-        popupWindow.showAsDropDown(parent, windowManager.getDefaultDisplay().getWidth(), 0);
+        popupWindow.showAsDropDown(parent, windowManager.getDefaultDisplay().getWidth()-DisplayUtil.dip2px(ct,10), 0);
     }
 
     private List<Map<String, Object>> getPopData() {

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

@@ -58,7 +58,6 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
 import java.io.File;
 import java.io.IOException;
@@ -111,7 +110,7 @@ public class OutSigninOKActivity extends BaseActivity {
 	public boolean onOptionsItemSelected(MenuItem item) {
 		if (item.getItemId() == R.id.push) {
 			if (StringUtil.isEmpty(text_edit.getText().toString())) {
-				Crouton.makeText(ct, "请填写备注");
+				showToast( "请填写备注");
 				return true;
 			}
 			if (!StringUtil.isEmpty(path) && new File(path).isFile())
@@ -218,7 +217,7 @@ public class OutSigninOKActivity extends BaseActivity {
 			public void onClick(View v) {
 				boolean is = CommonUtil.getSharedPreferencesBoolean(ct, "isImage", false);
 				if (!is) {
-					Crouton.makeText(ct, "您当前未被允许使用相册，请使用拍照");
+					showToast(  "您当前未被允许使用相册，请使用拍照");
 					return;
 				}
 				requestPermission(Manifest.permission.READ_EXTERNAL_STORAGE, new Runnable() {
@@ -470,7 +469,7 @@ public class OutSigninOKActivity extends BaseActivity {
 					});
 					break;
 				case Constants.APP_SOCKETIMEOUTEXCEPTION:
-					Crouton.makeText(ct, message);
+					showToast(  message);
 					break;
 			}
 		}
@@ -502,11 +501,11 @@ public class OutSigninOKActivity extends BaseActivity {
 	private void doSigninn() {
 		Context ct = MyApplication.getInstance();
 		if (!CommonUtil.isNetWorkConnected(ct)) {
-			Crouton.makeText(ct, "当前网络不可用，请检查网络连接");
+			showToast(  "当前网络不可用，请检查网络连接");
 			return;
 		}
 		if (isSubmit) {
-			Crouton.makeText(ct, "当前正在提交");
+			showToast(  "当前正在提交");
 			return;
 		}
 		isSubmit = true;

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) {
@@ -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/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/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/TaskActivity.java

@@ -264,7 +264,6 @@ public class TaskActivity extends SupportToolBarActivity implements OnClickListe
         mEmptyLayout.setShowEmptyButton(false);
         mEmptyLayout.setShowErrorButton(false);
         mEmptyLayout.setShowLoadingButton(false);
-        mEmptyLayout.showEmpty();
         //加载网络数据
         new Thread(new getallprocess_run()).start();
 //        sendResquestForServer("START", 2);

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/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"

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

@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:editTextFormExample="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/line"
-    android:fillViewport="true">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:id="@+id/ry_leave_man"
-            style="@style/add_meeting"
-            android:background="@color/item_color2">
-
-            <TextView
-                android:id="@+id/name_tag"
-                style="@style/form_relative_left_text"
-                android:text="@string/meeting_name"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <ImageView
-                android:id="@+id/voice_name_iv"
-                android:layout_width="10dp"
-                android:layout_height="16dp"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="35dp"
-                android:layout_toRightOf="@+id/name_tag"
-                android:background="@drawable/btn_yuyin_nor"
-                android:visibility="visible" />
-
-            <EditText
-                android:id="@+id/name_et"
-                style="@style/add_meet_tv"
-                android:layout_marginLeft="20dp"
-                android:layout_toRightOf="@+id/name_tag"
-                android:hint="@string/common_input"
-                android:inputType="text" />
-        </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px" />
-
-        <RelativeLayout
-            android:id="@+id/start_rl"
-            style="@style/add_meeting"
-            android:background="@color/item_color2">
-
-
-            <TextView
-                android:id="@+id/start_tag"
-                style="@style/form_relative_left_text"
-                android:text="@string/task_starttime"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <TextView
-                style="@style/form_relative_left_text"
-                android:layout_marginLeft="5dp"
-                android:layout_toRightOf="@+id/start_tag"
-                android:text="*"
-                android:textColor="@color/red" />
-
-            <TextView
-                android:id="@+id/start_tv"
-                style="@style/add_meet_tv"
-                android:layout_marginLeft="20dp"
-                android:layout_toRightOf="@id/start_tag"
-                android:drawableRight="@drawable/oa_next"
-                android:hint="@string/common_select" />
-        </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px" />
-
-        <RelativeLayout
-            android:id="@+id/end_rl"
-            style="@style/add_meeting"
-            android:background="@color/item_color2">
-
-            <TextView
-                android:id="@+id/end_tag"
-                style="@style/form_relative_left_text"
-                android:text="@string/task_endtime"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <TextView
-                style="@style/form_relative_left_text"
-                android:layout_marginLeft="5dp"
-                android:layout_toRightOf="@+id/end_tag"
-                android:text="*"
-                android:textColor="@color/red" />
-
-            <TextView
-                android:id="@+id/end_tv"
-                style="@style/add_meet_tv"
-                android:layout_marginLeft="20dp"
-                android:layout_toRightOf="@id/end_tag"
-                android:drawableRight="@drawable/oa_next"
-                android:hint="@string/common_select" />
-        </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px" />
-
-        <RelativeLayout
-            android:id="@+id/location_rl"
-            style="@style/add_meeting"
-            android:background="@color/item_color2">
-
-            <TextView
-                android:id="@+id/location_tag"
-                style="@style/form_relative_left_text"
-                android:text="@string/meet_position"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <TextView
-                style="@style/form_relative_left_text"
-                android:layout_marginLeft="5dp"
-                android:layout_toRightOf="@+id/location_tag"
-                android:text="*"
-                android:textColor="@color/red" />
-
-            <TextView
-                android:id="@+id/location_et"
-                style="@style/add_meet_tv"
-                android:layout_marginLeft="20dp"
-                android:layout_toRightOf="@id/location_tag"
-                android:drawableRight="@drawable/oa_next"
-                android:hint="@string/common_select"
-                android:lines="1" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/ry_leave_type"
-            style="@style/add_meeting"
-            android:visibility="gone">
-
-            <TextView
-                android:id="@+id/tv_leave_type"
-                style="@style/form_relative_left_text"
-                android:text="请假类型：" />
-
-            <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/et_leave_type"
-                style="@style/form_relative_right_text"
-                android:focusableInTouchMode="false"
-                editTextFormExample:testType="nocheck" />
-        </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="10dp" />
-
-        <RelativeLayout
-            android:id="@+id/users_rl"
-            style="@style/add_meeting"
-            android:background="@color/item_color2">
-
-            <TextView
-                android:id="@+id/users_tag"
-                style="@style/form_relative_left_text"
-                android:text="@string/join_numer"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <TextView
-                style="@style/form_relative_left_text"
-                android:layout_marginLeft="5dp"
-                android:layout_toRightOf="@+id/users_tag"
-                android:text="*"
-                android:textColor="@color/red" />
-
-            <TextView
-                android:id="@+id/users_tv"
-                style="@style/add_meet_tv"
-                android:layout_marginLeft="20dp"
-                android:layout_toRightOf="@+id/users_tag"
-                android:drawableRight="@drawable/oa_next"
-                android:ellipsize="end"
-                android:hint="@string/common_select"
-                android:maxLines="4"
-                android:minLines="1"
-
-                />
-        </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px" />
-
-        <RelativeLayout
-            android:id="@+id/user_rl"
-            style="@style/add_meeting"
-            android:background="@color/item_color2">
-
-            <TextView
-                android:id="@+id/user_tag"
-                style="@style/form_relative_left_text"
-                android:text="@string/administrators"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <TextView
-                android:id="@+id/user_tv"
-                style="@style/add_meet_tv"
-                android:layout_marginLeft="40dp"
-                android:layout_toRightOf="@id/user_tag" />
-        </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="10dp" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px" />
-
-        <RelativeLayout
-            android:id="@+id/tag_rl"
-            style="@style/add_meeting"
-            android:background="@color/item_color2"
-            android:clickable="true">
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1px"
-                android:background="@color/item_line" />
-
-            <TextView
-                android:id="@+id/tag_tag"
-                style="@style/form_relative_left_text"
-                android:text="@string/meet_tag"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <TextView
-                android:id="@+id/tag_et"
-                style="@style/add_meet_tv"
-                android:layout_marginLeft="20dp"
-                android:layout_toRightOf="@+id/tag_tag"
-                android:drawableRight="@drawable/oa_next"
-                android:hint="@string/common_select_not_must" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/meet_about"
-            style="@style/add_meeting"
-            android:background="@color/item_color2">
-
-            <TextView
-                android:id="@+id/about_tag"
-                style="@style/form_relative_left_text"
-                android:text="@string/meet_show"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <EditText
-                android:id="@+id/about_et"
-                style="@style/add_meet_tv"
-                android:layout_marginLeft="20dp"
-                android:layout_toRightOf="@id/about_tag"
-                android:hint="@string/common_input1" />
-
-            <ImageView
-                android:id="@+id/voice_introduce_iv"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="35dp"
-                android:layout_toRightOf="@+id/about_tag"
-                android:background="@drawable/btn_yuyin_nor"
-                android:visibility="visible" />
-        </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="10dp" />
-
-        <RelativeLayout
-            style="@style/add_meeting"
-            android:background="@color/item_color2">
-
-            <TextView
-                style="@style/form_relative_left_text"
-                android:text="@string/add_schedule_for_meeter"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <com.core.widget.view.SwitchView
-                android:id="@+id/create_ric_sv"
-                android:layout_width="50dp"
-                android:layout_height="35dp"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="20dp" />
-        </RelativeLayout>
-
-        <Button
-            android:id="@+id/bt_save"
-            style="@style/from_button_base_bule"
-            android:layout_marginBottom="30dp"
-            android:layout_marginTop="20dp"
-            android:text="@string/common_save_button"
-        />
-    </LinearLayout>
-</ScrollView>

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

@@ -7,16 +7,13 @@
 
     <Button
         android:id="@+id/exit_btn"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
+        style="@style/commonButtonStyle"
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="9dp"
         android:layout_marginLeft="40dp"
         android:layout_marginRight="40dp"
         android:layout_marginTop="18dp"
-        android:background="@drawable/bg_btn"
-        android:text="@string/common_submit_button"
-        android:textColor="@color/white" />
+        android:text="@string/common_submit_button" />
 
     <LinearLayout
         android:layout_width="match_parent"

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

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/sv_top"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity">
+   >
 
     <LinearLayout
         android:id="@+id/ll_top"
@@ -47,35 +46,25 @@
 
         <Button
             android:id="@+id/click_btn"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             android:layout_below="@+id/info"
+            style="@style/commonButtonStyle"
             android:layout_marginBottom="80dp"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
             android:layout_marginTop="20dp"
-            android:background="@drawable/bg_bule_btn"
-            android:padding="10dp"
             android:text="提交"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_main"
             android:visibility="gone"
              />
 
         <Button
             android:id="@+id/btn_update"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            style="@style/commonButtonStyle"
             android:layout_below="@+id/info"
             android:layout_marginBottom="80dp"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
             android:layout_marginTop="20dp"
-            android:background="@drawable/bg_bule_btn"
-            android:padding="10dp"
             android:text="更新"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_main"
             android:visibility="gone" />
     </LinearLayout>
 </ScrollView>

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

@@ -117,17 +117,12 @@
 
         <Button
             android:id="@+id/click_btn"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:layout_marginBottom="20dp"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
             android:layout_marginTop="30dp"
-            android:background="@drawable/bg_bule_btn"
-            android:padding="10dp"
-            android:text="@string/common_save_button"
-            android:textColor="@color/oa_item_bg"
-            android:textSize="@dimen/text_main" />
+            style="@style/commonButtonStyle"
+            android:text="@string/common_save_button"/>
     </RelativeLayout>
 </LinearLayout>

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

@@ -4,7 +4,7 @@
     android:id="@+id/activity_flihts_time"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/oa_bg"
+    android:background="#f2f2f2"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.FlihtsTimeActivity">
 
     <LinearLayout
@@ -15,14 +15,15 @@
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/listView"
+            android:background="@color/white"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content" />
 
         <TextView
             android:id="@+id/add_tv"
             android:layout_width="match_parent"
             android:layout_height="@dimen/item_height_min"
-            android:background="@color/oa_item_bg"
+            android:background="@color/white"
             android:gravity="center_vertical"
             android:paddingLeft="10dp"
             android:text="@string/add_work_times"
@@ -33,7 +34,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/item_height_min"
             android:layout_marginTop="10dp"
-            android:background="@color/oa_item_bg"
+            android:background="@color/white"
             android:paddingLeft="10dp">
 
             <TextView
@@ -43,8 +44,8 @@
                 android:layout_alignParentRight="true"
                 android:background="@null"
                 android:gravity="center_vertical"
-                android:textColor="@color/text_hine"
                 android:paddingRight="10dp"
+                android:textColor="@color/text_hine"
                 android:textSize="@dimen/text_hine" />
 
             <TextView
@@ -63,7 +64,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/item_height_min"
             android:layout_marginTop="2px"
-            android:background="@color/oa_item_bg"
+            android:background="@color/white"
             android:paddingLeft="10dp">
 
             <TextView
@@ -93,17 +94,12 @@
 
         <Button
             android:id="@+id/click_btn"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            style="@style/commonButtonStyle"
             android:layout_alignParentBottom="true"
             android:layout_marginBottom="20dp"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
             android:layout_marginTop="30dp"
-            android:background="@drawable/bg_bule_btn"
-            android:padding="10dp"
-            android:text="@string/save"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_main" />
+            android:text="@string/save"/>
     </LinearLayout>
 </ScrollView>

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

@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:background="@drawable/bg_main"
     android:orientation="vertical"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.MeetingActivity">
+  >
 
     <com.core.widget.VoiceSearchView
         android:id="@+id/voiceSearchView"
@@ -14,7 +14,8 @@
 
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/list_business"
-        style="@style/ListViewBasic"
-        android:divider="@drawable/bg_bar" />
+        android:divider="@null"
+        android:dividerHeight="0dp"
+        style="@style/ListViewBasic" />
 
 </LinearLayout>

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

@@ -1,7 +1,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/bg_main">
+    android:background="@color/white">
 
     <com.core.widget.VoiceSearchView
         android:id="@+id/voiceSearchView"
@@ -35,6 +35,12 @@
         android:dividerHeight="2px"
         android:smoothScrollbar="false" />
 
+    <include
+        layout="@layout/view_empty"
+        android:layout_width="200dp"
+        android:layout_centerInParent="true"
+        android:layout_height="200dp" />
+
     <TextView
         android:id="@+id/text_dialog"
         android:layout_width="80.0dip"
@@ -56,4 +62,5 @@
         android:layout_gravity="right|center"
         android:layout_marginBottom="10dp"
         android:layout_marginTop="60dp" />
+
 </RelativeLayout>

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

@@ -375,8 +375,8 @@
 
             <ImageView
                 android:id="@+id/voice_search_iv"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+                android:layout_width="10dp"
+                android:layout_height="16dp"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="35dp"

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

@@ -2,15 +2,16 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/oa_main"
-    android:fitsSystemWindows="true">
+    android:background="#FFFFFF" >
 
     <TextView
         android:id="@+id/date_tv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/item_line"
-        android:visibility="gone"
+        android:visibility="visible"
+        android:layout_marginTop="0dp"
+        android:layout_alignParentTop="true"
         android:drawableLeft="@drawable/icon_date_nor"
         android:drawablePadding="10dp"
         android:padding="5dp"
@@ -72,7 +73,7 @@
             android:divider="@null"
             android:dividerHeight="0dp"
             android:focusable="false"
-            android:longClickable="false"/>
+            android:longClickable="false" />
     </FrameLayout>
 
 

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

@@ -19,6 +19,7 @@
         app:color_checked="#149A45" />
 
     <LinearLayout style="@style/LinearLayout_vertical"
+        android:layout_margin="3dp"
         android:layout_height="wrap_content">
 
         <TextView

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

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:clickable="true"
+    android:background="@drawable/select_weixin_list_item"
     android:layout_height="wrap_content">
     <TextView
         android:id="@+id/tv_item_name"
@@ -11,7 +13,6 @@
         android:textSize="14sp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/select_weixin_list_item"
         android:gravity="center"
         android:text="xxx" />
 </LinearLayout>

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

@@ -2,27 +2,40 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="15dp"
+    android:gravity="center_horizontal"
     android:orientation="vertical">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="20dp" />
-
-
     <TextView
-        android:layout_width="match_parent"
+        android:id="@+id/meView"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center"
         android:textColor="#999999"
-        android:text="多见一个客户就多一个机会,
-        现在就去做客户拜访吧                 "/>
-    <ImageView
-        android:layout_width="match_parent"
+        android:layout_marginTop="40dp"
+        android:text="@string/empty_more_visio"/>
+
+
+    <LinearLayout
+        android:id="@+id/otherView"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:visibility="gone"
         android:layout_centerInParent="true"
-        android:src="@drawable/oa_empty" />
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <pl.droidsonroids.gif.GifImageView
+            android:id="@+id/view_empty_gif"
+            android:layout_width="110dp"
+            android:layout_height="110dp"
+            android:src="@drawable/gif_empty_view" />
+
+        <TextView
+            android:id="@+id/textViewMessage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="90dp"
+            android:text="@string/common_list_empty"
+            android:textSize="14sp"
+            />
+    </LinearLayout>
 
 </LinearLayout>

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

@@ -1,147 +0,0 @@
-<?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="match_parent"
-    android:padding="10dp"
-    android:background="@drawable/selector_me_menu_item_bg">
-
-    <TextView
-        android:id="@+id/oa_meeting_name_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
-
-    <TextView
-        android:id="@+id/oa_meeting_status_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:textColor="@color/hintColor"
-        android:textSize="@dimen/text_hine" />
-
-    <ImageView
-        android:id="@+id/oa_meeting_start_tag"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/oa_meeting_name_tv"
-        android:layout_marginTop="20dp"
-        android:drawablePadding="5dp"
-        android:src="@drawable/ic_meeting_time" />
-
-    <TextView
-        android:id="@+id/oa_meeting_start"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/oa_meeting_name_tv"
-        android:layout_marginLeft="5dp"
-        android:layout_marginTop="20dp"
-        android:layout_toRightOf="@id/oa_meeting_start_tag"
-        android:drawablePadding="5dp"
-        android:gravity="center_vertical"
-        android:textSize="@dimen/text_main" />
-
-    <TextView
-        android:id="@+id/oa_meeting_start_date"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/oa_meeting_start"
-        android:layout_below="@id/oa_meeting_start"
-        android:layout_marginTop="5dp"
-        android:gravity="center_vertical"
-        android:textSize="30sp" />
-
-    <TextView
-        android:id="@+id/oa_meeting_line"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/oa_meeting_start_date"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
-        android:layout_toRightOf="@+id/oa_meeting_start_date"
-        android:text="—"
-        android:textSize="30sp" />
-
-    <TextView
-        android:id="@+id/oa_meeting_end_date"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/oa_meeting_start_date"
-        android:layout_toRightOf="@+id/oa_meeting_line"
-        android:drawableLeft="@null"
-        android:gravity="center_vertical"
-        android:textSize="30sp" />
-
-    <TextView
-        android:id="@+id/oa_meeting_end"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/oa_meeting_end_date"
-        android:layout_alignLeft="@+id/oa_meeting_end_date"
-        android:layout_alignTop="@id/oa_meeting_start"
-        android:layout_marginBottom="5dp"
-        android:gravity="center_vertical"
-        android:textSize="@dimen/text_main" />
-
-    <TextView
-        android:id="@+id/oa_meeting_addr"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/oa_meeting_start_date"
-        android:layout_marginTop="10dp"
-        android:drawableLeft="@drawable/ic_meeting_address"
-        android:drawablePadding="5dp"
-        android:gravity="center_vertical"
-        android:text="@string/meet_position"
-        android:textColor="@color/hintColor" />
-
-    <TextView
-        android:id="@+id/oa_meeting_addr_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/oa_meeting_addr"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/oa_meeting_addr"
-        android:ellipsize="end"
-        android:lines="1" />
-
-    <TextView
-        android:id="@+id/oa_meeting_user"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/oa_meeting_addr"
-        android:layout_marginTop="10dp"
-        android:drawableLeft="@drawable/ic_metting_people"
-        android:drawablePadding="5dp"
-        android:gravity="center_vertical"
-        android:text="@string/recorder"
-        android:textColor="@color/hintColor" />
-
-    <TextView
-        android:id="@+id/oa_meeting_user_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/oa_meeting_addr_tv"
-        android:layout_alignTop="@+id/oa_meeting_user"
-        android:layout_toRightOf="@+id/oa_meeting_user" />
-
-    <TextView
-        android:id="@+id/oa_meeting_tag"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/oa_meeting_user"
-        android:layout_marginTop="10dp"
-        android:drawableLeft="@drawable/ic_metting_label"
-        android:drawablePadding="5dp"
-        android:gravity="center_vertical"
-        android:text="@string/meet_details"
-        android:textColor="@color/hintColor" />
-
-    <TextView
-        android:id="@+id/oa_meeting_tag_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/oa_meeting_addr_tv"
-        android:layout_alignTop="@+id/oa_meeting_tag"
-        android:layout_toRightOf="@+id/oa_meeting_tag" />
-</RelativeLayout>

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

@@ -162,17 +162,12 @@
 
             <Button
                 android:id="@+id/of_add_set_save_bt"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 android:layout_marginBottom="30dp"
                 android:layout_marginLeft="20dp"
                 android:layout_marginRight="20dp"
                 android:layout_marginTop="50dp"
-                android:background="@drawable/bg_bule_btn"
-                android:padding="10dp"
                 android:text="@string/common_save_button"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_main" />
+                style="@style/commonButtonStyle" />
         </LinearLayout>
 
     </ScrollView>

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

@@ -1,27 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:sl_cornerRadius="0dp"
-    app:sl_dx="-1dp"
-    app:sl_dy="3dp"
-    app:sl_shadowColor="@color/shadow"
-    app:sl_shadowRadius="3dp">
- 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/shape_pop_ll"
-        android:orientation="vertical"
-        android:padding="0.5dp">
+    app:cardElevation="@dimen/paddingMin"
+    android:layout_height="match_parent">
 
         <ListView
             android:id="@+id/mList"
-            style="@style/ListViewBasic"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:divider="@color/item_line"
-            android:dividerHeight="0.1dp"></ListView>
-    </LinearLayout>
-</RelativeLayout>
+            android:dividerHeight="@dimen/line"/>
+</FrameLayout>

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

@@ -258,17 +258,12 @@
 
             <Button
                 android:id="@+id/senior_setting_save_bt"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                style="@style/commonButtonStyle"
                 android:layout_marginBottom="30dp"
                 android:layout_marginLeft="20dp"
                 android:layout_marginRight="20dp"
                 android:layout_marginTop="100dp"
-                android:background="@drawable/bg_bule_btn"
-                android:padding="10dp"
-                android:text="@string/common_save_button"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_main" />
+                android:text="@string/common_save_button" />
         </LinearLayout>
     </ScrollView>
 </LinearLayout>

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -43,7 +43,7 @@
     <string name="common_save_failed">保存失败</string>
     <string name="common_save_success">保存成功</string>
 
-    <string name="common_list_empty">暂无记录</string>
+    <string name="common_list_empty">暂无数据</string>
     <string name="search">搜索</string>
 
     <!-- end公用部分-->

WeiChat/src/main/res/values/strings.xml

@@ -586,7 +586,7 @@
     <string name="common_save_failed">保存失败</string>
     <string name="common_save_success">保存成功</string>
 
-    <string name="common_list_empty">暂无记录</string>
+    <string name="common_list_empty">暂无数据</string>
 
     <!-- end公用部分-->
 

app_core/common/src/main/java/com/core/base/BaseToolBarActivity.java

@@ -33,7 +33,8 @@ public class BaseToolBarActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
-        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE |
+                WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
         super.onCreate(savedInstanceState);
         super.setContentView(R.layout.base_bar_layout);
         contentFl = findViewById(R.id.contentFl);
@@ -46,6 +47,15 @@ public class BaseToolBarActivity extends AppCompatActivity {
         }
     }
 
+    public CharSequence getToolBarTitle() {
+        if (commonTitleTv != null && !TextUtils.isEmpty(commonTitleTv.getText())) {
+            return commonTitleTv.getText();
+        } else if (getSupportActionBar() != null&&!TextUtils.isEmpty(getSupportActionBar().getTitle())) {
+            return getSupportActionBar().getTitle();
+        }
+        return "";
+    }
+
     public int getToolBarId() {
         return R.id.toolbarVs;
     }
@@ -168,7 +178,7 @@ public class BaseToolBarActivity extends AppCompatActivity {
                 commonTitleTv.setText(titleId);
             }
             if (getSupportActionBar() != null) {
-                getSupportActionBar().setTitle(titleId);
+                getSupportActionBar(). setTitle(titleId);
             }
         }
 
@@ -177,7 +187,7 @@ public class BaseToolBarActivity extends AppCompatActivity {
     /*设置标题*/
     public final void setTitle(CharSequence title) {
         super.setTitle(title);
-        if (title!=null) {
+        if (title != null) {
             if (commonTitleTv != null) {
                 commonTitleTv.setText(title);
             }
@@ -254,8 +264,6 @@ public class BaseToolBarActivity extends AppCompatActivity {
 
 
     public void showToast(CharSequence message) {
-        LogUtil.i("gong", "showToast=" + message);
-        LogUtil.i("gong", "contentFl=" + (contentFl != null));
         if (contentFl != null && !TextUtils.isEmpty(message)) {
             ToastUtil.showToast(this, message, contentFl);
         } else {

app_core/common/src/main/java/com/core/base/fragment/SupportToolBarFragment.java

@@ -159,7 +159,7 @@ public abstract class SupportToolBarFragment extends Fragment {
             commonTitleTv.setText(resId);
         }
         if (ct != null && ct.getSupportActionBar() != null) {
-            ct.getSupportActionBar().setTitle(resId);
+            ct.setTitle(resId);
         }
     }
 
@@ -168,7 +168,7 @@ public abstract class SupportToolBarFragment extends Fragment {
             commonTitleTv.setText(resId);
         }
         if (ct != null && ct.getSupportActionBar() != null) {
-            ct.getSupportActionBar().setTitle(resId);
+            ct.setTitle(resId);
         }
     }
 

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -19,7 +19,6 @@ import android.widget.AdapterView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.PopupWindow;
-import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.afollestad.materialdialogs.MaterialDialog.ButtonCallback;
@@ -94,39 +93,27 @@ public class ViewUtil {
 
 
     public static void ToastMessage(Context cont, String msg) {
-        if (StringUtil.isEmpty(msg)) return;
-        if (cont instanceof Activity) {
-            if (crouton != null) {
-                crouton.cancel();
-
-                crouton = Crouton.makeText((Activity) cont, msg, Style.holoGreenLight, 5000);
-                crouton.show();
-            } else {
-                crouton = Crouton.makeText((Activity) cont, msg, Style.holoGreenLight, 5000);
-                crouton.show();
-            }
-        } else {
-            Toast.makeText(cont, msg, Toast.LENGTH_SHORT).show();
-        }
+        ToastUtil.showToast(cont,msg);
 
     }
 
 
     public static void ToastMessage(Context cont, String msg, int toastColor, int toastTime) {
-        if (cont instanceof Activity) {
-            if (crouton != null) {
-                crouton.cancel();
-                crouton = Crouton.makeText((Activity) cont, msg, toastColor, toastTime);
-                crouton.show();
-            } else {
-                crouton = Crouton.makeText((Activity) cont, msg, toastColor, toastTime);
-                crouton.show();
-            }
-        } else {
-            if (cont != null) {
-                Toast.makeText(cont, msg, Toast.LENGTH_SHORT).show();
-            }
-        }
+        ToastUtil.showToast(cont,msg);
+//        if (cont instanceof Activity) {
+//            if (crouton != null) {
+//                crouton.cancel();
+//                crouton = Crouton.makeText((Activity) cont, msg, toastColor, toastTime);
+//                crouton.show();
+//            } else {
+//                crouton = Crouton.makeText((Activity) cont, msg, toastColor, toastTime);
+//                crouton.show();
+//            }
+//        } else {
+//            if (cont != null) {
+//                Toast.makeText(cont, msg, Toast.LENGTH_SHORT).show();
+//            }
+//        }
 
     }
 

app_core/common/src/main/java/com/core/utils/ToastUtil.java

@@ -94,7 +94,7 @@ public class ToastUtil {
         if (vg != null) {
             showToast(context, message, vg);
         } else {
-            Crouton.makeText(context, message);
+           Toast.makeText(context, message,Toast.LENGTH_SHORT).show();
         }
 
 

app_core/common/src/main/java/com/core/widget/view/selectcalendar/SelectCalendarActivity.java

@@ -215,7 +215,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
         if (item.getItemId() == R.id.oa_leave)
             if (swich) {
                 //按时间请假
-                getSupportActionBar().setTitle("按时间请假");
+                setTitle("按时间请假");
                 getSupportActionBar().setSubtitle("只适合普通请假");
                 ll_bottom.setVisibility(View.GONE);
                 swich = false;
@@ -235,7 +235,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                 ll_time_end.setEnabled(false);
             } else {
                 //按时间段请假
-                getSupportActionBar().setTitle("按时段请假");
+                setTitle("按时段请假");
                 getSupportActionBar().setSubtitle("只适合特殊请假");
                 ll_bottom.setVisibility(View.VISIBLE);
                 swich = true;
@@ -269,7 +269,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
     private Data object;
 
     private void initView() {
-        getSupportActionBar().setTitle("选择时间");
+        setTitle("选择时间");
         ll_time_top = (LinearLayout) findViewById(R.id.ll_time_top);
         ll_time_point = (LinearLayout) findViewById(R.id.ll_time_point);
         tv_time_point = (TextView) findViewById(R.id.tv_time_point);

app_core/common/src/main/res/drawable/radian_bottom_meeting_white_bg.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- solid 设置stroke设置的边框以内的颜色 -->
+    <solid android:color="@color/white" />
+    <!-- stroke主要设置组件的边框。width为边框宽度，color为边框颜色 -->
+    <!--<stroke-->
+        <!--android:width="1dp"-->
+        <!--android:color="@color/item_line" />-->
+    <!-- corners 设置边框四角弧度 -->
+    <corners android:bottomLeftRadius="4dp"
+        android:bottomRightRadius="4dp"/>
+
+
+</shape>

app_core/common/src/main/res/drawable/radian_top_hint_bg.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- solid 设置stroke设置的边框以内的颜色 -->
+    <solid android:color="#f2f2f2" />
+    <!-- stroke主要设置组件的边框。width为边框宽度，color为边框颜色 -->
+    <!--<stroke-->
+        <!--android:width="1dp"-->
+        <!--android:color="@color/item_line" />-->
+    <!-- corners 设置边框四角弧度 -->
+    <corners android:topRightRadius="4dp"
+        android:topLeftRadius="4dp"/>
+
+
+</shape>

app_core/common/src/main/res/layout/act_taskerp_add.xml

@@ -63,8 +63,8 @@
                 android:textColor="@color/red" />
             <ImageView
                 android:id="@+id/voice_search_iv"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+                android:layout_width="10dp"
+                android:layout_height="16dp"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="20dp"
                 android:layout_marginTop="8dp"

app_core/common/src/main/res/layout/activity_add_meeting.xml

@@ -25,8 +25,8 @@
 
             <ImageView
                 android:id="@+id/voice_name_iv"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+                android:layout_width="10dp"
+                android:layout_height="16dp"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="35dp"
                 android:layout_toRightOf="@+id/name_tag"
@@ -273,8 +273,8 @@
 
             <ImageView
                 android:id="@+id/voice_introduce_iv"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+                android:layout_width="10dp"
+                android:layout_height="16dp"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="35dp"
                 android:layout_toRightOf="@+id/about_tag"

app_core/common/src/main/res/layout/activity_meeting.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/bg_main"
+    android:background="#f2f2f2"
     android:orientation="vertical">
 
     <com.core.widget.VoiceSearchView
@@ -14,6 +13,8 @@
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/list_business"
         style="@style/ListViewBasic"
-        android:divider="@drawable/bg_bar" />
+        android:dividerHeight="0dp"
+        android:divider="@null"
+         />
 
 </LinearLayout>

app_core/common/src/main/res/layout/fragment_me.xml

@@ -42,8 +42,8 @@
 
             <de.hdodenhof.circleimageview.CircleImageView
                 android:id="@+id/avatar_img"
-                android:layout_width="86dp"
-                android:layout_height="86dp"
+                android:layout_width="78dp"
+                android:layout_height="78dp"
                 android:layout_alignParentBottom="true"
                 android:layout_centerHorizontal="true"
                 android:layout_marginBottom="8dp"

app_core/common/src/main/res/layout/layout_search_action.xml

@@ -2,15 +2,14 @@
 <RelativeLayout android:id="@+id/top"
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:background="@color/antionbarcolor">
+                android:layout_height="?attr/actionBarSize">
 
     <ImageView
         android:id="@+id/search_action_back_iv"
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_centerVertical="true"
-        android:src="@drawable/ic_action_back" />
+        android:src="@drawable/back" />
 
     <ImageView
         android:id="@+id/search_action_menu_iv"
@@ -46,8 +45,8 @@
 
         <ImageView
             android:id="@+id/search_action_voice_iv"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="10dp"
+            android:layout_height="16dp"
             android:layout_alignParentRight="true"
             android:layout_alignRight="@+id/search_edit"
             android:layout_centerVertical="true"

app_core/common/src/main/res/layout/layout_select_head.xml

@@ -10,8 +10,9 @@
         />
 
     <View
-        style="@style/app_line_gray_1dp"
-        />
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@drawable/shape_common_pop_top_item_pressed"/>
 
     <TextView
         android:id="@+id/head_select_photos"

app_core/common/src/main/res/layout/oa_meeting_item.xml

@@ -1,147 +1,194 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="10dp"
-    android:background="@drawable/selector_me_menu_item_bg">
+    android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/oa_meeting_name_tv"
-        android:layout_width="wrap_content"
+    <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main" />
+        android:layout_margin="@dimen/padding"
+        app:cardCornerRadius="@dimen/paddingMin"
+        app:cardElevation="@dimen/paddingMin">
 
-    <TextView
-        android:id="@+id/oa_meeting_status_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:textColor="@color/hintColor"
-        android:textSize="@dimen/text_hine" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:layout_height="wrap_content">
+            <RelativeLayout
+                android:id="@+id/titleRl"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="#f2f2f2"
+                android:paddingBottom="@dimen/paddingMin"
+                android:paddingLeft="@dimen/padding"
+                android:paddingRight="@dimen/padding"
+                android:paddingTop="@dimen/paddingMin">
 
-    <ImageView
-        android:id="@+id/oa_meeting_start_tag"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/oa_meeting_name_tv"
-        android:layout_marginTop="20dp"
-        android:drawablePadding="5dp"
-        android:src="@drawable/ic_meeting_time" />
-
-    <TextView
-        android:id="@+id/oa_meeting_start"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/oa_meeting_name_tv"
-        android:layout_marginLeft="5dp"
-        android:layout_marginTop="20dp"
-        android:layout_toRightOf="@id/oa_meeting_start_tag"
-        android:drawablePadding="5dp"
-        android:gravity="center_vertical"
-        android:textSize="@dimen/text_main" />
-
-    <TextView
-        android:id="@+id/oa_meeting_start_date"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/oa_meeting_start"
-        android:layout_below="@id/oa_meeting_start"
-        android:layout_marginTop="5dp"
-        android:gravity="center_vertical"
-        android:textSize="30sp" />
-
-    <TextView
-        android:id="@+id/oa_meeting_line"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/oa_meeting_start_date"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
-        android:layout_toRightOf="@+id/oa_meeting_start_date"
-        android:text="—"
-        android:textSize="30sp" />
-
-    <TextView
-        android:id="@+id/oa_meeting_end_date"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/oa_meeting_start_date"
-        android:layout_toRightOf="@+id/oa_meeting_line"
-        android:drawableLeft="@null"
-        android:gravity="center_vertical"
-        android:textSize="30sp" />
-
-    <TextView
-        android:id="@+id/oa_meeting_end"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/oa_meeting_end_date"
-        android:layout_alignLeft="@+id/oa_meeting_end_date"
-        android:layout_alignTop="@id/oa_meeting_start"
-        android:layout_marginBottom="5dp"
-        android:gravity="center_vertical"
-        android:textSize="@dimen/text_main" />
-
-    <TextView
-        android:id="@+id/oa_meeting_addr"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/oa_meeting_start_date"
-        android:layout_marginTop="10dp"
-        android:drawableLeft="@drawable/ic_meeting_address"
-        android:drawablePadding="5dp"
-        android:gravity="center_vertical"
-        android:text="@string/meet_position"
-        android:textColor="@color/hintColor" />
-
-    <TextView
-        android:id="@+id/oa_meeting_addr_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/oa_meeting_addr"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/oa_meeting_addr"
-        android:ellipsize="end"
-        android:lines="1" />
-
-    <TextView
-        android:id="@+id/oa_meeting_user"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/oa_meeting_addr"
-        android:layout_marginTop="10dp"
-        android:drawableLeft="@drawable/ic_metting_people"
-        android:drawablePadding="5dp"
-        android:gravity="center_vertical"
-        android:text="@string/recorder"
-        android:textColor="@color/hintColor" />
-
-    <TextView
-        android:id="@+id/oa_meeting_user_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/oa_meeting_addr_tv"
-        android:layout_alignTop="@+id/oa_meeting_user"
-        android:layout_toRightOf="@+id/oa_meeting_user" />
+                <TextView
+                    android:id="@+id/oa_meeting_name_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="title"
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
 
-    <TextView
-        android:id="@+id/oa_meeting_tag"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/oa_meeting_user"
-        android:layout_marginTop="10dp"
-        android:drawableLeft="@drawable/ic_metting_label"
-        android:drawablePadding="5dp"
-        android:gravity="center_vertical"
-        android:text="@string/meet_details"
-        android:textColor="@color/hintColor" />
-
-    <TextView
-        android:id="@+id/oa_meeting_tag_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/oa_meeting_addr_tv"
-        android:layout_alignTop="@+id/oa_meeting_tag"
-        android:layout_toRightOf="@+id/oa_meeting_tag" />
-</RelativeLayout>
+                <TextView
+                    android:id="@+id/oa_meeting_status_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:textColor="@color/hintColor"
+                    android:textSize="@dimen/text_hine" />
+            </RelativeLayout>
+
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:paddingBottom="@dimen/paddingMin"
+                android:paddingLeft="@dimen/padding"
+                android:paddingRight="@dimen/padding"
+                android:paddingTop="@dimen/paddingMin">
+
+
+                <ImageView
+                    android:id="@+id/oa_meeting_start_tag"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/padding"
+                    android:drawablePadding="5dp"
+                    android:src="@drawable/ic_meeting_time" />
+
+                <TextView
+                    android:id="@+id/oa_meeting_start"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_toRightOf="@id/oa_meeting_start_tag"
+                    android:drawablePadding="5dp"
+                    android:gravity="center_vertical"
+                    android:textColor="#666666"
+                    android:textSize="@dimen/text_main" />
+
+                <TextView
+                    android:id="@+id/oa_meeting_start_date"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignLeft="@id/oa_meeting_start"
+                    android:layout_below="@id/oa_meeting_start"
+                    android:layout_marginTop="5dp"
+                    android:gravity="center_vertical"
+                    android:textColor="#000000"
+                    android:textSize="30sp" />
+
+                <TextView
+                    android:id="@+id/oa_meeting_line"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@+id/oa_meeting_start_date"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:layout_toRightOf="@+id/oa_meeting_start_date"
+                    android:text="  "
+                    android:textSize="30sp"
+                    android:visibility="gone" />
+
+                <TextView
+                    android:id="@+id/oa_meeting_end_date"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@+id/oa_meeting_start_date"
+                    android:layout_marginLeft="@dimen/padding"
+                    android:layout_toRightOf="@+id/oa_meeting_start_date"
+                    android:drawableLeft="@null"
+                    android:gravity="center_vertical"
+                    android:textColor="#000000"
+                    android:textSize="30sp" />
+
+                <TextView
+                    android:id="@+id/oa_meeting_end"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_above="@id/oa_meeting_end_date"
+                    android:layout_alignLeft="@+id/oa_meeting_end_date"
+                    android:layout_alignTop="@id/oa_meeting_start"
+                    android:layout_marginBottom="5dp"
+                    android:gravity="center_vertical"
+                    android:textColor="#666666"
+                    android:textSize="@dimen/text_main" />
+
+                <TextView
+                    android:id="@+id/oa_meeting_addr"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/oa_meeting_start_date"
+                    android:layout_marginTop="10dp"
+                    android:drawableLeft="@drawable/ic_meeting_address"
+                    android:drawablePadding="5dp"
+                    android:gravity="center_vertical"
+                    android:text="@string/meet_position"
+                    android:textColor="#666666" />
+
+                <TextView
+                    android:id="@+id/oa_meeting_addr_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@+id/oa_meeting_addr"
+                    android:layout_marginLeft="10dp"
+                    android:layout_toRightOf="@+id/oa_meeting_addr"
+                    android:ellipsize="end"
+                    android:lines="1"
+                    android:textColor="#666666" />
+
+                <TextView
+                    android:id="@+id/oa_meeting_user"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/oa_meeting_addr"
+                    android:layout_marginTop="10dp"
+                    android:drawableLeft="@drawable/ic_metting_people"
+                    android:drawablePadding="5dp"
+                    android:gravity="center_vertical"
+                    android:text="@string/recorder"
+                    android:textColor="#666666" />
+
+                <TextView
+                    android:id="@+id/oa_meeting_user_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignLeft="@id/oa_meeting_addr_tv"
+                    android:layout_alignTop="@+id/oa_meeting_user"
+                    android:layout_toRightOf="@+id/oa_meeting_user"
+                    android:textColor="#666666" />
+
+                <TextView
+                    android:id="@+id/oa_meeting_tag"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/oa_meeting_user"
+                    android:layout_marginTop="10dp"
+                    android:drawableLeft="@drawable/ic_metting_label"
+                    android:drawablePadding="5dp"
+                    android:gravity="center_vertical"
+                    android:text="@string/meet_details"
+                    android:textColor="#666666" />
+
+                <TextView
+                    android:id="@+id/oa_meeting_tag_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignLeft="@id/oa_meeting_addr_tv"
+                    android:layout_alignTop="@+id/oa_meeting_tag"
+                    android:layout_toRightOf="@+id/oa_meeting_tag"
+                    android:textColor="#666666" />
+
+
+            </RelativeLayout>
+        </LinearLayout>
+
+
+    </android.support.v7.widget.CardView>
+</FrameLayout>

app_core/common/src/main/res/layout/seach_include.xml

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="48dp"
-    android:background="@drawable/bg_bar"
+    android:background="#f2f2f2"
     android:paddingBottom="5dp"
     android:paddingLeft="15dp"
     android:paddingRight="15dp"
@@ -20,6 +20,7 @@
         android:singleLine="true"
         android:imeOptions="actionSearch"
         android:textColor="@color/dark_grey"
+        android:paddingRight="26dp"
         android:textColorHint="@color/grey"
         android:textSize="15sp" />
 
@@ -30,8 +31,7 @@
         android:layout_centerVertical="true"
         android:layout_alignParentRight="true"
         android:layout_alignRight="@+id/search_edit"
-        android:layout_marginRight="25dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginRight="6dp"
         android:background="@drawable/btn_yuyin_nor"
         android:visibility="visible" />
 </RelativeLayout>

app_core/common/src/main/res/layout/view_empty.xml

@@ -53,7 +53,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="90dp"
-            android:text="数据为空"
+            android:text="@string/common_list_empty"
             android:textSize="14sp"
             />
     </LinearLayout>

app_core/common/src/main/res/values-zh-rCN/strings.xml

@@ -43,7 +43,7 @@
     <string name="common_save_failed">保存失败</string>
     <string name="common_save_success">保存成功</string>
 
-    <string name="common_list_empty">暂无记录</string>
+    <string name="common_list_empty">暂无数据</string>
     <string name="search">搜索</string>
 
     <!-- end公用部分-->

app_core/common/src/main/res/values/strings.xml

@@ -1873,6 +1873,7 @@
     <string name="schedule_title_must_input">日程标题为必填项</string>
     <string name="schedule_detail_must_input">日程详情为必填项</string>
     <string name="not_camera_permission">摄像头权限被禁用，请到设置中开启权限！</string>
+    <string name="empty_more_visio">多见一个客户就多一个机会,\n现在就去做客户拜访吧 </string>
     <string name="give_up">放弃</string>
     <string name="app_time_selecting">选择时间</string>
     <string name="qzone_edit_weekly">编写周报</string>

app_core/common/src/main/res/values/styles.xml

@@ -956,7 +956,7 @@
     <!--横线-->
     <style name="app_line_gray_1dp">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">0.5dp</item>
+        <item name="android:layout_height">2px</item>
         <item name="android:layout_marginLeft">10dp</item>
         <item name="android:layout_marginRight">10dp</item>
         <item name="android:background">@color/item_line</item>

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceAddActivity.java

@@ -382,7 +382,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     
                 }
 
-               // getSupportActionBar().setTitle(model.getName());
+               // setTitle(model.getName());
                setTitle("预约");
 
             } else {

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceListActivity.java

@@ -63,10 +63,6 @@ public class BServiceListActivity extends OABaseActivity {
         initData();
     }
 
-    @Override
-    public boolean needNavigation() {
-        return false;
-    }
 
     private void initView() {
         setTitle("");
@@ -87,7 +83,10 @@ public class BServiceListActivity extends OABaseActivity {
     private ImageView mBackImageView, mVoiceImageView;
     private ClearEditText mSearchEditText;
     private EmptyLayout mEmptyLayout;
-
+    @Override
+    public boolean needNavigation() {
+        return false;
+    }
     private void initSearchView() {
         View view = LayoutInflater.from(ct).inflate(R.layout.action_book_service_search, null);
         mBackImageView = (ImageView) view.findViewById(R.id.book_service_search_back);

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceSearchActivity.java

@@ -129,7 +129,13 @@ public class BServiceSearchActivity extends OABaseActivity implements View.OnCli
         });
     }
 
+    @Override
+    public boolean needNavigation() {
+        return false;
+    }
+
     private void initViews() {
+        setTitle("");
         View view = LayoutInflater.from(ct).inflate(R.layout.action_book_service_search, null);
         mBackImageView = (ImageView) view.findViewById(R.id.book_service_search_back);
         mVoiceImageView = (ImageView) view.findViewById(R.id.book_service_search_voice_iv);

app_modular/appbooking/src/main/res/layout/action_book_service_search.xml

@@ -38,8 +38,8 @@
 
         <ImageView
             android:id="@+id/book_service_search_voice_iv"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="10dp"
+            android:layout_height="16dp"
             android:layout_alignParentRight="true"
             android:layout_alignRight="@+id/search_edit"
             android:layout_centerVertical="true"

app_modular/applogin/src/main/java/com/modular/login/activity/ModifyPasswordPhoneActivity.java

@@ -16,6 +16,7 @@ import com.common.data.JSONUtil;
 import com.core.app.Constants;
 import com.core.base.activity.BaseMVPActivity;
 import com.core.base.presenter.SimplePresenter;
+import com.core.base.view.AndroidBug5497Workaround;
 import com.core.base.view.SimpleView;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
@@ -79,6 +80,7 @@ public class ModifyPasswordPhoneActivity extends BaseMVPActivity<SimplePresenter
 
     @Override
     protected void initView() {
+        AndroidBug5497Workaround.assistActivity(this);
         setTitle(R.string.title_password_reset);
 
         mPhoneEditText = $(R.id.modify_password_phone_mobile_et);

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BaseInfoActivity.java

@@ -394,7 +394,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
                         Log.d("wang", "uploadAvatar");
                         uploadAvatar(mCurrentFile);
                     }
-                    ImageLoader.getInstance().displayImage(mNewPhotoUri.toString(), iv_headImage);
+                    ImageLoader.getInstance().displayImage(mNewPhotoUri.toString(), iv_headImage,MyApplication.mAvatarRoundImageOptions);
                 } else {
                     ToastUtil.showToast(this, R.string.c_crop_failed);
                 }

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ApprovalActivity.java

@@ -12,6 +12,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
@@ -35,7 +36,6 @@ import com.common.system.DisplayUtil;
 import com.core.app.AppConfig;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
-import com.core.base.view.AndroidBug5497Workaround;
 import com.core.model.Approval;
 import com.core.model.OAConfig;
 import com.core.model.SelectBean;
@@ -187,8 +187,9 @@ public class ApprovalActivity extends BaseActivity implements IApproval, Approva
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN |
+                WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
         setContentView(R.layout.activity_approval);
-        AndroidBug5497Workaround.assistActivity(this);
         initView();
     }