Skip to content

android / dayu

Go to a project
Commit de52d782 by han xu
Options

在线填写验收报告

parent 05cacac4
Inline Side-by-side
Showing with 119 additions and 35 deletions
.idea/gradle.xml
...@@ -31,6 +31,5 @@ ...@@ -31,6 +31,5 @@
<option name="resolveExternalAnnotations" value="false" /> <option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings> </GradleProjectSettings>
</option> </option>
<option name="offlineMode" value="true" />
</component> </component>
</project> </project>
\ No newline at end of file
baseSDK/src/main/java/com/dayu/common/Constants.java
...@@ -45,41 +45,41 @@ public class Constants { ...@@ -45,41 +45,41 @@ public class Constants {
/** /**
* dev环境配置. * dev环境配置.
*/ */
public static String ENVIROMENT = "debug"; // public static String ENVIROMENT = "debug";
public static String PHOTO = "dev"; // public static String PHOTO = "dev";
public static int LOG_LEVEL = LogUtils.LEVEL_ALL; // public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static String BASE_URL = "http://47.94.101.239:3112"; // public static String BASE_URL = "http://47.94.101.239:3112";
public static String WEB_SOP = "http://47.94.101.239:9004/#/sop"; // public static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
public static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult"; // public static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
public static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop"; // public static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
public static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail"; // public static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
public static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail"; // public static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
public static final String UP_PHOTO = "/file/uploadMore?targetPath=dev/sp/mobile/android/business/checkApply"; // public static final String UP_PHOTO = "/file/uploadMore?targetPath=dev/sp/mobile/android/business/checkApply";
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video"; // public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video";
public static boolean IS_DEBUG = true; // public static boolean IS_DEBUG = true;
public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live) // public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
public static int XLR_PID = 239; //小绿人商家id // public static int XLR_PID = 239; //小绿人商家id
public static String SCHEME_9099 = "http://dev.kf.ai:9099/#/"; // public static String SCHEME_9099 = "http://dev.kf.ai:9099/#/";
/** /**
* uat测试环境配置. * uat测试环境配置.
*/ */
// public static String ENVIROMENT = "uat"; public static String ENVIROMENT = "uat";
// public static String PHOTO = "test"; public static String PHOTO = "test";
// public static int LOG_LEVEL = LogUtils.LEVEL_ALL; public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
// public static String BASE_URL = "http://47.95.223.6:3112"; public static String BASE_URL = "http://47.95.223.6:3112";
// public static String WEB_SOP = "http://47.95.223.6:9004/#/sop"; public static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
// public static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail"; public static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
// public static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail"; public static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
// public static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult"; public static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
// public static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop"; public static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
// public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"; public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
// public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=test/video"; public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=test/video";
// public static boolean IS_DEBUG = false; public static boolean IS_DEBUG = false;
// public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live) public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
// public static int XLR_PID = 14; //小绿人商家id public static int XLR_PID = 14; //小绿人商家id
// public static String SCHEME_9099 = "http://uat.kf.ai:9099/#/"; public static String SCHEME_9099 = "http://uat.kf.ai:9099/#/";
/** /**
......
build.gradle
...@@ -5,8 +5,8 @@ buildscript { ...@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "29.0.2" ext.build_tools_version = "29.0.2"
ext.min_sdk_version = 21 ext.min_sdk_version = 21
ext.target_sdk_version = 30 ext.target_sdk_version = 30
ext.version_code = 325 ext.version_code = 327
ext.verson_name = "3.2.5" ext.verson_name = "3.2.7"
ext.gradle_version = '4.0.1' ext.gradle_version = '4.0.1'
ext.isReleaseMinify = false ext.isReleaseMinify = false
ext.isDebugMinify = false ext.isDebugMinify = false
......
orderCenter/src/main/java/com/dayu/order/api/protocol/Spu.java
...@@ -34,7 +34,28 @@ public class Spu implements Serializable, Parcelable { ...@@ -34,7 +34,28 @@ public class Spu implements Serializable, Parcelable {
private String productName; private String productName;
private boolean isHide = false; private boolean isHide = false;
private int ordersRelationSpuId; private int ordersRelationSpuId;
private int needCheckReport;
private String checkReportH5;
public int getNeedCheckReport() {
return needCheckReport;
}
public void setNeedCheckReport(int needCheckReport) {
this.needCheckReport = needCheckReport;
}
public String getCheckReportH5() {
return checkReportH5;
}
public void setCheckReportH5(String checkReportH5) {
this.checkReportH5 = checkReportH5;
}
/** /**
* 处理工单获取信息使用. * 处理工单获取信息使用.
*/ */
......
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessContract.java
...@@ -4,6 +4,7 @@ package com.dayu.order.presenter.multipleprocess; ...@@ -4,6 +4,7 @@ package com.dayu.order.presenter.multipleprocess;
import com.dayu.base.ui.presenter.BaseListPresenter; import com.dayu.base.ui.presenter.BaseListPresenter;
import com.dayu.common.BaseView; import com.dayu.common.BaseView;
import com.dayu.order.api.protocol.OrderDetail; import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.api.protocol.Spu;
import com.dayu.widgets.listener.OnCloseListener; import com.dayu.widgets.listener.OnCloseListener;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -51,6 +52,10 @@ public interface MultipleProcessContract { ...@@ -51,6 +52,10 @@ public interface MultipleProcessContract {
void setPayBackGround(Integer payType); void setPayBackGround(Integer payType);
void setOrderDetail(OrderDetail detail); void setOrderDetail(OrderDetail detail);
//显示验收报告按钮
void setReport(String url);
} }
abstract class Presenter extends BaseListPresenter<View> { abstract class Presenter extends BaseListPresenter<View> {
......
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
...@@ -2,6 +2,8 @@ package com.dayu.order.presenter.multipleprocess; ...@@ -2,6 +2,8 @@ package com.dayu.order.presenter.multipleprocess;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.widget.Button;
import android.widget.TextView;
import androidx.databinding.ObservableField; import androidx.databinding.ObservableField;
...@@ -14,8 +16,10 @@ import com.dayu.order.api.protocol.OrderDetail; ...@@ -14,8 +16,10 @@ import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.api.protocol.Spu; import com.dayu.order.api.protocol.Spu;
import com.dayu.order.common.OrderConstant; import com.dayu.order.common.OrderConstant;
import com.dayu.order.common.SubmitCheckEvent; import com.dayu.order.common.SubmitCheckEvent;
import com.dayu.order.presenter.sop.SopContract;
import com.dayu.provider.event.RefreshServe; import com.dayu.provider.event.RefreshServe;
import com.dayu.provider.router.RouterPath; import com.dayu.provider.router.RouterPath;
import com.dayu.usercenter.ui.activity.CommeWebViewActivity;
import com.dayu.utils.ToastUtils; import com.dayu.utils.ToastUtils;
import com.dayu.utils.UIUtils; import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager; import com.dayu.utils.UserManager;
...@@ -237,12 +241,20 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter ...@@ -237,12 +241,20 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
mView.setPayType(payType); mView.setPayType(payType);
mView.setOrderSource(detail.getSource()); mView.setOrderSource(detail.getSource());
} }
if (detail.getPayStatus() == 3 && detail.getPayType() == 1) { if (detail.getPayStatus() != null && detail.getPayStatus() == 3 && detail.getPayType() == 1) {
mCanProcess = true; mCanProcess = true;
mView.paySuccess(detail); mView.paySuccess(detail);
mView.setPayBackGround(detail.getPayType()); mView.setPayBackGround(detail.getPayType());
} }
Spu spu = mOrderDetail.getSpus().get(0);
if (spu.getNeedCheckReport() == 1){
String url = spu.getCheckReportH5()+ "token=" + UserManager.getInstance().getUser().getToken() + "&created=" + mOrderDetail.getCreated();
mView.setReport(url);
ArrayList<Spu> data = new ArrayList<Spu>();
data.add(spu);
mDatas.set(data);
}
})); }));
} }
......
orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
...@@ -4,11 +4,13 @@ import android.content.Intent; ...@@ -4,11 +4,13 @@ import android.content.Intent;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import android.text.Editable; import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
...@@ -23,14 +25,19 @@ import com.bigkoo.pickerview.view.OptionsPickerView; ...@@ -23,14 +25,19 @@ import com.bigkoo.pickerview.view.OptionsPickerView;
import com.dayu.base.ui.activity.BaseActivity; import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.base.ui.adapter.PhotoViewAdapter; import com.dayu.base.ui.adapter.PhotoViewAdapter;
import com.dayu.base.ui.adapter.SpacesItemDecoration; import com.dayu.base.ui.adapter.SpacesItemDecoration;
import com.dayu.common.Constants;
import com.dayu.common.MyTextWatcher; import com.dayu.common.MyTextWatcher;
import com.dayu.order.R; import com.dayu.order.R;
import com.dayu.order.api.protocol.OrderDetail; import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.api.protocol.Spu;
import com.dayu.order.common.OrderConstant;
import com.dayu.order.databinding.ActivityMultipleProcessBinding; import com.dayu.order.databinding.ActivityMultipleProcessBinding;
import com.dayu.order.presenter.multipleprocess.MultipleProcessContract; import com.dayu.order.presenter.multipleprocess.MultipleProcessContract;
import com.dayu.order.presenter.multipleprocess.MultipleProcessPresenter; import com.dayu.order.presenter.multipleprocess.MultipleProcessPresenter;
import com.dayu.usercenter.ui.activity.CommeWebViewActivity;
import com.dayu.utils.ToastUtils; import com.dayu.utils.ToastUtils;
import com.dayu.utils.UIUtils; import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager;
import com.dayu.widgets.CustomDialog; import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.listener.OnCloseListener; import com.dayu.widgets.listener.OnCloseListener;
import com.google.zxing.integration.android.IntentIntegrator; import com.google.zxing.integration.android.IntentIntegrator;
...@@ -87,6 +94,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent ...@@ -87,6 +94,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
private LinearLayout llPayWay; private LinearLayout llPayWay;
private RelativeLayout mRlPay; private RelativeLayout mRlPay;
private boolean mWechatStatus; private boolean mWechatStatus;
private TextView mOrderIntroduce;
@Override @Override
public void setPresenter() { public void setPresenter() {
...@@ -619,4 +627,18 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent ...@@ -619,4 +627,18 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
} else { } else {
} }
} }
@Override
public void setReport(String url) {
mBind.orderIntroduce.setText("验收报告");
mBind.recyclerView.setViewType(R.layout.item_multi_process_button);
mBind.recyclerView.setOnItemClickListener((item, bind) -> {
Bundle bundle = new Bundle();
bundle.putString(Constants.URL, url);
// bundle.putString(Constants.TITLE, "验收报告，请认真完成填写");
startActivity(CommeWebViewActivity.class,bundle);
});
}
} }
orderCenter/src/main/res/layout/activity_multiple_process.xml
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<ImageView style="@style/card_line" /> <ImageView style="@style/card_line" />
<TextView <TextView
android:id="@+id/order_introduce"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="43dp" android:layout_height="43dp"
android:paddingLeft="15dp" android:paddingLeft="15dp"
......
orderCenter/src/main/res/layout/item_multi_process_button.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<variable
name="item"
type="com.dayu.order.api.protocol.Spu" />
</data>
<Button
android:id="@+id/btn_report"
android:layout_width="match_parent"
android:layout_height="49dp"
android:layout_marginRight="15sp"
android:layout_marginLeft="15sp"
android:text='在线填写验收报告'
android:textColor="@color/white"
android:background="@drawable/tab_blue_react"
/>
</layout>
\ No newline at end of file
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