9：40

WeiChat/src/main/AndroidManifest.xml

@@ -110,7 +110,7 @@
     <application
         android:name="com.core.app.MyApplication"
         android:allowBackup="true"
-        android:hardwareAccelerated="false"
+        android:hardwareAccelerated="true"
         android:icon="@drawable/uuu"
         android:label="@string/app_name"
         android:largeHeap="true"

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

@@ -1,8 +1,6 @@
 package com.xzjmyk.pm.activity;
 
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
@@ -19,6 +17,7 @@ import com.common.data.StringUtil;
 import com.common.file.DownloadUtil;
 import com.core.app.MyApplication;
 import com.core.utils.CommonUtil;
+import com.modular.apputils.utils.PopupWindowHelper;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 import com.xzjmyk.pm.activity.ui.me.ScanInfoResultsActivity;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
@@ -71,14 +70,14 @@ public class CaptureResultActivity extends Activity {
                 Log.d("fileurl", url);
                 String fileName = url.substring(url.lastIndexOf("/") + 1);
 
-                new AlertDialog.Builder(CaptureResultActivity.this).setTitle("提示").setMessage("确定下载文件<" + fileName + ">吗?").setNegativeButton(R.string.cancel, null)
-                        .setPositiveButton(R.string.sure, new DialogInterface.OnClickListener() {
+                PopupWindowHelper.showAlart(CaptureResultActivity.this,
+                        "提示", "确定下载文件<" + fileName + ">吗?",
+                        new PopupWindowHelper.OnSelectListener() {
                             @Override
-                            public void onClick(DialogInterface dialog, int which) {
+                            public void select(boolean selectOk) {
                                 DownloadUtil.DownloadFile(CaptureResultActivity.this, url, "/sdcard/uu");
-
                             }
-                        }).create().show();
+                        });
             }
         });
     }
@@ -161,6 +160,7 @@ public class CaptureResultActivity extends Activity {
 
     /**
      * 新增扫描UAS二维码登录功能
+     *
      * @param result
      */
     private void doUasLoginRequest(String result) {

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

@@ -14,6 +14,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
+import android.os.Looper;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.PersistableBundle;
@@ -67,6 +68,7 @@ import com.core.model.User;
 import com.core.model.WorkModel;
 import com.core.net.NetWorkObservable;
 import com.core.net.http.ViewUtil;
+import com.core.net.http.http.OAHttpHelper;
 import com.core.net.volley.ArrayResult;
 import com.core.net.volley.FastVolley;
 import com.core.net.volley.Result;
@@ -107,6 +109,8 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
 
 import static android.view.View.GONE;
 
@@ -284,11 +288,39 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
 //      animation.setRepeatCount(-1);//设置重复次数
         animation.setFillAfter(true);//动画执行完后是否停留在执行完的状态
         animation.setStartOffset(0);//执行前的等待时间
-        view.setTag(R.id.tag_key,animation);
+        view.setTag(R.id.tag_key, animation);
         return animation;
     }
 
+    private Timer delayTimer;
+    private Runnable uiRunnable=new Runnable() {
+        @Override
+        public void run() {
+            if (main_tab_three != null) {
+                main_tab_three.startAnimation(getImgAnimation(main_tab_three));
+            }
+        }
+    };
+
+    private void delay() {
+        if (delayTimer == null) {
+            delayTimer = new Timer();
+        }
+        delayTimer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                OAHttpHelper.getInstance().post(uiRunnable);
+            }
+        }, 100);
+    }
+
     private void startAnimator(View view) {
+//        if (view != null && main_tab_three == view) {
+//            delay();
+//        } else {
+//            view.startAnimation(getImgAnimation(view));
+//
+//        }
         view.startAnimation(getImgAnimation(view));
     }
 

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

@@ -1,7 +1,5 @@
 package com.xzjmyk.pm.activity.ui.account;
 
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -9,91 +7,91 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 
-import com.common.hmac.Md5Util;
 import com.common.data.StringUtil;
-import com.xzjmyk.pm.activity.R;
+import com.common.hmac.Md5Util;
 import com.core.app.ActionBackActivity;
+import com.modular.apputils.utils.PopupWindowHelper;
+import com.xzjmyk.pm.activity.R;
 
 /**
  * 注册输入密码界面
- * 
+ *
  * @author Dean Tao
  * @version 1.0
  */
 public class RegisterPasswordActivity extends ActionBackActivity {
 
-	private EditText mPasswordEdit;
-	private EditText mConfirmPasswordEdit;
-	private Button mNextStepBtn;
-
-	private String mPhoneNum;
+    private EditText mPasswordEdit;
+    private EditText mConfirmPasswordEdit;
+    private Button mNextStepBtn;
 
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		if (getIntent() != null) {
-			mPhoneNum = getIntent().getStringExtra(RegisterActivity.EXTRA_PHONE_NUMBER);
-		}
-		setContentView(R.layout.activity_register_password);
-		setTitle(R.string.register_step_two);
-		initView();
-	}
+    private String mPhoneNum;
 
-	private void initView() {
-		mPasswordEdit = (EditText) findViewById(R.id.password_edit);
-		mConfirmPasswordEdit = (EditText) findViewById(R.id.confirm_password_edit);
-		mNextStepBtn = (Button) findViewById(R.id.next_step_btn);
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getIntent() != null) {
+            mPhoneNum = getIntent().getStringExtra(RegisterActivity.EXTRA_PHONE_NUMBER);
+        }
+        setContentView(R.layout.activity_register_password);
+        setTitle(R.string.register_step_two);
+        initView();
+    }
 
-		mNextStepBtn.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				nextStep();
-			}
-		});
-	}
+    private void initView() {
+        mPasswordEdit = (EditText) findViewById(R.id.password_edit);
+        mConfirmPasswordEdit = (EditText) findViewById(R.id.confirm_password_edit);
+        mNextStepBtn = (Button) findViewById(R.id.next_step_btn);
 
-	private void nextStep() {
-		final String password = mPasswordEdit.getText().toString().trim();
-		String confirmPassword = mConfirmPasswordEdit.getText().toString().trim();
-		if (TextUtils.isEmpty(password) || password.length() < 6) {
-			mPasswordEdit.requestFocus();
-			mPasswordEdit.setError(StringUtil.editTextHtmlErrorTip( R.string.password_empty_error));
-			return;
-		}
-		if (TextUtils.isEmpty(confirmPassword) || confirmPassword.length() < 6) {
-			mConfirmPasswordEdit.requestFocus();
-			mConfirmPasswordEdit.setError(StringUtil.editTextHtmlErrorTip( R.string.confirm_password_empty_error));
-			return;
-		}
-		if (!confirmPassword.equals(password)) {
-			mConfirmPasswordEdit.requestFocus();
-			mConfirmPasswordEdit.setError(StringUtil.editTextHtmlErrorTip( R.string.password_confirm_password_not_match));
-			return;
-		}
+        mNextStepBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                nextStep();
+            }
+        });
+    }
 
-		Intent intent = new Intent();
-		intent.setClass(this, RegisterUserBasicInfoActivity.class);
-		intent.putExtra(RegisterActivity.EXTRA_PHONE_NUMBER, mPhoneNum);
-		intent.putExtra(RegisterActivity.EXTRA_PASSWORD, Md5Util.toMD5(password));
-		startActivity(intent);
-		finish();
-	}
+    private void nextStep() {
+        final String password = mPasswordEdit.getText().toString().trim();
+        String confirmPassword = mConfirmPasswordEdit.getText().toString().trim();
+        if (TextUtils.isEmpty(password) || password.length() < 6) {
+            mPasswordEdit.requestFocus();
+            mPasswordEdit.setError(StringUtil.editTextHtmlErrorTip(R.string.password_empty_error));
+            return;
+        }
+        if (TextUtils.isEmpty(confirmPassword) || confirmPassword.length() < 6) {
+            mConfirmPasswordEdit.requestFocus();
+            mConfirmPasswordEdit.setError(StringUtil.editTextHtmlErrorTip(R.string.confirm_password_empty_error));
+            return;
+        }
+        if (!confirmPassword.equals(password)) {
+            mConfirmPasswordEdit.requestFocus();
+            mConfirmPasswordEdit.setError(StringUtil.editTextHtmlErrorTip(R.string.password_confirm_password_not_match));
+            return;
+        }
 
-	@Override
-	public void onBackPressed() {
-		doBack();
-	}
+        Intent intent = new Intent();
+        intent.setClass(this, RegisterUserBasicInfoActivity.class);
+        intent.putExtra(RegisterActivity.EXTRA_PHONE_NUMBER, mPhoneNum);
+        intent.putExtra(RegisterActivity.EXTRA_PASSWORD, Md5Util.toMD5(password));
+        startActivity(intent);
+        finish();
+    }
 
-	private void doBack() {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.prompt_title).setMessage(R.string.cancel_register_prompt)
-				.setNegativeButton(getString(R.string.no), null).setPositiveButton(getString(R.string.yes), new DialogInterface.OnClickListener() {
+    @Override
+    public void onBackPressed() {
+        doBack();
+    }
 
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						finish();
-					}
-				});
-		builder.create().show();
-	}
+    private void doBack() {
+        PopupWindowHelper.showAlart(RegisterPasswordActivity.this,
+                getString(R.string.prompt_title), getString(R.string.cancel_register_prompt),
+                new PopupWindowHelper.OnSelectListener() {
+                    @Override
+                    public void select(boolean selectOk) {
+                        finish();
+                    }
+                });
+    }
 
 }

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

@@ -6,6 +6,9 @@ import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -66,7 +69,25 @@ public abstract class EasyFragment extends Fragment {
         onCreateView(savedInstanceState, createView);
         return mRootView;
     }
-
+    private MenuItem.OnMenuItemClickListener omOnMenuItemClickListener= new MenuItem.OnMenuItemClickListener() {
+        @Override
+        public boolean onMenuItemClick(MenuItem menuItem) {
+            onOptionsItemSelected(menuItem);
+            return false;
+        }
+    };
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if (menu!=null){
+            for (int i=0;i<menu.size();i++){
+                MenuItem item = menu.getItem(i);
+                if (item!=null){
+                    item.setOnMenuItemClickListener(omOnMenuItemClickListener);
+                }
+            }
+        }
+        super.onCreateOptionsMenu(menu, inflater);
+    }
     public View findViewById(int id) {
         if (mRootView != null) {
             return mRootView.findViewById(id);

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

@@ -38,7 +38,6 @@ import com.uas.appworks.CRM.erp.activity.UserSelectActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -149,7 +148,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         switch (item.getItemId()) {
             case R.id.btn_save:
                 if (!isPower) {
-                    Crouton.makeText(ct, "您没有查看列表的权限");
+                    showToast( "您没有查看列表的权限");
                     return true;
                 }
                 if (tv_name.testValidity() &&
@@ -185,14 +184,14 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                 String time = year + "-" + month + "-" + day + " " + hour + ":" + minute + ":00";
                 String curtime = TimeUtils.f_long_2_str(System.currentTimeMillis());
                 if (curtime.compareTo(time) > 0){
-                    Crouton.makeText(ct, "不能选择过去时间");
+                    showToast( "不能选择过去时间");
                     return;
                 }
                 if (b) {
                     tv_date_start.setText(time);
                 } else {
                     if (time.compareTo(tv_date_start.getText().toString()) < 0) {
-                        Crouton.makeText(ct, "结束时间不能小于开始时间");
+                        showToast( "结束时间不能小于开始时间");
                     } else {
                         tv_date.setText(time);
                     }

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

@@ -2,13 +2,11 @@ package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 
 
 import android.app.Activity;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Parcelable;
-import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.Selection;
 import android.text.TextUtils;
@@ -57,6 +55,7 @@ import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.modular.apputils.utils.PopupWindowHelper;
 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;
@@ -146,8 +145,8 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         if (!JSONUtil.validate(chche)) return;
         JSONObject object = JSON.parseObject(chche);
         //共有
-        tv_date_start.setText(TimeUtils.f_long_2_str( JSONUtil.getTime(object, "vr_visittime", "vr_startdate", "mpd_actdate", "mp_firsttime")));
-        tv_date_end.setText(TimeUtils.f_long_2_str( JSONUtil.getTime(object, "vr_visitend", "vr_enddate", "mpd_outdate", "mp_lasttime")));
+        tv_date_start.setText(TimeUtils.f_long_2_str(JSONUtil.getTime(object, "vr_visittime", "vr_startdate", "mpd_actdate", "mp_firsttime")));
+        tv_date_end.setText(TimeUtils.f_long_2_str(JSONUtil.getTime(object, "vr_visitend", "vr_enddate", "mpd_outdate", "mp_lasttime")));
         tv_customer_login.setText(JSONUtil.getText(object, "custname", "vr_cuname", "mpd_company"));
         tv_address_login.setText(JSONUtil.getText(object, "address", "vr_cuaddress", "mpd_address"));
         tv_visit_theme.setText(JSONUtil.getText(object, "vr_title", "mpd_remark"));
@@ -195,7 +194,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             save_btn.setText(R.string.common_save_button);
             delete_btn.setVisibility(View.GONE);
             delete_btn.setOnClickListener(null);
-            if (status ==2)save_btn.setVisibility(View.GONE);
+            if (status == 2) save_btn.setVisibility(View.GONE);
         } else
             switch (status) {
                 case 0:
@@ -414,9 +413,9 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                     endActivity();
                     break;
                 case CURRENT_DUR:
-                    if (!StringUtil.isEmpty(msg.getData().toString())){
+                    if (!StringUtil.isEmpty(msg.getData().toString())) {
                         String result = msg.getData().getString("result");
-                        LogUtil.prinlnLongMsg("CURRENT_DUR",result+"");
+                        LogUtil.prinlnLongMsg("CURRENT_DUR", result + "");
 
                         doSelectCurDur(result);
                     }
@@ -437,12 +436,12 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         SelectBean selectBean;
         for (int i = 0; i < array.size(); i++) {
             selectBean = new SelectBean();
-            if (!StringUtil.isEmpty(array.getJSONObject(i).getString("BS_NAME"))){
+            if (!StringUtil.isEmpty(array.getJSONObject(i).getString("BS_NAME"))) {
                 selectBean.setName(array.getJSONObject(i).getString("BS_NAME"));
                 formBeaan.add(selectBean);
             }
 
-            if (i == array.size()-1 && !ListUtils.isEmpty(formBeaan)){
+            if (i == array.size() - 1 && !ListUtils.isEmpty(formBeaan)) {
                 Intent intent = new Intent();
                 intent.setClass(this, SelectActivity.class);
                 intent.putExtra("type", 2);
@@ -465,22 +464,22 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
 
     private boolean canSubmit() {
         if (!CommonUtil.isNetWorkConnected(ct)) {
-            showToast( 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) {
-            showToast(  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) {
-            showToast(  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) {
-            showToast(  R.string.not_time_start_biger_end);
+            showToast(R.string.not_time_start_biger_end);
             return false;
         }
         if (!isB2b && (TextUtils.isEmpty(phone_tv.getText())
@@ -489,7 +488,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             return false;
         }
         if (TextUtils.isEmpty(tv_visit_content.getText())) {
-            showToast(  getString(R.string.input_vist_context));
+            showToast(getString(R.string.input_vist_context));
             return false;
         }
         if (!validatorInput()) {
@@ -602,17 +601,14 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                 else saveVisit();
                 break;
             case R.id.delete_btn:
-                new AlertDialog.Builder(ct).setTitle(R.string.prompt_title).setMessage(R.string.delete_prompt).setPositiveButton(R.string.sure, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterface, int i) {
-                        deleteVisitRecord();
-                    }
-                }).setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterface, int i) {
-
-                    }
-                }).show();
+                PopupWindowHelper.showAlart(VisitReportAddActivity.this,
+                        getString(R.string.prompt_title), getString(R.string.delete_prompt),
+                        new PopupWindowHelper.OnSelectListener() {
+                            @Override
+                            public void select(boolean selectOk) {
+                                deleteVisitRecord();
+                            }
+                        });
                 break;
         }
     }
@@ -688,9 +684,9 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         } else if (requestCode == 0x29) {
             String message = data.getStringExtra("data");
             tv_visit_theme.setText(StringUtil.isEmpty(message) ? getString(R.string.maintain_customers) : message);
-        }else if (requestCode == 0x828 && resultCode == 0x20){
+        } else if (requestCode == 0x828 && resultCode == 0x20) {
             SelectBean b = data.getParcelableExtra("data");
-            if (b != null && !StringUtil.isEmpty(b.getName())){
+            if (b != null && !StringUtil.isEmpty(b.getName())) {
                 tv_visit_steps.setText(b.getName());
             }
         }
@@ -818,7 +814,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         formStore.put("vr_cucode", cu_code);//客户编号
         formStore.put("vr_cuname", StringUtil.toHttpString(tv_customer_login.getText().toString()));//客户名字
         formStore.put("vr_cuaddress", tv_address_login.getText().toString());//客户地址
-        formStore.put("vr_cucontact",StringUtil.toHttpString(tv_linksman_login.getText().toString()));//客户联系人
+        formStore.put("vr_cucontact", StringUtil.toHttpString(tv_linksman_login.getText().toString()));//客户联系人
         params.put("formStore", JSONUtil.map2JSON(formStore));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());

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

@@ -1,9 +1,7 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -26,17 +24,17 @@ import com.core.base.OABaseActivity;
 import com.core.utils.RecognizerDialogUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
-import com.modular.apputils.utils.PopupWindowHelper;
 import com.core.utils.time.wheel.OASigninPicker;
 import com.core.widget.MyListView;
 import com.core.widget.view.model.SelectAimModel;
+import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.modular.apputils.utils.PopupWindowHelper;
 import com.xzjmyk.pm.activity.R;
-import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.ui.erp.presenter.AddVisitReportPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IAddVisitReport;
 
@@ -73,7 +71,7 @@ public class AddVisitReportActivity extends OABaseActivity implements IAddVisitR
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_add_visiting_report);
         ViewUtils.inject(this);
-       setTitle(R.string.visitrecord);
+        setTitle(R.string.visitrecord);
         initData();
         initEvent();
     }
@@ -110,7 +108,7 @@ public class AddVisitReportActivity extends OABaseActivity implements IAddVisitR
             model.setAddress(cuaddress);
             presenter.setClient(model);
             presenter.loadContact(code);
-            date_tv.setText(TimeUtils.s_long_2_str(DateFormatUtil.str2Long(vr_recorddate,DateFormatUtil.YMD_HMS)));
+            date_tv.setText(TimeUtils.s_long_2_str(DateFormatUtil.str2Long(vr_recorddate, DateFormatUtil.YMD_HMS)));
             initView(cucontact);
         }
     }
@@ -340,16 +338,16 @@ public class AddVisitReportActivity extends OABaseActivity implements IAddVisitR
         }
 
         public void deleteContact(final int position) {
-            AlertDialog.Builder builder = new AlertDialog.Builder(ct);
-            builder.setTitle(R.string.prompt_title).setMessage(R.string.sure_delete_content).setPositiveButton(R.string.sure, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialogInterface, int i) {
-                    contactNames.remove(position);
-                    adapter = new VisitAddContactAdapter(contactNames);
-                    contact_lv.setAdapter(adapter);
-//                    notifyDataSetChanged();
-                }
-            }).setNegativeButton(R.string.cancel,null).show();
+            PopupWindowHelper.showAlart(AddVisitReportActivity.this,
+                    getString(R.string.prompt_title), getString(R.string.sure_delete_content),
+                    new PopupWindowHelper.OnSelectListener() {
+                        @Override
+                        public void select(boolean selectOk) {
+                            contactNames.remove(position);
+                            adapter = new VisitAddContactAdapter(contactNames);
+                            contact_lv.setAdapter(adapter);
+                        }
+                    });
         }
 
         class ViewHodler {

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

@@ -807,6 +807,7 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
             plist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                 @Override
                 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                    LogUtil.i("onItemClick");
                     Intent intent = null;
                     popupWindow.dismiss();
                     switch (position) {
@@ -836,14 +837,15 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
                                     .putExtra("title", name);
                             break;
                     }
-                    if (intent != null)
+                    if (intent != null){
                         startActivityForResult(intent, 0x20);
+                    }
                 }
             });
             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.setHeight(DisplayUtil.dip2px(ct,125));
             }
         // 使其聚集
         popupWindow.setFocusable(true);
@@ -860,7 +862,7 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
         popupWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.top_bubble));
 //        popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
         // 显示的位置为:屏幕的宽度的一半-PopupWindow的高度的一半
-        popupWindow.showAsDropDown(parent, windowManager.getDefaultDisplay().getWidth()-DisplayUtil.dip2px(ct,10), 0);
+        popupWindow.showAsDropDown(parent, -DisplayUtil.dip2px(ct,50), 0);
     }
 
     private List<Map<String, Object>> getPopData() {

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

@@ -24,6 +24,7 @@ import com.core.api.wxapi.ApiUtils;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.fragment.BaseMVPFragment;
+import com.core.net.http.http.OAHttpHelper;
 import com.core.utils.StatusBarUtil;
 import com.me.network.app.base.HttpParams;
 import com.me.network.app.http.Method;
@@ -209,15 +210,29 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
 
     }
 
-    @Override
-    protected void initDatas() {
+    private Runnable uiRunnable = new Runnable() {
+        @Override
+        public void run() {
+            doInUi();
+        }
+    };
+
+    private void doInUi() {
         getLocalMenu();
-//        if (isFirstLoad) {
         loadOrdersCaller();
-//        }
         obtainCityIndustryService();
     }
 
+    @Override
+    protected void initDatas() {
+        if (isFirstLoad) {
+            doInUi();
+        } else {
+            OAHttpHelper.getInstance().postDelayed(uiRunnable, 250);
+        }
+
+    }
+
     private void getLocalMenu() {
         String role = com.core.utils.CommonUtil.getUserRole();
         String userId = MyApplication.getInstance().mLoginUser.getUserId();

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

@@ -494,12 +494,6 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
                 break;
             case R.id.rl_master_change:
                 if (!platform) {
-                    if (DialogUtils.isDialogShowing(ViewUtil.popupWindow)){
-                        ViewUtil.popupWindow.dismiss();
-                    }
-                    if (DialogUtils.isDialogShowing(popupWindow)){
-                        popupWindow.dismiss();
-                    }
                     changeMaster();
                 }
                 break;
@@ -575,11 +569,6 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
 
     //切换账套
     public void changeMaster() {
-//        if (ViewUtil.mdProcessDialog!=null&&!ViewUtil.mdProcessDialog.isShowing()){
-//            ViewUtil.mdProcessDialog.setContent("加载数据中...");
-//            ViewUtil.mdProcessDialog.getBuilder().autoDismiss(false);
-//            ViewUtil.mdProcessDialog.show();
-//        }
         if (StringUtil.isEmpty(CommonUtil.getSharedPreferences(ct, "erp_masterlist"))) {
             String url = com.core.utils.CommonUtil.getAppBaseUrl(ct) + "mobile/getAllMasters.action";
             Map<String, Object> params = new HashMap<>();
@@ -719,6 +708,13 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
 
     public void showPopDialog(final Activity ct, List<ItemsSelectType1> itemsSelectType1s) {
         View view = null;
+        if (DialogUtils.isDialogShowing(ViewUtil.popupWindow)){
+            ViewUtil.popupWindow.dismiss();
+        }
+        if (DialogUtils.isDialogShowing(popupWindow)){
+            popupWindow.dismiss();
+            popupWindow = null;
+        }
         popupWindow = null;
         WindowManager windowManager = (WindowManager) ct.getSystemService(Context.WINDOW_SERVICE);
         if (popupWindow == null) {

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

@@ -15,6 +15,7 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
@@ -171,6 +172,7 @@ public class TaskActivity extends SupportToolBarActivity implements OnClickListe
         }
 
     };
+    private ViewGroup topFl;
 
     private void doClassifyAllList(List<AllProcess> allList) {
         if (mCurrentPage == 1) {
@@ -178,12 +180,15 @@ public class TaskActivity extends SupportToolBarActivity implements OnClickListe
             if (!ListUtils.isEmpty(waitList)) waitList.clear();
             if (!ListUtils.isEmpty(doneList)) doneList.clear();
             if (!ListUtils.isEmpty(isendList)) isendList.clear();
-            ToastUtil.showToast(this, R.string.common_refresh_finish, tabGroup);
+            ToastUtil.showToast(this, R.string.common_refresh_finish, topFl);
         } else {
-            ToastUtil.showToast(this, R.string.common_up_finish, tabGroup);
+            ToastUtil.showToast(this, R.string.common_up_finish, topFl);
         }
         listview_main.onRefreshComplete();
-        if (ListUtils.isEmpty(allList)) return;
+        if (ListUtils.isEmpty(allList)) {
+            mEmptyLayout.showEmpty();
+            return;
+        }
         for (int i = 0; i < allList.size(); i++) {
             // 待处理
             if ((login_Name.equals(allList.get(i).getDealpersoncode()) &&
@@ -433,6 +438,7 @@ public class TaskActivity extends SupportToolBarActivity implements OnClickListe
         findViewById(R.id.backImg).setOnClickListener(this);
         findViewById(R.id.addImg).setOnClickListener(this);
         tabGroup = findViewById(R.id.tabGroup);
+        topFl = findViewById(R.id.topFl);
         final View todoLine = findViewById(R.id.todoLine);
         final View doneDealLine = findViewById(R.id.doneDealLine);
         final View byMeLine = findViewById(R.id.byMeLine);

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/bg_main"
+    android:background="@color/base_bg"
     android:orientation="vertical">
 
     <com.core.widget.VoiceSearchView
@@ -24,9 +24,8 @@
         android:id="@+id/lv_sale_list"
         style="@style/ListViewdoc"
         android:layout_below="@id/voiceSearchView"
-        android:background="@color/Transpant"
-        android:divider="@drawable/bg_bar"
         android:layerType="software"
+        android:background="@color/base_bg"
         android:scrollingCache="false" />
 
     <com.github.clans.fab.FloatingActionButton

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

@@ -4,10 +4,10 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.core.widget.CustomerScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true">
+    <!--<com.core.widget.CustomerScrollView-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="match_parent"-->
+        <!--android:fillViewport="true">-->
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -98,12 +98,12 @@
                     android:background="@drawable/shape_textview_line"
                     android:layerType="software" />
             </LinearLayout>
-            <ScrollView
+          <!--  <ScrollView-->
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-               >
+                android:layout_height="wrap_content">
                 <LinearLayout
                     style="@style/form_linear_customer"
+                    android:layout_height="250dp"
                     android:paddingBottom="5dp">
 
                     <LinearLayout
@@ -347,7 +347,7 @@
                             android:src="@drawable/icon_voice_black" />
                     </LinearLayout>
                 </LinearLayout>
-            </ScrollView>
+         <!--   </ScrollView>-->
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -392,5 +392,5 @@
                 android:padding="5dp"
                 android:scrollbars="none" />
         </LinearLayout>
-    </com.core.widget.CustomerScrollView>
+   <!-- </com.core.widget.CustomerScrollView>-->
 </LinearLayout>

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

@@ -24,8 +24,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="40dp"
-                android:layout_marginTop="@dimen/padding"
+                android:layout_marginLeft="29dp"
+                android:layout_marginTop="5dp"
                 android:text="*"
                 android:textColor="@color/red" />
             <TextView
@@ -50,8 +50,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="40dp"
-                android:layout_marginTop="@dimen/padding"
+                android:layout_marginLeft="29dp"
+                android:layout_marginTop="5dp"
                 android:text="*"
                 android:textColor="@color/red" />
             <TextView
@@ -77,8 +77,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="40dp"
-                android:layout_marginTop="@dimen/padding"
+                android:layout_marginLeft="29dp"
+                android:layout_marginTop="5dp"
                 android:text="*"
                 android:textColor="@color/red" />
             <TextView
@@ -106,8 +106,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="40dp"
-                android:layout_marginTop="@dimen/padding"
+                android:layout_marginLeft="29dp"
+                android:layout_marginTop="5dp"
                 android:text="*"
                 android:textColor="@color/red" />
             <EditText

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

@@ -196,7 +196,9 @@
         android:layout_alignParentBottom="true"
         android:orientation="horizontal"
         android:weightSum="2">
-       
+
+   <!--     <View style="@style/app_line_v_1dp"></View>-->
+
         <Button
             android:id="@+id/bt_change"
             android:layout_width="match_parent"
@@ -205,8 +207,6 @@
             android:background="@drawable/bg_bule_btn1"
             android:text="@string/booking_change" />
 
-        <View style="@style/app_line_v_1dp"></View>
-
         <Button
             android:id="@+id/bt_cancle"
             android:layout_width="match_parent"

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

@@ -208,15 +208,12 @@
                 android:textSize="@dimen/text_main" />
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="2px"
-            android:background="@color/item_line" />
+        
 
         <android.support.v4.view.ViewPager
             android:id="@+id/viewPager"
             android:layout_width="match_parent"
-            android:layout_height="200dp"
+            android:layout_height="180dp"
             android:background="@color/white" />
 
         <com.core.widget.MyListView

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

@@ -35,7 +35,8 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignTop="@id/name_tv"
+                    android:layout_marginLeft="1dp"
+                    android:layout_marginTop="19dp"
                     android:layout_toRightOf="@id/name_tv"
                     android:text="*"
                     android:textColor="@color/red" />
@@ -50,7 +51,7 @@
                     android:layout_alignParentRight="true"
                     android:background="@null"
                     android:gravity="center_vertical|right"
-                    android:hint="@string/common_input"
+                    android:hint="@string/common_input2"
                     android:maxLength="30"
                     android:padding="10dp"
                     android:textColor="@color/dark_dark_grey"
@@ -77,13 +78,16 @@
                     android:text="@string/Reimbursement_type"
                     android:textColor="@color/text_main"
                     android:textSize="15sp" />
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignTop="@id/type_left"
+                    android:layout_marginLeft="1dp"
+                    android:layout_marginTop="8dp"
                     android:layout_toRightOf="@id/type_left"
                     android:text="*"
                     android:textColor="@color/red" />
+
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                     android:id="@+id/reimbursement_type_fet"
                     android:layout_width="wrap_content"
@@ -93,7 +97,7 @@
                     android:background="@null"
                     android:ellipsize="end"
                     android:gravity="center_vertical|right"
-                    android:hint="@string/common_select"
+                    android:hint="@string/common_select1"
                     android:padding="10dp"
                     android:singleLine="true"
                     android:textColor="@color/dark_dark_grey"
@@ -125,13 +129,16 @@
                     android:text="@string/currency"
                     android:textColor="@color/text_main"
                     android:textSize="15sp" />
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignTop="@id/reimbursement_type"
+                    android:layout_marginLeft="1dp"
+                    android:layout_marginTop="8dp"
                     android:layout_toRightOf="@id/reimbursement_type"
                     android:text="*"
                     android:textColor="@color/red" />
+
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                     android:id="@+id/reimbursement_currency_fet"
                     android:layout_width="100dp"

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

@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout 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="@color/oa_main"
-                tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.MeetDetailsActivity">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white">
 
 
     <LinearLayout
         android:id="@+id/top"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/oa_background_orange"
+        android:background="#F4F4F4"
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:padding="10dp">
@@ -22,10 +20,11 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
             android:layout_weight="1"
+            android:drawablePadding="@dimen/padding"
             android:drawableTop="@drawable/oa_save_meet"
             android:gravity="center"
             android:text="@string/meet_details"
-            android:textColor="@color/white"/>
+            android:textColor="#666666" />
 
         <TextView
             android:id="@+id/add_task_ll"
@@ -33,10 +32,11 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
             android:layout_weight="1"
+            android:drawablePadding="@dimen/padding"
             android:drawableTop="@drawable/oa_add_task"
             android:gravity="center"
             android:text="@string/push_task"
-            android:textColor="@color/white"/>
+            android:textColor="#666666" />
     </LinearLayout>
 
     <RelativeLayout
@@ -45,24 +45,34 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/top"
         android:background="@color/white"
-        android:padding="10dp">
+        android:paddingRight="10dp"
+        android:paddingLeft="10dp"
+        android:paddingBottom="10dp"
+        android:paddingTop="@dimen/padding">
 
         <TextView
             android:id="@+id/name_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main"/>
+            android:textColor="#333333"
+            android:textStyle="bold"
+            android:text="标题"
+            android:textSize="@dimen/text_main" />
 
         <TextView
             android:id="@+id/status_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
-            android:layout_marginTop="10dp"
             android:textColor="@color/hintColor"
-            android:textSize="@dimen/text_hine"/>
+            android:textSize="@dimen/text_hine" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.1dp"
+            android:layout_below="@id/name_tv"
+            android:layout_marginTop="@dimen/padding"
+            android:background="@color/base_bg" />
 
         <TextView
             android:id="@+id/oa_meeting_start"
@@ -70,18 +80,23 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/name_tv"
             android:layout_marginTop="20dp"
+            android:drawableLeft="@drawable/ic_meeting_time"
+            android:drawablePadding="5dp"
             android:text="06月13日"
-            android:textSize="@dimen/text_main"/>
+            android:textColor="#666666"
+            android:textSize="13sp" />
 
         <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_marginLeft="18dp"
             android:layout_marginTop="5dp"
             android:text="16:00"
-            android:textColor="@color/powderblue"
-            android:textSize="30sp"/>
+            android:textColor="#000000"
+            android:textSize="18sp" />
 
         <TextView
             android:id="@+id/oa_meeting_line"
@@ -92,7 +107,8 @@
             android:layout_marginRight="5dp"
             android:layout_toRightOf="@+id/oa_meeting_start_date"
             android:text="—"
-            android:textSize="30sp"/>
+            android:textSize="30sp"
+            android:visibility="invisible" />
 
         <TextView
             android:id="@+id/oa_meeting_end_date"
@@ -101,8 +117,8 @@
             android:layout_alignTop="@+id/oa_meeting_start_date"
             android:layout_toRightOf="@+id/oa_meeting_line"
             android:text="18:00"
-            android:textColor="@color/powderblue"
-            android:textSize="30sp"/>
+            android:textColor="#000000"
+            android:textSize="18sp" />
 
         <TextView
             android:id="@+id/oa_meeting_end"
@@ -112,7 +128,8 @@
             android:layout_alignLeft="@+id/oa_meeting_end_date"
             android:layout_marginBottom="5dp"
             android:text="06月13日"
-            android:textSize="@dimen/text_main"/>
+            android:textColor="#666666"
+            android:textSize="13sp" />
 
         <TextView
             android:id="@+id/addr"
@@ -120,8 +137,10 @@
             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:text="@string/meet_position"
-            android:textColor="@color/hintColor"/>
+            android:textColor="#666666" />
 
         <TextView
             android:id="@+id/addr_tv"
@@ -133,38 +152,18 @@
             android:ellipsize="end"
             android:lines="1"
             android:text="@string/not_edit"
-            android:textColor="@color/text_hine"/>
-
-
-        <TextView
-            android:id="@+id/sub"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/addr_tv"
-            android:layout_marginTop="10dp"
-            android:text="@string/meet_show"
-            android:textColor="@color/hintColor"/>
-
-        <TextView
-            android:id="@+id/sub_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@id/sub"
-            android:layout_marginLeft="10dp"
-            android:layout_toRightOf="@id/sub"
-            android:ellipsize="end"
-            android:lines="1"
-            android:text="无"
-            android:textColor="@color/text_hine"/>
+            android:textColor="#666666" />
 
         <TextView
             android:id="@+id/user"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/sub_tv"
+            android:layout_below="@id/addr_tv"
             android:layout_marginTop="10dp"
+            android:drawableLeft="@drawable/ic_metting_people"
+            android:drawablePadding="5dp"
             android:text="@string/recorder"
-            android:textColor="@color/hintColor"/>
+            android:textColor="#666666" />
 
         <TextView
             android:id="@+id/user_tv"
@@ -172,16 +171,17 @@
             android:layout_height="wrap_content"
             android:layout_alignLeft="@id/addr_tv"
             android:layout_alignTop="@id/user"
-            android:textColor="@color/text_hine"/>
-
+            android:textColor="@color/text_hine" />
         <TextView
             android:id="@+id/tag"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/user_tv"
             android:layout_marginTop="10dp"
+            android:drawableLeft="@drawable/ic_metting_sub"
+            android:drawablePadding="5dp"
             android:text="@string/meet_tag"
-            android:textColor="@color/hintColor"/>
+            android:textColor="#666666" />
 
         <TextView
             android:id="@+id/tag_tv"
@@ -190,58 +190,51 @@
             android:layout_alignLeft="@id/addr_tv"
             android:layout_alignTop="@id/tag"
             android:text="无"
-            android:textColor="@color/text_hine"/>
+            android:textColor="#666666" />
+        <TextView
+            android:id="@+id/sub"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tag_tv"
+            android:layout_marginTop="10dp"
+            android:drawableLeft="@drawable/ic_metting_label"
+            android:drawablePadding="5dp"
+            android:text="@string/meet_show"
+            android:textColor="#666666" />
+
+        <TextView
+            android:id="@+id/sub_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@id/sub"
+            android:layout_marginLeft="10dp"
+            android:layout_toRightOf="@id/sub"
+            android:ellipsize="end"
+            android:lines="1"
+            android:text="无"
+            android:textColor="#666666" />
+
+
+
+
     </RelativeLayout>
 
     <Button
         android:id="@+id/click_btn"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        style="@style/commonButtonStyle"
         android:layout_below="@+id/info"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_marginTop="20dp"
-        android:background="@drawable/bg_orange_btn"
-        android:padding="10dp"
-        android:text="@string/signin_new"
-        android:textColor="@color/white"
-        android:textSize="@dimen/text_main"/>
+        android:text="@string/signin_new" />
 
 
-    <RelativeLayout
-        android:id="@+id/baidu_ll"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/click_btn"
-        android:layout_marginTop="10dp">
-
-        <TextView
-            android:id="@+id/location_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_marginRight="20dp"
-            android:layout_toLeftOf="@id/location_tag"
-            android:ellipsize="end"
-            android:lines="1"/>
-
-        <TextView
-            android:id="@+id/location_tag"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="30dp"
-            android:clickable="true"
-            android:text="@string/agare"
-            android:textColor="@color/blue"/>
-    </RelativeLayout>
-
     <LinearLayout
         android:id="@+id/click_ll"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/baidu_ll"
-        android:layout_centerHorizontal="true"
+        android:layout_below="@+id/click_btn"
+        android:layout_marginLeft="10dp"
         android:layout_marginTop="10dp"
         android:orientation="horizontal">
 
@@ -249,25 +242,52 @@
             android:id="@+id/num_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/signin_number"/>
+            android:text="@string/signin_number" />
 
         <View
             android:layout_width="6dp"
-            android:layout_height="1dp"/>
+            android:layout_height="1dp" />
 
         <TextView
             android:id="@+id/num_tag"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/click_finds"
-            android:textColor="@color/blue"/>
+            android:textColor="#1084D1" />
     </LinearLayout>
 
+    <RelativeLayout
+        android:id="@+id/baidu_ll"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/click_ll"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="10dp">
+
+        <TextView
+            android:id="@+id/location_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="10dp"
+            android:ellipsize="end"
+            android:lines="1" />
+
+        <TextView
+            android:id="@+id/location_tag"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="30dp"
+            android:layout_toRightOf="@id/location_tv"
+            android:clickable="true"
+            android:text="@string/agare"
+            android:textColor="#1084D1" />
+    </RelativeLayout>
+
     <TextView
         android:id="@+id/end_meet_tv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:background="@drawable/endmeeting"/>
+        android:background="@drawable/endmeeting" />
 
 </RelativeLayout>

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

@@ -10,8 +10,12 @@
         android:id="@+id/tabLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/item_color1"
         app:tabGravity="fill"
+        android:background="@color/white"
+        app:tabIndicatorColor="#33A2EE"
+        app:tabIndicatorHeight="4dp"
+        app:tabSelectedTextColor="#1084D1"
+        app:tabTextColor="#666666"
         app:tabMode="fixed" />
 
     <android.support.v4.view.ViewPager

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

@@ -273,7 +273,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:visibility="visible"
-                    android:background="#ebe9e9"
+                    android:dividerHeight="0dp"
                     >
                 </com.core.widget.MyListView>
 

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

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              style="@style/approvalStyle">
-
-    <TextView
-        android:id="@+id/nameTv"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center|left"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:textColor="@color/titleBlue"/>
-
-
-
-</LinearLayout>

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

@@ -15,11 +15,10 @@
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:layout_gravity="center_vertical|left"
-        android:layout_margin="5dp"
         app:color_checked="#149A45" />
 
     <LinearLayout style="@style/LinearLayout_vertical"
-        android:layout_margin="3dp"
+        android:layout_gravity="center_vertical|left"
         android:layout_height="wrap_content">
 
         <TextView
@@ -28,9 +27,7 @@
             android:layout_marginLeft="10dp"
             android:textSize="16sp"
             android:layout_gravity="center_vertical"
-            android:gravity="center"
             android:textColor="@color/black"
-            android:text="xxxx商机库"
             style="@style/TextView_VerticalCenter" />
 
         <TextView

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

@@ -52,6 +52,13 @@
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="65dp"
+            android:layout_marginTop="7dp"
+            android:text="*"
+            android:textColor="@color/red"/>
         <TextView
             android:id="@+id/item_company_tv"
             android:layout_width="wrap_content"
@@ -62,7 +69,7 @@
             android:drawableRight="@drawable/company"
             android:ellipsize="end"
             android:gravity="center|right"
-            android:hint="@string/common_select"
+            android:hint="@string/common_select1"
             android:maxLines="2"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_hine" />
@@ -92,6 +99,13 @@
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
         <!--android:drawableRight="@drawable/addr_bule"-->
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="65dp"
+            android:layout_marginTop="7dp"
+            android:text="*"
+            android:textColor="@color/red"/>
         <TextView
             android:id="@+id/item_companyaddr_tv"
             android:layout_width="wrap_content"
@@ -129,7 +143,13 @@
             android:text="@string/visit_aim"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
-
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="65dp"
+            android:layout_marginTop="7dp"
+            android:text="*"
+            android:textColor="@color/red"/>
         <TextView
             android:id="@+id/item_remark_tv"
             android:layout_width="wrap_content"
@@ -138,7 +158,7 @@
             android:layout_toRightOf="@+id/remark_tag"
             android:drawableRight="@drawable/oa_next"
             android:gravity="center|right"
-            android:hint="@string/common_select"
+            android:hint="@string/common_select1"
             android:minHeight="@dimen/misson_item_height"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_hine" />
@@ -371,7 +391,13 @@
             android:text="@string/expected_arrival_time"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
-
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="96dp"
+            android:layout_marginTop="7dp"
+            android:text="*"
+            android:textColor="@color/red"/>
         <TextView
             android:id="@+id/item_reckontime_tv"
             android:layout_width="wrap_content"
@@ -379,7 +405,7 @@
             android:layout_alignParentRight="true"
             android:drawableRight="@drawable/oa_next"
             android:gravity="center"
-            android:hint="@string/common_select"
+            android:hint="@string/common_select1"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_hine" />
     </RelativeLayout>

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

@@ -1,7 +1,6 @@
 <?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

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

@@ -29,17 +29,15 @@
             android:background="@color/button_invalid"/>
         <TextView
             android:id="@+id/send_qzone_video"
-            style="@style/commonPopItem"
+            style="@style/commonPopSingleItem"
             android:text="@string/qzone_send_video"
             />
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="10dp"
-            android:background="@color/black_gray"/>
-        <TextView
-            android:id="@+id/send_qzone_cancel"
-            style="@style/commonPopCancelItem"
-            android:text="@string/common_cancel"
-            />
+
     </LinearLayout>
+
+    <TextView
+        android:id="@+id/send_qzone_cancel"
+        style="@style/commonPopCancelItem"
+        android:text="@string/common_cancel"
+        />
 </LinearLayout>

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

@@ -16,7 +16,8 @@
         <TextView
             android:id="@+id/tv_less_key"
             style="@style/TextView_Basic"
-            android:layout_width="60dp"
+            android:layout_width="wrap_content"
+            android:maxWidth="60dp"
             android:layout_gravity="center_vertical"
             android:layout_marginBottom="10dp"
             android:layout_marginLeft="10dp"
@@ -30,7 +31,7 @@
             android:id="@+id/muchInputTv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="10dp"
             android:text="*"
             android:textColor="@color/red"
             android:visibility="gone" />

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

@@ -33,8 +33,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="90dp"
-            android:text="@string/common_list_empty"
+            android:text="@string/str_common_empty_text"
             android:textSize="14sp"
+            android:textColor="@color/empty_text_color"
             />
     </LinearLayout>
 

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

@@ -10,5 +10,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:divider="@color/item_line"
+            android:listSelector="@drawable/selector_me_menu_item_bg"
             android:dividerHeight="@dimen/line"/>
 </FrameLayout>

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

@@ -16,8 +16,8 @@
         android:src="@drawable/ic_loading" /> -->
       <ProgressBar
         android:id="@+id/imageViewLoading"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_centerInParent="true"
         android:indeterminateDrawable="@drawable/frame_loading" />
 

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

@@ -40,7 +40,7 @@
     <color name="item_text">#cca0a0a0</color>
     <color name="item_line">#ebe9e9</color>
     <color name="antionbarcolor">#646464</color>
-    <color name="base_bg">#FFEBE9E9</color>
+    <color name="base_bg">#f2f2f2</color>
     <color name="antionbaritemcolor">#a3b2cf</color>
     <color name="wirtehine">#a3b2cf</color>
     <color name="text_main">#3c3c3c</color>
@@ -314,7 +314,7 @@
     <color name="me_menu_item_press">#DFDEDE</color>
     <color name="bg_underlying">#ebe9e9</color>
     <color name="orange_text">#f17e21</color>
-    <color name="oa_bg">#EBE9E9</color>
+    <color name="oa_bg">#f2f2f2</color>
     <color name="oa_item_bg">#f9f9f9</color>
     <color name="colorPrimary">#3F51B5</color>
     <color name="colorPrimaryDark">#303F9F</color>

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

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--String-->
-
-    <!--end String-->
-
-    <!--Color-->
-    <color name="oa_main">#f4f4f5</color>
-    <!--listView 中对于 contentView的settag方法参数定义 -->
-    <item name="position" type="id"></item>
-    <!--end Color-->
-
-
-    <!--Style-->
-    <!--共有对象-->
-    <style name="oa_btn_style">
-        <item name="android:layout_width">40dp</item>
-        <item name="android:layout_height">40dp</item>
-        <item name="android:clickable">false</item>
-    </style>
-
-    <!-- 进度条-->
-    <style name="StyleProgressBarMini" parent="@android:style/Widget.ProgressBar.Horizontal">
-        <item name="android:maxHeight">50dip</item>
-        <item name="android:minHeight">14dip</item>
-        <item name="android:indeterminateOnly">false</item>
-        <item name="android:indeterminateDrawable">
-            @android:drawable/progress_indeterminate_horizontal
-        </item>
-        <item name="android:progressDrawable">@drawable/shape_progressbar_mini</item>
-    </style>
-
-    <!-- 考勤统计通通用属性-->
-    <style name="statistics_style">
-        <item name="android:layout_height">20dp</item>
-    </style>
-
-    <!-- 会议-->
-    <style name="add_meeting">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:minHeight">50dp</item>
-        <item name="android:clickable">true</item>
-    </style>
-    <!-- 添加考勤组-->
-    <style name="add_signin">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">@dimen/item_height</item>
-        <item name="android:background">@color/item_color2</item>
-        <item name="android:paddingLeft">20dp</item>
-        <item name="android:paddingRight">20dp</item>
-    </style>
-
-    <style name="add_signin_item">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">@dimen/item_height</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:background">@drawable/oa_signin_rl</item>
-        <item name="android:padding">10dp</item>
-    </style>
-
-    <style name="add_signin_tv">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:gravity">center_vertical</item>
-    </style>
-
-
-    <style name="add_signin_tv_main" parent="@style/add_signin_tv">
-        <item name="android:textSize">@dimen/text_main</item>
-        <item name="android:textColor">@color/text_main</item>
-        <item name="android:drawablePadding">8dp</item>
-
-    </style>
-
-    <style name="add_signin_tv_hine" parent="@style/add_signin_tv">
-        <item name="android:textSize">@dimen/text_hine</item>
-        <item name="android:textColor">@color/text_hine</item>
-        <item name="android:layout_marginLeft">10dp</item>
-    </style>
-
-    <style name="add_meet_tv">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_centerVertical">true</item>
-        <item name="android:layout_marginRight">10dp</item>
-        <item name="android:layout_marginLeft">10dp</item>
-        <item name="android:background">@null</item>
-        <item name="android:gravity">left</item>
-        <item name="android:padding">5dp</item>
-        <item name="android:textColorHint">@color/gray</item>
-        <item name="android:textSize">15sp</item>
-    </style>
-
-    <!--工作日志-->
-    <style name="style0">  
-            <item name="android:textSize">19dip</item>  
-            <item name="android:textColor">@color/text_main</item>  
-    </style>
-
-    <style name="style1">  
-            <item name="android:textSize">23dip</item>  
-            <item name="android:textColor">@color/text_hine</item>  
-            <item name="android:textStyle">italic</item>  
-    </style>
-
-    <style name="style_calender">  
-        <item name="android:layout_width">0dp</item>
-
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:divider">@null</item>
-        <item name="android:dividerHeight">0dp</item>
-        <item name="android:scrollbars">none</item>
-        <item name="android:scrollbarSize">0dp</item>
-    </style><!--end Style-->
-
-    <dimen name="drawable_padding">5dp</dimen>
-
-    <style name="text_color">  
-        <item name="android:textColor">#268508</item>
-        <item name="android:textSize">@dimen/text_main</item>
-    </style>
-</resources>

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

@@ -86,7 +86,7 @@
     <string name="crm_customer_visit">客户拜访</string>
     <string name="crm_waller">荣誉墙</string>
     <!--View empty-->
-    <string name="empty_message">暂无记录</string>
+    <string name="empty_message">暂无数据</string>
     <string name="loading_message">请等待！</string>
     <string name="error_message">很抱歉! 系统发现未知错误</string>
     <string name="empty_button">再次尝试</string>

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

@@ -567,7 +567,7 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_centerVertical">true</item>
-        <item name="android:layout_marginLeft">20dp</item>
+        <item name="android:layout_marginLeft">10dp</item>
         <item name="android:gravity">right</item>
         <item name="android:textColor">@color/text_main</item>
         <item name="android:textSize">@dimen/text_main</item>
@@ -576,7 +576,7 @@
     <style name="form_relative_left_text2">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginLeft">20dp</item>
+        <item name="android:layout_marginLeft">10dp</item>
         <item name="android:layout_centerVertical">true</item>
         <item name="android:gravity">right</item>
         <item name="android:textColor">@color/text_main</item>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon May 28 09:30:49 CST 2018
-debugName=387
+#Fri May 25 11:49:26 CST 2018
+debugName=429
 versionName=630
-debugCode=387
+debugCode=429
 versionCode=170

app_core/common/src/main/java/com/core/app/ActionBackActivity.java

@@ -8,6 +8,7 @@ import android.util.Log;
 import android.view.MenuItem;
 
 import com.core.base.StackActivity;
+import com.core.utils.CommonUtil;
 
 
 public class ActionBackActivity extends StackActivity {
@@ -108,6 +109,7 @@ public class ActionBackActivity extends StackActivity {
 
     @Override
     public void finish() {
+        CommonUtil.closeKeybord(this);
         super.finish();
         overridePendingTransition(R.anim.anim_activity_back_in, R.anim.anim_activity_back_out);
     }

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

@@ -20,6 +20,7 @@ import android.widget.TextView;
 
 import com.common.LogUtil;
 import com.core.app.R;
+import com.core.utils.CommonUtil;
 import com.core.utils.StatusBarUtil;
 import com.core.utils.ToastUtil;
 
@@ -47,6 +48,12 @@ public class BaseToolBarActivity extends AppCompatActivity {
         }
     }
 
+    @Override
+    protected void onPause() {
+        CommonUtil.closeKeybord(this);
+        super.onPause();
+    }
+
     public CharSequence getToolBarTitle() {
         if (commonTitleTv != null && !TextUtils.isEmpty(commonTitleTv.getText())) {
             return commonTitleTv.getText();

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

@@ -11,6 +11,9 @@ import android.support.v4.content.ContextCompat;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -64,6 +67,26 @@ public abstract class EasyFragment extends Fragment {
 	 */
 	protected abstract void onCreateView(Bundle savedInstanceState, boolean createView);
 
+
+	private MenuItem.OnMenuItemClickListener omOnMenuItemClickListener= new MenuItem.OnMenuItemClickListener() {
+		@Override
+		public boolean onMenuItemClick(MenuItem menuItem) {
+			onOptionsItemSelected(menuItem);
+			return false;
+		}
+	};
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+		if (menu!=null){
+			for (int i=0;i<menu.size();i++){
+				MenuItem item = menu.getItem(i);
+				if (item!=null){
+					item.setOnMenuItemClickListener(omOnMenuItemClickListener);
+				}
+			}
+		}
+		super.onCreateOptionsMenu(menu, inflater);
+	}
 	public View getmRootView() {
 		return mRootView;
 	}

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

@@ -10,6 +10,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.common.LogUtil;
 import com.core.app.R;
 import com.core.base.presenter.BasePresenter;
 import com.core.base.view.BaseView;
@@ -75,6 +76,7 @@ public abstract class BaseMVPFragment<T extends BasePresenter> extends Fragment
 
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        LogUtil.i("onViewCreated");
         super.onViewCreated(view, savedInstanceState);
         if (mPresenter != null) {
             mPresenter.attachView(this);

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

@@ -47,6 +47,7 @@ import com.core.utils.CommonUtil;
 import com.core.utils.DialogUtils;
 import com.core.utils.FlexJsonUtil;
 import com.core.utils.ToastUtil;
+import com.core.widget.CustomProgressDialog;
 import com.core.widget.crouton.Crouton;
 import com.core.widget.crouton.Style;
 import com.me.network.app.base.HttpCallback;
@@ -81,16 +82,9 @@ public class ViewUtil {
     private static MaterialDialog loginERPDialog;
     private static List<LoginEntity> erpEntities;
     private static boolean hasErp = true;//是否有erp
-
-
-    private static String oldMsg;
-    private static long time;
-    private static String oldMsg2;
-    private static long time2;
-
-
     public static Crouton crouton;
 
+    public static CustomProgressDialog progressDialog;
 
     public static void ToastMessage(Context cont, String msg) {
         ToastUtil.showToast(cont,msg);
@@ -99,21 +93,6 @@ public class ViewUtil {
 
     public static void ToastMessage(Context cont, String msg, int toastColor, int toastTime) {
         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();
-//            }
-//        }
-
     }
 
     public static void ShowMessageTitle(Context ct, String msg) {
@@ -275,6 +254,7 @@ public class ViewUtil {
      */
     public static void LoginTask(final String user_phone, final String user_password, final Context ct) {
         ViewUtil.ct = ct;
+        progressDialog= CustomProgressDialog.createDialog(ct);
         LogUtil.d("AppInfo","password:"+user_password+" phone:"+user_phone);
         mdProcessDialog = new MaterialDialog.Builder(ct).title(
                 MyApplication.getInstance().getString(R.string.app_dialog_title))
@@ -285,24 +265,6 @@ public class ViewUtil {
         if (!((BaseActivity) ViewUtil.ct).isFinishing()) {
             mdProcessDialog.show();
         }
-//        if (!(ct instanceof LoginActivity)) {
-        //取缓存
-//            if (!StringUtil.isEmpty(CommonUtil.getSharedPreferences(ct, "loginJson"))) {
-//                showDialogCompany(CommonUtil.getSharedPreferences(ct, "loginJson"), user_phone, user_password);
-//            }
-//        } else {
-        //登录界面过来，不走缓存
-        /*String url = Constants.BASE_URL_LOGIN;
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("user", user_phone);
-        params.put("password", user_password);
-        Message message = new Message();
-        Bundle bundle = new Bundle();
-        bundle.putString("phone", user_phone);
-        bundle.putString("password", user_password);
-        startNetThread(url, params, handler, Constants.SUCCESS_LOGIN, message,
-                bundle, "get");*/
-//        }
         HttpRequest.getInstance().sendRequest(Constants.ACCOUNT_CENTER_HOST,
                 new HttpParams.Builder()
                         .url("sso/login/mobile")
@@ -454,14 +416,14 @@ public class ViewUtil {
                     ChangeStatusERP(result);
                 } else {
                     String reason = JSON.parseObject(result).getString("reason");
-                    ToastMessage(ct, reason, Style.holoGreenLight, 3000);
+                    ToastMessage(MyApplication.getInstance(), reason, Style.holoGreenLight, 3000);
                 }
             } else {
-                ToastMessage(ct, "接口数据非法！", Style.holoRedLight, 3000);
+                ToastMessage(MyApplication.getInstance(), "接口数据非法！", Style.holoRedLight, 3000);
             }
         } catch (Exception e) {
             e.printStackTrace();
-            ToastMessage(ct, MyApplication.getInstance().getString(R.string.login_error_erp), Style.holoRedLight, 3000);
+            ToastMessage(MyApplication.getInstance(), MyApplication.getInstance().getString(R.string.login_error_erp), Style.holoRedLight, 3000);
         }
     }
 
@@ -526,7 +488,7 @@ public class ViewUtil {
                 ct.startActivity(new Intent("com.modular.main.DataDownloadActivity"));
             }
             CommonUtil.setSharedPreferences(ct, "erp_baseurl", erp_baseurl);
-        } else {
+        }else{
             if (!StringUtil.isEmpty(CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_baseurl"))) {
             } else {
               MyApplication.getInstance().startActivity(new Intent("com.modular.main.DataDownloadActivity"));
@@ -638,8 +600,10 @@ public class ViewUtil {
     }
 
 
-    /*@功能:管理平台的返回信息处理*/
+   
+      /*@功能:管理平台的返回信息处理*/
     public static void LoginSucess(String json, String phone, String password) {
+        LogUtil.d("AppInfo","phone:"+phone+"password:"+password);
         CommonUtil.setSharedPreferences(ct, "loginJson", json);
         try {
             JSONArray array = JSON.parseArray(json);
@@ -652,7 +616,7 @@ public class ViewUtil {
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace();
+             e.printStackTrace();
         }
         if (JSONUtil.validate(json)) {
             // showDialogCompany(json, phone, password);
@@ -663,7 +627,9 @@ public class ViewUtil {
     }
 
 
+
     public static void showLoginDialog(String loginResult, final String phone, final String password) {
+        LogUtil.d("AppInfo","phone:"+phone+"password:"+password);
         List<LoginEntity> loginMsg = JSON.parseArray(loginResult, LoginEntity.class);
         List<LoginEntity> loginEntities = new ArrayList<>();
         boolean isHasUas = false;
@@ -720,16 +686,16 @@ public class ViewUtil {
             erpEntities = loginEntities;
             String[] items = new String[loginEntities.size()];
             int select = 0;
-            List<ItemsSelectType1> itemsSelectType1s = new ArrayList<>();
+            List<ItemsSelectType1> itemsSelectType1s=new ArrayList<>();
             for (int j = 0; j < loginEntities.size(); j++) {
-                ItemsSelectType1 model = new ItemsSelectType1();
+                ItemsSelectType1 model=new ItemsSelectType1();
                 model.setName(loginEntities.get(j).getName());
                 items[j] = loginEntities.get(j).getName();
                 itemsSelectType1s.add(model);
-                String companyName = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_commpany");
-                if (!StringUtil.isEmpty(companyName)) {
-                    if (companyName.equals(loginEntities.get(j).getName())) {
-                        selectId = j;
+                String companyName=CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany");
+                if (!StringUtil.isEmpty(companyName)){
+                    if (companyName.equals(loginEntities.get(j).getName())){
+                        selectId=j;
                     }
                 }
             }
@@ -740,8 +706,9 @@ public class ViewUtil {
 //                if (select > items.length) {
 //                    select = 0;
 //                }
-                popupWindow = null;
-                showPopDialog((Activity) ct, itemsSelectType1s, phone, password);
+                LogUtil.d("AppInfo","phone:"+phone+"password:"+password);
+                
+                showPopDialog((Activity) ct,itemsSelectType1s,phone,password);
 //                loginERPDialog = new MaterialDialog.Builder(ct)
 //                        .title(ct.getString(R.string.user_dialog_company))
 //                        .items(items)
@@ -760,23 +727,27 @@ public class ViewUtil {
 
 
     public static PopupWindow popupWindow = null;
-    public static int selectId = 0;
+    public static int selectId=0;
     public static ItemPopListAdapter adapter;
-
-    public static void showPopDialog(final Activity ct, List<ItemsSelectType1> itemsSelectType1s
-            , final String phone, final String password) {
-        erp_phone = phone;
-        erp_password = password;
+    public static void  showPopDialog(final Activity ct, List<ItemsSelectType1> itemsSelectType1s
+    , final String phone, final String password){
+        erp_phone=phone;
+        erp_password=password;
         View view = null;
-        if (DialogUtils.isDialogShowing(mdProcessDialog)) {
+        if (DialogUtils.isDialogShowing(mdProcessDialog)){
             mdProcessDialog.dismiss();
         }
-        WindowManager windowManager = (WindowManager) ct.getSystemService(Context.WINDOW_SERVICE);
+        if (DialogUtils.isDialogShowing(popupWindow)){
+            popupWindow.dismiss();
+            popupWindow=null;
+        }
+        popupWindow=null;
+        WindowManager windowManager = (WindowManager)ct. getSystemService(Context.WINDOW_SERVICE);
         if (popupWindow == null) {
             LayoutInflater layoutInflater = (LayoutInflater) ct.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             view = layoutInflater.inflate(R.layout.pop_dialog_list, null);
             ListView plist = view.findViewById(R.id.mList);
-            List<ItemsSelectType1> datas = itemsSelectType1s;
+            List<ItemsSelectType1> datas =itemsSelectType1s;
             adapter = new ItemPopListAdapter(ct, datas);
             adapter.setSelectId(selectId);
             plist.setAdapter(adapter);
@@ -790,12 +761,12 @@ public class ViewUtil {
                     selectId = position;
                     adapter.setSelectId(selectId);
                     adapter.notifyDataSetChanged();
-                    ItemPopListAdapter.ViewHolder viewHolder = (ItemPopListAdapter.ViewHolder) view.getTag();
-                    String text = viewHolder.tvItemName.getText().toString();
-                    selectCompanyItems(selectId, text, phone, password);
-                }
-            });
-            popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth() - DensityUtil.dp2px(50), LinearLayout.LayoutParams.WRAP_CONTENT);
+                    ItemPopListAdapter.ViewHolder viewHolder= (ItemPopListAdapter.ViewHolder) view.getTag();
+                    String text= viewHolder.tvItemName.getText().toString();
+                   
+                    selectCompanyItems(selectId, text,erp_phone, erp_password);
+                }});
+            popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth()- DensityUtil.dp2px(50), LinearLayout.LayoutParams.WRAP_CONTENT);
         }
         popupWindow.setFocusable(true);
         popupWindow.setOutsideTouchable(true);
@@ -810,9 +781,11 @@ public class ViewUtil {
         popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
         popupWindow.showAtLocation(ct.getWindow().getDecorView(), Gravity.CENTER, 0, 0);
     }
-
+        
+  
 
     private static boolean selectCompanyItems(int which, CharSequence text, String phone, String password) {
+        LogUtil.d("AppInfo","text；"+text+"phone:"+phone+" password:"+password);
         if (!CommonUtil.isNetWorkConnected(ct)) {
             ToastUtil.showToast(ct, R.string.networks_out);
             return true;
@@ -1191,19 +1164,21 @@ public class ViewUtil {
     // 登录ERP
     public static void LoginERPTask(String url, String enuu, String master, String username, String password) {
         mdProcessDialog.setContent(MyApplication.getInstance().getString(R.string.login_progress_erp));
+        progressDialog.show();
         String loginToken = CommonUtil.getSharedPreferences(ct, Constants.CACHE.ACCOUNT_CENTER_TOKEN);
         HttpRequest.getInstance().sendRequest(url,
                 new HttpParams.Builder()
                         .url("mobile/login.action")
                         .addParam("token", loginToken)
                         .addParam("enuu", enuu)
-                        .connectTimeOut(5)
-                        .readTimeOut(5)
+                        .connectTimeOut(3)
+                        .readTimeOut(3)
                         .method(Method.POST)
                         .build(), new HttpCallback() {
                     @Override
                     public void onSuccess(int flag, Object o) throws Exception {
                         Log.d("erp登录成功", o.toString());
+                        progressDialog.dismiss();
                         if (o != null) {
                             loginErpSuccess(o.toString());
                         }
@@ -1211,8 +1186,9 @@ public class ViewUtil {
 
                     @Override
                     public void onFail(int flag, String failStr) throws Exception {
-                        Log.e("erp登录失败", "登录失败:" + failStr);
-                        ToastMessage(MyApplication.getInstance(), "登录失败:" + failStr);
+                        Log.e("erp登录失败", "登录失败:"+failStr);
+                        progressDialog.dismiss();
+                        ToastMessage(MyApplication.getInstance(),"登录失败:"+failStr);
                         mdProcessDialog.setContent("登录失败");
                         new Handler().postDelayed(new Runnable() {
                             @Override

app_core/common/src/main/java/com/core/net/volley/Result.java

@@ -7,17 +7,17 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
-import com.core.app.R;
 import com.common.hmac.Md5Util;
 import com.common.system.SystemUtil;
 import com.core.app.AppConfig;
 import com.core.app.MyApplication;
+import com.core.app.R;
 import com.core.dao.UserDao;
 import com.core.model.LoginRegisterResult;
 import com.core.model.User;
+import com.core.utils.ToastUtil;
 import com.core.utils.helper.LoginHelper;
 import com.core.utils.sp.UserSp;
-import com.core.widget.crouton.Crouton;
 
 import java.util.HashMap;
 
@@ -73,7 +73,8 @@ public class Result {
                 showResultToast(context, result);
             return false;
         } else if (result.resultCode == CODE_INTERNAL_ERROR) {//接口内部异常
-            Crouton.makeText(context, R.string.service_start_failed, 2000);
+           // Crouton.makeText(context, R.string.service_start_failed, 2000);
+            ToastUtil.showToast(context,R.string.service_start_failed);
             return false;
         } else {
             if (showToast) {

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

@@ -106,7 +106,7 @@ public class CommonUtil {
         }
         String baseUrl = getSharedPreferences(ct, "erp_baseurl");
 //        if (BaseConfig.isDebug()){
-//            baseUrl="http://192.168.253.41:8080/ERP/";
+//            baseUrl="http://192.168.253.243:8080/ERP/";
 //        }
 //        baseUrl = "http://192.168.253.52:9000/ERP/";
 
@@ -888,6 +888,22 @@ public class CommonUtil {
 
     }
 
+    /**
+     * 关闭软键盘
+     *
+     * @param mContext 上下文
+     */
+    public static void closeKeybord(final Activity mContext) {
+        if (mContext != null) {
+            InputMethodManager imm = (InputMethodManager) mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
+            if (imm.isActive() && mContext.getCurrentFocus() != null) {
+                if (mContext.getCurrentFocus().getWindowToken() != null) {
+                    imm.hideSoftInputFromWindow(mContext.getCurrentFocus().getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+                }
+            }
+        }
+    }
+
     public static boolean isBiteman() {
         String baseUrl = getSharedPreferences(MyApplication.getInstance(), "erp_base");
         return !StringUtil.isEmpty(baseUrl) && baseUrl.contains("http://202.104.151.184:8099/ERP/");

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

@@ -39,7 +39,7 @@ public class NotificationManage {
     private void sendNotification(Context context, int icon, String title, String group, String content, Class<? extends Activity> clazz) {
         NotificationManager mNotificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
         NotificationCompat.Builder builder = new NotificationCompat.Builder(context.getApplicationContext());
-        builder.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE);
+//        builder.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE);
         builder.setAutoCancel(true);
         builder.setContentTitle(title);
         builder.setContentText(content);

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

@@ -111,14 +111,14 @@ public class ToastUtil {
         if (context == null || TextUtils.isEmpty(message)) {
             return;
         }
-        Crouton.makeText((Activity) context, message, Style.holoGreenLight, 1000, viewGroup).show();
+        Crouton.makeText((Activity) context, message, Style.holoGreenLight, 2000, viewGroup).show();
     }
 
     public static void showToast(Context context, int resId, ViewGroup viewGroup) {
         if (context == null) {
             return;
         }
-        Crouton.makeText((Activity) context, context.getString(resId), Style.holoGreenLight, 1000, viewGroup).show();
+        Crouton.makeText((Activity) context, context.getString(resId), Style.holoGreenLight, 2000, viewGroup).show();
     }
 
 }

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

@@ -2,21 +2,21 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
         <shape>
-            <solid android:color="@color/btn_orange_press" />
+            <solid android:color="#2D84C0" />
 
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>
     <item android:state_enabled="false">
         <shape>
-            <solid android:color="@color/btn_orange_press" />
+            <solid android:color="#8EB2CD" />
        
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>
     <item>
         <shape>
-            <solid android:color="@color/titleBlue" />
+            <solid android:color="#33A2EE" />
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>

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

@@ -1,4 +1,9 @@
-<vector android:height="24dp" android:viewportHeight="1024"
-    android:viewportWidth="1024" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#D4D4D4" android:pathData="M769.79,476.03 L416.48,125.92c-18.85,-18.66 -49.22,-18.53 -67.87,0.32 -18.66,18.82 -18.53,49.22 0.32,67.87l319.46,316.58 -318.18,321.06c-18.66,18.82 -18.53,49.22 0.32,67.87 9.34,9.28 21.57,13.92 33.79,13.92 12.35,0 24.7,-4.74 34.08,-14.21l350.11,-353.31c0.51,-0.51 0.67,-1.25 1.18,-1.79 0.13,-0.13 0.29,-0.16 0.42,-0.29C788.74,525.09 788.64,494.69 769.79,476.03z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="10dp"
+    android:height="15dp"
+    android:viewportHeight="1024"
+    android:viewportWidth="1024">
+    <path
+        android:fillColor="#D4D4D4"
+        android:pathData="M769.79,476.03 L416.48,125.92c-18.85,-18.66 -49.22,-18.53 -67.87,0.32 -18.66,18.82 -18.53,49.22 0.32,67.87l319.46,316.58 -318.18,321.06c-18.66,18.82 -18.53,49.22 0.32,67.87 9.34,9.28 21.57,13.92 33.79,13.92 12.35,0 24.7,-4.74 34.08,-14.21l350.11,-353.31c0.51,-0.51 0.67,-1.25 1.18,-1.79 0.13,-0.13 0.29,-0.16 0.42,-0.29C788.74,525.09 788.64,494.69 769.79,476.03z" />
 </vector>

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

@@ -26,7 +26,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignTop="@id/tv_title"
+                android:layout_marginLeft="1dp"
+                android:layout_marginTop="12dp"
                 android:layout_toRightOf="@id/tv_title"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -37,7 +38,7 @@
                 android:layout_toRightOf="@+id/tv_title"
                 android:background="@null"
                 android:gravity="right|center_vertical"
-                android:hint="@string/common_input" />
+                android:hint="@string/common_input2" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -49,16 +50,15 @@
                 android:id="@+id/detailsTV"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="10dp"
                 android:gravity="bottom"
                 android:text="@string/task_detail" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignTop="@id/detailsTV"
+                android:layout_marginLeft="1dp"
+                android:layout_marginTop="10dp"
                 android:layout_toRightOf="@id/detailsTV"
-                android:layout_marginTop="@dimen/padding"
                 android:text="*"
                 android:textColor="@color/red" />
             <ImageView
@@ -78,7 +78,7 @@
             android:layout_height="100dp"
             android:layout_marginBottom="10dp"
             android:background="@color/white"
-            android:hint="@string/common_input"
+            android:hint="@string/common_input2"
             android:paddingLeft="10dp"
             android:textSize="15sp" />
 
@@ -96,8 +96,9 @@
                 android:text="@string/task_executor" />
             <TextView
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignTop="@id/tv_task_peoples"
+                android:layout_height="wrap_content"      
+                android:layout_marginTop="31dp"
+                android:layout_marginLeft="1dp"
                 android:layout_toRightOf="@id/tv_task_peoples"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -152,7 +153,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignTop="@id/tv_startime"
+                android:layout_marginLeft="1dp"
+                android:layout_marginTop="12dp"
                 android:layout_toRightOf="@id/tv_startime"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -163,7 +165,7 @@
                 android:layout_toRightOf="@+id/tv_startime"
                 android:background="@null"
                 android:gravity="right"
-                android:hint="@string/common_select" />
+                android:hint="@string/common_select1" />
         </RelativeLayout>
 
         <View
@@ -189,7 +191,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignTop="@id/tv_task_startime"
+                android:layout_marginLeft="1dp"
+                android:layout_marginTop="12dp"
                 android:layout_toRightOf="@id/tv_task_startime"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -200,7 +203,7 @@
                 android:layout_toRightOf="@+id/tv_task_startime"
                 android:background="@null"
                 android:gravity="right"
-                android:hint="@string/common_select" />
+                android:hint="@string/common_select1" />
 
         </RelativeLayout>
         <!--

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

@@ -47,8 +47,8 @@
 
         <ImageView
             android:id="@+id/data_inquiry_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/activity_add_meeting.xml

@@ -3,7 +3,7 @@
     xmlns:editTextFormExample="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/line"
+    android:background="#f2f2f2"
     android:fillViewport="true">
 
     <LinearLayout
@@ -14,22 +14,27 @@
         <RelativeLayout
             android:id="@+id/ry_leave_man"
             style="@style/add_meeting"
-            android:background="@color/item_color2">
+            android:background="@color/white">
 
             <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" />
-
+                android:textSize="@dimen/text_hine" />
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="1dp"
+                android:layout_toRightOf="@+id/name_tag"
+                android:text="*"
+                android:textColor="@color/red" />
             <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:layout_alignParentRight="true"
+                android:layout_marginRight="@dimen/padding"
                 android:background="@drawable/btn_yuyin_nor"
                 android:visibility="visible" />
 
@@ -38,13 +43,18 @@
                 style="@style/add_meet_tv"
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@+id/name_tag"
-                android:hint="@string/common_input"
+                android:layout_toLeftOf="@+id/voice_name_iv"
+                android:hint="@string/common_input2"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_hine"
+                android:gravity="right|center"
                 android:inputType="text" />
         </RelativeLayout>
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1px" />
+            android:background="@color/item_line"
+            android:layout_height="0.1dp" />
 
         <RelativeLayout
             android:id="@+id/start_rl"
@@ -57,11 +67,11 @@
                 style="@style/form_relative_left_text"
                 android:text="@string/task_starttime"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="5dp"
+                android:layout_marginLeft="1dp"
                 android:layout_toRightOf="@+id/start_tag"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -72,12 +82,15 @@
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@id/start_tag"
                 android:drawableRight="@drawable/oa_next"
-                android:hint="@string/common_select" />
+                android:gravity="center|right"
+                android:textSize="@dimen/text_hine"
+                android:textColor="@color/text_main"
+                android:hint="@string/common_select1" />
         </RelativeLayout>
-
         <View
             android:layout_width="match_parent"
-            android:layout_height="1px" />
+            android:background="@color/item_line"
+            android:layout_height="0.1dp" />
 
         <RelativeLayout
             android:id="@+id/end_rl"
@@ -89,11 +102,11 @@
                 style="@style/form_relative_left_text"
                 android:text="@string/task_endtime"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="5dp"
+                android:layout_marginLeft="1dp"
                 android:layout_toRightOf="@+id/end_tag"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -103,14 +116,17 @@
                 style="@style/add_meet_tv"
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@id/end_tag"
+                android:gravity="center|right"
+                android:textSize="@dimen/text_hine"
+                android:textColor="@color/text_main"
                 android:drawableRight="@drawable/oa_next"
-                android:hint="@string/common_select" />
+                android:hint="@string/common_select1" />
         </RelativeLayout>
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1px" />
-
+            android:background="@color/item_line"
+            android:layout_height="0.1dp" />
         <RelativeLayout
             android:id="@+id/location_rl"
             style="@style/add_meeting"
@@ -121,11 +137,11 @@
                 style="@style/form_relative_left_text"
                 android:text="@string/meet_position"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="5dp"
+                android:layout_marginLeft="1dp"
                 android:layout_toRightOf="@+id/location_tag"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -134,9 +150,12 @@
                 android:id="@+id/location_et"
                 style="@style/add_meet_tv"
                 android:layout_marginLeft="20dp"
+                android:textSize="@dimen/text_hine"
                 android:layout_toRightOf="@id/location_tag"
+                android:textColor="@color/text_main"
                 android:drawableRight="@drawable/oa_next"
-                android:hint="@string/common_select"
+                android:gravity="center|right"
+                android:hint="@string/common_select1"
                 android:lines="1" />
         </RelativeLayout>
 
@@ -171,11 +190,11 @@
                 style="@style/form_relative_left_text"
                 android:text="@string/join_numer"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="5dp"
+                android:layout_marginLeft="1dp"
                 android:layout_toRightOf="@+id/users_tag"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -183,11 +202,14 @@
             <TextView
                 android:id="@+id/users_tv"
                 style="@style/add_meet_tv"
+                android:textSize="@dimen/text_hine"
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@+id/users_tag"
                 android:drawableRight="@drawable/oa_next"
+                android:gravity="center|right"
+                android:textColor="@color/text_main"
                 android:ellipsize="end"
-                android:hint="@string/common_select"
+                android:hint="@string/common_select1"
                 android:maxLines="4"
                 android:minLines="1"
 
@@ -196,7 +218,8 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1px" />
+            android:background="@color/item_line"
+            android:layout_height="0.1dp" />
 
         <RelativeLayout
             android:id="@+id/user_rl"
@@ -208,12 +231,15 @@
                 style="@style/form_relative_left_text"
                 android:text="@string/administrators"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
             <TextView
                 android:id="@+id/user_tv"
                 style="@style/add_meet_tv"
+                android:textColor="@color/text_main"
                 android:layout_marginLeft="40dp"
+                android:textSize="@dimen/text_hine"
+                android:gravity="center|right"
                 android:layout_toRightOf="@id/user_tag" />
         </RelativeLayout>
 
@@ -221,9 +247,7 @@
             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"
@@ -233,7 +257,7 @@
 
             <View
                 android:layout_width="match_parent"
-                android:layout_height="1px"
+                android:layout_height="0.1dp"
                 android:background="@color/item_line" />
 
             <TextView
@@ -241,17 +265,23 @@
                 style="@style/form_relative_left_text"
                 android:text="@string/meet_tag"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
             <TextView
                 android:id="@+id/tag_et"
                 style="@style/add_meet_tv"
                 android:layout_marginLeft="20dp"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_hine"
                 android:layout_toRightOf="@+id/tag_tag"
                 android:drawableRight="@drawable/oa_next"
-                android:hint="@string/common_select_not_must" />
+                android:gravity="center|right"
+                android:hint="@string/common_select1" />
         </RelativeLayout>
-
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.1dp"
+            android:background="@color/item_line" />
         <RelativeLayout
             android:id="@+id/meet_about"
             style="@style/add_meeting"
@@ -262,24 +292,29 @@
                 style="@style/form_relative_left_text"
                 android:text="@string/meet_show"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
-            <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="10dp"
                 android:layout_height="16dp"
                 android:layout_centerVertical="true"
-                android:layout_marginRight="35dp"
-                android:layout_toRightOf="@+id/about_tag"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="@dimen/padding"
                 android:background="@drawable/btn_yuyin_nor"
                 android:visibility="visible" />
+            <EditText
+                android:id="@+id/about_et"
+                style="@style/add_meet_tv"
+                android:layout_marginLeft="20dp"
+                android:gravity="center|right"
+                android:layout_toLeftOf="@+id/voice_introduce_iv"
+                android:textSize="@dimen/text_hine"
+                android:textColor="@color/text_main"
+                android:layout_toRightOf="@id/about_tag"
+                android:hint="@string/common_input2" />
+
         </RelativeLayout>
 
         <View
@@ -294,7 +329,7 @@
                 style="@style/form_relative_left_text"
                 android:text="@string/add_schedule_for_meeter"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
             <com.core.widget.view.SwitchView
                 android:id="@+id/create_ric_sv"
@@ -307,7 +342,9 @@
 
         <Button
             android:id="@+id/bt_save"
-            style="@style/from_button_base_bule"
+            style="@style/commonButtonStyle"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
             android:layout_marginBottom="30dp"
             android:layout_marginTop="20dp"
             android:text="@string/common_save_button"

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

@@ -186,9 +186,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
-                android:background="#ebe9e9"
+                android:divider="@color/white"
+                android:dividerHeight="0dp"
                 android:focusableInTouchMode="false"
-                android:visibility="visible"></com.core.widget.MyListView>
+                android:visibility="visible"/>
 
         </LinearLayout>
 

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

@@ -6,8 +6,8 @@
 
     <ImageView
         android:id="@+id/loadingImageView"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
         android:layout_gravity="center"
         android:background="@anim/progress_round">
     </ImageView>

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

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              style="@style/approvalStyle">
-
-    <TextView
-        android:id="@+id/nameTv"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center|left"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:textColor="@color/titleBlue"/>
-
-
-
-</LinearLayout>

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

@@ -53,25 +53,16 @@
                 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:text="06月13日"
+                    android:drawableLeft="@drawable/ic_meeting_time"
                     android:textColor="#666666"
-                    android:textSize="@dimen/text_main" />
+                    android:textSize="13sp"  />
 
                 <TextView
                     android:id="@+id/oa_meeting_start_date"
@@ -80,9 +71,11 @@
                     android:layout_alignLeft="@id/oa_meeting_start"
                     android:layout_below="@id/oa_meeting_start"
                     android:layout_marginTop="5dp"
+                    android:layout_marginLeft="18dp"
                     android:gravity="center_vertical"
+                    android:text="16:00"
                     android:textColor="#000000"
-                    android:textSize="30sp" />
+                    android:textSize="18sp" />
 
                 <TextView
                     android:id="@+id/oa_meeting_line"
@@ -94,19 +87,20 @@
                     android:layout_toRightOf="@+id/oa_meeting_start_date"
                     android:text="  "
                     android:textSize="30sp"
-                    android:visibility="gone" />
+                    android:visibility="invisible" />
 
                 <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_marginLeft="30dp"
                     android:layout_toRightOf="@+id/oa_meeting_start_date"
                     android:drawableLeft="@null"
+                    android:text="16:00"
                     android:gravity="center_vertical"
                     android:textColor="#000000"
-                    android:textSize="30sp" />
+                    android:textSize="18sp" />
 
                 <TextView
                     android:id="@+id/oa_meeting_end"
@@ -117,8 +111,9 @@
                     android:layout_alignTop="@id/oa_meeting_start"
                     android:layout_marginBottom="5dp"
                     android:gravity="center_vertical"
+                    android:text="06月13日"
                     android:textColor="#666666"
-                    android:textSize="@dimen/text_main" />
+                    android:textSize="13sp"/>
 
                 <TextView
                     android:id="@+id/oa_meeting_addr"

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

@@ -25,7 +25,7 @@
             android:id="@+id/mList"
             style="@style/ListViewBasic"
             android:layout_height="300dp"
-            android:divider="@color/gray_light"
-            android:dividerHeight="0dp">
+            android:divider="@color/item_line"
+            android:dividerHeight="0.5dp">
         </ListView>
 </LinearLayout>

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

@@ -22,8 +22,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="90dp"
-            android:text="数据为空"
-            android:textSize="14sp" />
+            android:text="@string/str_common_empty_text"
+            android:textSize="14sp"
+            android:textColor="@color/empty_text_color"
+            />
 
     </LinearLayout>
 

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

@@ -53,8 +53,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="90dp"
-            android:text="@string/common_list_empty"
+            android:text="@string/str_common_empty_text"
             android:textSize="14sp"
+            android:textColor="@color/empty_text_color"
             />
     </LinearLayout>
 </RelativeLayout>

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

@@ -16,8 +16,8 @@
         android:src="@drawable/ic_loading" /> -->
       <ProgressBar
         android:id="@+id/imageViewLoading"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_centerInParent="true"
         android:indeterminateDrawable="@drawable/frame_loading" />
 

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

@@ -54,6 +54,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="80dp"
             android:text="当前企业没有任何相关询价单，请前往系统维护产品库"
+            android:textColor="@color/empty_text_color"
             android:textSize="14sp"
             />
     </LinearLayout>

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

@@ -1636,4 +1636,5 @@
          <string name = "booking_time_set"> Reservation time period setting </string>
         <string name = "enter_details_money"> Please enter the details amount </string>
     <string name="host_null_please_login_retry">站点地址获取失败，请重新登录后重试</string>
+    <string name="str_common_empty_text">暂无记录</string>
 </resources>

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

@@ -1686,4 +1686,5 @@
     <string name="table_repeat">桌位不可重复设置</string>
     <string name="booking_time_set">预约时间段设置</string>
     <string name="host_null_please_login_retry">站点地址获取失败，请重新登录后重试</string>
+    <string name="str_common_empty_text">暂无记录</string>
 </resources>

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

@@ -1748,6 +1748,7 @@
     <string name="booking_time_set">預約時間段設置</string>
     <string name="enter_details_money">請輸入明細金額</string>
     <string name="host_null_please_login_retry">站点地址获取失败，请重新登录后重试</string>
+    <string name="str_common_empty_text">暂无记录</string>
     <!--end s商家设置-->
 
 </resources>

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

@@ -352,4 +352,8 @@
 
     <color name="common_pop_item_normal">#CCFFFFFF</color>
     <color name="common_pop_item_pressed">#D8D8D8</color>
+    <color name="meeting_end_status">#9B9B9B</color>
+    <color name="meeting_start_status">#3BAE7E</color>
+    <color name="meeting_before_status">#FF0000</color>
+    <color name="empty_text_color">#999999</color>
 </resources>

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

@@ -86,7 +86,7 @@
     <string name="crm_customer_visit">客户拜访</string>
     <string name="crm_waller">荣誉墙</string>
     <!--View empty-->
-    <string name="empty_message">暂无记录</string>
+    <string name="empty_message">暂无数据</string>
     <string name="loading_message">请等待！</string>
     <string name="error_message">很抱歉! 系统发现未知错误</string>
     <string name="empty_button">再次尝试</string>
@@ -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公用部分-->
 
@@ -1873,7 +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="empty_more_visio">多见一个客户就多一个机会,\n现在就去做客户拜访吧！ </string>
     <string name="give_up">放弃</string>
     <string name="app_time_selecting">选择时间</string>
     <string name="qzone_edit_weekly">编写周报</string>
@@ -2033,5 +2033,6 @@
     <string name="room_location">服务/场地/房间</string>
     <string name="relax_time">休息时间</string>
     <string name="host_null_please_login_retry">站点地址获取失败，请重新登录后重试</string>
+    <string name="str_common_empty_text">暂无记录</string>
     <!--end s商家设置-->
 </resources>

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

@@ -581,7 +581,7 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_centerVertical">true</item>
-        <item name="android:layout_marginLeft">20dp</item>
+        <item name="android:layout_marginLeft">10dp</item>
         <item name="android:gravity">right</item>
         <item name="android:textColor">@color/text_main</item>
         <item name="android:textSize">@dimen/text_main</item>
@@ -1353,5 +1353,6 @@
         <item name="styleLoadingLayout">@style/LoadingLayoutStyle</item>
         <item name="android:homeAsUpIndicator">@drawable/actionbar_up_indicator</item>
         <item name="actionMenuTextColor">#ffffff</item>
+        <item name="android:windowBackground">@color/base_bg</item>
     </style>
 </resources>

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

@@ -118,7 +118,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
         drawBg = getResources().getDrawable(R.color.antionbarcolor);
         //  drawBg.setAlpha(0);
         // bar.setSplitBackgroundDrawable(new ColorDrawable(Color.parseColor("#330000ff")));
-        bar.setBackgroundDrawable(drawBg);
+//        bar.setBackgroundDrawable(drawBg);
         bar.setCustomView(view);
 
 

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

@@ -32,8 +32,8 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="40dp"
-                    android:layout_marginTop="@dimen/padding"
+                    android:layout_marginLeft="29dp"
+                    android:layout_marginTop="5dp"
                     android:text="*"
                     android:textColor="@color/red" />
                 <TextView
@@ -60,8 +60,8 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="40dp"
-                    android:layout_marginTop="@dimen/padding"
+                    android:layout_marginLeft="29dp"
+                    android:layout_marginTop="5dp"
                     android:text="*"
                     android:textColor="@color/red" />
                 <TextView
@@ -88,8 +88,8 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="40dp"
-                    android:layout_marginTop="@dimen/padding"
+                    android:layout_marginLeft="29dp"
+                    android:layout_marginTop="5dp"
                     android:text="*"
                     android:textColor="@color/red" />
                 <TextView
@@ -119,8 +119,8 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="40dp"
-                    android:layout_marginTop="@dimen/padding"
+                    android:layout_marginLeft="29dp"
+                    android:layout_marginTop="5dp"
                     android:text="*"
                     android:textColor="@color/red" />
                 <TextView
@@ -151,8 +151,8 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="40dp"
-                    android:layout_marginTop="@dimen/padding"
+                    android:layout_marginLeft="29dp"
+                    android:layout_marginTop="5dp"
                     android:text="*"
                     android:textColor="@color/red" />
                 <EditText

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

@@ -244,7 +244,7 @@
             android:background="@drawable/bg_bule_btn1"
             android:text="@string/booking_change" />
 
-        <View style="@style/app_line_v_1dp"></View>
+      <!--  <View style="@style/app_line_v_1dp"></View>-->
 
         <Button
             android:id="@+id/bt_cancle"

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/fragment/GroupChatFragment.java

@@ -21,11 +21,13 @@ import android.widget.TextView;
 
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.LogUtil;
 import com.common.data.CalendarUtil;
 import com.common.data.StringUtil;
 import com.common.ui.ProgressDialogUtil;
 import com.common.ui.ViewHolder;
 import com.core.app.AppConfig;
+import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.base.EasyFragment;
@@ -37,10 +39,8 @@ import com.core.net.volley.StringJsonArrayRequest;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
 import com.core.utils.helper.AvatarHelper;
-import com.core.widget.crouton.Crouton;
 import com.core.xmpp.dao.FriendDao;
 import com.core.xmpp.model.MucRoom;
-import com.core.app.AppConstant;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.uas.appcontact.R;
@@ -100,6 +100,7 @@ public class GroupChatFragment extends EasyFragment {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.add_item) {
+            LogUtil.i("onOptionsItemSelected");
 //            startActivity(new Intent(getActivity(), SelectContactsActivity.class));
             startActivity(new Intent("com.modular.groupchat.CreateGroupActivity"));
         }
@@ -238,7 +239,8 @@ public class GroupChatFragment extends EasyFragment {
                 @Override
                 public void run() {
                     if (imStatus != 3) {
-                        Crouton.makeText(ct, R.string.service_start_failed);
+                        //Crouton.makeText(ct, R.string.service_start_failed);
+                        ToastUtil.showToast(ct, R.string.service_start_failed);
                         return;
                     }
                     mPullToRefreshListView.setPullDownRefreshing(200);
@@ -263,7 +265,8 @@ public class GroupChatFragment extends EasyFragment {
 
     private void requestData(final boolean isPullDwonToRefersh) {
         if (imStatus != 3) {
-            Crouton.makeText(ct, R.string.service_start_failed, 2000);
+          //  Crouton.makeText(ct, R.string.service_start_failed, 2000);
+            ToastUtil.showToast(ct, R.string.service_start_failed);
             return;
         }
         if (isPullDwonToRefersh) {

app_modular/appme/src/main/java/com/uas/appme/other/fragment/FriendFragment.java

@@ -45,6 +45,7 @@ import com.core.xmpp.listener.OnCompleteListener;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.modular.apputils.utils.PopupWindowHelper;
 import com.uas.appme.R;
 import com.uas.appme.other.activity.BasicInfoActivity;
 import com.uas.appme.other.activity.CardcastActivity;
@@ -409,18 +410,18 @@ public class FriendFragment extends EasyFragment {
         } else {// 其他关系（错误的状态）
             return;
         }
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()).setTitle(R.string.prompt_title).setMessage(messageId)
-                .setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
+        PopupWindowHelper.showAlart(getActivity(),
+                getString(R.string.prompt_title), getString(messageId),
+                new PopupWindowHelper.OnSelectListener() {
                     @Override
-                    public void onClick(DialogInterface dialog, int which) {
+                    public void select(boolean selectOk) {
                         if (friend.getStatus() == Friend.STATUS_BLACKLIST) {// 已经在黑名单，那就是移出黑名单(在名片盒界面，不可能出现此情况)
                             // removeBlacklist(friend);
                         } else if (friend.getStatus() == Friend.STATUS_ATTENTION || friend.getStatus() == Friend.STATUS_FRIEND) {
                             addBlacklist(sortFriend);
                         }
                     }
-                }).setNegativeButton(getString(R.string.cancel), null);
-        builder.create().show();
+                });
     }
 
     private void addBlacklist(final BaseSortModel<Friend> sortFriend) {
@@ -445,7 +446,7 @@ public class FriendFragment extends EasyFragment {
                             Friend.STATUS_BLACKLIST);
                     FriendHelper.addBlacklistExtraOperation(mLoginUserId, sortFriend.getBean().getUserId());
 
-					/* 发送加入黑名单的通知 */
+                    /* 发送加入黑名单的通知 */
                     if (sortFriend.getBean().getStatus() == Friend.STATUS_FRIEND) {// 之前是好友，需要发消息让那个人不能看我的商务圈
                         NewFriendMessage message = NewFriendMessage.createWillSendMessage(MyApplication.getInstance().mLoginUser,
                                 XmppMessage.TYPE_BLACK, null, sortFriend.getBean());

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

@@ -25,7 +25,6 @@ import com.common.ui.ProgressDialogUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.SupportToolBarActivity;
-import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
 import com.lidroid.xutils.HttpUtils;
@@ -147,7 +146,7 @@ public class ImageSettingActivity extends SupportToolBarActivity implements View
                 @Override
                 public void onStart() {
                     progressDialog.show();
-                    ViewUtil.ToastMessage(ct, getString(com.uas.appworks.R.string.sending_picture)+"...");
+                    showToast( getString(com.uas.appworks.R.string.sending_picture)+"...");
                 }
                 @Override
                 public void onLoading(long total, long current, boolean isUploading) {
@@ -178,7 +177,7 @@ public class ImageSettingActivity extends SupportToolBarActivity implements View
 
                 @Override
                 public void onFailure(HttpException error, String msg) {
-                    ViewUtil.ToastMessage(ct, getString(com.uas.appworks.R.string.common_save_failed) + msg);
+                    showToast( getString(com.uas.appworks.R.string.common_save_failed) + msg);
                     progressDialog.dismiss();
                 }
             });

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

@@ -2,7 +2,6 @@ package com.uas.appme.settings.activity;
 
 import android.annotation.TargetApi;
 import android.app.ActivityManager;
-import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -188,7 +187,7 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
                 PopupWindowHelper.showAlart(SettingActivity.this, getString(R.string.app_name), getString(R.string.exit_tips), new PopupWindowHelper.OnSelectListener() {
                     @Override
                     public void select(boolean selectOk) {
-                        if (selectOk){
+                        if (selectOk) {
                             UserSp.getInstance(mContext).clearUserInfo();
                             ViewUtil.clearAccount(mContext);
                             LoginHelper.broadcastLogout(mContext);
@@ -311,7 +310,7 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
 //                            businessmen_setting_rl.setVisibility(View.VISIBLE);
 //                        } else
 
-                            if ("1".equals(JSON.parseObject(o.toString()).getString("result"))) {
+                        if ("1".equals(JSON.parseObject(o.toString()).getString("result"))) {
                             businessmen_setting_rl.setVisibility(View.VISIBLE);
                         } else {
                             businessmen_setting_rl.setVisibility(View.GONE);
@@ -358,7 +357,7 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
         new MaterialDialog.Builder(this)
                 .title(R.string.app_name)
                 .titleGravity(GravityEnum.CENTER)
-                
+
                 .content(R.string.exit_tips)
                 .positiveText(R.string.common_sure)
                 .positiveColorRes(R.color.white)
@@ -369,7 +368,7 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
                 .negativeText(R.string.common_cancel)
                 .negativeColorRes(R.color.white)
                 .show();
-        
+
 //        new AlertDialog.Builder(mContext)
 //                .setTitle(R.string.app_name)
 //                .setMessage(R.string.exit_tips)
@@ -441,9 +440,17 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
                                                     .getInstallPath())) {
                                     } else if (info != null) {
                                     } else {
-                                        ViewUtil.ShowMessageTitle(
-                                                SettingActivity.this,
-                                                getString(R.string.set_isnewVersion));
+//                                        ViewUtil.ShowMessageTitle(
+//                                                SettingActivity.this,
+//                                                getString(R.string.set_isnewVersion));
+                                        PopupWindowHelper.showAlart(SettingActivity.this,
+                                                getString(R.string.app_dialog_title), getString(R.string.set_isnewVersion)
+                                                , new PopupWindowHelper.OnSelectListener() {
+                                                    @Override
+                                                    public void select(boolean selectOk) {
+
+                                                    }
+                                                });
                                     }
                                     dialog.dismiss();
                                 }
@@ -494,19 +501,15 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
 
     //确认是否清空本地缓存
     private void showclearDialog() {
-        new AlertDialog
-                .Builder(mContext)
-                .setTitle(getString(R.string.common_notice))
-                .setMessage(getString(R.string.cache_msg))
-                .setNegativeButton(getString(R.string.common_cancel), null)
-                .setPositiveButton(getString(R.string.common_sure), new DialogInterface.OnClickListener() {
-
+        PopupWindowHelper.showAlart(this, getString(R.string.common_notice),
+                getString(R.string.cache_msg), new PopupWindowHelper.OnSelectListener() {
                     @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        clearCache();
-                        Log.i("clearCache", "clearCache");
+                    public void select(boolean selectOk) {
+                        if (selectOk) {
+                            clearCache();
+                        }
                     }
-                }).create().show();
+                });
     }
 
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
@@ -663,24 +666,25 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
         DisplayUtil.backgroundAlpha(this, 1f);
     }
 
-    private  PopupWindow popupWindow;
+    private PopupWindow popupWindow;
+
     public void showExitPop() {
         View view = null;
         WindowManager windowManager = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
         if (popupWindow == null) {
             LayoutInflater layoutInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             view = layoutInflater.inflate(R.layout.pop_simple_dialog, null);
-            TextView tv_title= view.findViewById(R.id.tv_title);
-            TextView tv_content= view.findViewById(R.id.tv_content);
-            TextView tv_cancel=view.findViewById(R.id.tv_cancel);
-            TextView tv_sure= view.findViewById(R.id.tv_sure);
+            TextView tv_title = view.findViewById(R.id.tv_title);
+            TextView tv_content = view.findViewById(R.id.tv_content);
+            TextView tv_cancel = view.findViewById(R.id.tv_cancel);
+            TextView tv_sure = view.findViewById(R.id.tv_sure);
             tv_content.setText(R.string.exit_tips);
-            popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth()- DensityUtil.dp2px(50), LinearLayout.LayoutParams.MATCH_PARENT);
+            popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth() - DensityUtil.dp2px(50), LinearLayout.LayoutParams.MATCH_PARENT);
             tv_sure.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     popupWindow.dismiss();
-                  
+
                 }
             });
             tv_cancel.setOnClickListener(new View.OnClickListener() {
@@ -689,7 +693,7 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
                     popupWindow.dismiss();
                 }
             });
-           
+
         }
 
         popupWindow.setFocusable(true);
@@ -705,5 +709,5 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
         popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
         popupWindow.showAtLocation(activity.getWindow().getDecorView(), Gravity.CENTER, 0, 0);
     }
-    
+
 }

app_modular/appme/src/main/res/layout/wage_forgetps.xml

@@ -143,6 +143,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/delete"
                     android:textSize="20sp"
+                    android:visibility="gone"
                     android:textColor="@color/black"/>
                 <TextView
                     android:layout_marginTop="30dp"

app_modular/appme/src/main/res/values-en/strings.xml

@@ -86,7 +86,7 @@
     <string name="crm_customer_visit">客户拜访</string>
     <string name="crm_waller">荣誉墙</string>
     <!--View empty-->
-    <string name="empty_message">暂无记录</string>
+    <string name="empty_message">暂无数据</string>
     <string name="loading_message">请等待！</string>
     <string name="error_message">很抱歉! 系统发现未知错误</string>
     <string name="empty_button">再次尝试</string>
@@ -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_modular/appme/src/main/res/values/strings.xml

@@ -86,7 +86,7 @@
     <string name="crm_customer_visit">客户拜访</string>
     <string name="crm_waller">荣誉墙</string>
     <!--View empty-->
-    <string name="empty_message">暂无记录</string>
+    <string name="empty_message">暂无数据</string>
     <string name="loading_message">请等待！</string>
     <string name="error_message">很抱歉! 系统发现未知错误</string>
     <string name="empty_button">再次尝试</string>
@@ -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_modular/appmessages/src/main/java/com/modular/appmessages/activity/SubscribeDetailActivity.java

@@ -39,7 +39,7 @@ import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
-import com.core.widget.crouton.Crouton;
+import com.core.utils.ToastUtil;
 import com.modular.appmessages.R;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.bean.SHARE_MEDIA;
@@ -92,7 +92,7 @@ public class SubscribeDetailActivity extends BaseActivity {
                     break;
                 case REMOVE_MY_SUBSCRIPTION:
                     progressDialog.dismiss();
-                    Crouton.makeText(mContext, getString(R.string.subscribe_cancled));
+                   ToastUtil.showToast(mContext, getString(R.string.subscribe_cancled));
                     Intent myIntent = new Intent();
                     setResult(44, myIntent);
                     mApplyButton.setText(getString(R.string.subscribe_detail_commit));
@@ -100,7 +100,7 @@ public class SubscribeDetailActivity extends BaseActivity {
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
-                    Crouton.makeText(mContext, msg.getData().getString("result"));
+                    ToastUtil.showToast(mContext, msg.getData().getString("result"));
                     break;
             }
         }

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

@@ -1,11 +1,9 @@
 package com.modular.appmessages.activity;
 
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -33,6 +31,7 @@ import com.modular.appmessages.R;
 import com.modular.appmessages.adapter.SubscriptionAdapter;
 import com.modular.appmessages.db.SubsDao;
 import com.modular.appmessages.model.SubMessage;
+import com.modular.apputils.utils.PopupWindowHelper;
 import com.module.recyclerlibrary.ui.refresh.BaseRefreshLayout;
 import com.module.recyclerlibrary.ui.refresh.simlpe.SimpleRefreshLayout;
 
@@ -67,7 +66,7 @@ public class Subscription2Activity extends BaseActivity {
                             JSONArray array = JSON.parseObject(message).getJSONArray("data");
                             if (ListUtils.isEmpty(array)) {
                                 updataAdapter();
-                                showToast(  getString(R.string.common_list_empty));
+                                showToast(getString(R.string.common_list_empty));
                                 return;
                             }
                             if (ListUtils.isEmpty(messages)) messages = new ArrayList<>();
@@ -80,7 +79,7 @@ public class Subscription2Activity extends BaseActivity {
                                 reckonData(array, false);
                             }
                         } else {
-                          showToast( message == null ? "" : StringUtil.getChinese(message));
+                            showToast(message == null ? "" : StringUtil.getChinese(message));
                         }
                         break;
                     case Constants.APP_SOCKETIMEOUTEXCEPTION:
@@ -101,11 +100,11 @@ public class Subscription2Activity extends BaseActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId()==R.id.subscribe_manage){
+        if (item.getItemId() == R.id.subscribe_manage) {
             Intent intent = new Intent();
             intent.setClass(this, SubcribeManageActivity.class);
             startActivity(intent);
-        }else if (android.R.id.home==item.getItemId()){
+        } else if (android.R.id.home == item.getItemId()) {
             onBackPressed();
         }
         return super.onOptionsItemSelected(item);
@@ -122,8 +121,8 @@ public class Subscription2Activity extends BaseActivity {
 
 
     private void initView() {
-        swiperefresh= (SimpleRefreshLayout) findViewById(R.id.swiperefresh);
-        recycler= (RecyclerView) findViewById(R.id.recycler);
+        swiperefresh = (SimpleRefreshLayout) findViewById(R.id.swiperefresh);
+        recycler = (RecyclerView) findViewById(R.id.recycler);
         ViewUtil.LoginERPTask(this, handler, 0x12);
         LinearLayoutManager layoutManager = new LinearLayoutManager(ct);
         recycler.setLayoutManager(layoutManager);
@@ -181,18 +180,16 @@ public class Subscription2Activity extends BaseActivity {
             public void longClick(View view, SubMessage bean, final int position) {
                 if (bean == null) bean = (SubMessage) view.getTag();
                 if (bean == null) return;
-                AlertDialog.Builder builder = new AlertDialog.Builder(ct);
                 final SubMessage finalBean = bean;
-                builder.setTitle(R.string.prompt_title).setMessage(R.string.delete_prompt).setPositiveButton(R.string.sure, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterface, int i) {
-                        longClickItem(finalBean, position);
-                    }
-                }).setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterface, int i) {
-                    }
-                }).show();
+                PopupWindowHelper.showAlart(Subscription2Activity.this, getString(R.string.common_notice),
+                        getString(R.string.delete_prompt), new PopupWindowHelper.OnSelectListener() {
+                            @Override
+                            public void select(boolean selectOk) {
+                                if (selectOk) {
+                                    longClickItem(finalBean, position);
+                                }
+                            }
+                        });
             }
         });
     }
@@ -229,16 +226,16 @@ public class Subscription2Activity extends BaseActivity {
         if (delete) {
             messages.remove(position);
             updataAdapter();
-            showToast( R.string.delete_all_succ);
+            showToast(R.string.delete_all_succ);
         } else {
-            showToast(  R.string.delete_failed);
+            showToast(R.string.delete_failed);
         }
     }
 
     private void clickItem(SubMessage bean, int position) {
         String url = baseUrl + "common/charts/mobileCharts.action";
         String title = bean.getTitle();
-        Intent intent_web = new Intent("com.modular.main.WebViewCommActivity" );
+        Intent intent_web = new Intent("com.modular.main.WebViewCommActivity");
         intent_web.putExtra("url", url);
         intent_web.putExtra("p", title);
         intent_web.putExtra("cookie", true);
@@ -324,7 +321,7 @@ public class Subscription2Activity extends BaseActivity {
         String url = baseUrl + "common/desktop/subs/getSubs.action";
         final Map<String, Object> param = new HashMap<>();
         param.put("count", 100);
-        param.put("condition", "where to_char(createdate_,'yyyymmdd')='" + DateFormatUtil.long2Str(showTime,"yyyyMMdd") + "'");
+        param.put("condition", "where to_char(createdate_,'yyyymmdd')='" + DateFormatUtil.long2Str(showTime, "yyyyMMdd") + "'");
         param.put("sessionId", CommonUtil.getSharedPreferences(this, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(this, "sessionId"));