【11-31】版本WeiChat_v6.0.9_baidu(Build148)_release 发布上线！

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/version.properties

@@ -1,5 +1,5 @@
-#Fri Dec 01 11:36:31 CST 2017
-debugName=30
-versionName=610
-debugCode=30
-versionCode=149
+#Mon Dec 04 16:06:27 CST 2017
+debugName=38
+versionName=616
+debugCode=38
+versionCode=155

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

@@ -1644,6 +1644,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                                  String ad_deskcode=object.getString("ad_deskcode");
                                  SeatsStateModel model=new SeatsStateModel();
                                  model.setAd_deskcode(String.valueOf(i));
+                                 if (i==jsonArray.size()-1){
+                                     model.setAd_status("1");
+                                 }else{
+                                     model.setAd_status("0");
+                                 }
                                  seats.add(model);
                              }
                              gvMSeats.setAdapter(new ItemFoodStateAdapter(mContext,seats));

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

@@ -57,6 +57,12 @@ public class ItemFoodStateAdapter extends BaseAdapter {
 
     private void initializeViews(SeatsStateModel object, ViewHolder holder) {
        holder.tvSeatsCode.setText(object.getAd_deskcode());
+       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(" ");
+       }
     }
 
     protected class ViewHolder {