Browse Source

5.9.8版本发布

Arison 8 years ago
parent
commit
3622585895

+ 1 - 1
WeiChat/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xzjmyk.pm.activity"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="1160"
+    android:versionCode="116"
     android:versionName="5.9.2">
     android:versionName="5.9.2">
 
 
     <uses-sdk
     <uses-sdk

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

@@ -17,6 +17,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
 import com.common.LogUtil;
+import com.common.config.BaseConfig;
 import com.common.data.CalendarUtil;
 import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
 import com.common.data.ListUtils;
@@ -247,7 +248,11 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
                 startActivity(new Intent(mContext, BBookingAddActivity.class));
                 startActivity(new Intent(mContext, BBookingAddActivity.class));
                 break;
                 break;
             case R.id.mBookService:
             case R.id.mBookService:
-                startActivity(new Intent(mContext,  BServicesActivity.class));
+              if (BaseConfig.isDebug()){
+                  startActivity(new Intent(mContext,  BServicesActivity.class));
+              }else{
+                  ToastMessage("暂未开通!");
+              }
                 break;
                 break;
             case R.id.mBookShares:
             case R.id.mBookShares:
                 Intent intent = new Intent(mContext, BBSharesListActivity.class);
                 Intent intent = new Intent(mContext, BBSharesListActivity.class);

+ 2 - 2
version.gradle

@@ -11,8 +11,8 @@ ext {
             minSdkVersion    : 9,
             minSdkVersion    : 9,
             targetSdkVersion : 24,
             targetSdkVersion : 24,
             javaVersion      : JavaVersion.VERSION_1_8,
             javaVersion      : JavaVersion.VERSION_1_8,
-            versionCode      : 119,
-            versionName      : '5.9.7',
+            versionCode      : 120,
+            versionName      : '5.9.8',
     ]
     ]
 
 
     depsVersion = [
     depsVersion = [