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/appmessages/src/main/java/com/modular/appmessages/activity/ProcessMsgActivity.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/AndroidManifest.xml

@@ -888,15 +888,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ui.erp.activity.oa.TeamsAttShowActivity"
-            android:label="@string/sign_teams_rank" />
-            android:windowSoftInputMode="stateUnspecified|adjustNothing">
-            <intent-filter>
-                <action android:name="com.modular.main.SelectCollisionActivity" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
+  
 
 
         <!-- 消息红点模块 -->

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

@@ -275,7 +275,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.booking_rl:
-                startActivity(new Intent("com.modular.secretary.BookingListActivity"));
+                startActivity(new Intent("com.modular.booking.BookingListActivity"));
                 tv_book_num.setVisibility(View.GONE);
                 CommonUtil.setSharedPreferences(MyApplication.getInstance(), Constants.SET_BOOKING, true);
                 break;

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

@@ -31,11 +31,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:background="@color/Transpant"
         android:orientation="vertical">
-
         <View
             android:layout_width="match_parent"
             android:layout_height="2px"

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

@@ -32,12 +32,12 @@ import com.core.base.OABaseActivity;
 import com.core.model.SelectEmUser;
 import com.core.net.volley.ObjectResult;
 import com.core.net.volley.StringJsonObjectRequest;
-import com.core.selectcalendar.SelectCalendarActivity;
-import com.core.selectcalendar.bean.DataState;
 import com.core.utils.CommonUtil;
 import com.core.widget.NScrollerGridView;
 import com.core.widget.view.Activity.SearchLocationActivity;
 import com.core.widget.view.model.SearchPoiParam;
+import com.core.widget.view.selectcalendar.SelectCalendarActivity;
+import com.core.widget.view.selectcalendar.bean.DataState;
 import com.core.xmpp.model.AddAttentionResult;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/ContactsActivity.java

@@ -146,14 +146,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
             type = getIntent().getIntExtra("type", 0);
             String title = getIntent().getStringExtra("title");
             isSingleSelect = getIntent().getBooleanExtra("isSingleSelect", true);
-            if(isSingleSelect){
-                include_tag.setVisibility(View.INVISIBLE);
-                //include_tag.getBackground().setAlpha(0);
-            }else{
-                include_tag.setVisibility(View.VISIBLE);
-               // include_tag.getBackground().setAlpha(100);
-                
-            }
+           
             if (!StringUtil.isEmpty(title)) {
                 getSupportActionBar().setTitle(title);
             } else {
@@ -488,6 +481,14 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                                 mlist.onRefreshComplete();
                                 voiceSearchView.getSearch_edit().setHint(lists.size() + "位联系人");
                                 dimssLoading();
+                                if(isSingleSelect){
+                                    include_tag.setVisibility(View.GONE);
+                                    //include_tag.getBackground().setAlpha(0);
+                                }else{
+                                    include_tag.setVisibility(View.VISIBLE);
+                                    // include_tag.getBackground().setAlpha(100);
+
+                                }
                             }
                         }
                     });

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

@@ -48,8 +48,8 @@ import com.modular.appmessages.adapter.ApprovalAdapter;
 import com.modular.appmessages.adapter.CrashLinearLayoutManager;
 import com.modular.appmessages.presenter.ApprovaPresenter;
 import com.modular.appmessages.presenter.imp.IApproval;
-import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.uas.appworks.OA.erp.model.SelectEmUser;
+import com.core.model.SelectCollisionTurnBean;
+import com.core.model.SelectEmUser;
 
 import java.util.ArrayList;
 import java.util.LinkedHashSet;

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/TaskAddErpActivity.java

@@ -22,6 +22,8 @@ import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.model.OAConfig;
+import com.core.model.SelectCollisionTurnBean;
+import com.core.model.SelectEmUser;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.utils.RecognizerDialogUtil;
@@ -34,8 +36,6 @@ import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
-import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.uas.appworks.OA.erp.model.SelectEmUser;
 import com.uas.appworks.R;
 
 import java.util.Calendar;

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/AddMeetingActivity.java

@@ -39,8 +39,8 @@ import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialog;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
-import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.uas.appworks.OA.erp.model.SelectEmUser;
+import com.core.model.SelectCollisionTurnBean;
+import com.core.model.SelectEmUser;
 import com.core.widget.view.selectcalendar.bean.Data;
 import com.uas.appworks.R;