Skip to content

android / dayu

Go to a project
Commit b4125274 by wukun
Options

api30 调整文件路径

parent 65df3fcc
Inline Side-by-side
Showing with 53 additions and 51 deletions
baseSDK/src/main/java/com/dayu/common/Constants.java
......@@ -45,21 +45,21 @@ public class Constants {
/**
* dev环境配置.
*/
// public static String ENVIROMENT = "debug";
// public static String PHOTO = "dev";
// public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
// 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 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 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 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 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 int XLR_PID = 239; //小绿人商家id
// public static String SCHEME_9099 = "http://dev.kf.ai:9099/#/";
public static String ENVIROMENT = "debug";
public static String PHOTO = "dev";
public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
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 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 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 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 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 int XLR_PID = 239; //小绿人商家id
public static String SCHEME_9099 = "http://dev.kf.ai:9099/#/";
/**
......@@ -85,21 +85,21 @@ public class Constants {
/**
* 正式环境.
*/
public static String ENVIROMENT = "release";
public static String PHOTO = "online";
public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
public static String BASE_URL = "https://mobile.dayuspm.com";
public static String WEB_SOP = "https://sop.kf.ai/#/sop";
public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video";
public static boolean IS_DEBUG = false;
public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live)
public static int XLR_PID = 1936; //小绿人商家id
public static String SCHEME_9099 = "http://app.dl.kf.ai/ext/#/";
// public static String ENVIROMENT = "release";
// public static String PHOTO = "online";
// public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
// public static String BASE_URL = "https://mobile.dayuspm.com";
// public static String WEB_SOP = "https://sop.kf.ai/#/sop";
// public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
// public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
// public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
// public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
// public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
// public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video";
// public static boolean IS_DEBUG = false;
// public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live)
// public static int XLR_PID = 1936; //小绿人商家id
// public static String SCHEME_9099 = "http://app.dl.kf.ai/ext/#/";
/**
......
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
package com.dayu.order.presenter.multipleprocess;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
......@@ -15,8 +14,6 @@ import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.api.protocol.Spu;
import com.dayu.order.common.OrderConstant;
import com.dayu.order.common.SubmitCheckEvent;
import com.dayu.order.ui.activity.QrCodeActivity;
import com.dayu.order.ui.activity.SignatureActivity;
import com.dayu.provider.event.RefreshServe;
import com.dayu.provider.router.RouterPath;
import com.dayu.utils.ToastUtils;
......@@ -40,6 +37,7 @@ import okhttp3.RequestBody;
* on 2017/11/8.
*/
public class MultipleProcessPresenter extends MultipleProcessContract.Presenter {
public ObservableField<Object> mDatas = new ObservableField<>();
public ObservableField<Object> mFootDatas = new ObservableField<>();
private ArrayList<Spu> mSpus;
......@@ -83,12 +81,13 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
return mFootDatas;
}
public void process() {
public void process(String path) {
if (mView.getPayType() == 1 && !mCanProcess) {
ToastUtils.showShortToast("请先扫码收款后再提交验收!");
return;
}
File file = new File(SignatureActivity.path);
File file = new File(path);
if (mNeedEsignature != null && mNeedEsignature == 1 && !file.exists()) {
ToastUtils.showShortToast(R.string.signature_name);
return;
......@@ -108,12 +107,13 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
// }
// });
// } else {
commitePhoto();
commitePhoto(path);
// }
}
}
private void commitePhoto() {
private void commitePhoto(String path) {
MultipartBody.Part[] parts;
ArrayList<String> imageUrl = mView.getImages();
if (imageUrl != null && imageUrl.size() > 0) {
......@@ -122,7 +122,7 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
BaseApiFactory.uploadPhoto(parts).subscribe(baseObserver(list -> {
if (mNeedEsignature != null && mNeedEsignature == 1) {
mView.showDialog();
File file = new File(SignatureActivity.path);
File file = new File(path);
RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
MultipartBody.Part part = MultipartBody.Part.createFormData("fileUpload", file.getName(), requestFile);
BaseApiFactory.uploadPhoto(part).subscribe(baseObserver(
......@@ -138,7 +138,7 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
} else {
if (mNeedEsignature != null && mNeedEsignature == 1) {
mView.showDialog();
File file = new File(SignatureActivity.path);
File file = new File(path);
RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
MultipartBody.Part part = MultipartBody.Part.createFormData("fileUpload", file.getName(), requestFile);
BaseApiFactory.uploadPhoto(part).subscribe(baseObserver(
......
orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
......@@ -4,6 +4,7 @@ import android.content.Intent;
import android.content.res.Configuration;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.Environment;
import android.text.Editable;
import android.text.TextUtils;
import android.view.LayoutInflater;
......@@ -52,6 +53,7 @@ import java.util.List;
public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresenter, ActivityMultipleProcessBinding>
implements MultipleProcessContract.View {
private String path = "";
private EditText mDoorPrice;
private EditText mServerPrice;
private EditText mMaterialsPrice;
......@@ -98,11 +100,17 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
@Override
public void initView() {
path = mActivity.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS) + "/dayu/image/signature.png";
mBind.tvTitle.setText(getString(R.string.submit_order));
mBind.recyclerView.mCoreAdapter.addFooterViewType(R.layout.item_multi_process_foot, null);
View view = LayoutInflater.from(mActivity).inflate(R.layout.item_multi_process_foot, null);
mBind.recyclerView.mCoreAdapter.addFootViwe(view, R.layout.item_multi_process_foot);
initFootView(view);
mBind.tvCommit.setOnClickListener(v -> {
String path = getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS) + "/dayu/image/signature.png";
mPresenter.process(path);
});
}
public void initFootView(View view) {
......@@ -585,7 +593,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
mSignature.setClickable(false);
BitmapFactory.Options options = new BitmapFactory.Options();
options.inSampleSize = 2;
Bitmap bm = BitmapFactory.decodeFile(SignatureActivity.path, options);
Bitmap bm = BitmapFactory.decodeFile(path, options);
mIvSignature.setImageBitmap(bm);
}
}
......@@ -593,7 +601,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
@Override
protected void onDestroy() {
super.onDestroy();
File file = new File(SignatureActivity.path);
File file = new File(path);
if (file.exists()) {
file.delete();
}
......
orderCenter/src/main/java/com/dayu/order/ui/activity/SignatureActivity.java
......@@ -2,13 +2,10 @@ package com.dayu.order.ui.activity;
import android.Manifest;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Environment;
import android.text.TextUtils;
import com.dayu.base.ui.activity.CameraActivity;
import com.dayu.base.ui.activity.DataBindingActivity;
import com.dayu.common.Constants;
import com.dayu.order.R;
import com.dayu.order.common.OrderConstant;
import com.dayu.order.databinding.ActivitySignatureLayoutBinding;
......@@ -17,10 +14,6 @@ import com.dayu.utils.ToastUtils;
import java.io.File;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
/**
* Created by luofan
......@@ -28,7 +21,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
*/
public class SignatureActivity extends DataBindingActivity<ActivitySignatureLayoutBinding> {
public static String path = Environment.getExternalStorageDirectory() + "/dayu/image/signature.png";
private String path = "";
@Override
public int getLayoutId() {
......@@ -37,6 +30,7 @@ public class SignatureActivity extends DataBindingActivity<ActivitySignatureLayo
@Override
public void initView() {
path = mActivity.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS) + "/dayu/image/signature.png";
String mpath = getIntent().getStringExtra(OrderConstant.PATH);
mBind.titleRight.setOnClickListener(v -> mBind.view.clear());
mBind.titleBack.setOnClickListener(v -> finish());
......@@ -47,7 +41,7 @@ public class SignatureActivity extends DataBindingActivity<ActivitySignatureLayo
@SuppressLint("CheckResult")
@Override
public void onPermissionGranted() {
File file = new File(Environment.getExternalStorageDirectory() + "/dayu/image/");
File file = new File(mActivity.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS) + "/dayu/image/");
try {
if (!file.exists()) {
file.mkdirs();
......
orderCenter/src/main/res/layout/activity_multiple_process.xml
......@@ -59,12 +59,12 @@
app:needFoot="false" />
<TextView
android:id="@+id/tv_commit"
android:layout_width="match_parent"
android:layout_height="49dp"
android:layout_alignParentBottom="true"
android:background="@color/bg_button"
android:gravity="center"
android:onClick="@{()->presenter.process()}"
android:text="@string/submit_order"
android:textColor="@color/white" />
......
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