Skip to content

android / dayu

Go to a project
Commit c44e43ba by 罗翻
Options

增加多任务

parent 8464cc50
Inline Side-by-side
Showing with 33 additions and 38 deletions
app/release/output.json
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":10},"path":"app-release.apk","properties":{"packageId":"com.dayu.bigfish","split":"","minSdkVersion":"16"}}] [{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":11},"path":"app-release.apk","properties":{"packageId":"com.dayu.bigfish","split":"","minSdkVersion":"16"}}]
\ No newline at end of file \ No newline at end of file
baseSDK/src/main/java/com/dayu/common/Constants.java
...@@ -12,30 +12,30 @@ public class Constants { ...@@ -12,30 +12,30 @@ public class Constants {
/** /**
* 测试环境配置. * 测试环境配置.
*/ */
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL; // public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static final String ENVIROMENT = "debug"; // public static final String ENVIROMENT = "debug";
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 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 final static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult"; // public final static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
public final static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop"; // public final static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
public final static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail"; // public final static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail"; // public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
public static final boolean IS_DEBUG = true; // public static final boolean IS_DEBUG = true;
/** /**
* uat环境配置. * uat环境配置.
*/ */
// public static final String ENVIROMENT = "uat"; public static final String ENVIROMENT = "uat";
// public static final int LOG_LEVEL = LogUtils.LEVEL_ALL; public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
// public static final String BASE_URL = "http://47.95.223.6:3112"; public static final String BASE_URL = "http://47.95.223.6: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.95.223.6:9004/#/sop"; public final static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
// public final static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail"; public final static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
// public final static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail"; public final static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
// public final static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult"; public final static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
// public final static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop"; public final static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
// public static final boolean IS_DEBUG = true; public static final boolean IS_DEBUG = true;
/** /**
* 正式环境. * 正式环境.
......
build.gradle
...@@ -5,8 +5,8 @@ buildscript { ...@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "27.0.2" ext.build_tools_version = "27.0.2"
ext.min_sdk_version = 16 ext.min_sdk_version = 16
ext.target_sdk_version = 23 ext.target_sdk_version = 23
ext.version_code = 10 ext.version_code = 11
ext.verson_name = "1.6.0" ext.verson_name = "1.7.0"
ext.gradle_version = '3.0.1' ext.gradle_version = '3.0.1'
ext.isReleaseMinify = true ext.isReleaseMinify = true
ext.isDebugMinify = true ext.isDebugMinify = true
......
orderCenter/src/main/java/com/dayu/order/presenter/processorder/ProcessOrderPresenter.java
...@@ -298,7 +298,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter { ...@@ -298,7 +298,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
} }
mView.getData(); mView.getData();
OrderInfo info = mOrderField.get(); OrderInfo info = mOrderField.get();
if (mOrderDetail.getCreatedSource() == 3) { if (mOrderDetail != null && mOrderDetail.getCreatedSource() == 3) {
if (TextUtils.isEmpty(info.getPayer())) { if (TextUtils.isEmpty(info.getPayer())) {
mView.showNoPayerDialog(); mView.showNoPayerDialog();
return; return;
......
orderCenter/src/main/res/layout/activity_multi_process_order.xml
...@@ -54,7 +54,8 @@ ...@@ -54,7 +54,8 @@
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/tv_modify_sop"> android:layout_below="@id/tv_modify_sop"
>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -78,7 +79,9 @@ ...@@ -78,7 +79,9 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/tv_product_title"> android:layout_below="@+id/tv_product_title"
android:layout_marginBottom="@dimen/dp_10"
>
<RelativeLayout <RelativeLayout
android:id="@+id/rl_product" android:id="@+id/rl_product"
...@@ -308,19 +311,13 @@ ...@@ -308,19 +311,13 @@
android:orientation="horizontal" /> android:orientation="horizontal" />
</RelativeLayout> </RelativeLayout>
<ImageView
android:id="@+id/image_eight_lin"
style="@style/line"
android:layout_below="@id/photo_view" />
<TextView <TextView
android:id="@+id/tv_process" android:id="@+id/tv_process"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="47dp" android:layout_height="47dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_below="@id/image_eight_lin" android:layout_below="@id/photo_view"
android:layout_marginLeft="@dimen/dp_15" android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15" android:layout_marginRight="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_10" android:layout_marginTop="@dimen/dp_10"
......
orderCenter/src/main/res/layout/activity_server_info.xml
...@@ -41,8 +41,6 @@ ...@@ -41,8 +41,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@+id/line" android:layout_below="@+id/line"
android:layout_marginBottom="@dimen/dp_50" android:layout_marginBottom="@dimen/dp_50"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
app:headType="@layout/recycler_server_info_header" app:headType="@layout/recycler_server_info_header"
app:itemType="@layout/item_server_info" /> app:itemType="@layout/item_server_info" />
......
orderCenter/src/main/res/layout/item_server_info.xml
...@@ -67,6 +67,7 @@ ...@@ -67,6 +67,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="12dp" android:layout_marginLeft="12dp"
android:layout_marginRight="@dimen/dp_10"
android:layout_marginTop="28dp"> android:layout_marginTop="28dp">
<TextView <TextView
...@@ -121,7 +122,6 @@ ...@@ -121,7 +122,6 @@
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/size_order_item_line_width" android:layout_height="@dimen/size_order_item_line_width"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:background="@color/cl_order_item_line_bg" /> android:background="@color/cl_order_item_line_bg" />
......
userCenter/src/main/java/com/dayu/usercenter/api/UserService.java
...@@ -87,7 +87,7 @@ public interface UserService { ...@@ -87,7 +87,7 @@ public interface UserService {
/** /**
* 获取工程师工单记录，评分. * 获取工程师工单记录，评分.
* *
* @param siteId * @param siteIdHome
* @param engineerId * @param engineerId
* @return * @return
*/ */
......
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