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

# Conflicts:
#	WeiChat/src/main/AndroidManifest.xml
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingListActivity.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/CommonUtil.java
#	app_core/common/src/main/java/com/core/model/SelectCollisionTurnBean.java
#	app_core/network/src/main/java/com/me/network/app/http/impl/RetrofitImpl.java
#	app_modular/appme/src/main/java/com/uas/appme/settings/activity/AboutActivity.java
#	app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ApprovalActivity.java
#	app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ComplaintDetailActivity.java
#	app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/TaskAddErpActivity.java
#	app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/AddMeetingActivity.java

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

@@ -26,6 +26,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
+import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.app.Constants;
@@ -686,7 +687,8 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                         String nodename = jsonArray.getJSONObject(position).getString("JP_NODEDEALMANNAME");
                         JP_NODEID = jsonArray.getJSONObject(position).getString("JP_NODEID");
                         String codename = jsonArray.getJSONObject(position).getString("JP_NODENAME");
-                        int me_emid = jsonArray.getJSONObject(position).getInteger("EM_IMID");
+                        int me_emid =
+                                JSONUtil.getInt(jsonArray.getJSONObject(position), "EM_IMID");
                         if (!StringUtil.isEmpty(status)) {
                             if (status.equals("待审批")) {
                                 model.status.setTextColor(getResources().getColor(R.color.approvaling));

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

@@ -13,7 +13,7 @@
         android:id="@+id/mList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_above="@+id/include_tag"
+        
         android:layout_below="@+id/voiceSearchView"
         android:divider="#00000000"
         android:dividerHeight="0dip"

app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBCompanyListActivity.java

@@ -25,6 +25,7 @@ import com.core.model.OAConfig;
 import com.core.model.SelectBean;
 import com.core.model.SelectCollisionTurnBean;
 import com.core.model.SelectEmUser;
+import com.core.utils.CommonUtil;
 import com.core.widget.VoiceSearchView;
 import com.core.widget.view.EmptyLayout;
 import com.me.network.app.http.HttpClient;
@@ -72,7 +73,7 @@ public class BBCompanyListActivity extends BaseActivity {
     }
     
     public void initEvent(){
-        
+        search_edit.setText(CommonUtil.getSharedPreferences(mContext,"erp_commpany"));
         list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {

app_modular/appbooking/src/main/java/com/modular/booking/activity/shares/MuiltSelectShareActivity.java

@@ -47,6 +47,7 @@ public class MuiltSelectShareActivity extends OABaseActivity {
         if (getIntent() != null) {
             mDatas = getIntent().getParcelableArrayListExtra("model");
             mAdapter = new MuiltBookAdapter(mContext, mDatas);
+            mAdapter.setTime(true);
             mlist.setAdapter(mAdapter);
         }
 

app_modular/appbooking/src/main/java/com/modular/booking/adapter/MuiltBookAdapter.java

@@ -25,6 +25,15 @@ public class MuiltBookAdapter extends BaseAdapter {
     private Context ct;
     private int type=1;
     private Date currentDate;
+    private boolean isTime=false;
+
+    public boolean isTime() {
+        return isTime;
+    }
+
+    public void setTime(boolean time) {
+        isTime = time;
+    }
 
     public Date getCurrentDate() {
         return currentDate;
@@ -90,10 +99,15 @@ public class MuiltBookAdapter extends BaseAdapter {
                 holder.title_tv.setText(model.getAb_starttime().substring(0,10)+" "+model.getAb_starttime().substring(11,16)+"-"+
                         model.getAb_endtime().substring(11,16));
             }else{
+                
+            }
+            if (isTime){
+                holder.title_tv.setText(model.getAb_starttime().substring(0,10)+" "+model.getAb_starttime().substring(11,16)+"-"+
+                        model.getAb_endtime().substring(11,16));
+            }else{
                 holder.title_tv.setText(model.getAb_starttime().substring(11,16)+"-"+
                         model.getAb_endtime().substring(11,16));
             }
-          
            
             holder.status_tv.setText(model.getAb_confirmstatus());