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/res/layout/activity_contacts.xml

@@ -8,12 +8,25 @@
         android:id="@+id/voiceSearchView"
         android:layout_width="match_parent"
         android:layout_height="48dp" />
+    <LinearLayout
+        android:id="@+id/include_tag"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        android:layout_alignParentBottom="true"
+        android:orientation="vertical">
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/item_line" />
+        <include layout="@layout/include_select" />
+    </LinearLayout>
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         xmlns:ptr="http://schemas.android.com/apk/res-auto"
         android:id="@+id/mList"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/include_tag"
+        android:layout_height="match_parent"
+        android:layout_above="@id/include_tag"
         android:layout_below="@+id/voiceSearchView"
         android:divider="#00000000"
         android:dividerHeight="0dip"
@@ -26,21 +39,4 @@
         ptr:ptrOverScroll="false"
         ptr:ptrScrollingWhileRefreshingEnabled="true"
         ptr:ptrShowIndicator="false" />
-    <LinearLayout
-        android:id="@+id/include_tag"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:clickable="true"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:orientation="vertical">
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="2px"
-            android:background="@color/item_line" />
-
-        <include layout="@layout/include_select" />
-    </LinearLayout>
 </RelativeLayout>

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

@@ -69,6 +69,9 @@ public class BBCompanyListActivity extends BaseActivity {
         emptyLayout.setShowErrorButton(false);
         emptyLayout.setEmptyViewRes(R.layout.view_empty);
         adapter = new ListAdapter(formBean);
+        SelectBean selectBean=new SelectBean();
+        selectBean.setName(CommonUtil.getSharedPreferences(mContext,"erp_commpany"));
+        formBean.add(selectBean);
         list.setAdapter(adapter);
     }
     
@@ -79,11 +82,14 @@ public class BBCompanyListActivity extends BaseActivity {
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 List<SelectBean> formBeaans=  adapter.getFormBeaan();
                 if (!ListUtils.isEmpty(formBeaans)){
-                    String json=formBeaans.get(position).getJson();
-                    String name= JSON.parseObject(json).getString("company");
-                    ToastMessage(name);
-//                    startActivityForResult(new Intent(mContext,MuilSelectBeanActivity.class)
-//                            .putExtra("name",name),0x01);
+                    String name= null;
+                    try {
+                        String json=formBeaans.get(position).getJson();
+                        name = JSON.parseObject(json).getString("company");
+                    } catch (Exception e) {
+                        name=formBeaans.get(position).getName();
+                    }
+                    
                     Intent intent = new Intent("com.modular.main.SelectCollisionActivity");
                     SelectCollisionTurnBean bean = new SelectCollisionTurnBean()
                             .setResultCode(0x001)

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

@@ -46,6 +46,7 @@ import com.core.model.SelectCollisionTurnBean;
 import com.core.model.SelectEmUser;
 import com.core.model.XmppMessage;
 import com.core.utils.helper.AvatarHelper;
+import com.core.widget.CustomerScrollView;
 import com.core.widget.MyListView;
 import com.core.xmpp.CoreService;
 import com.core.xmpp.ListenerManager;
@@ -118,6 +119,7 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
 
         }
     };
+    private CustomerScrollView sv_top;
 
     @Override
     protected void onDestroy() {
@@ -177,6 +179,7 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
     
     public void initView(){
         getSupportActionBar().setTitle("商务预约");
+        sv_top =(CustomerScrollView)findViewById(R.id.sv_top);
         mListDetail=(MyListView) findViewById(R.id.mListDetail);
         rvTop = (RelativeLayout) findViewById(R.id.rv_top);
         llLeft = (LinearLayout) findViewById(R.id.ll_left);
@@ -293,6 +296,8 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
             ll_bottom.setVisibility(View.GONE);
             isMenuShuffle=false;
         }
+        ll_bottom.setVisibility(View.VISIBLE);
+        sv_top.setVisibility(View.VISIBLE);
     }
 
     public void initEvent(){
@@ -308,6 +313,7 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
     private String companys;
     private String  bmanid;
     public void getApiData(){
+        showLoading();
         HttpClient httpClient=new HttpClient.Builder("http://113.105.74.140:8092/").build();
         httpClient.Api()
                 .send(new HttpClient.Builder().url("user/appBusinessDetail")
@@ -318,6 +324,7 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
                     
                     @Override
                     public void onResponse(Object o) {
+                        dimssLoading();
                         LogUtil.d("ResponseText"," onResponse o:"+o.toString());
                         //mapdetail
                         if (JSONUtil.validate(o.toString())){
@@ -327,6 +334,7 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
                             JSONObject baseObject=baseArray.getJSONObject(0);
                             
                             model= JSON.parseObject(baseObject.toJSONString(),BookingModel.class);
+                            
 //                            tvTime.setText(model.getAb_starttime().substring(0,10)+" "+model.getAb_starttime().substring(11,16)
 //                            +"-"+model.getAb_endtime().substring(11,16));
 //                            tv_topic.setText(model.getAb_content());

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

@@ -8,6 +8,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp"
+        android:visibility="gone"
         android:fillViewport="true">
 
         <RelativeLayout
@@ -231,6 +232,7 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:layout_alignParentBottom="true"
+        android:visibility="gone"
         android:orientation="horizontal"
         android:weightSum="2">
 

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

@@ -18,6 +18,7 @@ import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.LinearLayout;
 import android.widget.ListView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -90,6 +91,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
 
     private PullToRefreshListView mlist;
     private VoiceSearchView voiceSearchView;
+    private RelativeLayout select_rl;
     private TextView mumber_tv;
     private CheckBox all_sure_cb;
     private boolean isClickCb = true;
@@ -138,7 +140,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
         all_sure_cb = (CheckBox) findViewById(R.id.all_sure_cb);
         mumber_tv = (TextView) findViewById(R.id.mumber_tv);
         include_tag= (LinearLayout) findViewById(R.id.include_tag);
-
+        select_rl= (RelativeLayout) findViewById(R.id.select_rl);
         voiceSearchView = (VoiceSearchView) findViewById(R.id.voiceSearchView);
         if (getIntent() != null) {
             type = getIntent().getIntExtra("type", 0);
@@ -480,12 +482,11 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                                 voiceSearchView.getSearch_edit().setHint(lists.size() + "位联系人");
                                 dimssLoading();
                                 if(isSingleSelect){
-                                    include_tag.setVisibility(View.GONE);
+                                    select_rl.setVisibility(View.GONE);
                                     //include_tag.getBackground().setAlpha(0);
                                 }else{
-                                    include_tag.setVisibility(View.VISIBLE);
+                                    select_rl.setVisibility(View.VISIBLE);
                                     // include_tag.getBackground().setAlpha(100);
-
                                 }
                             }
                         }