提交代码

WeiChat/src/main/AndroidManifest.xml

@@ -1063,7 +1063,12 @@
         <activity
             android:name=".ui.erp.activity.secretary.SelectPContactsActivity"
             android:windowSoftInputMode="adjustPan" />
-        <activity android:name=".ui.erp.activity.secretary.BookingDetailActivity" />
+        <activity android:name=".ui.erp.activity.secretary.BookingDetailActivity" >
+            <intent-filter>
+                <action android:name="com.modular.booking.BookingDetailActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity android:name=".ui.erp.activity.secretary.BookingListActivity" >
             <intent-filter>
                 <action android:name="com.modular.booking.BookingListActivity" />

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingListActivity.java

@@ -36,6 +36,7 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.modular.booking.activity.business.BBookingAddActivity;
 import com.modular.booking.activity.business.BBookingDetailActivity;
 import com.modular.booking.activity.shares.BBSharesListActivity;
+import com.modular.booking.activity.shares.MuiltSelectShareActivity;
 import com.modular.booking.adapter.BookAdapter;
 import com.modular.booking.model.BookingModel;
 import com.uas.appme.settings.model.Business;
@@ -83,9 +84,13 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
     private int posItem;
 
     private ArrayList<BookingModel> mDatas = new ArrayList<>();
+    private ArrayList<BookingModel> mShareDatas = new ArrayList<>();
+    private ArrayList<BookingModel> mShareMuiltDatas = new ArrayList<>();
+
     private BookAdapter mAdapter;
     private OACalendarView calendarView;
     private OACalenderViewPagerAdapter pagerAdapter;//当前Viewpager适配器
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -104,7 +109,6 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
     }
 
 
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_about, menu);
@@ -113,8 +117,10 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() ==R.id.app_about) {
-            startActivity(new Intent(mContext,BBookingDetailActivity.class));
+        if (item.getItemId() == R.id.app_about) {
+            Intent intent = new Intent(mContext, MuiltSelectShareActivity.class);
+            intent.putExtra("model", mShareMuiltDatas);
+            startActivity(intent);
         }
 
         if (item.getItemId() == android.R.id.home) {
@@ -134,7 +140,7 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
         mBookPersonal.setOnClickListener(this);
         mBookService.setOnClickListener(this);
         mBookShares.setOnClickListener(this);
-        
+
         viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
             @Override
             public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
@@ -142,7 +148,7 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
 
             @Override
             public void onPageSelected(int position) {
-                LogUtil.d("----------------------------------------------------"+position);
+                LogUtil.d("----------------------------------------------------" + position);
                 Calendar c = Calendar.getInstance();
                 c.setTime(curDate);
                 int day = c.get(Calendar.DAY_OF_MONTH);
@@ -168,14 +174,14 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
                 Bundle bundle = new Bundle();
                 bundle.putParcelable("model", viewHolder.model);
                 bundle.putBoolean("isShared", tv_book_shared.isSelected());
-                if ("个人".equals(viewHolder.model.getKind())){
-                startActivity(new Intent(mContext, BookingDetailActivity.class)
-                        .putExtras(bundle)  );
-                }else{
+                if ("个人".equals(viewHolder.model.getKind())) {
+                    startActivity(new Intent(mContext, BookingDetailActivity.class)
+                            .putExtras(bundle));
+                } else {
                     startActivity(new Intent(mContext, BBookingDetailActivity.class)
-                            .putExtras(bundle)  );
+                            .putExtras(bundle));
                 }
-              
+
             }
         });
 
@@ -194,17 +200,17 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
         mBookBusiness = (TextView) findViewById(R.id.mBookBusiness);
         mBookService = (TextView) findViewById(R.id.mBookService);
         mBookShares = (TextView) findViewById(R.id.mBookShares);
-        
+
         Intent intent = getIntent();
         if (intent != null) {
             String cDate = intent.getStringExtra("curDate");
             if (!StringUtil.isEmpty(cDate)) {
-                getIntent().getExtras().putString("curDate","");
+                getIntent().getExtras().putString("curDate", "");
                 curDate = DateFormatUtil.getDate4StrDate(cDate, "yyyy-MM-dd");
-            }else{
+            } else {
                 curDate = new Date(System.currentTimeMillis());
             }
-        }else{
+        } else {
             curDate = new Date(System.currentTimeMillis());
         }
 
@@ -220,7 +226,7 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
         LinearLayout.LayoutParams linearParams = (LinearLayout.LayoutParams) viewPager.getLayoutParams(); // 取控件mGrid当前的布局参数   搜索
         linearParams.height = (getResources().getDisplayMetrics().heightPixels * 1 / 3);// 当控件的高强制设成50象素
         viewPager.setLayoutParams(linearParams); // 使设置好的布局参数应用到控件myGrid
-        pagerAdapter = new OACalenderViewPagerAdapter(ct,curDate);
+        pagerAdapter = new OACalenderViewPagerAdapter(ct, curDate);
         viewPager.setAdapter(pagerAdapter);
 
         viewPager.setCurrentItem(OACalenderViewPagerAdapter.MAX_NUM / 2);
@@ -241,8 +247,10 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
             case R.id.mBookService:
                 ToastMessage("暂未开放！");
                 break;
-            case  R.id.mBookShares:
-                startActivity(new Intent(mContext, BBSharesListActivity.class));
+            case R.id.mBookShares:
+                Intent intent = new Intent(mContext, BBSharesListActivity.class);
+                intent.putExtra("model", mShareDatas);
+                startActivity(intent);
                 break;
             case R.id.tv_book_me:
                 tv_book_shared.setSelected(false);
@@ -304,8 +312,8 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
         Map<String, Object> params = new HashMap<>();
         params.put("token", MyApplication.getInstance().mAccessToken);
         params.put("userid", MyApplication.getInstance().mLoginUser.getUserId());
-        params.put("telephone",MyApplication.getInstance().mLoginUser.getTelephone());
-        params.put("yearmonth",DateFormatUtil.getStrDate4Date(curDate, "yyyyMM"));
+        params.put("telephone", MyApplication.getInstance().mLoginUser.getTelephone());
+        params.put("yearmonth", DateFormatUtil.getStrDate4Date(curDate, "yyyyMM"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, 0x01, null, null, "post");
@@ -321,6 +329,7 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
                 case 0x01:
                     try {
                         String result = msg.getData().getString("result");
+
                         if (!ListUtils.isEmpty(mDatas)) {
                             mDatas.clear();
                         }
@@ -329,13 +338,71 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
                             emptyLayout.showEmpty();
                             return;
                         }
-                        if (tv_book_me.isSelected()) {
-                            JSONArray jsonArray = JSON.parseArray(JSON.parseObject(result).getString("bookinglist"));
-                            JSONArray buinessArray = JSON.parseArray(JSON.parseObject(result).getString("businessList"));
-                            if (jsonArray != null) {
-                                Set<Integer> tags = new HashSet<>();
-                                for (int i = 0; i < jsonArray.size(); i++) {
-                                    JSONObject object = jsonArray.getJSONObject(i);
+                        mShareMuiltDatas.clear();
+//                        if (tv_book_me.isSelected()) {
+                        JSONArray jsonArray = JSON.parseArray(JSON.parseObject(result).getString("bookinglist"));
+                        JSONArray buinessArray = JSON.parseArray(JSON.parseObject(result).getString("businessList"));
+                        if (jsonArray != null) {
+                            Set<Integer> tags = new HashSet<>();
+                            for (int i = 0; i < jsonArray.size(); i++) {
+                                JSONObject object = jsonArray.getJSONObject(i);
+                                BookingModel model = new BookingModel();
+                                model.setAb_address(object.getString("ab_address"));
+                                model.setAb_bman(object.getString("ab_bman"));
+                                model.setAb_bmanid(object.getString("ab_bmanid"));
+                                model.setAb_confirmstatus(object.getString("ab_confirmstatus"));
+                                model.setAb_content(object.getString("ab_content"));
+                                model.setAb_endtime(object.getString("ab_endtime"));
+                                model.setAb_id(object.getString("ab_id"));
+                                model.setAb_latitude(object.getString("ab_latitude"));
+                                model.setAb_longitude(object.getString("ab_longitude"));
+                                model.setAb_recorddate(object.getString("ab_recorddate"));
+                                model.setAb_recordid(object.getString("ab_recordid"));
+                                model.setAb_recordman(object.getString("ab_recordman"));
+                                model.setAb_sharestatus(object.getString("ab_sharestatus"));
+                                model.setAb_starttime(object.getString("ab_starttime"));
+                                model.setAb_type(object.getString("ab_type"));
+                                model.setKind(object.getString("kind"));
+                                tags.add(Integer.valueOf(model.getAb_starttime().substring(8, 10)));
+                                if (model.getAb_starttime().contains(DateFormatUtil.getStrDate4Date(curDate, "yyyy-MM-dd"))) {
+                                    mDatas.add(model);
+                                    mShareMuiltDatas.add(model);
+                                }
+                            }
+
+                            if (buinessArray != null) {
+                                for (int i = 0; i < buinessArray.size(); i++) {
+                                    JSONObject object = buinessArray.getJSONObject(i);
+                                    BookingModel bModel = new BookingModel();
+                                    bModel.setAb_address(object.getString("ab_address"));
+                                    bModel.setAb_bman(object.getString("ab_bman"));
+                                    bModel.setAb_bmanid(object.getString("ab_bmanid"));
+                                    bModel.setAb_confirmstatus(object.getString("ab_confirmstatus"));
+                                    bModel.setAb_content(object.getString("ab_content"));
+                                    bModel.setAb_endtime(object.getString("ab_endtime"));
+                                    bModel.setAb_id(object.getString("ab_id"));
+                                    bModel.setAb_latitude(object.getString("ab_latitude"));
+                                    bModel.setAb_longitude(object.getString("ab_longitude"));
+                                    bModel.setAb_recorddate(object.getString("ab_recorddate"));
+                                    bModel.setAb_recordid(object.getString("ab_recordid"));
+                                    bModel.setAb_recordman(object.getString("ab_recordman"));
+                                    bModel.setAb_sharestatus(object.getString("ab_sharestatus"));
+                                    bModel.setAb_starttime(object.getString("ab_starttime"));
+                                    bModel.setAb_type(object.getString("ab_type"));
+                                    bModel.setKind(object.getString("kind"));
+                                    tags.add(Integer.valueOf(bModel.getAb_starttime().substring(8, 10)));
+                                    if (bModel.getAb_starttime().contains(DateFormatUtil.getStrDate4Date(curDate, "yyyy-MM-dd"))) {
+                                        mDatas.add(bModel);
+                                        mShareMuiltDatas.add(bModel);
+                                    }
+                                }
+                            }
+
+                            if (DateFormatUtil.getStrDate4Date(curDate, "yyyy-MM-dd").equals(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd"))) {
+                                JSONArray tenArray = JSON.parseArray(JSON.parseObject(result).getString("tenlist"));
+
+                                for (int i = 0; i < tenArray.size(); i++) {
+                                    JSONObject object = tenArray.getJSONObject(i);
                                     BookingModel model = new BookingModel();
                                     model.setAb_address(object.getString("ab_address"));
                                     model.setAb_bman(object.getString("ab_bman"));
@@ -353,87 +420,82 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
                                     model.setAb_starttime(object.getString("ab_starttime"));
                                     model.setAb_type(object.getString("ab_type"));
                                     model.setKind(object.getString("kind"));
-                                    tags.add(Integer.valueOf(model.getAb_starttime().substring(8, 10)));
-                                    if (model.getAb_starttime().contains(DateFormatUtil.getStrDate4Date(curDate, "yyyy-MM-dd"))) {
-                                        mDatas.add(model);
-                                    }
+                                    mDatas.add(model);
+                                    mShareMuiltDatas.add(model);
                                 }
-                                
-                                if(buinessArray!=null) {
-                                    for (int i = 0; i < buinessArray.size(); i++) {
-                                        JSONObject object = buinessArray.getJSONObject(i);
-                                        BookingModel bModel = new BookingModel();
-                                        bModel.setAb_address(object.getString("ab_address"));
-                                        bModel.setAb_bman(object.getString("ab_bman"));
-                                        bModel.setAb_bmanid(object.getString("ab_bmanid"));
-                                        bModel.setAb_confirmstatus(object.getString("ab_confirmstatus"));
-                                        bModel.setAb_content(object.getString("ab_content"));
-                                        bModel.setAb_endtime(object.getString("ab_endtime"));
-                                        bModel.setAb_id(object.getString("ab_id"));
-                                        bModel.setAb_latitude(object.getString("ab_latitude"));
-                                        bModel.setAb_longitude(object.getString("ab_longitude"));
-                                        bModel.setAb_recorddate(object.getString("ab_recorddate"));
-                                        bModel.setAb_recordid(object.getString("ab_recordid"));
-                                        bModel.setAb_recordman(object.getString("ab_recordman"));
-                                        bModel.setAb_sharestatus(object.getString("ab_sharestatus"));
-                                        bModel.setAb_starttime(object.getString("ab_starttime"));
-                                        bModel.setAb_type(object.getString("ab_type"));
-                                        bModel.setKind(object.getString("kind"));
-                                        if (bModel.getAb_starttime().contains(DateFormatUtil.getStrDate4Date(curDate, "yyyy-MM-dd"))) {
-                                            mDatas.add(bModel);
-                                        }
-                                    }
+                                JSONArray btenArray = JSON.parseArray(JSON.parseObject(result).getString("businesstenlist"));
+                                for (int i = 0; i < btenArray.size(); i++) {
+                                    JSONObject object = btenArray.getJSONObject(i);
+                                    BookingModel model = new BookingModel();
+                                    model.setAb_address(object.getString("ab_address"));
+                                    model.setAb_bman(object.getString("ab_bman"));
+                                    model.setAb_bmanid(object.getString("ab_bmanid"));
+                                    model.setAb_confirmstatus(object.getString("ab_confirmstatus"));
+                                    model.setAb_content(object.getString("ab_content"));
+                                    model.setAb_endtime(object.getString("ab_endtime"));
+                                    model.setAb_id(object.getString("ab_id"));
+                                    model.setAb_latitude(object.getString("ab_latitude"));
+                                    model.setAb_longitude(object.getString("ab_longitude"));
+                                    model.setAb_recorddate(object.getString("ab_recorddate"));
+                                    model.setAb_recordid(object.getString("ab_recordid"));
+                                    model.setAb_recordman(object.getString("ab_recordman"));
+                                    model.setAb_sharestatus(object.getString("ab_sharestatus"));
+                                    model.setAb_starttime(object.getString("ab_starttime"));
+                                    model.setAb_type(object.getString("ab_type"));
+                                    model.setKind(object.getString("kind"));
+                                    mDatas.add(model);
+                                    mShareMuiltDatas.add(model);
                                 }
+                            }
 
-                               if (DateFormatUtil.getStrDate4Date(curDate, "yyyy-MM-dd").equals(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd"))){
-                                   JSONArray tenArray = JSON.parseArray(JSON.parseObject(result).getString("tenlist"));
-                                   for (int i = 0; i < tenArray.size(); i++) {
-                                       JSONObject object = tenArray.getJSONObject(i);
-                                       BookingModel model = new BookingModel();
-                                       model.setAb_address(object.getString("ab_address"));
-                                       model.setAb_bman(object.getString("ab_bman"));
-                                       model.setAb_bmanid(object.getString("ab_bmanid"));
-                                       model.setAb_confirmstatus(object.getString("ab_confirmstatus"));
-                                       model.setAb_content(object.getString("ab_content"));
-                                       model.setAb_endtime(object.getString("ab_endtime"));
-                                       model.setAb_id(object.getString("ab_id"));
-                                       model.setAb_latitude(object.getString("ab_latitude"));
-                                       model.setAb_longitude(object.getString("ab_longitude"));
-                                       model.setAb_recorddate(object.getString("ab_recorddate"));
-                                       model.setAb_recordid(object.getString("ab_recordid"));
-                                       model.setAb_recordman(object.getString("ab_recordman"));
-                                       model.setAb_sharestatus(object.getString("ab_sharestatus"));
-                                       model.setAb_starttime(object.getString("ab_starttime"));
-                                       model.setAb_type(object.getString("ab_type"));
-                                       model.setKind(object.getString("kind"));
-                                       mDatas.add(model);
-                                   }
-                               }
-                                
-                                
-                                if (mAdapter != null) {
-                                    mAdapter.setCurrentDate(curDate);
-                                    mAdapter.notifyDataSetChanged();
-                                } else {
-                                    mAdapter = new BookAdapter(mContext, mDatas);
-                                    mAdapter.setCurrentDate(curDate);
-                                    lv_book.setAdapter(mAdapter);
-                                }
-                                calendarView.setDecoratDays(tags);
+
+                            if (mAdapter != null) {
+                                mAdapter.setCurrentDate(curDate);
+                                mAdapter.notifyDataSetChanged();
+                            } else {
+                                mAdapter = new BookAdapter(mContext, mDatas);
+                                mAdapter.setCurrentDate(curDate);
+                                lv_book.setAdapter(mAdapter);
+                            }
+                            calendarView.setDecoratDays(tags);
 //                                Calendar c = Calendar.getInstance();
 //                                c.setTime(curDate);
 //                                int day = c.get(Calendar.DAY_OF_MONTH);
- //                               calendarView.setDownIndex(day);
-                                if (mDatas.size() == 0) {
-                                    emptyLayout.showEmpty();
-                                }
+                            //                               calendarView.setDownIndex(day);
+                            if (mDatas.size() == 0) {
+                                emptyLayout.showEmpty();
+                            }
+                        }
+//                        } else {
+                        mShareDatas.clear();
+                        JSONArray shareArray = JSON.parseArray(JSON.parseObject(result).getString("sharelist"));
+                        JSONArray businessshare = JSON.parseArray(JSON.parseObject(result).getString("businessshare"));
+                        if (shareArray != null) {
+                            for (int i = 0; i < shareArray.size(); i++) {
+                                JSONObject object = shareArray.getJSONObject(i);
+                                BookingModel model = new BookingModel();
+                                model.setAb_address(object.getString("ab_address"));
+                                model.setAb_bman(object.getString("ab_bman"));
+                                model.setAb_bmanid(object.getString("ab_bmanid"));
+                                model.setAb_confirmstatus(object.getString("ab_confirmstatus"));
+                                model.setAb_content(object.getString("ab_content"));
+                                model.setAb_endtime(object.getString("ab_endtime"));
+                                model.setAb_id(object.getString("ab_id"));
+                                model.setAb_latitude(object.getString("ab_latitude"));
+                                model.setAb_longitude(object.getString("ab_longitude"));
+                                model.setAb_recorddate(object.getString("ab_recorddate"));
+                                model.setAb_recordid(object.getString("ab_recordid"));
+                                model.setAb_recordman(object.getString("ab_recordman"));
+                                model.setAb_sharestatus(object.getString("ab_sharestatus"));
+                                model.setAb_starttime(object.getString("ab_starttime"));
+                                model.setAb_type(object.getString("ab_type"));
+                                model.setKind(object.getString("kind"));
+                                mShareDatas.add(model);
                             }
-                        } else {
-                            JSONArray jsonArray = JSON.parseArray(JSON.parseObject(result).getString("sharelist"));
-                            if (jsonArray != null) {
-                                Set<Integer> tags = new HashSet<>();
-                                for (int i = 0; i < jsonArray.size(); i++) {
-                                    JSONObject object = jsonArray.getJSONObject(i);
+
+                            if (businessshare != null) {
+                                for (int i = 0; i < businessshare.size(); i++) {
+                                    JSONObject object = businessshare.getJSONObject(i);
                                     BookingModel model = new BookingModel();
                                     model.setAb_address(object.getString("ab_address"));
                                     model.setAb_bman(object.getString("ab_bman"));
@@ -450,26 +512,8 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
                                     model.setAb_sharestatus(object.getString("ab_sharestatus"));
                                     model.setAb_starttime(object.getString("ab_starttime"));
                                     model.setAb_type(object.getString("ab_type"));
-                                    tags.add(Integer.valueOf(model.getAb_starttime().substring(8, 10)));
-                                    if (model.getAb_starttime().contains(DateFormatUtil.getStrDate4Date(curDate, "yyyy-MM-dd"))) {
-                                        mDatas.add(model);
-                                    }
-                                }
-                                if (mAdapter != null) {
-                                    mAdapter.setCurrentDate(curDate);
-                                    mAdapter.notifyDataSetChanged();
-                                } else {
-                                    mAdapter = new BookAdapter(mContext, mDatas);
-                                    mAdapter.setCurrentDate(curDate);
-                                    lv_book.setAdapter(mAdapter);
-                                }
-                                calendarView.setDecoratDays(tags);
-//                                Calendar c = Calendar.getInstance();
-//                                c.setTime(curDate);
-//                                int day = c.get(Calendar.DAY_OF_MONTH);
-//                                calendarView.setDownIndex(day);
-                                if (mDatas.size() == 0) {
-                                    emptyLayout.showEmpty();
+                                    model.setKind(object.getString("kind"));
+                                    mShareDatas.add(model);
                                 }
                             }
                         }

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:background="@drawable/selector_oa_itembg"
     android:descendantFocusability="blocksDescendants"
     android:padding="10dp">
@@ -14,7 +14,19 @@
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:src="@drawable/oa_doit" />
-
+    <CheckBox
+        android:id="@+id/cb"
+        android:layout_width="15dp"
+        android:layout_height="15dp"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="8dp"
+        android:button="@drawable/oa_checkbox"
+        android:focusableInTouchMode="false" />
+<LinearLayout
+    android:layout_toRightOf="@+id/cb"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
     <LinearLayout
         android:id="@+id/title_ll"
         android:layout_width="match_parent"
@@ -85,4 +97,5 @@
         android:layout_marginTop="10dp"
         android:ellipsize="end"
         android:lines="1" />
+</LinearLayout>
 </RelativeLayout>

app_core/network/src/main/java/com/me/network/app/http/HttpClient.java

@@ -228,7 +228,7 @@ public class HttpClient {
         }
 
         public HttpClient build() {
-            HttpClient client = build(true);
+            HttpClient client = build(false);
             return client;
         }
 

app_modular/appbooking/src/main/AndroidManifest.xml

@@ -7,7 +7,8 @@
         <activity android:name=".activity.shares.BBSharesListActivity" />
         <activity android:name=".activity.business.BBCompanyListActivity" />
         <activity android:name=".activity.business.MuilSelectBeanActivity" />
-        <activity android:name=".activity.business.BBookingDetailActivity"></activity>
+        <activity android:name=".activity.business.BBookingDetailActivity" />
+        <activity android:name=".activity.shares.MuiltSelectShareActivity"></activity>
     </application>
 
 </manifest>

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

@@ -132,6 +132,7 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
                 et_book_content.setText(model.getAb_content());
                 longitude = Double.valueOf(model.getAb_longitude());
                 latitude = Double.valueOf(model.getAb_latitude());
+                tv_book_company.setText(getIntent().getExtras().getString("companys"));
                 imId = model.getAb_bmanid();
                 startTime = model.getAb_starttime();
                 endTime = model.getAb_endtime();
@@ -158,7 +159,7 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
         if (i == R.id.submit_btn) {
             save();
         } else if (i == R.id.topic_rl) {
-
+           update();
         } else if (i == R.id.company_add_rl) {
             //时间
             if (!StringUtil.isEmpty(tvBookObject.getText().toString())) {
@@ -336,7 +337,10 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
                     String success=JSON.parseObject(o.toString()).getString("result");
                     if ("true".equals(success)){
                         ToastMessage("预约计划生成！");
-                        startActivity(new Intent("com.modular.booking.BookingListActivity"));
+                        Intent intent=    new Intent("com.modular.booking.BookingListActivity");
+                      
+                        intent.putExtra("curDate",startTime);
+                        startActivity(intent);
                     }
                 }
             }
@@ -347,7 +351,20 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
 
     //变更
     public void update() {
-
+        HttpClient httpClient = new HttpClient.Builder("https://account.ubtob.com").isDebug(true).build();
+        httpClient.Api().send(new HttpClient.Builder()
+        .url("")
+        .add("","")
+        .add("","")
+        .method(Method.POST)
+        .build(),new ResultSubscriber<Object>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                if (JSONUtil.validate(o.toString())){
+                    
+                }
+            }
+        }));
     }
     
     

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

@@ -40,8 +40,11 @@ import com.modular.booking.model.BookingModel;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import de.hdodenhof.circleimageview.CircleImageView;
+import rx.Observable;
+import rx.functions.Action1;
 
 /**
   * @desc:商务预约详情
@@ -141,7 +144,12 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
         if (getIntent()!=null&&getIntent().getExtras()!=null){
             isShared=getIntent().getExtras().getBoolean("isShared");
             model=getIntent().getExtras().getParcelable("model");
-            updateUi(isShared);
+            if ("个人".equals(model.getKind())){
+                updateUi(isShared);
+            }else{
+                getApiData();
+            }
+          
         }
 
     }
@@ -232,11 +240,11 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
     }
     
     public void initData(){
-        getApiData();
+        
         mAdapter=new ItemListTypeAdapter(mContext);
         mListDetail.setAdapter(mAdapter);
     }
-    
+    private String companys;
     public void getApiData(){
         HttpClient httpClient=new HttpClient.Builder("http://113.105.74.140:8092/").build();
         httpClient.Api()
@@ -266,10 +274,13 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
                             JSONArray array=JSON.parseArray(detail);
                             if (!ListUtils.isEmpty(array)){
                                 List<JSONObject> datas=new ArrayList<>();
+                                StringBuilder companysBuilder=new StringBuilder("");
                                 for (int i=0;i<array.size();i++) {
                                     JSONObject object = array.getJSONObject(i);
+                                    companysBuilder.append(object.getString("ad_bcompany")+",");
                                     datas.add(object);
                                 }
+                                companys=companysBuilder.toString();
                                 mAdapter.setObjects(datas);
                                 mAdapter.notifyDataSetChanged();
                                 if(mAdapter.getCount()==1){
@@ -347,6 +358,12 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
             @Override
             public void onResponse(Object o) {
               dimssLoading();
+                if (JSONUtil.validate(o.toString())){
+                    String result=JSON.parseObject(o.toString()).getString("result");
+                    if ("success".equals(result)){
+                        ToastMessage("分享成功！");
+                    }
+                }
             }
         }));
      
@@ -355,7 +372,7 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
     public void updateBookingState(Button button){
         // 发起人  可以变更和取消
         //被预约人  不能变更和取消
-        String map="{\"ab_confirmstatus \":\"已确认\",\"ab_bmanid\":\""+model.getAb_bmanid()+"\"}";
+        String map="{\"ab_confirmstatus\":\"已确认\",\"ab_bmanid\":\""+model.getAb_bmanid()+"\"}";
         String time=model.getAb_starttime().substring(0,16)+"-"+model.getAb_endtime().substring(11,16);
         if (button.getText().equals("变更")){
             if (MyApplication.getInstance().mLoginUser.getUserId().equals(model.getAb_bmanid())){
@@ -368,8 +385,12 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
 
             Bundle bundle=new Bundle();
             bundle.putParcelable("model",model);
-//            startActivity(new Intent(mContext,BookingAddActivity.class)
-//                    .putExtras(bundle));
+            if (!StringUtil.isEmpty(companys)){
+                bundle.putString("companys",companys.substring(0,companys.length()-1));
+            }
+           
+            startActivity(new Intent(mContext,BBookingAddActivity.class)
+                    .putExtras(bundle));
             return;
         }
         showLoading();
@@ -377,13 +398,13 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
             String content=model.getAb_bman()+"确认了您"+time+"的预约计划";
          //   sendMessage(model.getAb_bmanid(),model.getAb_bman(),model.getAb_recordid(),content);
             String action="已确认";
-            map="{\"ad_confirmstatus \":\""+action+"\",\"ad_bmanid\":\""+model.getAb_bmanid()+"\",\"ad_sharestatus\":\"" +"未共享"+ "\"}";
+            map="{\"ad_confirmstatus\":\""+action+"\",\"ad_bmanid\":\""+MyApplication.getInstance().getLoginUserId()+"\",\"ad_sharestatus\":\"" +"未共享"+ "\"}";
         }
         if (button.getText().equals("拒绝")){
             String content=model.getAb_bman()+"拒绝了您"+time+"的预约计划";
            // sendMessage(model.getAb_bmanid(),model.getAb_bman(),model.getAb_recordid(),content);
             String action="已拒绝";
-            map="{\"ad_confirmstatus \":\""+action+"\",\"ad_bmanid\":\""+model.getAb_bmanid()+"\",\"ad_sharestatus\":\"" +"未共享"+ "\"}";
+            map="{\"ad_confirmstatus\":\""+action+"\",\"ad_bmanid\":\""+MyApplication.getInstance().getLoginUserId()+"\",\"ad_sharestatus\":\"" +"未共享"+ "\"}";
         }
         if (button.getText().equals("取消")){
             if (MyApplication.getInstance().mLoginUser.getUserId().equals(model.getAb_bmanid())){
@@ -396,7 +417,7 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
              //   sendMessage(model.getAb_recordid(),model.getAb_recordman(),model.getAb_bmanid(),content);
             }
             String action="已取消";
-            map="{\"ad_confirmstatus \":\""+action+"\",\"ad_bmanid\":\""+model.getAb_bmanid()+"\",\"ad_sharestatus\":\"" +"未共享"+ "\"}";
+            map="{\"ad_confirmstatus\":\""+action+"\",\"ad_bmanid\":\""+MyApplication.getInstance().getLoginUserId()+"\",\"ad_sharestatus\":\"" +"未共享"+ "\"}";
         }
         actionOrder(model.getAb_id(),map);
     }
@@ -431,7 +452,7 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
         LogUtil.d("HttpLogs","map:"+map);
         HttpClient httpClient=new HttpClient.Builder(Constants.IM_BASE_URL).isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
-                .url("/user/appBatchShare")
+                .url("/user/appDoBusiness")
                 .header("Content-Type","application/x-www-form-urlencoded;charset=UTF-8")
                 .add("token", MyApplication.getInstance().mAccessToken)
                 .add("map", map)
@@ -441,12 +462,21 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
             @Override
             public void onResponse(Object o) {
                 dimssLoading();
-                //{"result":"true"}
                 if (JSONUtil.validate(o.toString())){
                     String result=JSON.parseObject(o.toString()).getString("result");
                     if ("true".equals(result)){
                         ToastMessage("操作成功!");
+                        Observable.timer(2, TimeUnit.SECONDS).subscribe(new Action1<Long>() {
+                            @Override
+                            public void call(Long aLong) {
+                              startActivity(new Intent("com.modular.booking.BookingListActivity")
+                                .putExtra("curDate",model.getAb_starttime()));
+                              finish();
+                            }
+                        });
                     }
+                }else{
+                    ToastMessage("接口异常");
                 }
             }
         }));

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

@@ -1,19 +1,60 @@
 package com.modular.booking.activity.shares;
 
+import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.AdapterView;
 
 import com.core.base.BaseActivity;
+import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.modular.booking.R;
+import com.modular.booking.activity.business.BBookingDetailActivity;
+import com.modular.booking.adapter.BookAdapter;
+import com.modular.booking.model.BookingModel;
+
+import java.util.ArrayList;
 
 /**
   * @desc:分享列表界面
   * @author：Arison on 2017/9/7
   */
 public class BBSharesListActivity extends BaseActivity {
-
+    
+    private ArrayList<BookingModel> mDatas = new ArrayList<>();
+    private BookAdapter mAdapter;
+    private PullToRefreshListView mlist;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_shares_list);
+        initView();
+    }
+    
+    private void initView(){
+        getSupportActionBar().setTitle("共享预约");
+        mlist= (PullToRefreshListView) findViewById(R.id.shareList);
+        if (getIntent()!=null){
+            mDatas=getIntent().getParcelableArrayListExtra("model");
+            mAdapter=new BookAdapter(mContext,mDatas);
+            mlist.setAdapter(mAdapter);
+        }
+
+        mlist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                BookAdapter.ViewHolder viewHolder = (BookAdapter.ViewHolder) view.getTag();
+                Bundle bundle = new Bundle();
+                bundle.putParcelable("model", viewHolder.model);
+                bundle.putBoolean("isShared", true);
+                if ("个人".equals(viewHolder.model.getKind())){
+                    startActivity(new Intent("com.modular.booking.BookingDetailActivity")
+                            .putExtras(bundle)  );
+                }else{
+                    startActivity(new Intent(mContext, BBookingDetailActivity.class)
+                            .putExtras(bundle)  );
+                }
+
+            }
+        });
     }
 }

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

@@ -0,0 +1,167 @@
+package com.modular.booking.activity.shares;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+
+import com.alibaba.fastjson.JSON;
+import com.common.LogUtil;
+import com.common.data.JSONUtil;
+import com.common.data.StringUtil;
+import com.core.app.Constants;
+import com.core.app.MyApplication;
+import com.core.base.OABaseActivity;
+import com.core.model.OAConfig;
+import com.core.model.SelectCollisionTurnBean;
+import com.core.model.SelectEmUser;
+import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.me.network.app.http.HttpClient;
+import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.ResultListener;
+import com.me.network.app.http.rx.ResultSubscriber;
+import com.modular.booking.R;
+import com.modular.booking.adapter.MuiltBookAdapter;
+import com.modular.booking.model.BookingModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MuiltSelectShareActivity extends OABaseActivity {
+    private ArrayList<BookingModel> mDatas = new ArrayList<>();
+    private MuiltBookAdapter mAdapter;
+    private PullToRefreshListView mlist;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_shares_list);
+        initView();
+    }
+
+    private void initView() {
+        getSupportActionBar().setTitle("预约分享");
+        mlist = (PullToRefreshListView) findViewById(R.id.shareList);
+        if (getIntent() != null) {
+            mDatas = getIntent().getParcelableArrayListExtra("model");
+            mAdapter = new MuiltBookAdapter(mContext, mDatas);
+            mlist.setAdapter(mAdapter);
+        }
+
+        mlist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                MuiltBookAdapter.ViewHolder viewHolder = (MuiltBookAdapter.ViewHolder) view.getTag();
+                boolean isChecked = !viewHolder.checkBox.isChecked();
+                mAdapter.getItem(position - 1).setClick(isChecked);
+                mAdapter.notifyDataSetChanged();
+
+
+            }
+        });
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_about, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.app_about) {
+            Intent intent = new Intent("com.modular.main.SelectCollisionActivity");
+            SelectCollisionTurnBean bean = new SelectCollisionTurnBean()
+                    .setTitle(getString(R.string.select_share_friend))
+                    .setSingleAble(false);
+            intent.putExtra(OAConfig.MODEL_DATA, bean);
+            startActivityForResult(intent, 0x02);
+        }
+
+        if (item.getItemId() == android.R.id.home) {
+            onBackPressed();
+        }
+        return super.onOptionsItemSelected(item);
+
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (data == null) return;
+        switch (requestCode) {
+            case 0x02:
+                try {
+                    List<SelectEmUser> employeesList = data.getParcelableArrayListExtra("data");
+                    LogUtil.d("Test", JSON.toJSONString(employeesList));
+                    StringBuilder stringBuilder = new StringBuilder("");
+                    for (int i = 0; i < employeesList.size(); i++) {
+                        if (i == employeesList.size() - 1) {
+                            stringBuilder.append(employeesList.get(i).getImId());
+                        } else {
+                            stringBuilder.append(employeesList.get(i).getImId());
+                            stringBuilder.append(",");
+                        }
+                    }
+                    LogUtil.d("Test", stringBuilder.toString());
+                    List<BookingModel> models = mAdapter.getDatas();
+                    StringBuilder planids = new StringBuilder("");
+                    StringBuilder bplanids = new StringBuilder("");
+                    for (int i = 0; i < models.size(); i++) {
+                        if (models.get(i).isClick) {
+                            if ("个人".equals(models.get(i).getKind())) {
+                                planids.append(models.get(i).getAb_id() + ",");
+                            } else {
+                                bplanids.append(models.get(i).getAb_id() + ",");
+                            }
+                        }
+                    }
+//                  
+                    if (!StringUtil.isEmpty(stringBuilder.toString())) {
+                        String p="";
+                        String b="";
+                        if (!StringUtil.isEmpty(planids.toString())){
+                            p=planids.substring(0,planids.length()-1);
+                        }
+                        if (!StringUtil.isEmpty(bplanids.toString())){
+                           b= bplanids.substring(0,bplanids.length()-1);
+                        }
+                        shareBooking(p, b, stringBuilder.toString());
+                    } else {
+                        ToastMessage("共享失败！");
+                    }
+                } catch (Exception e) {
+
+                }
+                break;
+        }
+    }
+
+
+    public void shareBooking(String planids, String bplanids, String imids) {
+        showLoading();
+        //map包括planids 个人计划id,bplanids商务计划id,userids共享人员imid，多个id用逗号连接
+        String map = "{\"planids\":\"" + planids + "\",\"bplanids\":\"" + bplanids + "\",\"userids\":\"" + imids + "\"}";
+        LogUtil.d("HttpLogs", "map:" + map);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL).isDebug(true).build();
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("/user/appBatchShare")
+                .add("token", MyApplication.getInstance().mAccessToken)
+                .add("map", map)
+                .method(Method.POST)
+                .build(), new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                dimssLoading();
+                if (JSONUtil.validate(o.toString())){
+                    String result=JSON.parseObject(o.toString()).getString("result");
+                    if ("success".equals(result)){
+                        ToastMessage("分享成功！");
+                    }
+                }
+            }
+        }));
+
+    }
+}

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

@@ -0,0 +1,136 @@
+package com.modular.booking.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.common.data.DateFormatUtil;
+import com.modular.booking.R;
+import com.modular.booking.model.BookingModel;
+
+import java.util.ArrayList;
+import java.util.Date;
+
+/**
+ * Created by Arison on 2017/6/23.
+ */
+
+public class MuiltBookAdapter extends BaseAdapter {
+    
+    private Context ct;
+    private int type=1;
+    private Date currentDate;
+
+    public Date getCurrentDate() {
+        return currentDate;
+    }
+
+    public void setCurrentDate(Date currentDate) {
+        this.currentDate = currentDate;
+    }
+
+    private ArrayList<BookingModel> datas=new ArrayList<>();
+    
+    public MuiltBookAdapter(Context ct, ArrayList<BookingModel> data){
+        this.ct=ct;
+        this.datas=data;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    @Override
+    public int getCount() {
+        return datas!=null?datas.size():0;
+    }
+
+    @Override
+    public BookingModel getItem(int position) {
+        return   datas.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        ViewHolder holder = null;
+        if (convertView == null) {
+            holder = new ViewHolder();
+            convertView = LayoutInflater.from(ct).inflate(R.layout.item_booking_list_muilt, null);
+            holder.status_img = (ImageView) convertView.findViewById(R.id.status_img);
+            holder.share_img = (ImageView) convertView.findViewById(R.id.iv_share);
+            holder.title_tv = (TextView) convertView.findViewById(R.id.title_tv);
+            holder.status_tv = (TextView) convertView.findViewById(R.id.status_tv);
+            holder.checkBox=(CheckBox) convertView.findViewById(com.uas.appcontact.R.id.cb);
+            holder.address_tv = (TextView) convertView.findViewById(R.id.address_tv);
+            holder.handler_tv = (TextView) convertView.findViewById(R.id.handler_tv);
+            holder.topic_tv=(TextView) convertView.findViewById(R.id.topic_tv);
+            convertView.setTag(holder);
+        } else {
+            holder = (ViewHolder) convertView.getTag();
+        }
+        try {
+            BookingModel model=datas.get(position);
+            holder.model=model;
+
+            if (DateFormatUtil.getStrDate4Date(currentDate, "yyyy-MM-dd").equals(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd"))){
+                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());
+           
+            if(model.getAb_sharestatus().equals("已共享")){
+                holder.share_img.setVisibility(View.VISIBLE);
+            }else{
+                holder.share_img.setVisibility(View.GONE);
+            }
+            if (type==2){
+                holder.handler_tv.setText(model.getAb_recordman()+"—>"+model.getAb_bman());
+            }else{
+                holder.handler_tv.setText(model.getAb_recordman()+"—>"+model.getAb_bman());
+            }
+            
+            holder.topic_tv.setText(model.getAb_type());
+            holder.model.setAb_type(model.getAb_type());
+
+            holder.checkBox.setChecked(model.isClick);
+            holder.checkBox.setFocusable(false);
+            holder.checkBox.setClickable(false);
+        } catch (Exception e) {
+        }
+        return convertView;
+    }
+
+    public class ViewHolder {
+        public ImageView status_img,share_img;
+        public TextView title_tv, status_tv, address_tv, handler_tv,topic_tv;
+        public BookingModel model;
+        public CheckBox checkBox;
+    }
+
+    public ArrayList<BookingModel> getDatas() {
+        return datas;
+    }
+
+    public void setDatas(ArrayList<BookingModel> datas) {
+        this.datas = datas;
+    }
+}

app_modular/appbooking/src/main/java/com/modular/booking/model/BookingModel.java

@@ -26,6 +26,16 @@ public class BookingModel implements Parcelable {
     private String ab_type;
     private String kind;
 
+    public boolean isClick() {
+        return isClick;
+    }
+
+    public void setClick(boolean click) {
+        isClick = click;
+    }
+
+    public boolean isClick = false;
+
     public String getAb_type() {
         return ab_type;
     }
@@ -180,6 +190,7 @@ public class BookingModel implements Parcelable {
         dest.writeString(this.ab_starttime);
         dest.writeString(this.ab_type);
         dest.writeString(this.kind);
+        dest.writeByte(this.isClick ? (byte) 1 : (byte) 0);
     }
 
     protected BookingModel(Parcel in) {
@@ -199,6 +210,7 @@ public class BookingModel implements Parcelable {
         this.ab_starttime = in.readString();
         this.ab_type = in.readString();
         this.kind = in.readString();
+        this.isClick = in.readByte() != 0;
     }
 
     public static final Creator<BookingModel> CREATOR = new Creator<BookingModel>() {

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

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/selector_oa_itembg"
+    android:descendantFocusability="blocksDescendants"
+    android:padding="10dp">
+
+    <ImageView
+        android:id="@+id/status_img"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:visibility="gone"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:src="@drawable/oa_doit" />
+    <CheckBox
+        android:id="@+id/cb"
+        android:layout_width="15dp"
+        android:layout_height="15dp"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="8dp"
+        android:button="@drawable/oa_checkbox"
+        android:focusableInTouchMode="false" />
+<LinearLayout
+    android:layout_toRightOf="@+id/cb"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <LinearLayout
+        android:id="@+id/title_ll"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/title_tv"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:lines="1"
+            android:text="*****"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+       <ImageView
+           android:id="@+id/iv_share"
+           android:layout_width="25dp"
+           android:layout_height="25dp" 
+           android:background="@drawable/icon_share_nor"/> 
+        
+        <TextView
+            android:id="@+id/status_tv"
+            android:layout_width="70dp"
+            android:layout_height="match_parent"
+            
+            android:layout_toRightOf="@+id/title_tv"
+            android:textColor="@color/green"
+            android:ellipsize="end"
+            android:text="*****"
+            android:gravity="right|center_vertical"
+            android:lines="1" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/address_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/title_ll"
+        android:layout_marginRight="70dp"
+        android:visibility="gone"
+        android:layout_marginTop="10dp"
+        android:ellipsize="end"
+        android:text="*****"
+        android:lines="1" />
+
+    <TextView
+        android:id="@+id/handler_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/address_tv"
+        android:layout_marginRight="40dp"
+        android:text="*****"
+        android:layout_marginTop="10dp"
+        android:ellipsize="end"
+        android:lines="1" />
+
+    <TextView
+        android:id="@+id/topic_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/address_tv"
+        android:layout_toRightOf="@+id/handler_tv"
+        android:layout_marginRight="70dp"
+        android:text="*****"
+        android:layout_marginTop="10dp"
+        android:ellipsize="end"
+        android:lines="1" />
+</LinearLayout>
+</RelativeLayout>

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

@@ -70,7 +70,6 @@ import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
-import com.me.network.app.http.impl.RetrofitImpl;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appcontact.R;
@@ -865,6 +864,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
 
     //
     public void uploadData(List<Contacts> models) {
+        
         if (!ListUtils.isEmpty(models)) {
 //            String map="[{\n" +
 //                    "\"am_telephone\":\"13266699268\",\n" +
@@ -875,23 +875,25 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                 if (i == models.size() - 1) {
                     mapBuilder.append("{\n" +
                             "\"am_telephone\":\"" + models.get(i).getPhone() + "\",\n" +
-                            "\"am_username\":\"" + models.get(i).getName() + "\"\n" +
+                            "\"am_username\":\"" + models.get(i).getName() + "\",\n" +
+                            "\"am_userid\":\"" + 0 + "\"\n" +
                             "}]");
                 } else {
                     mapBuilder.append("{\n" +
                             "\"am_telephone\":\"" + models.get(i).getPhone() + "\",\n" +
-                            "\"am_username\":\"" + models.get(i).getName() + "\"\n" +
+                            "\"am_username\":\"" + models.get(i).getName() + "\",\n" +
+                            "\"am_userid\":\"" + 0 + "\"\n" +
                             "},");
                 }
             }
-      
+            LogUtil.d("HttpLogs","token:"+MyApplication.getInstance().mAccessToken);
+            LogUtil.d("HttpLogs","userid:"+MyApplication.getInstance().mLoginUser.getUserId());
+            LogUtil.d("HttpLogs","username:"+MyApplication.getInstance().mLoginUser.getNickName());
+            LogUtil.prinlnLongMsg("HttpLogs","map:"+mapBuilder.toString());
             HttpClient httpClient = new HttpClient.Builder().url(Constants.IM_BASE_URL)
-                    .add("http","hh")
-                    .httpBase(RetrofitImpl.getInstance())
-                    .isDebug(true).build();
+                    .isDebug(true).build(true);
             httpClient.Api().send(new HttpClient.Builder()
                     .url("/user/appMobileContact")
-                    .isDebug(true)
                     .add("token", MyApplication.getInstance().mAccessToken)
                     .add("userid", MyApplication.getInstance().mLoginUser.getUserId())
                     .add("username", MyApplication.getInstance().mLoginUser.getNickName())