Arison 8 лет назад
Родитель
Сommit
285b4c9c55

+ 7 - 2
WeiChat/src/main/AndroidManifest.xml

@@ -742,7 +742,7 @@
             android:screenOrientation="portrait"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
         <activity
-            android:name=".WBShareActivity"
+            android:name="com.core.api.wxapi.WBShareActivity"
             android:configChanges="keyboardHidden|orientation"
             android:screenOrientation="portrait">
             <intent-filter>
@@ -1064,7 +1064,12 @@
             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.BookingListActivity" />
+        <activity android:name=".ui.erp.activity.secretary.BookingListActivity" >
+            <intent-filter>
+                <action android:name="com.modular.booking.BookingListActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>  
+        </activity>
         <activity
             android:name=".ui.erp.activity.secretary.BookingAddActivity"
             android:windowSoftInputMode="adjustPan"/>

+ 4 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingAddActivity.java

@@ -70,7 +70,7 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
     private TextView tvBookAddress;
     private double latitude;
     private double longitude;
-    private int imId;
+    private String imId;
     private String startTime;
     private String endTime;
     private EditText et_book_content;
@@ -120,7 +120,7 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
 
                 longitude = Double.valueOf(model.getAb_longitude());
                 latitude = Double.valueOf(model.getAb_latitude());
-                imId = Integer.valueOf(model.getAb_bmanid());
+                imId = model.getAb_bmanid();
 
                 startTime = model.getAb_starttime();
                 endTime = model.getAb_endtime();
@@ -236,7 +236,7 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
                 // SelectEmUser model = data.getParcelableExtra("data");
                 ContactsModel model = data.getParcelableExtra("data");
                 LogUtil.d("Test",JSON.toJSONString(model));
-                imId = Integer.valueOf(model.getImid());
+                imId = model.getImid();
                 phone = model.getPhone();
                 tvBookObject.setText(model.getName());
                 break;
@@ -394,7 +394,7 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
                         String resutl = JSON.parseObject(msg.getData().getString("result")).getString("result");
                         if (resutl.equals("true")) {
                             ToastMessage("预约成功!");
-                            if (imId == 0) {
+                            if (!StringUtil.isEmpty(imId)) {
                                 invite(phone, "6e554e51-08de-443c-9b6c-f0d6d0d07bb4");
                                 invite(phone, "fd4ac30e-b176-4410-ac0e-e39c8b71dfe0");
                             } else {

+ 1 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingDetailActivity.java

@@ -380,6 +380,7 @@ public class BookingDetailActivity extends OABaseActivity implements HttpImp,Vie
     public void shareBooking(String id,String imids){
         showLoading();
         String map="{\"ab_bmanid\":\"" + model.getAb_bmanid() + "\",\"as_planid\":\""+id+"\",\"as_userids\":\""+imids+"\"}";
+        LogUtil.d("HttpLogs","map:"+map);
         String url = Constants.IM_BASE_URL + "user/appSharePlan";
         Map<String, Object> params = new HashMap<>();
         params.put("token", MyApplication.getInstance().mAccessToken);

+ 37 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingListActivity.java

@@ -38,6 +38,7 @@ import com.modular.booking.activity.business.BBookingDetailActivity;
 import com.modular.booking.activity.shares.BBSharesListActivity;
 import com.modular.booking.adapter.BookAdapter;
 import com.modular.booking.model.BookingModel;
+import com.uas.appme.settings.model.Business;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.OACalenderViewPagerAdapter;
@@ -167,10 +168,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)
-                );
+                        .putExtras(bundle)  );
+                }else{
+                    startActivity(new Intent(mContext, BBookingDetailActivity.class)
+                            .putExtras(bundle)  );
+                }
+              
             }
         });
 
@@ -325,8 +330,8 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
                             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++) {
@@ -347,11 +352,38 @@ 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"));
+                                    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);
                                     }
                                 }
+                                
+                                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);
+                                        }
+                                    }
+                                }
 
                                if (DateFormatUtil.getStrDate4Date(curDate, "yyyy-MM-dd").equals(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd"))){
                                    JSONArray tenArray = JSON.parseArray(JSON.parseObject(result).getString("tenlist"));
@@ -373,6 +405,7 @@ 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"));
+                                       model.setKind(object.getString("kind"));
                                        mDatas.add(model);
                                    }
                                }

+ 1 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/WBShareActivity.java → app_core/common/src/main/java/com/core/api/wxapi/WBShareActivity.java

@@ -1,9 +1,6 @@
-package com.xzjmyk.pm.activity;
+package com.core.api.wxapi;
 
 import com.umeng.socialize.media.WBShareCallBackActivity;
 
-/**
- * Created by wangfei on 15/12/3.
- */
 public class WBShareActivity extends WBShareCallBackActivity{
 }

+ 2 - 1
app_core/common/src/main/java/com/core/app/MyApplication.java

@@ -43,6 +43,7 @@ import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
 import com.nostra13.universalimageloader.core.assist.QueueProcessingType;
 import com.nostra13.universalimageloader.core.display.RoundedBitmapDisplayer;
 import com.umeng.analytics.MobclickAgent;
+import com.umeng.socialize.Config;
 import com.umeng.socialize.PlatformConfig;
 import com.uuzuche.lib_zxing.activity.ZXingLibrary;
 
@@ -126,7 +127,7 @@ public class MyApplication extends BaseApplication {
         CustomActivityOnCrash.setEnableAppRestart(true);
         //设置重新启动的activity
         //  CustomActivityOnCrash.setRestartActivityClass(SplashActivity.class);
-
+        Config.REDIRECT_URL = "http://sns.whalecloud.com/sina2/callback";
         INSTANCE = this;
         ZXingLibrary.initDisplayOpinion(this);
         mRequestQueue = Volley.newRequestQueue(this);

+ 5 - 5
app_core/common/src/main/java/com/core/selectcalendar/SelectCalendarActivity.java

@@ -108,7 +108,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
     private String first_start_time;
     private String first_end_time;
     private Boolean breastfeeding = false;
-    private int imId;
+    private String imId;
     private int type;//0:默认erp:1:小秘书
     private ArrayList<DataState> totals = new ArrayList<>();
     private Handler mHandler = new Handler() {
@@ -159,7 +159,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                                 initGridData();
                             }
 
-                            if (imId != 0) {
+                            if (StringUtil.isEmpty(imId)) {
                                 getBookingTime(imId);
                             }
                         }
@@ -344,7 +344,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                     Log.d("currentSelectDate2", currentSelectDate);
                 }
             }
-            imId = intent.getIntExtra("imId", 0);
+            imId = intent.getStringExtra("imId");
         }
         initListener();
 
@@ -1129,7 +1129,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
      * @desc:获取总的时间段
      * @author:Arison on 2017/6/28
      */
-    private void getBookingTotalTime(int imId) {
+    private void getBookingTotalTime(String imId) {
         if (type == 1) {
             String url = Constants.IM_BASE_URL + "user/appUsertime";
             Map<String, Object> params = new HashMap<>();
@@ -1146,7 +1146,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
      * @desc:获取预约时间
      * @author:Arison on 2017/6/28
      */
-    public void getBookingTime(int imId) {
+    public void getBookingTime(String imId) {
         if (type == 1) {
             String url = Constants.IM_BASE_URL + "user/appBusytime";
             String ym;

+ 2 - 0
app_core/network/build.gradle

@@ -26,6 +26,8 @@ dependencies {
     testCompile deps.junit
     compile deps.appcompatV7
     
+    compile project(":common")
+    
     compile deps.rxjava
     compile deps.rxandroid
     compile deps.okhttp

+ 6 - 0
app_core/network/src/main/java/com/me/network/app/http/interceptor/LogInterceptor.java

@@ -1,5 +1,7 @@
 package com.me.network.app.http.interceptor;
 
+import com.alibaba.fastjson.JSON;
+import com.common.LogUtil;
 import com.me.network.app.http.HttpClient;
 
 import java.io.IOException;
@@ -86,6 +88,10 @@ public class LogInterceptor implements Interceptor {
 			 Logger.i("params:" + JSON.toJSONString(postParam));
 			 Logger.init("PRETTYLOGGER")
 					 .methodCount(1);*/
+			 LogUtil.d("HttpLogs","URL:" + JSON.toJSONString(response.request().url().toString()));
+			 LogUtil.d("HttpLogs","HEADER:"+ JSON.toJSONString(response.request().headers().toMultimap()));
+			 LogUtil.d("HttpLogs","PARAMS:" + JSON.toJSONString(postParam));
+			 LogUtil.d("HttpLogs","TEXT:" + content);
 		}
     
 		return response.newBuilder()

+ 78 - 12
app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingAddActivity.java

@@ -13,14 +13,18 @@ import android.widget.EditText;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baidu.mapapi.search.core.PoiInfo;
 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;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
+import com.core.base.OABaseActivity;
 import com.core.model.SelectEmUser;
 import com.core.selectcalendar.SelectCalendarActivity;
 import com.core.selectcalendar.bean.DataState;
@@ -44,7 +48,7 @@ import java.util.List;
  * @desc:商务预约新增界面
  * @author:Arison on 2017/9/7
  */
-public class BBookingAddActivity extends BaseActivity implements View.OnClickListener {
+public class BBookingAddActivity extends OABaseActivity implements View.OnClickListener {
     private TextView tvBookObject;
     private RelativeLayout companyAddRl;
     private RelativeLayout rlObject;
@@ -57,7 +61,7 @@ public class BBookingAddActivity extends BaseActivity implements View.OnClickLis
     private TextView tv_book_company;
     private double latitude;
     private double longitude;
-    private int imId;
+    private String imId;
     private String startTime;
     private String endTime;
 
@@ -128,7 +132,7 @@ public class BBookingAddActivity extends BaseActivity implements View.OnClickLis
                 et_book_content.setText(model.getAb_content());
                 longitude = Double.valueOf(model.getAb_longitude());
                 latitude = Double.valueOf(model.getAb_latitude());
-                imId = Integer.valueOf(model.getAb_bmanid());
+                imId = model.getAb_bmanid();
                 startTime = model.getAb_starttime();
                 endTime = model.getAb_endtime();
                 ((Button) findViewById(R.id.submit_btn)).setText(getString(R.string.booking_change));
@@ -152,7 +156,7 @@ public class BBookingAddActivity extends BaseActivity implements View.OnClickLis
     public void onClick(View v) {
         int i = v.getId();
         if (i == R.id.submit_btn) {
-
+            save();
         } else if (i == R.id.topic_rl) {
 
         } else if (i == R.id.company_add_rl) {
@@ -206,9 +210,20 @@ public class BBookingAddActivity extends BaseActivity implements View.OnClickLis
                 ArrayList<ContactsModel> models = data.getParcelableArrayListExtra("data");
                 //拿到多个预约对象,需要下拉他们的企业信息
                 StringBuilder names = new StringBuilder("");
+                StringBuilder imids=new StringBuilder("");
+                StringBuilder phones=new StringBuilder("");
                 for (int i = 0; i < models.size(); i++) {
-                    names.append(models.get(i).getName() + ",");
+                    if(i==models.size()-1){
+                        names.append(models.get(i).getName() );
+                        imids.append(models.get(i).getImid());
+                        phones.append(models.get(i).getPhone());
+                    }else{
+                        names.append(models.get(i).getName() + ",");
+                        imids.append(models.get(i).getImid() + ",");
+                        phones.append(models.get(i).getPhone() + ",");
+                    }
                 }
+                comboxGetCompany(phones.toString());
                 tvBookObject.setText(names.toString());
                 break;
             case 0x02://企业
@@ -238,8 +253,11 @@ public class BBookingAddActivity extends BaseActivity implements View.OnClickLis
                     tv_book_company.setText(companyBuilder.toString());
                    String bookObject= tvBookObject.getText().toString();
                    bookObject=bookObject+nameBuilder;
+                   
                    tvBookObject.setText(bookObject);
-                  // imId=imidBuilder.toString();
+                   imId=imidBuilder.toString();
+                   phone=phoneBuilder.toString();
+                   
                 }
 
                 break;
@@ -259,7 +277,6 @@ public class BBookingAddActivity extends BaseActivity implements View.OnClickLis
             case 0x11://主题
 
                 break;
-
         }
     }
 
@@ -289,7 +306,7 @@ public class BBookingAddActivity extends BaseActivity implements View.OnClickLis
         String map= "{" +
                 "\"ab_bman\":\"" + tvBookObject.getText().toString() + "\"," +
                 "\"ab_bmanid\":\"" + imId + "\"," +
-                "\"ab_bcompany\":\"" + imId + "\"," +
+                "\"ab_bcompany\":\"" + tv_book_company.getText().toString() + "\"," +
                 "\"ab_btelephone\":\"" + phone + "\"," +
                 "\"ab_starttime\":\"" + startTime + "\"," +
                 "\"ab_endtime\":\"" + endTime + "\"," +
@@ -302,16 +319,26 @@ public class BBookingAddActivity extends BaseActivity implements View.OnClickLis
                 "\"ab_longitude\":\"" + longitude + "\",\n" +
                 "\"ab_latitude\":\"" + latitude + "\"" +
                 "}\n";
-        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL).build();
+        showLoading();
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL).isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appSaveBusiness")
+                .header("Content-Type","application/x-www-form-urlencoded;charset=UTF-8")
                 .add("map", map)
                 .add("token", MyApplication.getInstance().mAccessToken)
                 .method(Method.POST)
                 .build(), new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
             public void onResponse(Object o) {
+                dimssLoading();
                 LogUtil.d("",""+o.toString());
+                if (JSONUtil.validate(o.toString())){
+                    String success=JSON.parseObject(o.toString()).getString("result");
+                    if ("true".equals(success)){
+                        ToastMessage("预约计划生成!");
+                        startActivity(new Intent("com.modular.booking.BookingListActivity"));
+                    }
+                }
             }
         }));
 
@@ -325,8 +352,47 @@ public class BBookingAddActivity extends BaseActivity implements View.OnClickLis
     
     
     
-    public void comboxGetCompany(){
-        
+    public void comboxGetCompany(String phones){
+        HttpClient httpClient = new HttpClient.Builder("https://account.ubtob.com").isDebug(true).build();
+        httpClient.Api().send(new HttpClient.Builder()
+                .isDebug(true)
+                .url("api/userspace/userInfos")
+                .add("tel", phones)
+                .method(Method.GET)
+                .build(), new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                LogUtil.d("ResponseText","o:"+o.toString());
+                if (JSONUtil.validate(o.toString())){
+                    JSONArray datas= JSON.parseObject(o.toString()).getJSONArray("listdata");
+                    if (!ListUtils.isEmpty(datas)){
+                        StringBuilder companyBuilder=new StringBuilder("");
+                        StringBuilder imidBuilder=new StringBuilder("");
+                        StringBuilder phoneBuilder=new StringBuilder("");
+                        StringBuilder nameBuilder=new StringBuilder("");
+                        for (int i=0;i<datas.size();i++){
+                            JSONObject object=datas.getJSONObject(i);
+                           if (i==datas.size()-1){
+                               companyBuilder.append(object.getString("company"));
+                               imidBuilder.append(object.getString("imid"));
+                               phoneBuilder.append(object.getString("username"));
+                               nameBuilder.append(object.getString("usertel"));
+                           }else{
+                               companyBuilder.append(object.getString("company")+",");
+                               imidBuilder.append(object.getString("imid")+",");
+                               phoneBuilder.append(object.getString("username")+",");
+                               nameBuilder.append(object.getString("usertel")+",");
+                           }
+                        }
+                        
+                        tv_book_company.setText(companyBuilder.toString());
+                        imId=imidBuilder.toString();
+                        phone=phoneBuilder.toString();
+                    }
+                            
+                }
+            }
+        }));
     }
 
     public class GridDataAdapter extends BaseAdapter {

+ 208 - 6
app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingDetailActivity.java

@@ -1,6 +1,10 @@
 package com.modular.booking.activity.business;
 
+import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
@@ -17,11 +21,17 @@ 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;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
+import com.core.base.OABaseActivity;
+import com.core.model.OAConfig;
+import com.core.model.SelectCollisionTurnBean;
+import com.core.model.SelectEmUser;
 import com.core.utils.helper.AvatarHelper;
 import com.core.widget.MyListView;
 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;
@@ -37,7 +47,7 @@ import de.hdodenhof.circleimageview.CircleImageView;
   * @desc:商务预约详情
   * @author:Arison on 2017/9/11
   */
-public class BBookingDetailActivity extends BaseActivity  implements View.OnClickListener{
+public class BBookingDetailActivity extends OABaseActivity implements View.OnClickListener{
     
    private MyListView mListDetail;
    private RelativeLayout rvTop;
@@ -69,6 +79,45 @@ public class BBookingDetailActivity extends BaseActivity  implements View.OnClic
         initEvent();
         initData();
     }
+    Menu mMenu;
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        mMenu=menu;
+        Log.e("isMenuShuffle",isMenuShuffle + "");
+        if(isMenuShuffle)
+        {
+            menu.findItem(R.id.app_about).setVisible(true);
+        }else
+        {
+            menu.findItem(R.id.app_about).setVisible(false);
+        }
+        return super.onPrepareOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_about, menu);
+        return true;
+    }
+
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int i = item.getItemId();
+        if (i == 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);
+
+        } else if (i == android.R.id.home) {
+            onBackPressed();
+
+        }
+        return true;
+    }
     
     public void initView(){
         getSupportActionBar().setTitle("商务预约");
@@ -119,10 +168,12 @@ public class BBookingDetailActivity extends BaseActivity  implements View.OnClic
             ll_bottom.setVisibility(View.VISIBLE);
             ivResultInfo.startAnimation(animation);
             if( MyApplication.getInstance().mLoginUser.getUserId().equals(model.getAb_recordid())){
+                //发起人
                 ((Button)findViewById(R.id.bt_change)).setText("变更");
                 ((Button)findViewById(R.id.bt_change)).setTextColor(getResources().getColor(R.color.white));
                 ((Button)findViewById(R.id.bt_cancle)).setText("取消");
             }else{
+                //被预约人
                 ((Button)findViewById(R.id.bt_change)).setText("确认");
                 ((Button)findViewById(R.id.bt_cancle)).setText("拒绝");
             }
@@ -190,7 +241,8 @@ public class BBookingDetailActivity extends BaseActivity  implements View.OnClic
         HttpClient httpClient=new HttpClient.Builder("http://113.105.74.140:8092/").build();
         httpClient.Api()
                 .send(new HttpClient.Builder().url("user/appBusinessDetail")
-                        .add("id", "10002")
+                        .add("id", model.getAb_id())
+                        .add("userid",MyApplication.getInstance().mLoginUser.getUserId())
                         .add("token", MyApplication.getInstance().mAccessToken)
                         .build(), new ResultSubscriber<>(new ResultListener<Object>() {
                     
@@ -242,12 +294,162 @@ public class BBookingDetailActivity extends BaseActivity  implements View.OnClic
     public void onClick(View v) {
         int i = v.getId();
         if (i == R.id.bt_change) {
-            
+            updateBookingState((Button) v);
         } else if (i == R.id.bt_cancle) {
-            
+            updateBookingState((Button) v);
         }
     }
+
+
+    @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());
+                    LogUtil.d("Test",model.getAb_id());
+                    if (!StringUtil.isEmpty(stringBuilder.toString())&&!StringUtil.isEmpty(model.getAb_id())){
+                        shareBooking(model.getAb_id(),stringBuilder.toString());
+                    }else {
+                        ToastMessage("共享失败!");
+                    }
+                } catch (Exception e) {
+
+                }
+                break;
+        }
+    }
+
+    public void shareBooking(String id,String imids){
+        showLoading();
+        //map包括planids 个人计划id,bplanids商务计划id,userids共享人员imid,多个id用逗号连接
+        String map="{\"planids\":\"" +"" + "\",\"bplanids\":\""+id+"\",\"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();
+            }
+        }));
+     
+    }
+
+    public void updateBookingState(Button button){
+        // 发起人  可以变更和取消
+        //被预约人  不能变更和取消
+        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())){
+                String content=model.getAb_bman()+"变更了您"+time+"的预约计划";
+              //  sendMessage(model.getAb_bmanid(),model.getAb_bman(),model.getAb_recordid(),content);
+            }else{
+                String content=model.getAb_recordman()+"变更了您"+time+"的预约计划";
+               // sendMessage(model.getAb_recordid(),model.getAb_recordman(),model.getAb_bmanid(),content);
+            }
+
+            Bundle bundle=new Bundle();
+            bundle.putParcelable("model",model);
+//            startActivity(new Intent(mContext,BookingAddActivity.class)
+//                    .putExtras(bundle));
+            return;
+        }
+        showLoading();
+        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\":\"" +"未共享"+ "\"}";
+        }
+        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\":\"" +"未共享"+ "\"}";
+        }
+        if (button.getText().equals("取消")){
+            if (MyApplication.getInstance().mLoginUser.getUserId().equals(model.getAb_bmanid())){
+                String content=model.getAb_bman()+"取消了您"+time+"的预约计划";
+                ToastMessage("您不能取消!");
+                return;
+            //    sendMessage(model.getAb_bmanid(),model.getAb_bman(),model.getAb_recordid(),content);
+            }else{
+                String content=model.getAb_recordman()+"取消了您"+time+"的预约计划";
+             //   sendMessage(model.getAb_recordid(),model.getAb_recordman(),model.getAb_bmanid(),content);
+            }
+            String action="已取消";
+            map="{\"ad_confirmstatus \":\""+action+"\",\"ad_bmanid\":\""+model.getAb_bmanid()+"\",\"ad_sharestatus\":\"" +"未共享"+ "\"}";
+        }
+        actionOrder(model.getAb_id(),map);
+    }
     
+    //变更
+    public void updateOrder(String id ,String map){
+        ///user/appUpdateBusiness
+        HttpClient httpClient=new HttpClient.Builder(Constants.IM_BASE_URL).isDebug(true).build();
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("/user/appUpdateBusiness")
+                .add("token", MyApplication.getInstance().mAccessToken)
+                .add("map", map)
+                .add("id",id)
+                .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 ("true".equals(result)){
+                        ToastMessage("变更");
+                    }
+                }
+            }
+        }));
+    }
     
-    
+    //确认和取消
+    public void actionOrder(String id, String map){
+        LogUtil.d("HttpLogs","id:"+id);
+        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")
+                .header("Content-Type","application/x-www-form-urlencoded;charset=UTF-8")
+                .add("token", MyApplication.getInstance().mAccessToken)
+                .add("map", map)
+                .add("id",id)
+                .method(Method.POST)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @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("操作成功!");
+                    }
+                }
+            }
+        }));
+        
+    }
 }

+ 11 - 0
app_modular/appbooking/src/main/java/com/modular/booking/model/BookingModel.java

@@ -24,6 +24,7 @@ public class BookingModel implements Parcelable {
     private String ab_sharestatus;
     private String ab_starttime;
     private String ab_type;
+    private String kind;
 
     public String getAb_type() {
         return ab_type;
@@ -145,6 +146,14 @@ public class BookingModel implements Parcelable {
         return ab_starttime;
     }
 
+    public String getKind() {
+        return kind;
+    }
+
+    public void setKind(String kind) {
+        this.kind = kind;
+    }
+
     public BookingModel() {
     }
 
@@ -170,6 +179,7 @@ public class BookingModel implements Parcelable {
         dest.writeString(this.ab_sharestatus);
         dest.writeString(this.ab_starttime);
         dest.writeString(this.ab_type);
+        dest.writeString(this.kind);
     }
 
     protected BookingModel(Parcel in) {
@@ -188,6 +198,7 @@ public class BookingModel implements Parcelable {
         this.ab_sharestatus = in.readString();
         this.ab_starttime = in.readString();
         this.ab_type = in.readString();
+        this.kind = in.readString();
     }
 
     public static final Creator<BookingModel> CREATOR = new Creator<BookingModel>() {

+ 1 - 0
app_modular/appbooking/src/main/res/layout/activity_bbooking_detail.xml

@@ -16,6 +16,7 @@
 
             <RelativeLayout
                 android:id="@+id/rv_top"
+                android:visibility="gone"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true">

+ 19 - 16
app_modular/appme/src/main/java/com/uas/appme/settings/activity/AboutActivity.java

@@ -22,7 +22,6 @@ import com.core.utils.IntentUtils;
 import com.core.widget.view.Activity.CommonWebviewActivity;
 import com.lidroid.xutils.ViewUtils;
 import com.me.appme.R;
-import com.umeng.socialize.Config;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.UMShareAPI;
 import com.umeng.socialize.bean.SHARE_MEDIA;
@@ -51,7 +50,7 @@ public class AboutActivity extends BaseActivity implements View.OnClickListener
         me_function.setOnClickListener(this);
         me_QRcode.setOnClickListener(this);
 
-        Config.REDIRECT_URL = "http://sns.whalecloud.com/sina2/callback";
+      
 //		UmengTool.getSignature(activity);
 //		UmengTool.checkSina(activity);
 //		UmengTool.getREDICRECT_URL(activity);
@@ -74,20 +73,24 @@ public class AboutActivity extends BaseActivity implements View.OnClickListener
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.app_about){
-            new ShareAction(activity).setDisplayList(
-                    SHARE_MEDIA.SINA,
-                    SHARE_MEDIA.QQ,
-                    SHARE_MEDIA.QZONE,
-                    SHARE_MEDIA.WEIXIN,
-                    SHARE_MEDIA.WEIXIN_CIRCLE,
-                    SHARE_MEDIA.WEIXIN_FAVORITE,
-                    SHARE_MEDIA.MORE)
-                    .withTitle("UU互联")
-                    .withText("UU互联 Android客户端"+ SystemUtil.getVersionName(mContext))
-                    .withMedia(new UMImage(activity, "http://img.my.csdn.net/uploads/201609/30/1475204542_1365.png"))
-                    .withTargetUrl("http://www.usoftchina.com/usoft/uas_client.html")
-                    .setCallback(CommonUtil.umShareListener)
-                    .open();
+            try {
+                new ShareAction(activity).setDisplayList(
+                        SHARE_MEDIA.SINA,
+                        SHARE_MEDIA.QQ,
+                        SHARE_MEDIA.QZONE,
+                        SHARE_MEDIA.WEIXIN,
+                        SHARE_MEDIA.WEIXIN_CIRCLE,
+                        SHARE_MEDIA.WEIXIN_FAVORITE,
+                        SHARE_MEDIA.MORE)
+                        .withTitle("UU互联")
+                        .withText("UU互联 Android客户端"+ SystemUtil.getVersionName(mContext))
+                        .withMedia(new UMImage(activity, "http://img.my.csdn.net/uploads/201609/30/1475204542_1365.png"))
+                        .withTargetUrl("http://www.usoftchina.com/usoft/uas_client.html")
+                        .setCallback(CommonUtil.umShareListener)
+                        .open();
+            } catch (Exception e) {
+                
+            }
         }else if (item.getItemId() == android.R.id.home){
 
             onBackPressed();