SpringBoots 8 年 前
コミット
daaecc23a2

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

@@ -145,6 +145,10 @@ public class BookingDetailActivity extends OABaseActivity implements HttpImp,Vie
                   
                 }else{
                    // ll_bottom.setVisibility(View.VISIBLE);
+                    ((Button)findViewById(R.id.bt_change)).setText("变更");
+                    ((Button)findViewById(R.id.bt_cancle)).setText("取消");
+                    ((Button)findViewById(R.id.bt_change)).setVisibility(View.GONE);
+                    ll_bottom.setVisibility(View.VISIBLE);
                 }
             }
             if("已取消".equals(model.getAb_confirmstatus())){

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/tool/ThreadUtil.java

@@ -9,6 +9,7 @@ import java.util.concurrent.Executors;
  */
 public class ThreadUtil {
     private static ThreadUtil instance = null;
+    ExecutorService cachedThreadPool =  Executors.newCachedThreadPool();
 
     public static ThreadUtil getInstance() {
         if (instance == null) {
@@ -26,13 +27,12 @@ public class ThreadUtil {
      * @param runnable
      */
     public void addLoopTask(Runnable runnable) {
-        ExecutorService cachedThreadPool = Executors.newCachedThreadPool();
+//        ExecutorService cachedThreadPool = Executors.newCachedThreadPool();
         cachedThreadPool.execute(runnable);
     }
 
     //普通线程
     public void addTask(Runnable runnable) {
-        ExecutorService cachedThreadPool = Executors.newFixedThreadPool(10);
         cachedThreadPool.execute(runnable);
     }
 

+ 2 - 2
WeiChat/src/main/res/layout/activity_booking_detail.xml

@@ -198,7 +198,7 @@
        
         <Button
             android:id="@+id/bt_change"
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:background="@drawable/select_weixin_list_item"
@@ -208,7 +208,7 @@
 
         <Button
             android:id="@+id/bt_cancle"
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"

+ 2 - 2
WeiChat/src/main/res/raw/versionconfiguration.properties

@@ -1,3 +1,3 @@
 #发布版本状态改为true,测试版本状态为false
-#release_version = false
-release_version=true
+release_version = false
+#release_version=true