提交分类 修复BUG；功能开发；

提交内容
    1、去除新的网络框架默认的header参数Accept-Encoding，防止出现解压缩过程中的异常
    2、调整弹出提示的工具类中的默认显示时间，由5秒缩短为1秒
    3、优化工作台actionbar标题，显示为当前账套名
    4、隐藏工作日历和销售看板的头布局
    5、切换登录ERP时清空B2Bsession信息
当前版本	正式版本V6.1.0（测试版本6.1.0）
是否冲突	是
Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_raomeng

# Conflicts:
#	app_core/common/src/main/java/com/core/app/Constants.java

WeiChat/src/main/java/com/xzjmyk/pm/activity/CustomCrashActivity.java

@@ -8,7 +8,6 @@ import android.widget.Button;
 import android.widget.ImageView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
 
@@ -31,10 +30,10 @@ public class CustomCrashActivity extends Activity {
         mErrorIv = (ImageView) findViewById(R.id.error_image);
         intent = getIntent();
         stackTraceString = CustomActivityOnCrash.getAllErrorDetailsFromIntent(this, intent);
-        if (stackTraceString != null && !CommonUtil.isReleaseVersion()) {
+//        if (stackTraceString != null && !CommonUtil.isReleaseVersion()) {
             new MaterialDialog.Builder(this).content(stackTraceString)
-                    .build().show();// TODO 打开或关闭就不用改了，只需要在version_configuration.properties中改变release_version即可
-        }
+                    .build().show();
+//        }
         final Class<? extends Activity> activityClassFromIntent = CustomActivityOnCrash.getRestartActivityClassFromIntent(intent);
         final CustomActivityOnCrash.EventListener listenerFromIntent = CustomActivityOnCrash.getEventListenerFromIntent(intent);
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddB2BActivity.java

@@ -153,7 +153,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                 case LOAD_SUCCESS_ADD:
 //				progressDialog.dismiss();
                     String result = msg.getData().getString("result");
-                    Log.i(TAG, result+"");
+                    Log.i(TAG, result + "");
                     JSONObject object = JSON.parseObject(result);
                     Boolean falg = object.getBoolean("success");
                     if (falg) {
@@ -271,8 +271,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
         getSupportActionBar().setTitle(getString(R.string.task_add));
         String people = getIntent().getStringExtra("people") == null ? "" : getIntent().getStringExtra("people");
         bt_task_add.setOnClickListener(this);
-        if (!StringUtil.isEmpty(people))
-        {
+        if (!StringUtil.isEmpty(people)) {
             et_task_people.setTags(people);
             selectNames = people;
         }
@@ -289,7 +288,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
         voice_search_iv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                RecognizerDialogUtil.showRecognizerDialog(ct,TaskAddB2BActivity.this);
+                RecognizerDialogUtil.showRecognizerDialog(ct, TaskAddB2BActivity.this);
             }
         });
     }
@@ -305,7 +304,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
         picker.setOnDateTimePickListener(new DateTimePicker.OnYearMonthDayTimePickListener() {
             @Override
             public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
-                String time = year + "-" + month + "-" + day + " " + hour + ":" + minute ;
+                String time = year + "-" + month + "-" + day + " " + hour + ":" + minute;
                 tv.setText(time);
             }
         });
@@ -402,14 +401,14 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
         }
 
         String resourcename = "";
-        if (tagValues != null && tagValues.length > 0 ) {
+        if (tagValues != null && tagValues.length > 0) {
             try {
                 resourcename = getResourceName(tagValues);
             } catch (Exception e) {
-                if (StringUtil.isEmpty(et_task_people.getInputTagText().toString())){
+                if (StringUtil.isEmpty(et_task_people.getInputTagText().toString())) {
                     ToastMessage(getString(R.string.task_doman_must_input));
                     return;
-                }else if (et_task_people.getInputTagText().toString().length() > 1000){
+                } else if (et_task_people.getInputTagText().toString().length() > 1000) {
                     ToastMessage(getString(R.string.task_limit_doman));
                     return;
                 }
@@ -437,8 +436,8 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                 "\"uu\":\"" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getEnuu() + "\",\n" +
                 "\"taskname\":\"" + et_title.getText().toString() + "\",\n" +//任务名称
                 "\"domancode\":\"" + resourcename + "\",\n" +//执行人
-                "\"startdate\":\"" + et_startime.getText().toString() + ":00"+"\",\n" +
-                "\"enddate\":\"" + et_task_startime.getText().toString() + ":00"+"\",\n" +
+                "\"startdate\":\"" + et_startime.getText().toString() + ":00" + "\",\n" +
+                "\"enddate\":\"" + et_task_startime.getText().toString() + ":00" + "\",\n" +
                 "}";
         sendDataToServer(formStore);
     }
@@ -564,8 +563,8 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
         save = 1;
         progressDialog.show();
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().task_save;
-        Log.i(TAG, url+"");
-        Log.i(TAG, formStore+"");
+        Log.i(TAG, url + "");
+        Log.i(TAG, formStore + "");
         Map<String, Object> param = new HashMap<String, Object>();
         param.put("formStore", formStore);
         //param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
@@ -591,7 +590,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                 }
                 if (resultCode == 1) {
                     String values = data.getStringExtra("employees");
-                    Log.i("fromStore", values+"");
+                    Log.i("fromStore", values + "");
                     String[] tag_values = values.split(",");
                     et_task_people.setTags(tag_values);
                 }
@@ -604,7 +603,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                     tagValues = null;
                     et_task_people.setVisibility(View.GONE);
                     return;
-                }else{
+                } else {
                     et_task_people.setVisibility(View.VISIBLE);
                 }
                 int i = 0;

WeiChat/src/main/res/layout/activity_book_add.xml

@@ -2,7 +2,8 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/hine_bg">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -92,26 +93,13 @@
                 android:ellipsize="end"
                 android:layout_toRightOf="@id/remark_tag"
                 android:drawablePadding="6dp"
-
+                android:drawableRight="@drawable/oa_next"
                 android:hint="@string/common_select" />
-
-            <EditText
-                android:id="@+id/et_book_content"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_alignParentTop="true"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="61dp"
-                android:background="@color/white"
-                android:enabled="false"
-                android:gravity="top"
-                android:paddingLeft="10dp"
-                android:textSize="15sp" />
         </RelativeLayout>
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="30dp" />
+            android:layout_height="10dp" />
 
         <RelativeLayout
             style="@style/form_relative_customer"
@@ -137,15 +125,26 @@
             android:paddingLeft="15dp"
             android:paddingRight="15dp"
             android:paddingTop="5dp"
-            android:paddingBottom="20dp"
+            android:paddingBottom="10dp"
             android:scrollbars="none"
             android:verticalSpacing="10dp"/>
 
+        <EditText
+            android:id="@+id/et_book_content"
+            android:layout_width="match_parent"
+            android:layout_height="20dp"
+            android:layout_marginBottom="10dp"
+            android:background="@color/white"
+            android:enabled="false"
+            android:gravity="top"
+            android:paddingLeft="10dp"
+            android:textSize="15sp" />
+
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginBottom="30dp"
+            android:layout_marginBottom="25dp"
             android:layout_marginTop="60dp">
 
             <Button

WeiChat/src/main/res/layout/activity_subscription2.xml

@@ -1,25 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/item_line"
-    tools:context="com.xzjmyk.pm.activity.com.modular.appmessages.activity.Subscription2Activity">
+    android:background="@color/item_line">
+
+
 
-    <TextView
-        android:id="@+id/loading_tv"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:gravity="center"
-        android:text="正在加载"
-        android:visibility="gone" />
 
-    <android.support.v4.widget.SwipeRefreshLayout
+    <com.module.recyclerlibrary.ui.refresh.simlpe.SimpleRefreshLayout
         android:id="@+id/swiperefresh"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@id/loading_tv">
+        android:layout_height="match_parent">
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/recycler"
@@ -27,10 +18,11 @@
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
+            android:layout_marginBottom="@dimen/padding"
             android:layout_alignParentTop="true"
             android:paddingLeft="@dimen/sub_padding"
             android:paddingRight="@dimen/sub_padding" />
-    </android.support.v4.widget.SwipeRefreshLayout>
+    </com.module.recyclerlibrary.ui.refresh.simlpe.SimpleRefreshLayout>
 
 
 </RelativeLayout>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Dec 08 09:16:16 CST 2017
-debugName=29
-versionName=611
-debugCode=29
-versionCode=150
+#Mon Dec 11 16:07:47 CST 2017
+debugName=115
+versionName=618
+debugCode=115
+versionCode=157

app_core/common/src/main/java/com/core/app/Constants.java

@@ -13,20 +13,19 @@ public class Constants {
     //IM测试地址
     public static final String IM_BASE_URL_TEST = "http://113.105.74.135:8092/";
 
-	public static String IM_BASE_URL() {
-		String url = "";
-		if (BaseConfig.isDebug()) {
-			url = IM_BASE_URL_TEST;
-            url = IM_BASE_URL;
+    public static String IM_BASE_URL() {
+        String url = "";
+        if (BaseConfig.isDebug()) {
+            url = IM_BASE_URL_TEST;
         } else {
-			url = IM_BASE_URL;
-		}
-		return url;
-	}
+            url = IM_BASE_URL;
+        }
+        return url;
+    }
 
-	public static String charitBaseUrl() {
-		return "http://lj.ubtob.com/";
-	}
+    public static String charitBaseUrl() {
+        return "http://lj.ubtob.com/";
+    }
 
     //通讯录表
     public static final String TABLE_CONTANCTS = "CREATE TABLE  tbl_contacts " +
@@ -446,7 +445,7 @@ public class Constants {
     public static final String B2B_UID_CACHE = "b2b_uid_cache";
     public static final String B2B_SESSION_CACHE = "b2b_session_cache";
 
-	public static String BASE_CHARIT_ACTIVITY_URL = "http://lj.ubtob.com/mobile#/activity/detail/";
-	public static String BASE_CHARIT_PROJECT_URL = "http://lj.ubtob.com/mobile#/project/detail/";
+    public static String BASE_CHARIT_ACTIVITY_URL = "http://lj.ubtob.com/mobile#/activity/detail/";
+    public static String BASE_CHARIT_PROJECT_URL = "http://lj.ubtob.com/mobile#/project/detail/";
 
-}
+}

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -610,6 +610,7 @@ public class ViewUtil {
                     loginEntities.add(model);
                 } else if (model.getPlatform().equals("B2B")) {
                     List<LoginEntity.Spaces> sModel = model.getSpaces();
+                    b2b_uu= model.getAccount();
                     if (!ListUtils.isEmpty(sModel)) {
                         for (int j = 0; j < sModel.size(); j++) {
                             //去重逻辑
@@ -649,7 +650,7 @@ public class ViewUtil {
             if (ListUtils.isEmpty(loginEntities)) return;
             erpEntities = loginEntities;
             String[] items = new String[loginEntities.size()];
-            int select = 0;
+            int select =0;
             for (int j = 0; j < loginEntities.size(); j++) {
                 items[j] = loginEntities.get(j).getName();
             }
@@ -657,6 +658,10 @@ public class ViewUtil {
                 if (loginERPDialog != null) {
                     select = loginERPDialog.getSelectedIndex();
                 }
+                if (select>items.length){
+                    select=0;
+                }
+                LogUtil.d("AppLogs","select:"+select+"");
                 loginERPDialog = new MaterialDialog.Builder(ct)
                         .title(ct.getString(R.string.user_dialog_company))
                         .items(items)
@@ -1041,6 +1046,7 @@ public class ViewUtil {
                                     String password) {
         mdProcessDialog.setContent(MyApplication.getInstance().getString(R.string.login_progress_erp));
         url = url + "mobile/login.action";
+ //       url="http://192.168.253.58:8080/ERP/mobile/login.action";
 //        url = "http://192.168.253.29:8080/ERP/mobile/login.action";
 //        url = "http://192.168.253.6/uas_dev/mobile/login.action";
 //        url = "https://admin-city.ubtob.com/mobile/login.action";

app_core/common/src/main/java/com/core/net/http/http/OAHttpHelper.java

@@ -87,7 +87,7 @@ public class OAHttpHelper extends Handler {
         if (request == null) new NullPointerException("Request is null");
         try {
 	        String role = CommonUtil.getUserRole();
-	        if (role.equals(3)) {
+	        if (role.equals("3")) {
 		        loadB2B(request, listener);
 	        } else if (role.equals("2")) {
 		        loadERP(request, listener);

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -99,6 +99,7 @@ public class CommonUtil {
             return "";
         }
         String baseUrl = getSharedPreferences(ct, "erp_baseurl");
+        //baseUrl="http://192.168.253.58:8080/ERP/";
         return baseUrl;
     }
 

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

@@ -69,6 +69,24 @@
             android:background="@color/white"
             android:layout_height="90dp">
 
+            <ScrollView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_toRightOf="@+id/tv_task_peoples"
+                android:layout_toLeftOf="@+id/iv_find"
+                android:layout_margin="5dp"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
+                android:scrollbars="none">
+
+                <com.core.widget.view.TagGroup
+                    android:id="@+id/et_task_people"
+                    style="@style/TagGroup"
+                    android:layout_width="wrap_content"
+                    android:layout_height="fill_parent"
+                    android:background="@null" />
+            </ScrollView>
+
             <TextView
                 android:id="@+id/tv_task_peoples"
                 android:layout_width="wrap_content"
@@ -124,20 +142,6 @@
                 android:layout_centerVertical="true"
                 android:visibility="invisible" />
 
-            <ScrollView
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentBottom="true"
-                android:layout_centerHorizontal="true"
-                android:scrollbars="none">
-
-                <com.core.widget.view.TagGroup
-                    android:id="@+id/et_task_people"
-                    style="@style/TagGroup"
-                    android:layout_width="wrap_content"
-                    android:layout_height="fill_parent"
-                    android:background="@null" />
-            </ScrollView>
         </RelativeLayout>
         <View
             android:layout_width="match_parent"

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

@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/hine_bg"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.AddBusinessActivity">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/hine_bg"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:id="@+id/rl_object"
-            style="@style/item_menu">
-
-            <TextView
-                style="@style/item_menu_tag"
-                android:gravity="center_vertical"
-                android:text="@string/booking_object" />
-
-            <TextView
-                android:id="@+id/tv_book_object"
-                style="@style/item_menu_input"
-                android:layout_toRightOf="@id/company_tag"
-                android:drawablePadding="6dp"
-                android:drawableRight="@drawable/oa_next"
-                android:hint="@string/common_select" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/company_add_rl"
-            style="@style/item_menu">
-
-            <TextView
-
-                style="@style/item_menu_tag"
-                android:gravity="center_vertical"
-                android:text="@string/times"
-                android:textColor="@color/hintColor" />
-
-            <TextView
-                android:id="@+id/tv_book_times"
-                style="@style/item_menu_input"
-                android:layout_toRightOf="@id/company_add_tag"
-                android:drawableRight="@drawable/oa_next"
-                android:hint="@string/common_select"
-                android:textColor="@color/hintColor" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/remark_rl"
-            style="@style/item_menu">
-
-            <TextView
-                style="@style/item_menu_tag"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                android:gravity="center_vertical"
-                android:text="@string/address" />
-
-            <TextView
-                android:id="@+id/tv_book_address"
-                style="@style/item_menu_input"
-                android:layout_width="300dp"
-                android:ellipsize="end"
-                android:layout_toRightOf="@id/remark_tag"
-                android:drawablePadding="6dp"
-                android:drawableRight="@drawable/oa_next"
-                android:hint="@string/common_select" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/topic_rl"
-            style="@style/item_menu">
-
-            <TextView
-                style="@style/item_menu_tag"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                android:gravity="center_vertical"
-                android:text="@string/booking_topic" />
-
-            <EditText
-                android:id="@+id/tv_book_topic"
-                style="@style/item_menu_input"
-                android:layout_width="300dp"
-                android:ellipsize="end"
-                android:layout_toRightOf="@id/remark_tag"
-                android:drawablePadding="6dp"
-                android:drawableRight="@drawable/oa_next"
-                android:hint="@string/common_select" />
-        </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="30dp" />
-
-        <RelativeLayout
-            style="@style/form_relative_customer"
-            android:layout_height="20dp"
-            android:background="@color/white">
-
-            <TextView
-                android:visibility="gone"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="10dp"
-                android:gravity="center_vertical"
-                android:text="@string/booking_topic" />
-        </RelativeLayout>
-
-        <com.core.widget.NScrollerGridView
-            android:id="@+id/gv_topic"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
-            android:horizontalSpacing="15dp"
-            android:numColumns="4"
-            android:paddingLeft="15dp"
-            android:paddingRight="15dp"
-            android:paddingTop="5dp"
-            android:paddingBottom="10dp"
-            android:scrollbars="none"
-            android:verticalSpacing="10dp"/>
-
-        <EditText
-            android:id="@+id/et_book_content"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_marginBottom="10dp"
-            android:background="@color/white"
-            android:enabled="false"
-            android:gravity="top"
-            android:paddingLeft="10dp"
-            android:textSize="15sp" />
-
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="30dp"
-            android:layout_marginTop="60dp">
-
-            <Button
-                android:id="@+id/submit_btn"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_marginBottom="10dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:background="@drawable/bg_bule_btn"
-                android:padding="10dp"
-                android:text="@string/app_button_commit"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_main" />
-        </RelativeLayout>
-    </LinearLayout>
-
-
-</ScrollView>

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

@@ -1,25 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/item_line"
-    tools:context="com.xzjmyk.pm.activity.ui.message.Subscription2Activity">
+    android:background="@color/item_line">
+
+
 
-    <TextView
-        android:id="@+id/loading_tv"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:gravity="center"
-        android:text="正在加载"
-        android:visibility="gone" />
 
-    <android.support.v4.widget.SwipeRefreshLayout
+    <com.module.recyclerlibrary.ui.refresh.simlpe.SimpleRefreshLayout
         android:id="@+id/swiperefresh"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@id/loading_tv">
+        android:layout_height="match_parent">
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/recycler"
@@ -30,7 +21,7 @@
             android:layout_alignParentTop="true"
             android:paddingLeft="@dimen/sub_padding"
             android:paddingRight="@dimen/sub_padding" />
-    </android.support.v4.widget.SwipeRefreshLayout>
+    </com.module.recyclerlibrary.ui.refresh.simlpe.SimpleRefreshLayout>
 
 
 </RelativeLayout>

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceAddActivity.java

@@ -9,9 +9,11 @@ import android.support.v4.app.ActivityCompat;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.WindowManager;
+import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
@@ -54,12 +56,15 @@ import com.me.network.app.http.rx.ResultSubscriber;
 import com.modular.booking.R;
 import com.modular.booking.activity.utils.GridSelectActivity;
 import com.modular.booking.activity.utils.GridSelectDateActivity;
+import com.modular.booking.adapter.ItemFoodStateAdapter;
 import com.modular.booking.model.SBListModel;
 import com.modular.booking.model.SBMenuModel;
+import com.modular.booking.model.SeatsStateModel;
 import com.modular.booking.widget.AddSubUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import de.hdodenhof.circleimageview.CircleImageView;
@@ -99,9 +104,14 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
     private TextView tvMSeatsName,tvMSeatsNum,tvZSeatsName,tvZSeatsNum,tvDSeatsName,tvDSeatsNum;
     private TextView tv_food_seats;
     private SwitchView sv_food_rooms;
-    private boolean foodCheckRooms=true;
+    private boolean foodCheckRooms=false;
     private TextView tvMSeatsTitle,tvZSeatsTitle,tvDSeatsTitle;
     private NScrollerGridView gvMSeats,gvZSeats,gvDSeats;
+    private LinearLayout llPanelWait;
+    private LinearLayout llPanelBusiness;
+    private TextView tvSeatsLeft;
+    private TextView tvSeatsRight;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -163,10 +173,15 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
         
         tvMSeatsTitle=(TextView)findViewById(R.id.tvMSeatsTitle);
          gvMSeats=(NScrollerGridView)findViewById(R.id.gvMSeats);
-        tvMSeatsTitle=(TextView)findViewById(R.id.tvZSeatsTitle);
-         gvMSeats=(NScrollerGridView)findViewById(R.id.gvZSeats);
-        tvMSeatsTitle=(TextView)findViewById(R.id.tvDSeatsTitle);
-         gvMSeats=(NScrollerGridView)findViewById(R.id.gvDSeats);
+        tvZSeatsTitle=(TextView)findViewById(R.id.tvZSeatsTitle);
+         gvZSeats=(NScrollerGridView)findViewById(R.id.gvZSeats);
+        tvDSeatsTitle=(TextView)findViewById(R.id.tvDSeatsTitle);
+         gvDSeats=(NScrollerGridView)findViewById(R.id.gvDSeats);
+
+        tvSeatsLeft=findViewById(R.id.tvSeatsLeft);
+        tvSeatsRight=findViewById(R.id.tvSeatsRight);
+        llPanelWait=(LinearLayout)findViewById(R.id.llPanelWait);
+        llPanelBusiness=(LinearLayout)findViewById(R.id.llPanelBusiness);
                 
         submit_btn.setOnClickListener(this);
         et_book_name.setText(CommonUtil.getName());
@@ -224,7 +239,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 }
             }
         });
-
+        sv_food_rooms.setChecked(false);
         sv_food_rooms.setOnCheckedChangeListener(new SwitchView.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(View view, boolean isChecked) {
@@ -233,6 +248,25 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         
             }
         });
+        
+        tvSeatsLeft.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                tvSeatsLeft.setTextColor(mContext.getResources().getColor(R.color.blue_seats_num));
+                tvSeatsRight.setTextColor(mContext.getResources().getColor(R.color.gray));
+                llPanelBusiness.setVisibility(View.GONE);
+                llPanelWait.setVisibility(View.VISIBLE);
+            }
+        });
+        tvSeatsRight.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                tvSeatsLeft.setTextColor(mContext.getResources().getColor(R.color.gray));
+                tvSeatsRight.setTextColor(mContext.getResources().getColor(R.color.blue_seats_num));
+                llPanelBusiness.setVisibility(View.VISIBLE);
+                llPanelWait.setVisibility(View.GONE);
+            }
+        });
     }
 
     private boolean isEdited = true;
@@ -251,7 +285,6 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
             if (model != null) {
                 LogUtil.i(model.toString());
                 initType(model.getType());
-                getSteatListStates();//获取餐饮类别状态信息
                 if (isEdited) {
                     submit_btn.setText("立即预约");
                     if (!StringUtil.isEmpty(sb_userid)) {
@@ -955,7 +988,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         map.put("sb_spname", tv_food_rooms.getText());
                     }else{
                         //选桌位
-                        map.put("sb_spname", tv_food_seats.getTag(R.id.tag_id));
+                        map.put("sb_stname", tv_food_seats.getTag(R.id.tag_id));
                     }
                   
                 }
@@ -1111,10 +1144,10 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
     private void initType(String type) {
         if (type == null) return;
         JSONObject data = null;
+        if (dataService != null) {
+            data = JSON.parseObject(dataService);
+        }
         if (!isEdited) {
-            if (dataService != null) {
-                data = JSON.parseObject(dataService);
-            }
             et_book_phone.setText(data.getString("sb_telephone"));
             et_book_name.setText(data.getString("sb_recordor"));
             et_book_notes.setText(data.getString("sb_remark"));
@@ -1131,7 +1164,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tv_food_peoples.setOnClickListener(this);
                     tv_food_peoples.setVisibility(View.GONE);
                     addSubUtils.setVisibility(View.VISIBLE);
-                    
+                    tvSeatsRight.setVisibility(View.GONE);
                 } else {
                     if (StringUtil.isEmpty(data.getString("sb_starttime"))) {
                         tv_food_times.setText(data.getString("sb_endtime"));
@@ -1139,10 +1172,22 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         tv_food_times.setText(data.getString("sb_starttime").substring(0, 10) + " "
                                 + data.getString("sb_starttime").substring(11, 16) + "-" + data.getString("sb_endtime").substring(11, 16));
                     }
+             
+                    searchSeatNumbers(tv_food_times.getText().toString(),data.getString("sb_companyid"));
+                    getSteatListStates(data.getString("sb_companyid"));//获取餐饮类别状态信息
                     tv_food_rooms.setText(data.getString("sb_stname"));
                     tv_food_peoples.setText(data.getString("sb_person"));
                     tv_food_peoples.setVisibility(View.VISIBLE);
                     addSubUtils.setVisibility(View.GONE);
+                    if (!StringUtil.isEmpty(dataService)) {
+                        JSONObject object = JSON.parseObject(dataService);
+                        String recordId = object.getString("sb_recordid");
+                        if (MyApplication.getInstance().mLoginUser.getUserId().equals(recordId)) {
+                            tvSeatsRight.setVisibility(View.GONE);
+                        } else {
+                            tvSeatsRight.setVisibility(View.VISIBLE);  //商家释放
+                        }
+                    }
                 }
                 break;
             case "美容美发"://  美容美发
@@ -1275,6 +1320,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tv_food_peoples.setOnClickListener(this);
                     addSubUtils.setVisibility(View.VISIBLE);
                     tv_food_peoples.setVisibility(View.GONE);
+                    tvSeatsRight.setVisibility(View.GONE);
                 } else {
                     if (StringUtil.isEmpty(data.getString("sb_starttime"))) {
                         tv_food_times.setText(data.getString("sb_endtime"));
@@ -1282,10 +1328,20 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         tv_food_times.setText(data.getString("sb_starttime").substring(0, 10) + " "
                                 + data.getString("sb_starttime").substring(11, 16) + "-" + data.getString("sb_endtime").substring(11, 16));
                     }
+                    searchSeatNumbers(tv_food_times.getText().toString(),data.getString("sb_companyid"));
                     tv_food_rooms.setText(data.getString("sb_spname"));
                     tv_food_peoples.setText(data.getString("sb_person"));
                     tv_food_peoples.setVisibility(View.VISIBLE);
                     addSubUtils.setVisibility(View.GONE);
+                    if (!StringUtil.isEmpty(dataService)) {
+                        JSONObject object = JSON.parseObject(dataService);
+                        String recordId = object.getString("sb_recordid");
+                        if (MyApplication.getInstance().mLoginUser.getUserId().equals(recordId)) {
+                            tvSeatsRight.setVisibility(View.GONE);
+                        } else {
+                            tvSeatsRight.setVisibility(View.VISIBLE);  //商家释放
+                        }
+                    }
                 }
                 break;
             case "10004"://美容美发
@@ -1547,6 +1603,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                          dimssLoading();
                          try {
                              LogUtil.d(TAG,o.toString());
+                             boolean isEnter=false;
                              JSONArray deskbook=JSON.parseObject(o.toString()).getJSONArray("deskbook");
                              JSONArray desklist=JSON.parseObject(o.toString()).getJSONArray("desklist");
                              if (!ListUtils.isEmpty(deskbook)){
@@ -1554,23 +1611,26 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                                      JSONObject object=deskbook.getJSONObject(i);
                                      String number= object.getString("number");//预约量
                                      String king=object.getString("kind");//类型
-                                     String booknumber=object.getString("booknumber");//总预约量
+                                     String booknumber=object.getString("as_booknumber");//总预约量
                                      String deskcode=object.getString("deskcode");//桌位编号
                                      Integer bookednumber=Integer.valueOf(booknumber)-Integer.valueOf(number);
-                                     if(asType.contains(king)){
-                                         if (asType.equals("小桌")){
+                                         if (king.equals("小桌")){
                                              CommonUtil.textSpanForStyle(tvMSeatsNum,"前方"+number+"桌",number,ct.getResources().getColor(R.color.blue_seats_num));
                                          }
-                                         if (asType.equals("中桌")){
+                                         if (king.equals("中桌")){
                                              CommonUtil.textSpanForStyle(tvZSeatsNum,"前方"+number+"桌",number,ct.getResources().getColor(R.color.blue_seats_num));
                                          }
-                                         if (asType.equals("大桌")){
+                                         if (king.equals("大桌")){
                                              CommonUtil.textSpanForStyle(tvDSeatsNum,"前方"+number+"桌",number,ct.getResources().getColor(R.color.blue_seats_num));
                                          }
-                                     }
+                                    if (asType.equals(king)){
+                                        tv_food_seats.setTag(R.id.tag_id,deskcode);
+                                        CommonUtil.textSpanForStyle(tv_food_seats,"仅剩"+bookednumber+"桌",String.valueOf(bookednumber),ct.getResources().getColor(R.color.blue_seats_num));
+                                    }else{
+                                       isEnter=true;//置空，下面循环会进入指定逻辑代码
+                                    }
                                      //tv_food_seats.setText("仅剩"+bookednumber+"桌");
-                                     tv_food_seats.setTag(R.id.tag_id,deskcode);
-                                     CommonUtil.textSpanForStyle(tv_food_seats,"仅剩"+bookednumber+"桌",String.valueOf(bookednumber),ct.getResources().getColor(R.color.blue_seats_num));
+                                    
                                  }
                              }
                              if (desklist!=null){
@@ -1579,11 +1639,13 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                                      String as_type= object.getString("as_type");
                                      String as_number=object.getString("as_number");
                                      String as_remark=object.getString("as_remark");
+                                     String as_booknumber=object.getString("as_booknumber");
+                                     Integer bookNum=Integer.valueOf(as_booknumber)-Integer.valueOf(as_number);
                                      String as_deskcode=object.getString("as_deskcode");
                                     if (ListUtils.isEmpty(deskbook)) {
-                                        if (as_type.equals(asType)) {
+                                        if (as_type.equals(asType)||isEnter) {
                                             //tv_food_seats.setText("仅剩"+as_number+"桌");
-                                            CommonUtil.textSpanForStyle(tv_food_seats,"仅剩"+as_number+"桌",as_number,ct.getResources().getColor(R.color.blue_seats_num));
+                                            CommonUtil.textSpanForStyle(tv_food_seats,"仅剩"+bookNum+"桌",String.valueOf(bookNum),ct.getResources().getColor(R.color.blue_seats_num));
                                             LogUtil.d(TAG,"as_number:"+as_number+" as_deskcode:"+as_deskcode);
                                            // tv_food_seats.setTag(0,as_number);
                                             tv_food_seats.setTag(R.id.tag_id,as_deskcode+"01");//桌位编号
@@ -1623,39 +1685,128 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
     
     
     //获取列表状态
-    public void getSteatListStates(){
+    public void getSteatListStates(String companyId){
         LogUtil.d(TAG,"model companyid："+model.getCompanyid());
           HttpClient httpClient=new HttpClient.Builder(Constants.IM_BASE_URL()).build();
                  httpClient.Api().send(new HttpClient.Builder()
                  .url("user/appDeskDetail")
-                 .add("companyid",model.getCompanyid())
+                 .add("companyid",companyId)
                  .add("token",MyApplication.getInstance().mAccessToken)
                  .method(Method.POST)
                  .build(),new ResultSubscriber<Object>(new ResultListener<Object>() {
           
                      @Override
                      public void onResponse(Object o) {
-                         LogUtil.d(TAG,o.toString());
+                         try {
+                             LogUtil.d(TAG,o.toString());
+                             JSONArray jsonArray=JSON.parseObject(o.toString()).getJSONArray("result");
+                             List< SeatsStateModel> seatsM=new ArrayList<>();
+                             List< SeatsStateModel> seatsZ=new ArrayList<>();
+                             List< SeatsStateModel> seatsD=new ArrayList<>();
+                             for (int i = 0; i <jsonArray.size() ; i++) {
+                                 JSONObject object=jsonArray.getJSONObject(i);
+                                 String ad_deskcode=object.getString("ad_deskcode");
+                                 String ad_desktype=object.getString("ad_desktype");
+                                 String ad_status=object.getString("ad_status");
+                                 String ad_bookid=object.getString("ad_bookid");
+                                 
+                                 SeatsStateModel model=new SeatsStateModel();
+                                 model.setAd_deskcode(ad_deskcode.substring(1,ad_deskcode.length()));
+                                 model.setAd_id(ad_deskcode);
+                                 model.setAd_status(ad_status);
+                                 model.setAd_bookid(ad_bookid);
+                                 model.setAd_companyid(object.getString("ad_companyid"));
+                                 
+                                if ("小桌".equals(ad_desktype)){
+                                    seatsM.add(model);
+                                }else if("中桌".equals(ad_desktype)){
+                                    seatsZ.add(model);
+                                }else{
+                                    seatsD.add(model);
+                                }
+                                
+                             }
+                             
+                             tvMSeatsTitle.setText("小桌(1-2人,共"+seatsM.size()+"桌)");
+                             tvZSeatsTitle.setText("中桌(3-5人,共"+seatsZ.size()+"桌)");
+                             tvDSeatsTitle.setText("大桌(6人以上,共"+seatsD.size()+"桌)");
+                             gvMSeats.setAdapter(new ItemFoodStateAdapter(mContext,seatsM));
+                             gvDSeats.setAdapter(new ItemFoodStateAdapter(mContext,seatsD));
+                             gvZSeats.setAdapter(new ItemFoodStateAdapter(mContext,seatsZ));
+                             
+                             gvMSeats.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                                 @Override
+                                 public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+                                     ItemFoodStateAdapter.ViewHolder viewHolder= (ItemFoodStateAdapter.ViewHolder) view.getTag();
+                                     LogUtil.d(TAG,"model:"+JSON.toJSONString(viewHolder.model));
+                                     steatAction(viewHolder.model.getAd_id(),viewHolder.model.getAd_status(),viewHolder.model.getAd_bookid());
+                                 }
+                             });
+                             
+                             gvDSeats.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                                 @Override
+                                 public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+                                     ItemFoodStateAdapter.ViewHolder viewHolder= (ItemFoodStateAdapter.ViewHolder) view.getTag();
+                                     LogUtil.d(TAG,"model:"+JSON.toJSONString(viewHolder.model));
+                                     steatAction(viewHolder.model.getAd_id(),viewHolder.model.getAd_status(),viewHolder.model.getAd_bookid());
+                                 }
+                             });
+                             
+                             gvZSeats.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                                 @Override
+                                 public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+                                     ItemFoodStateAdapter.ViewHolder viewHolder= (ItemFoodStateAdapter.ViewHolder) view.getTag();
+                                     LogUtil.d(TAG,"model:"+JSON.toJSONString(viewHolder.model));
+                                     steatAction(viewHolder.model.getAd_id(),viewHolder.model.getAd_status(),viewHolder.model.getAd_bookid());
+                                 }
+                             });
+                         } catch (Exception e) {
+                             e.printStackTrace();
+                         }
                      }
                  }));
     }
     
     //释放操作，锁定操作
-    public void steatAction(String deskcode,String actionType){
+    public void steatAction(String deskcode,String actionType,String bookid){
+        showLoading();
         //companyid 公司ID,bookid 服务预约ID,deskcode 桌位号,type 0代表释放操作，1代表锁定操作,token
-          HttpClient httpClient=new HttpClient.Builder("").build();
+          if ("0".equals(actionType)){
+              actionType="1";
+          }else if("1".equals(actionType)){
+              actionType="0";
+          }
+
+        final  String sb_companyid=JSON.parseObject(dataService).getString("sb_companyid");
+        final String sb_id=JSON.parseObject(dataService).getString("sb_id");
+        HttpClient httpClient=new HttpClient.Builder(Constants.IM_BASE_URL()).build();
                  httpClient.Api().send(new HttpClient.Builder()
                  .url("user/appStoreRelease")
-                 .add("companyid",model.getCompanyid())
+                 .add("companyid", sb_companyid)
+                 .add("bookid",bookid)
                  .add("deskcode",deskcode)
-                         .add("type",actionType)
-                         .add("token",MyApplication.getInstance().mAccessToken)
+                 .add("type",actionType)
+                 .add("token",MyApplication.getInstance().mAccessToken)
                  .method(Method.POST)
                  .build(),new ResultSubscriber<Object>(new ResultListener<Object>() {
           
                      @Override
                      public void onResponse(Object o) {
-                         LogUtil.d(TAG,o.toString());
+                         //{"result":"true"}
+                         try {
+                             dimssLoading();
+                             LogUtil.d(TAG,o.toString());
+                             if (JSONUtil.validate(o.toString())){
+                               String result=  JSON.parseObject(o.toString()).getString("result");
+                               if (result.equals("true")){
+                                   getSteatListStates(sb_companyid);
+                               }else{
+                                   ToastMessage("操作失败！");
+                               }
+                             }
+                         } catch (Exception e) {
+                             e.printStackTrace();
+                         }
                      }
                  }));
     }

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

@@ -0,0 +1,77 @@
+package com.modular.booking.adapter;
+
+/**
+ * Created by Arison on 2017/11/30.
+ */
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.modular.booking.R;
+import com.modular.booking.model.SeatsStateModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ItemFoodStateAdapter extends BaseAdapter {
+
+    private List<SeatsStateModel> objects = new ArrayList<SeatsStateModel>();
+
+    private Context context;
+    private LayoutInflater layoutInflater;
+
+    public ItemFoodStateAdapter(Context context,List<SeatsStateModel> data) {
+        this.context = context;
+        this.objects=data;
+        this.layoutInflater = LayoutInflater.from(context);
+    }
+
+    @Override
+    public int getCount() {
+        return objects.size();
+    }
+
+    @Override
+    public SeatsStateModel getItem(int position) {
+        return objects.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        if (convertView == null) {
+            convertView = layoutInflater.inflate(R.layout.item_food_state, null);
+            convertView.setTag(new ViewHolder(convertView));
+        }
+        initializeViews((SeatsStateModel)getItem(position), (ViewHolder) convertView.getTag());
+        return convertView;
+    }
+
+    private void initializeViews(SeatsStateModel object, ViewHolder holder) {
+       holder.tvSeatsCode.setText(object.getAd_deskcode());
+       holder.model=object;
+       if ("0".equals(object.getAd_status())){
+           holder.tvSeatsCode.setBackgroundResource(R.drawable.shape_rounds_blue);
+       }else{
+           holder.tvSeatsCode.setBackgroundResource(R.drawable.icon_seats_lock);
+           holder.tvSeatsCode.setText(" ");
+       }
+    }
+
+    public class ViewHolder {
+        private TextView tvSeatsCode;
+        public SeatsStateModel model;
+
+        public ViewHolder(View view) {
+            tvSeatsCode = (TextView) view.findViewById(R.id.tvSeatsCode);
+        }
+    }
+}

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

@@ -0,0 +1,98 @@
+package com.modular.booking.model;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * Created by Arison on 2017/11/30.
+ */
+
+public class SeatsStateModel implements Parcelable {
+//    "ad_companyid":"10002",
+//            "ad_deskcode":"C10",
+//            "ad_id":"132",
+//            "ad_status":"0"
+
+    private String ad_companyid;
+    private String ad_deskcode;
+    private String ad_id;
+    private String ad_status;//0代表空闲  1代表是锁定
+    private String ad_bookid;
+
+    public String getAd_companyid() {
+        return ad_companyid;
+    }
+
+    public void setAd_companyid(String ad_companyid) {
+        this.ad_companyid = ad_companyid;
+    }
+
+    public String getAd_deskcode() {
+        return ad_deskcode;
+    }
+
+    public void setAd_deskcode(String ad_deskcode) {
+        this.ad_deskcode = ad_deskcode;
+    }
+
+    public String getAd_id() {
+        return ad_id;
+    }
+
+    public void setAd_id(String ad_id) {
+        this.ad_id = ad_id;
+    }
+
+    public String getAd_status() {
+        return ad_status;
+    }
+
+    public void setAd_status(String ad_status) {
+        this.ad_status = ad_status;
+    }
+
+    public String getAd_bookid() {
+        return ad_bookid;
+    }
+
+    public void setAd_bookid(String ad_bookid) {
+        this.ad_bookid = ad_bookid;
+    }
+
+    public SeatsStateModel() {
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(this.ad_companyid);
+        dest.writeString(this.ad_deskcode);
+        dest.writeString(this.ad_id);
+        dest.writeString(this.ad_status);
+        dest.writeString(this.ad_bookid);
+    }
+
+    protected SeatsStateModel(Parcel in) {
+        this.ad_companyid = in.readString();
+        this.ad_deskcode = in.readString();
+        this.ad_id = in.readString();
+        this.ad_status = in.readString();
+        this.ad_bookid = in.readString();
+    }
+
+    public static final Creator<SeatsStateModel> CREATOR = new Creator<SeatsStateModel>() {
+        @Override
+        public SeatsStateModel createFromParcel(Parcel source) {
+            return new SeatsStateModel(source);
+        }
+
+        @Override
+        public SeatsStateModel[] newArray(int size) {
+            return new SeatsStateModel[size];
+        }
+    };
+}

app_modular/appbooking/src/main/res/drawable/addsubutils_left_selector.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="200" android:exitFadeDuration="200">
+    android:enterFadeDuration="200"
+    android:exitFadeDuration="200">
     <item android:state_pressed="true" >
         <shape>
             <stroke android:color="@color/divider"

app_modular/appbooking/src/main/res/drawable/shape_rounds_blue.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:drawable="@drawable/icon_seats_lock">
+    </item>
+    <item >
+        <shape  android:shape="rectangle">
+            <corners
+                android:topLeftRadius="100dp"
+                android:topRightRadius="100dp"
+                android:bottomRightRadius="100dp"
+                android:bottomLeftRadius="100dp">
+            </corners>
+            <solid
+                android:color="#58bae9">
+            </solid>
+        </shape>
+    </item>
+</selector>

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

@@ -490,7 +490,7 @@
                     style="@style/item_menu_input"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-               
+                    android:layout_marginRight="45dp"
                     android:layout_toRightOf="@id/tag_food_rooms"
                     android:layout_toLeftOf="@+id/sv_food_rooms"
                     android:drawableRight="@drawable/oa_next"
@@ -502,13 +502,12 @@
                     android:id="@+id/sv_food_rooms"
                     android:layout_width="40dp"
                     android:layout_height="25dp"
-                    android:visibility="gone"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true" />
             </RelativeLayout>
             <RelativeLayout
                 android:id="@+id/food_seats_rl"
-                android:visibility="gone"
+             
                 style="@style/item_menu">
 
                 <TextView
@@ -538,7 +537,6 @@
                 android:layout_height="wrap_content"
                 android:background="@color/me_menu_item_normal"
                 android:layout_marginTop="10dp"
-                android:visibility="gone"
                 android:orientation="vertical">
                 
                 <LinearLayout
@@ -546,22 +544,25 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
                     <TextView
+                        android:id="@+id/tvSeatsLeft"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_margin="10dp"
-                        android:textColor="#6EAEE4"
-                        android:textStyle="bold"
+                        android:textColor="@color/blue_seats_num"
+                
                         android:text="排队实况"/>
                     <TextView
+                        android:id="@+id/tvSeatsRight"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_margin="10dp"
-                        android:textColor="#6EAEE4"
-                        android:textStyle="bold"
+                       
+                        android:textColor="@color/gray"
                         android:text="商家释放"/>
                 </LinearLayout>
                
                 <LinearLayout
+                    android:id="@+id/llPanelWait"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                    
@@ -634,6 +635,7 @@
                     </RelativeLayout>
                 </LinearLayout>
                 <LinearLayout
+                    android:id="@+id/llPanelBusiness"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:visibility="gone"
@@ -641,12 +643,14 @@
                     <RelativeLayout
                         android:background="@drawable/shape_sample_one_1dp"
                         android:layout_margin="5dp"
+                        android:layout_height="wrap_content"
                         style="@style/item_menu">
                         <TextView
                             android:id="@+id/tvMSeatsTitle"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginBottom="5dp"
                             android:textStyle="bold"
                             android:text="小桌"
                             android:layout_alignParentLeft="true"/>
@@ -657,10 +661,10 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:background="@color/transparent"
-                            android:horizontalSpacing="15dp"
-                            android:numColumns="4"
-                            android:paddingLeft="15dp"
-                            android:paddingRight="15dp"
+                            android:horizontalSpacing="3dp"
+                            android:numColumns="8"
+                            android:paddingLeft="8dp"
+                            android:paddingRight="8dp"
                             android:paddingTop="5dp"
                             android:scrollbars="none"
                             android:verticalSpacing="10dp" />
@@ -668,12 +672,14 @@
                     <RelativeLayout
                         android:background="@drawable/shape_sample_one_1dp"
                         android:layout_margin="5dp"
+                        android:layout_height="wrap_content"
                         style="@style/item_menu">
                         <TextView
                             android:id="@+id/tvZSeatsTitle"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginBottom="5dp"
                             android:textStyle="bold"
                             android:text="中桌"
                             android:layout_alignParentLeft="true"/>
@@ -684,10 +690,10 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:background="@color/transparent"
-                            android:horizontalSpacing="15dp"
-                            android:numColumns="4"
-                            android:paddingLeft="15dp"
-                            android:paddingRight="15dp"
+                            android:horizontalSpacing="3dp"
+                            android:numColumns="8"
+                            android:paddingLeft="8dp"
+                            android:paddingRight="8dp"
                             android:paddingTop="5dp"
                             android:scrollbars="none"
                             android:verticalSpacing="10dp" />
@@ -695,12 +701,14 @@
                     <RelativeLayout
                         android:background="@drawable/shape_sample_one_1dp"
                         android:layout_margin="5dp"
+                        android:layout_height="wrap_content"
                         style="@style/item_menu">
                         <TextView
                             android:id="@+id/tvDSeatsTitle"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_centerVertical="true"
+                            android:layout_marginBottom="5dp"
+                            android:layout_marginLeft="10dp"
                             android:textStyle="bold"
                             android:text="大桌"
                             android:layout_alignParentLeft="true"/>
@@ -711,10 +719,10 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:background="@color/transparent"
-                            android:horizontalSpacing="15dp"
-                            android:numColumns="4"
-                            android:paddingLeft="15dp"
-                            android:paddingRight="15dp"
+                            android:horizontalSpacing="3dp"
+                            android:numColumns="8"
+                            android:paddingLeft="8dp"
+                            android:paddingRight="8dp"
                             android:paddingTop="5dp"
                             android:scrollbars="none"
                             android:verticalSpacing="10dp" />

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

@@ -36,7 +36,7 @@
 
         <RelativeLayout
             android:id="@+id/sex_rl"
-            android:visibility="gone"
+     
             style="@style/item_menu">
 
             <TextView

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" 
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center">
+    <TextView
+        android:id="@+id/tvSeatsCode"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:gravity="center"
+        android:padding="4dp"
+        android:background="@drawable/shape_rounds_blue"
+        android:textSize="14sp"
+        android:textColor="@color/white"
+        android:text="20"/>
+</LinearLayout>

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

@@ -83,7 +83,6 @@ import com.uas.appcontact.model.contacts.ContactsModel;
 import com.uas.appcontact.utils.ContactsUtils;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -856,6 +855,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
 			public void result(@NonNull boolean success, @NonNull int what, @Nullable String message) {
 				try {
 					if (success) {
+						LogUtil.d("Test","系统通讯录： message:"+message);
 						String role = CommonUtil.getUserRole();
 						if ("1".equals(role)) {
 							//个人用户不需要加载企业架构

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

@@ -37,6 +37,8 @@ import com.modular.appmessages.R;
 import com.modular.appmessages.adapter.SubscriptionAdapter;
 import com.modular.appmessages.db.SubsDao;
 import com.modular.appmessages.model.SubMessage;
+import com.module.recyclerlibrary.ui.refresh.BaseRefreshLayout;
+import com.module.recyclerlibrary.ui.refresh.simlpe.SimpleRefreshLayout;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -46,9 +48,8 @@ import java.util.Map;
 
 public class Subscription2Activity extends BaseActivity {
     private static final int REQUEST_SUBS_DETAIL = 0x20;
-    private SwipeRefreshLayout swiperefresh;
+    private SimpleRefreshLayout swiperefresh;
     private RecyclerView recycler;
-    private TextView loading_tv;
 
     private long daylong = 24 * 1000 * 3600;
     private long showTime;//当前显示的最早的时间，初始化进来为当前
@@ -125,9 +126,8 @@ public class Subscription2Activity extends BaseActivity {
 
 
     private void initView() {
-        swiperefresh= (SwipeRefreshLayout) findViewById(R.id.swiperefresh);
+        swiperefresh= (SimpleRefreshLayout) findViewById(R.id.swiperefresh);
         recycler= (RecyclerView) findViewById(R.id.recycler);
-        loading_tv= (TextView) findViewById(R.id.loading_tv);
         ViewUtil.LoginERPTask(this, handler, 0x12);
         LinearLayoutManager layoutManager = new LinearLayoutManager(ct);
         recycler.setLayoutManager(layoutManager);
@@ -148,23 +148,30 @@ public class Subscription2Activity extends BaseActivity {
     }
 
     private void initEvent() {
-        recycler.addOnScrollListener(new RecyclerView.OnScrollListener() {
-            @Override
-            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
-                super.onScrollStateChanged(recyclerView, newState);
-                if (newState != RecyclerView.SCROLL_STATE_IDLE || !isSlideToBottom()) return;
-                showTime -= daylong;
-                loading_tv.setVisibility(View.VISIBLE);
-                loadData(false);//加载
-            }
-        });
-        swiperefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+//        recycler.addOnScrollListener(new RecyclerView.OnScrollListener() {
+//            @Override
+//            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+//                super.onScrollStateChanged(recyclerView, newState);
+//                if (newState != RecyclerView.SCROLL_STATE_IDLE || !isSlideToBottom()) return;
+//
+//            }
+//        });
+        swiperefresh.setEnabledPullUp(true);
+        swiperefresh.setOnRefreshListener(new BaseRefreshLayout.onRefreshListener() {
             @Override
             public void onRefresh() {
                 showTime = TimeUtils.f_str_2_long(DateFormatUtil.long2Str(DateFormatUtil.YMD) + " 00:00:00");
                 loadData(true);
             }
+
+            @Override
+            public void onLoadMore() {
+                showTime -= daylong;
+                loadData(false);//加载
+            }
         });
+
+
         adapter.setOnClickListener(new SubscriptionAdapter.OnClickListener() {
             @Override
             public void click(View view, SubMessage bean, int position) {
@@ -333,9 +340,7 @@ public class Subscription2Activity extends BaseActivity {
 
     private void stopFresh() {
         try {
-            if (loading_tv.getVisibility() == View.VISIBLE)
-                loading_tv.setVisibility(View.GONE);
-            swiperefresh.setRefreshing(false);
+            swiperefresh.stopRefresh();
         } catch (Exception e) {
             e.printStackTrace();
         }

app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/ApprovaPresenter.java

@@ -454,7 +454,7 @@ public class ApprovaPresenter implements OnHttpResultListener {
         param.put("master", master);
         param.put("id", record.id);
         param.put("isprocess", 1);
-        param.put("config", 1);
+        param.put("config", 0);
         Request.Bulider bulider = new Request.Bulider()
                 .setUrl(url)
                 .setWhat(LOAD_FORMAND_GRIDDATA)

app_modular/apputils/src/main/res/layout/autoplay_banner_layout.xml

@@ -14,6 +14,6 @@
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/viewpager"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="10dp" />
+        android:layout_marginBottom="3dp" />
 
 </merge>

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

@@ -482,4 +482,9 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
 		entity.setType(1);//当前时间
 		entitys.add(entity);
 	}
+
+	@Override
+	public void showLoading() {
+		super.showLoading();
+	}
 }

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/presenter/MissionPresenter.java

@@ -7,6 +7,7 @@ import android.os.Bundle;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
@@ -76,7 +77,7 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
             entity.setRecorddate(TimeUtils.f_long_2_str(System.currentTimeMillis()));//当前时间
             models.add(entity);
             iMission.showModels(models);
-            iMission.showLoading();
+//            iMission.showLoading();
         }
         if (intent != null) {
             modelIntent = intent.getParcelableExtra("model");
@@ -381,12 +382,15 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
 
     //获取外勤计划列表
     public void loadMissionPlan() {
-        iMission.showLoading();
+        if (!isB2b){
+            iMission.showLoading();
+        }
         Map<String, Object> param = new HashMap<>();
         param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username"));
 
         String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getOutPlan :
                 "mobile/mobileoutplan.action";
+        LogUtil.i("url="+url);
         Request request = new Request.Bulider()
                 .setUrl(url)
                 .setWhat(LOAD_PLAN)

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/CharitSearchActivity.java

@@ -45,7 +45,9 @@ import java.util.List;
 import java.util.Map;
 
 public class CharitSearchActivity extends BaseActivity implements OnPlayListener {
-    private HttpClient httpClient = new HttpClient.Builder(Constants.charitBaseUrl()).isDebug(true).build();
+    private HttpClient httpClient = new HttpClient.Builder(Constants.charitBaseUrl()).isDebug(true)
+            .connectTimeout(5000)
+            .readTimeout(5000).build();
 
     private PullToRefreshListView refreshListView;
     private EmptyLayout mEmptyLayout;
@@ -86,7 +88,7 @@ public class CharitSearchActivity extends BaseActivity implements OnPlayListener
                             IntentUtils.linkCommonWeb(ct, Constants.BASE_CHARIT_PROJECT_URL + model.getId()
                                             + "/" + MyApplication.getInstance().getLoginUserId()
                                     , StringUtil.getMessage(R.string.charitable),
-                                    model.getMobileImg(),model.getName());
+                                    model.getMobileImg(), model.getName());
                         }
                     }
                 } else {
@@ -96,7 +98,7 @@ public class CharitSearchActivity extends BaseActivity implements OnPlayListener
                             IntentUtils.linkCommonWeb(ct, Constants.BASE_CHARIT_ACTIVITY_URL + model.getId()
                                             + "/" + MyApplication.getInstance().getLoginUserId()
                                     , StringUtil.getMessage(R.string.charitable)
-                            ,model.getActImg(),model.getName());
+                                    , model.getActImg(), model.getName());
                         }
                     }
                 }
@@ -129,7 +131,7 @@ public class CharitSearchActivity extends BaseActivity implements OnPlayListener
             return;
         }
         httpClient.Api().send(new HttpClient.Builder()
-                .url("activities")
+                .url("app/activities")
                 .add("keyWork", keyWork)
                 .add("status", "全部")
                 .method(Method.GET)
@@ -153,7 +155,7 @@ public class CharitSearchActivity extends BaseActivity implements OnPlayListener
 
     private void loadProjects(final String keyWork) {
         httpClient.Api().send(new HttpClient.Builder()
-                .url("projects")
+                .url("app/projects")
                 .add("area", "全部")
                 .add("search", keyWork)
                 .method(Method.GET)

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/JoinCharitActivity.java

@@ -87,7 +87,7 @@ public class JoinCharitActivity extends BaseActivity {
                                         + model.getId()
                                         + "/" + MyApplication.getInstance().getLoginUserId()
                                 , StringUtil.getMessage(R.string.charitable)
-                        ,null,null);
+                                , null, null);
                     }
                 }
             }
@@ -122,7 +122,7 @@ public class JoinCharitActivity extends BaseActivity {
         progressDialog.show();
         HttpClient httpClient = new HttpClient.Builder(Constants.charitBaseUrl()).isDebug(true).build();
         HttpClient builder = new HttpClient.Builder()
-                .url((type == 2 ? "joinActivity" : "donateDetail") + "/" + MyApplication.getInstance().getLoginUserId())
+                .url("app/" + (type == 2 ? "joinActivity" : "donateDetail") + "/" + MyApplication.getInstance().getLoginUserId())
                 .method(Method.GET)
                 .build();
         httpClient.Api().send(builder, new ResultSubscriber<>(new ResultListener<Object>() {

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/fragment/ActivityFragment.java

@@ -53,7 +53,9 @@ import java.util.List;
  */
 
 public class ActivityFragment extends EasyFragment implements View.OnClickListener {
-    private HttpClient httpClient = new HttpClient.Builder(Constants.charitBaseUrl()).isDebug(true).build();
+    private HttpClient httpClient = new HttpClient.Builder(Constants.charitBaseUrl()).isDebug(true)
+            .connectTimeout(5000)
+            .readTimeout(5000).build();
     private PullToRefreshListView refreshListView;
     private BaseActivity baseActivity;
     private TextView statusTv;
@@ -162,7 +164,7 @@ public class ActivityFragment extends EasyFragment implements View.OnClickListen
         }
         baseActivity.progressDialog.show();
         httpClient.Api().send(new HttpClient.Builder()
-                .url("activities")
+                .url("app/activities")
                 .add("keyWork", keyWork)
                 .add("status", status)
                 .method(Method.GET)

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/fragment/CharitableListFragment.java

@@ -64,7 +64,10 @@ import java.util.Map;
  */
 
 public class CharitableListFragment extends EasyFragment implements OnPlayListener {
-    private HttpClient httpClient = new HttpClient.Builder(Constants.charitBaseUrl()).isDebug(true).build();
+    private HttpClient httpClient = new HttpClient.Builder(Constants.charitBaseUrl())
+            .connectTimeout(5000)
+            .readTimeout(5000)
+            .isDebug(true).build();
     private CustomerBanner banner;
     private RecyclerView typeGv;
     private BaseActivity baseActivity;
@@ -160,7 +163,7 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
         baseActivity.progressDialog.show();
         LogUtil.i("loadIndexData");
         httpClient.Api().send(new HttpClient.Builder()
-                .url("appIndex")
+                .url("app/appIndex")
                 .method(Method.GET)
                 .build(), new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
@@ -203,7 +206,7 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
                 char c = showTop.charAt(i);
                 TextView textView = new TextView(ct);
                 textView.setTextSize(textSize);
-                textView.setPadding(2,3,2,3);
+                textView.setPadding(2, 3, 2, 3);
                 textView.setText(String.valueOf(c));
                 textView.setGravity(Gravity.CENTER_VERTICAL);
                 textView.setBackgroundResource(R.drawable.text_frame_hint_bg);
@@ -244,7 +247,7 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
         baseActivity.progressDialog.show();
         LogUtil.i("loadProjects=" + area);
         httpClient.Api().send(new HttpClient.Builder()
-                .url("projects")
+                .url("app/projects")
                 .add("area", area)
                 .method(Method.GET)
                 .build(), new ResultSubscriber<>(new ResultListener<Object>() {
@@ -298,8 +301,7 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
                             Constants.BASE_CHARIT_PROJECT_URL + carousel.getId()
                                     + "/" + MyApplication.getInstance().getLoginUserId()
                             , StringUtil.getMessage(R.string.charitable)
-                    ,carousel.getImageUrl(),carousel.getText());
-
+                            , carousel.getImageUrl(), carousel.getText());
                 }
             });
             banner.setAdapter(autoPlayPagerAdapter);
@@ -374,7 +376,7 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
                             IntentUtils.linkCommonWeb(ct, Constants.BASE_CHARIT_PROJECT_URL
                                             + model.getId() + "/" + MyApplication.getInstance().getLoginUserId()
                                     , StringUtil.getMessage(R.string.charitable)
-                                    ,model.getMobileImg(),model.getName());
+                                    , model.getMobileImg(), model.getName());
                         }
                     }
                 }

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/fragment/UserFragment.java

@@ -88,7 +88,7 @@ public class UserFragment extends EasyFragment implements View.OnClickListener {
             return;
         }
         httpClient.Api().send(new HttpClient.Builder()
-                .url("center")
+                .url("app/center")
                 .add("imid", MyApplication.getInstance().getLoginUserId())
                 .method(Method.GET)
                 .build(), new ResultSubscriber<>(new ResultListener<Object>() {

app_modular/appworks/src/main/res/layout/handler_charit_list.xml

@@ -43,7 +43,7 @@
         android:layout_width="match_parent"
         android:layout_height="160dp"
         android:layout_marginTop="10dp"
-        custom:indicator_bottommargin="30dp"
+        custom:indicator_bottommargin="@dimen/padding"
         custom:indicator_radius="3dp"
         custom:indicator_selected_color="@color/white"
         custom:indicator_span="16dp"

version.gradle

@@ -11,8 +11,8 @@ ext {
             minSdkVersion    : 14,
             targetSdkVersion : 26,
             javaVersion      : JavaVersion.VERSION_1_8,
-            versionCode      : 130,
-            versionName      : '6.0.7',
+            versionCode      : 150,
+            versionName      : '6.1.0',
     ]
 
     depsVersion = [
@@ -24,7 +24,7 @@ ext {
             logVersion                          : '1.15',
             rxJavaVersion                       : '1.1.8',
             rxAndroidVersion                    : '1.2.1',
-            okhttpVersion                       : '3.9.0',
+            okhttpVersion                       : '3.4.1',
             retrofitVersion                     : '2.1.0',
             stethoVersion                       : '1.5.0',
             glideVersion                        : '3.8.0',