瀏覽代碼

修改部分问题

Pq 1 年之前
父節點
當前提交
e111d36857

+ 6 - 9
BaseLibrary/src/main/java/com/cooleshow/base/utils/helper/upload/UploadHelper.java

@@ -9,6 +9,7 @@ import com.cooleshow.base.constanst.UploadConstants;
 import com.cooleshow.base.data.api.UploadApi;
 import com.cooleshow.base.data.net.BaseResponse;
 import com.cooleshow.base.data.net.RetrofitFactory;
+import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.FileUtils;
 import com.cooleshow.base.utils.LOG;
 import com.cooleshow.base.utils.LogUtils;
@@ -305,17 +306,13 @@ public class UploadHelper {
         UploadApi uploadApi = RetrofitFactory.Companion.getInstance().create(UploadApi.class);
         uploadApi.getUploadTokenForTeacher(body, BaseConstant.CLIENT_API_GROUP_NAME).subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<BaseResponse<UploadTokenInfoBean>>() {
-                    @Override
-                    public void onSubscribe(@NonNull Disposable d) {
-
-                    }
+                .subscribe(new BaseObserver<UploadTokenInfoBean>() {
 
                     @Override
-                    public void onNext(@NonNull BaseResponse<UploadTokenInfoBean> response) {
-                        if (response != null && response.getData() != null) {
-                            uploadToken = "KSS " + response.getData().kssAccessKeyId + ":" + response.getData().signature;
-                            uploadSignature = response.getData().signature;
+                    protected void onSuccess(UploadTokenInfoBean data) {
+                        if (data != null) {
+                            uploadToken = "KSS " + data.kssAccessKeyId + ":" + data.signature;
+                            uploadSignature = data.signature;
 //                            doUpload(key, file);
                             doUpload2(key, file);
                         }

+ 4 - 4
student/src/main/java/com/cooleshow/student/widgets/helper/JsInterfaceAccomPanyUtils.java

@@ -52,7 +52,7 @@ public class JsInterfaceAccomPanyUtils extends Object {
             try {
                 JSONObject jsonObject = new JSONObject(message);
                 String api = jsonObject.getString("api");
-                LOG.i("acc api:"+api);
+                LOG.i("acc api:" + api);
                 if ("back".equals(api)) {
                     activity.finish();
                 } else if ("login".equals(api)) {
@@ -70,7 +70,7 @@ public class JsInterfaceAccomPanyUtils extends Object {
                     if (null != contentBean) {
                         String userId = contentBean.optString("userId");
                         String name = contentBean.optString("name");
-                        ChatHelper.getInstance().goChat(userId,name);
+                        ChatHelper.getInstance().goChat(userId, name);
                     }
                 } else if ("videoUpdate".equals(api)) {
                     if (onListener != null) {
@@ -139,7 +139,7 @@ public class JsInterfaceAccomPanyUtils extends Object {
                         statusBarTextColor = content.getBoolean("statusBarTextColor");
                         isOpenLight = content.getBoolean("isOpenLight");
                         orientation = content.getInt("orientation");
-                        c_orientation = content.optInt("c_orientation",ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+                        c_orientation = content.optInt("c_orientation", ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
                     } catch (Exception e) {
                     }
 
@@ -326,7 +326,7 @@ public class JsInterfaceAccomPanyUtils extends Object {
                 if (TextUtils.equals("cloudAccompanyMessage", api)) {
                     JSONObject content = jsonObject.getJSONObject("content");
                     if (onListener != null) {
-                        String accompanyUrl = content.optString("accompanyUrl");
+                        String accompanyUrl = content.isNull("accompanyUrl") ? null : content.optString("accompanyUrl");
                         onListener.saveAccompanimentMp3(accompanyUrl);
                     }
                     return;