Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature

# Conflicts:
#	WeiChat/version.properties

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

@@ -100,8 +100,7 @@
             </LinearLayout>
             <ScrollView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-               >
+                android:layout_height="wrap_content">
                 <LinearLayout
                     style="@style/form_linear_customer"
                     android:paddingBottom="5dp">

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

@@ -196,7 +196,9 @@
         android:layout_alignParentBottom="true"
         android:orientation="horizontal"
         android:weightSum="2">
-       
+
+   <!--     <View style="@style/app_line_v_1dp"></View>-->
+
         <Button
             android:id="@+id/bt_change"
             android:layout_width="match_parent"
@@ -205,8 +207,6 @@
             android:background="@drawable/bg_bule_btn1"
             android:text="@string/booking_change" />
 
-        <View style="@style/app_line_v_1dp"></View>
-
         <Button
             android:id="@+id/bt_cancle"
             android:layout_width="match_parent"

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu May 24 15:59:08 CST 2018
-debugName=382
+#Thu May 24 17:25:38 CST 2018
+debugName=387
 versionName=630
-debugCode=382
+debugCode=387
 versionCode=170

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

@@ -416,14 +416,14 @@ public class ViewUtil {
                     ChangeStatusERP(result);
                 } else {
                     String reason = JSON.parseObject(result).getString("reason");
-                    ToastMessage(ct, reason, Style.holoGreenLight, 3000);
+                    ToastMessage(MyApplication.getInstance(), reason, Style.holoGreenLight, 3000);
                 }
             } else {
-                ToastMessage(ct, "接口数据非法！", Style.holoRedLight, 3000);
+                ToastMessage(MyApplication.getInstance(), "接口数据非法！", Style.holoRedLight, 3000);
             }
         } catch (Exception e) {
             e.printStackTrace();
-            ToastMessage(ct, MyApplication.getInstance().getString(R.string.login_error_erp), Style.holoRedLight, 3000);
+            ToastMessage(MyApplication.getInstance(), MyApplication.getInstance().getString(R.string.login_error_erp), Style.holoRedLight, 3000);
         }
     }
 
@@ -704,7 +704,7 @@ public class ViewUtil {
 //                if (select > items.length) {
 //                    select = 0;
 //                }
-                popupWindow=null;
+               
                 showPopDialog((Activity) ct,itemsSelectType1s,phone,password);
 //                loginERPDialog = new MaterialDialog.Builder(ct)
 //                        .title(ct.getString(R.string.user_dialog_company))
@@ -736,6 +736,7 @@ public class ViewUtil {
         }
         if (DialogUtils.isDialogShowing(popupWindow)){
             popupWindow.dismiss();
+            popupWindow=null;
         }
         WindowManager windowManager = (WindowManager)ct. getSystemService(Context.WINDOW_SERVICE);
         if (popupWindow == null) {

app_core/common/src/main/res/drawable/bg_bule_btn1.xml

@@ -2,21 +2,21 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
         <shape>
-            <solid android:color="@color/btn_orange_press" />
+            <solid android:color="#2D84C0" />
 
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>
     <item android:state_enabled="false">
         <shape>
-            <solid android:color="@color/btn_orange_press" />
+            <solid android:color="#8EB2CD" />
        
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>
     <item>
         <shape>
-            <solid android:color="@color/titleBlue" />
+            <solid android:color="#33A2EE" />
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>

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

@@ -25,7 +25,7 @@
             android:id="@+id/mList"
             style="@style/ListViewBasic"
             android:layout_height="300dp"
-            android:divider="@color/gray_light"
-            android:dividerHeight="0dp">
+            android:divider="@color/item_line"
+            android:dividerHeight="0.5dp">
         </ListView>
 </LinearLayout>

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

@@ -244,7 +244,7 @@
             android:background="@drawable/bg_bule_btn1"
             android:text="@string/booking_change" />
 
-        <View style="@style/app_line_v_1dp"></View>
+      <!--  <View style="@style/app_line_v_1dp"></View>-->
 
         <Button
             android:id="@+id/bt_cancle"