android/pipIrrApp.git

			@@ -17,6 +17,7 @@
			import com.dayu.pipirrapp.bean.net.CodeResult;
			import com.dayu.pipirrapp.bean.net.UplodFileState;
			import com.dayu.pipirrapp.bean.net.WeatherResponse;
			import com.dayu.pipirrapp.bean.net.UploadFileResult;
			import com.dayu.pipirrapp.net.subscribers.BaseProgressSubscriber;
			import com.dayu.pipirrapp.net.subscribers.CodeListener;
			import com.dayu.pipirrapp.net.subscribers.ProgressSubscriber;
			@@ -28,7 +29,6 @@
			import com.dayu.pipirrapp.utils.MyJsonParser;
			import com.dayu.pipirrapp.utils.MyLog;
			import com.dayu.pipirrapp.utils.NetUtils;
			import com.google.gson.internal.LinkedTreeMap;

			import java.io.File;
			import java.util.HashMap;
			@@ -313,13 +313,18 @@
			int progress = (int) (100 * bytesWritten / contentLength);
			// 例如：更新 ProgressBar 或显示进度
			runOnUiThread(() -> {
			if (progress <5) {
			uplodData.setProgress(0);
			}
			// 进度条更新代码
			if (adapter != null && uplodData.getAdapterPosition() != -1) {
			//优化不频繁更新进度
			if (progress - uplodData.getProgress() > 5 \|\| progress == 100){
			if (progress - uplodData.getProgress() > 5 \|\| progress == 100) {
			uplodData.setProgress(progress);
			adapter.updateProgress(uplodData);

			}

			}
			MyLog.d("progressRequestBodyHolder>>>path" + "adapterPosition:" + uplodData.getAdapterPosition() + ">>>上传进度: " + progress + "%");
			});
			@@ -327,7 +332,7 @@
			});
			MultipartBody.Part body = MultipartBody.Part.createFormData("file", file.getName(), progressRequestBody);
			RequestBody description = RequestBody.create(MediaType.parse("text/plain"), "file description");
			Call<BaseResponse> uploadFile = null;
			Call<BaseResponse<UploadFileResult>> uploadFile = null;
			switch (uplodData.getUploadType()) {
			case UplodFileState.IMG_TYPE:
			uploadFile = apiService.uploadImgFile(body, description);
			@@ -341,14 +346,17 @@
			}

			uplodData.setThisCall(uploadFile);
			uploadFile.enqueue(new Callback<BaseResponse>() {
			uploadFile.enqueue(new Callback<BaseResponse<UploadFileResult>>() {
			@Override
			public void onResponse(Call<BaseResponse> call, Response<BaseResponse> response) {
			public void onResponse(Call<BaseResponse<UploadFileResult>> call, Response<BaseResponse<UploadFileResult>> response) {
			if (response.body() != null) {
			if (response.body().isSuccess()) {
			UploadFileResult uploadFileResult=response.body().getContent();
			uplodData.setState(STATE_DONE);
			uplodData.setPostId(((LinkedTreeMap) response.body().getContent()).get("id").toString());
			uplodData.setWebPath(((LinkedTreeMap) response.body().getContent()).get("webPath").toString());
			uplodData.setPostId(uploadFileResult.getId());
			uplodData.setUoloadFilePath(uploadFileResult.getFilePath());
			uplodData.setHash(uploadFileResult.getHash());
			uplodData.setWebPathZip(uploadFileResult.getWebPathZip());
			listener.onBack(uplodData);
			} else {
			MyLog.d("progressRequestBody>>>" + response.body().getMsg());
			@@ -366,7 +374,7 @@
			}

			@Override
			public void onFailure(Call<BaseResponse> call, Throwable t) {
			public void onFailure(Call<BaseResponse<UploadFileResult>> call, Throwable t) {
			MyLog.d("progressRequestBody>>>" + "onFailure:" + t.getMessage());
			if (!t.getMessage().equals("Canceled")) {
			uplodData.setState(STATE_ERROR);