f44ad656d556dL579">579
|
|
takePhoto.setImagePath(imagePath);
|
|
580
|
|
|
|
|
557
|
takePhoto.setFile(file);
|
|
581
|
558
|
Bimp.tempSelectBitmap.add(takePhoto);
|
|
582
|
|
subscriber.onNext(imagePath);
|
|
|
559
|
subscriber.onNext("");
|
|
583
|
560
|
}
|
|
584
|
561
|
subscriber.onComplete();
|
|
585
|
|
|
|
586
|
562
|
} catch (Exception e) {
|
|
587
|
563
|
e.printStackTrace();
|
|
588
|
564
|
subscriber.onError(e);
|
|
|
@ -885,13 +861,10 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
|
|
885
|
861
|
/**
|
|
886
|
862
|
* 表单上传
|
|
887
|
863
|
*
|
|
888
|
|
* @param SAMPLE_PIC_FILE
|
|
889
|
864
|
* @param sign
|
|
890
|
865
|
* @param policyServer
|
|
891
|
866
|
*/
|
|
892
|
|
private void formUpload(String SAMPLE_PIC_FILE, String sign, String policyServer) {
|
|
893
|
|
File temp = new File(SAMPLE_PIC_FILE);
|
|
894
|
|
|
|
|
867
|
private void formUpload(File file, String sign, String policyServer) {
|
|
895
|
868
|
// //进度回调，可为空
|
|
896
|
869
|
UpProgressListener progressListener = new UpProgressListener() {
|
|
897
|
870
|
@Override
|
|
|
@ -929,7 +902,7 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
|
|
929
|
902
|
};
|
|
930
|
903
|
|
|
931
|
904
|
//表单上传（服务器签名方式）
|
|
932
|
|
UploadEngine.getInstance().formUpload(temp, policyServer, OPERATER, sign, completeListener,
|
|
|
905
|
UploadEngine.getInstance().formUpload(file, policyServer, OPERATER, sign, completeListener,
|
|
933
|
906
|
progressListener);
|
|
934
|
907
|
|
|
935
|
908
|
}
|
|
|
@ -76,10 +76,10 @@ public class MainApplication extends MultiDexApplication {
|
|
76
|
76
|
public static String firstPoint = "";
|
|
77
|
77
|
public static Boolean firstSsyd;
|
|
78
|
78
|
public static String password = "";
|
|
79
|
|
public static String url = "http://59.110.68.162";// 充电桩测试环境
|
|
80
|
|
// public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
|
|
81
|
|
public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
|
|
82
|
|
// public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
|
|
|
79
|
// public static String url = "http://59.110.68.162";// 充电桩测试环境
|
|
|
80
|
public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
|
|
|
81
|
// public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
|
|
|
82
|
public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
|
|
83
|
83
|
public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
|
|
84
|
84
|
// public static String url = "https://cdz.d1ev.com";
|
|
85
|
85
|
public static String build_flag = "0";
|
|
|
@ -2,6 +2,7 @@ package com.electric.chargingpile.util;
|
|
2
|
2
|
|
|
3
|
3
|
import android.graphics.Bitmap;
|
|
4
|
4
|
|
|
|
5
|
import java.io.File;
|
|
5
|
6
|
import java.io.IOException;
|
|
6
|
7
|
import java.io.Serializable;
|
|
7
|
8
|
|
|
|
@ -13,6 +14,15 @@ public class ImageItem implements Serializable {
|
|
13
|
14
|
private Bitmap bitmap;
|
|
14
|
15
|
public String fName = "";
|
|
15
|
16
|
public boolean isSelected = false;
|
|
|
17
|
private File file;
|
|
|
18
|
|
|
|
19
|
public File getFile() {
|
|
|
20
|
return file;
|
|
|
21
|
}
|
|
|
22
|
|
|
|
23
|
public void setFile(File file) {
|
|
|
24
|
this.file = file;
|
|
|
25
|
}
|
|
16
|
26
|
|
|
17
|
27
|
public String getImageId() {
|
|
18
|
28
|
return imageId;
|