Skip to content

android / dayu

Go to a project
Commit 8f21c002 by 罗翻
Options

将mvp替换成mvvm

parent 30ecfed1 master … dev dev_xx dev_xx_241116 dev_xx_250108_toast dev_xx_250224_report dev_xx_web test v2.7.2 v2.7.1 v2.7.0 v2.6.9 v2.6.7 v2.6.6 v2.6.5 v2.6.4 v2.6.3 v2.6.2 v2.6.1 v2.6.0 v2.5.9 v2.5.7 v2.5.5 v2.5.4 v2.5.3 v2.5.2 v2.5.0 v2.4.6 v2.4.5 v2.4.0 v_2.4.0 v2.3.2 v2.3.1 dev20230405 android_v1.6.0 android_v1.3.0 android_v1.2.0
Inline Side-by-side
Showing with 18 additions and 8 deletions
app/build.gradle
...@@ -21,7 +21,7 @@ android { ...@@ -21,7 +21,7 @@ android {
applicationId "com.dayu.bigfish" applicationId "com.dayu.bigfish"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 23 targetSdkVersion 23
versionCode 5 versionCode 6
versionName "1.1.1" versionName "1.1.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled true
......
app/src/main/java/com/dayu/bigfish/Constants.java
...@@ -22,7 +22,6 @@ public class Constants { ...@@ -22,7 +22,6 @@ public class Constants {
/***********************测试环境配置**********************************/ /***********************测试环境配置**********************************/
public static final int DEBUGLEVEL = LogUtils.LEVEL_ALL; 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://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 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 final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
public static final boolean UM_DEBUG = true; 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> { ...@@ -132,10 +132,8 @@ public abstract class BasePresenter<V> {
} }
return exception; return exception;
} }
if (!Constants.NOT_SHOW.equals(message) && mView instanceof BaseActivity) { if (!Constants.NOT_SHOW.equals(message) && mView instanceof BaseView) {
((BaseActivity) mView).showToast(message); ((BaseView) mView).showToast(message);
} else if (!Constants.NOT_SHOW.equals(message) && mView instanceof BaseFragment) {
((BaseFragment) mView).showToast(message);
} }
return exception; return exception;
} }
......
app/src/main/java/com/dayu/bigfish/ui/adapter/OrderAdapter.java
...@@ -203,6 +203,8 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -203,6 +203,8 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
} else if (errorState == 4) { } else if (errorState == 4) {
holder.tvErrorState.setText(mContext.getString(R.string.delivery_time_out)); holder.tvErrorState.setText(mContext.getString(R.string.delivery_time_out));
holder.tvErrorState.setVisibility(View.VISIBLE); holder.tvErrorState.setVisibility(View.VISIBLE);
} else {
holder.tvErrorState.setVisibility(View.GONE);
} }
holder.tvItemProcess.setOnClickListener( holder.tvItemProcess.setOnClickListener(
......
app/src/main/res/layout/activity_modify_person_activity.xml
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="15dp" android:layout_marginLeft="15dp"
android:text="@string/real_name" android:text="@string/real_name"
android:textColor="@color/default_text_color"
android:textSize="15sp" /> android:textSize="15sp" />
<EditText <EditText
...@@ -73,6 +74,7 @@ ...@@ -73,6 +74,7 @@
android:layout_marginLeft="35dp" android:layout_marginLeft="35dp"
android:background="@null" android:background="@null"
android:hint="请输入真实姓名" android:hint="请输入真实姓名"
android:textColor="@color/default_editext_color"
android:text="@={presenter.mRealName}" android:text="@={presenter.mRealName}"
android:textSize="15sp" /> android:textSize="15sp" />
</LinearLayout> </LinearLayout>
...@@ -96,6 +98,7 @@ ...@@ -96,6 +98,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="15dp" android:layout_marginLeft="15dp"
android:text="@string/person_identity" android:text="@string/person_identity"
android:textColor="@color/default_text_color"
android:textSize="15sp" /> android:textSize="15sp" />
<EditText <EditText
...@@ -106,6 +109,7 @@ ...@@ -106,6 +109,7 @@
android:background="@null" android:background="@null"
android:hint="请输入证件号" android:hint="请输入证件号"
android:text="@={presenter.mIdentity}" android:text="@={presenter.mIdentity}"
android:textColor="@color/default_editext_color"
android:textSize="15sp" /> android:textSize="15sp" />
</LinearLayout> </LinearLayout>
...@@ -122,6 +126,7 @@ ...@@ -122,6 +126,7 @@
android:layout_marginLeft="15dp" android:layout_marginLeft="15dp"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/commite_identity_pic" android:text="@string/commite_identity_pic"
android:textColor="@color/default_text_color"
android:textSize="15sp" /> android:textSize="15sp" />
<TextView <TextView
...@@ -129,6 +134,7 @@ ...@@ -129,6 +134,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="15dp" android:layout_marginRight="15dp"
android:textColor="@color/default_editext_color"
android:text='@{presenter.mIdentityUrl==""?@string/commite_pic_zero:@string/commite_pic_one}' android:text='@{presenter.mIdentityUrl==""?@string/commite_pic_zero:@string/commite_pic_one}'
android:textSize="15sp" /> android:textSize="15sp" />
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/activity_person_info.xml
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
android:layout_marginLeft="15dp" android:layout_marginLeft="15dp"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/header_pic" android:text="@string/header_pic"
android:textColor="@color/default_text_color"
android:textSize="15sp" /> android:textSize="15sp" />
<com.dayu.bigfish.ui.views.CircleImageView <com.dayu.bigfish.ui.views.CircleImageView
...@@ -98,6 +99,7 @@ ...@@ -98,6 +99,7 @@
android:layout_marginLeft="@dimen/dp_10" android:layout_marginLeft="@dimen/dp_10"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/person_mobile" android:text="@string/person_mobile"
android:textColor="@color/default_text_color"
android:textSize="15sp" /> android:textSize="15sp" />
<TextView <TextView
...@@ -106,6 +108,7 @@ ...@@ -106,6 +108,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="@dimen/dp_15" android:layout_marginRight="@dimen/dp_15"
android:text="@{presenter.info.mobile}" android:text="@{presenter.info.mobile}"
android:textColor="@color/default_editext_color"
android:textSize="15sp" /> android:textSize="15sp" />
</LinearLayout> </LinearLayout>
...@@ -123,6 +126,7 @@ ...@@ -123,6 +126,7 @@
android:layout_marginLeft="@dimen/dp_10" android:layout_marginLeft="@dimen/dp_10"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/person_identity_audite" android:text="@string/person_identity_audite"
android:textColor="@color/default_text_color"
android:textSize="15sp" /> android:textSize="15sp" />
<TextView <TextView
...@@ -131,6 +135,7 @@ ...@@ -131,6 +135,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="15dp" android:layout_marginRight="15dp"
android:text='@{presenter.info.aduitStatus == 3?@string/identity_unaudite:@string/identity_audited}' 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" /> android:textSize="15sp" />
<ImageView <ImageView
......
app/src/main/res/layout/fragment_orderdoing_item.xml
...@@ -134,7 +134,6 @@ ...@@ -134,7 +134,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:layout_marginTop="@dimen/dp_16.7" android:layout_marginTop="@dimen/dp_16.7"
android:text="[预约超时]"
android:textColor="@color/cl_tab_read" android:textColor="@color/cl_tab_read"
android:textSize="@dimen/size_login_hint_text" android:textSize="@dimen/size_login_hint_text"
android:visibility="visible" /> android:visibility="visible" />
......
app/src/main/res/values/colors.xml
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
<color name="primary">#5C92FC</color> <color name="primary">#5C92FC</color>
<color name="line_color">#dddddd</color> <color name="line_color">#dddddd</color>
<color name="text_color">#8a8a8a</color> <color name="text_color">#8a8a8a</color>
<color name="default_text_color">#FF2D2D2D</color>
<color name="default_editext_color">#FF959595</color>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment