|
@@ -52,6 +52,7 @@ import com.cooleshow.base.data.net.RetrofitClientNoToken;
|
|
|
import com.cooleshow.base.router.RouterPath;
|
|
|
import com.cooleshow.base.ui.activity.BaseActivity;
|
|
|
import com.cooleshow.base.utils.AppUtils;
|
|
|
+import com.cooleshow.base.utils.FileUtils;
|
|
|
import com.cooleshow.base.utils.LogUtils;
|
|
|
import com.cooleshow.base.utils.PermissionUtils;
|
|
|
import com.cooleshow.base.utils.ToastUtil;
|
|
@@ -1179,9 +1180,14 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ Log.i("pq", "baseJsonObject:" + baseJsonObject.toString());
|
|
|
if (result != null) {
|
|
|
File file = UriUtils.uri2File(result);
|
|
|
if (file != null && file.exists()) {
|
|
|
+// if (!isMatchFile(file.getAbsolutePath())) {
|
|
|
+// ToastUtil.getInstance().showShort("请上传正确类型的文件");
|
|
|
+// return;
|
|
|
+// }
|
|
|
UploadHelper uploadHelper = new UploadHelper(HtmlActivity.this, buckName);
|
|
|
uploadHelper.uploadFile(file);
|
|
|
uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
|
|
@@ -1231,6 +1237,17 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
|
|
|
|
|
|
}
|
|
|
|
|
|
+ private boolean isMatchFile(String filePath) {
|
|
|
+ try {
|
|
|
+ JSONObject contentJsonObject = baseJsonObject.getJSONObject("content");
|
|
|
+ String type = contentJsonObject.optString("type");
|
|
|
+ return FileUtils.isMatchTargetFileType(type, filePath);
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
private void upLoadFileFaile() {
|
|
|
try {
|
|
|
JSONObject contentObj = baseJsonObject.getJSONObject("content");
|