浏览代码

修改老师端曲谱bug

Pq 3 年之前
父节点
当前提交
cb539fc120

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/main/MineFragment.java

@@ -347,7 +347,7 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
 
 
     public void getTeacherPromoteInfoSuccess(TeacherPromoteIncomeBean incomeBean) {
-        if (incomeBean != null && mViewBinding.tvPromoteIncomeTip != null) {
+        if (incomeBean != null && mViewBinding != null && mViewBinding.tvPromoteIncomeTip != null) {
             mViewBinding.tvPromoteIncomeTip.setText(String.format("累计收益%s元", incomeBean.amountShare));
         }
     }

+ 14 - 8
teacher/src/main/java/com/cooleshow/teacher/ui/web/AccompanyActivity.java

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Handler;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.WindowManager;
@@ -13,6 +14,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.rx.BaseObserver;
@@ -78,10 +80,15 @@ public class AccompanyActivity extends BaseMVPActivity<ActivityAccompanyBinding,
 
     @Override
     protected void initView() {
-        camera=viewBinding.camera;
-        fl_webview=viewBinding.flWebview;
+        camera = viewBinding.camera;
+        fl_webview = viewBinding.flWebview;
         Intent intent = getIntent();
-        String url = intent.getStringExtra("url");
+        String url = intent.getStringExtra(WebConstants.WEB_URL);
+        if (TextUtils.isEmpty(url)) {
+            finish();
+            Log.i("AccompanyActivity", "url can not null");
+            return;
+        }
 
         int orientation = intent.getIntExtra("orientation", -1);
         boolean isOpenLight = intent.getBooleanExtra("isOpenLight", false);
@@ -200,7 +207,7 @@ public class AccompanyActivity extends BaseMVPActivity<ActivityAccompanyBinding,
                     FileUtils.deleteFile(recordVideFilePath);
                 }
                 String bucket = WebParamsHelper.getParams(jsonObject, "bucket");
-                UploadHelper uploadHelper = new UploadHelper(AccompanyActivity.this,bucket);
+                UploadHelper uploadHelper = new UploadHelper(AccompanyActivity.this, bucket);
                 uploadHelper.uploadFile(file);
                 uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
                     @Override
@@ -293,7 +300,6 @@ public class AccompanyActivity extends BaseMVPActivity<ActivityAccompanyBinding,
     }
 
 
-
     @Override
     protected void onResume() {
         super.onResume();
@@ -331,8 +337,8 @@ public class AccompanyActivity extends BaseMVPActivity<ActivityAccompanyBinding,
             } catch (JSONException e) {
                 e.printStackTrace();
             }
-        }else if (requestCode == 1000) {
-                if (data != null) {
+        } else if (requestCode == 1000) {
+            if (data != null) {
                 try {
                     String filePath = data.getStringExtra("filePath");
                     JSONObject jsonObject = new JSONObject();
@@ -352,7 +358,7 @@ public class AccompanyActivity extends BaseMVPActivity<ActivityAccompanyBinding,
             }
         } else if (requestCode == 1011) {
             String selectAddress = data.getStringExtra("selectAddress");
-            if (null!=accompanyFragment){
+            if (null != accompanyFragment) {
                 accompanyFragment.selectAddress(selectAddress);
             }
         }