将mvp替换成mvvm

app/build.gradle

@@ -21,7 +21,7 @@ android {
         applicationId "com.dayu.bigfish"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 5
+        versionCode 6
         versionName "1.1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true

app/src/main/java/com/dayu/bigfish/Constants.java

@@ -22,7 +22,6 @@ public class Constants {
     /***********************测试环境配置**********************************/
     public static final int DEBUGLEVEL = LogUtils.LEVEL_ALL;
     public static final String BASE_URL = "http://47.94.101.239:3112";
-    //    public static final String BASE_URL = "http://192.168.123.121:3112";
     public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
     public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
     public static final boolean UM_DEBUG = true;

app/src/main/java/com/dayu/bigfish/base/BasePresenter.java

@@ -132,10 +132,8 @@ public abstract class BasePresenter<V> {
             }
             return exception;
         }
-        if (!Constants.NOT_SHOW.equals(message) && mView instanceof BaseActivity) {
-            ((BaseActivity) mView).showToast(message);
-        } else if (!Constants.NOT_SHOW.equals(message) && mView instanceof BaseFragment) {
-            ((BaseFragment) mView).showToast(message);
+        if (!Constants.NOT_SHOW.equals(message) && mView instanceof BaseView) {
+            ((BaseView) mView).showToast(message);
         }
         return exception;
     }

app/src/main/java/com/dayu/bigfish/ui/adapter/OrderAdapter.java

@@ -203,6 +203,8 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
         } else if (errorState == 4) {
             holder.tvErrorState.setText(mContext.getString(R.string.delivery_time_out));
             holder.tvErrorState.setVisibility(View.VISIBLE);
+        } else {
+            holder.tvErrorState.setVisibility(View.GONE);
         }
 
         holder.tvItemProcess.setOnClickListener(

app/src/main/res/layout/activity_modify_person_activity.xml

@@ -64,6 +64,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="15dp"
                 android:text="@string/real_name"
+                android:textColor="@color/default_text_color"
                 android:textSize="15sp" />
 
             <EditText
@@ -73,6 +74,7 @@
                 android:layout_marginLeft="35dp"
                 android:background="@null"
                 android:hint="请输入真实姓名"
+                android:textColor="@color/default_editext_color"
                 android:text="@={presenter.mRealName}"
                 android:textSize="15sp" />
         </LinearLayout>
@@ -96,6 +98,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="15dp"
                 android:text="@string/person_identity"
+                android:textColor="@color/default_text_color"
                 android:textSize="15sp" />
 
             <EditText
@@ -106,6 +109,7 @@
                 android:background="@null"
                 android:hint="请输入证件号"
                 android:text="@={presenter.mIdentity}"
+                android:textColor="@color/default_editext_color"
                 android:textSize="15sp" />
         </LinearLayout>
 
@@ -122,6 +126,7 @@
                 android:layout_marginLeft="15dp"
                 android:layout_weight="1"
                 android:text="@string/commite_identity_pic"
+                android:textColor="@color/default_text_color"
                 android:textSize="15sp" />
 
             <TextView
@@ -129,6 +134,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="15dp"
+                android:textColor="@color/default_editext_color"
                 android:text='@{presenter.mIdentityUrl==""?@string/commite_pic_zero:@string/commite_pic_one}'
                 android:textSize="15sp" />
         </LinearLayout>

app/src/main/res/layout/activity_person_info.xml

@@ -59,6 +59,7 @@
                 android:layout_marginLeft="15dp"
                 android:layout_weight="1"
                 android:text="@string/header_pic"
+                android:textColor="@color/default_text_color"
                 android:textSize="15sp" />
 
             <com.dayu.bigfish.ui.views.CircleImageView
@@ -98,6 +99,7 @@
                 android:layout_marginLeft="@dimen/dp_10"
                 android:layout_weight="1"
                 android:text="@string/person_mobile"
+                android:textColor="@color/default_text_color"
                 android:textSize="15sp" />
 
             <TextView
@@ -106,6 +108,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginRight="@dimen/dp_15"
                 android:text="@{presenter.info.mobile}"
+                android:textColor="@color/default_editext_color"
                 android:textSize="15sp" />
         </LinearLayout>
 
@@ -123,6 +126,7 @@
                 android:layout_marginLeft="@dimen/dp_10"
                 android:layout_weight="1"
                 android:text="@string/person_identity_audite"
+                android:textColor="@color/default_text_color"
                 android:textSize="15sp" />
 
             <TextView
@@ -131,6 +135,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginRight="15dp"
                 android:text='@{presenter.info.aduitStatus == 3?@string/identity_unaudite:@string/identity_audited}'
+                android:textColor="@{presenter.info.aduitStatus == 3?@color/cl_receiving_order_item_data:@color/default_editext_color}"
                 android:textSize="15sp" />
 
             <ImageView

app/src/main/res/layout/fragment_orderdoing_item.xml

@@ -134,7 +134,6 @@
                         android:layout_height="wrap_content"
                         android:layout_marginRight="10dp"
                         android:layout_marginTop="@dimen/dp_16.7"
-                        android:text="[预约超时]"
                         android:textColor="@color/cl_tab_read"
                         android:textSize="@dimen/size_login_hint_text"
                         android:visibility="visible" />

app/src/main/res/values/colors.xml

@@ -26,7 +26,8 @@
     <color name="primary">#5C92FC</color>
     <color name="line_color">#dddddd</color>
     <color name="text_color">#8a8a8a</color>
-
+    <color name="default_text_color">#FF2D2D2D</color>
+    <color name="default_editext_color">#FF959595</color>