优化网络教室代码

classRoom/src/main/java/com/dayayuemeng/classroom/helper/OpenClassRoomHelper.java

@@ -58,7 +58,8 @@ public class OpenClassRoomHelper {
     private static void checkPermission(FragmentActivity activity, String sealClassId, String subjectName) {
         String[] permissions = new String[]{Manifest.permission.MODIFY_AUDIO_SETTINGS,
                 Manifest.permission.RECORD_AUDIO,
-                Manifest.permission.CAMERA};
+                Manifest.permission.CAMERA,
+                Manifest.permission.WRITE_EXTERNAL_STORAGE};
         PermissionTipHelper.getInstance().showTipDialog(activity, permissions);
 
         Disposable subscribe = new RxPermissions(activity)
@@ -117,6 +118,6 @@ public class OpenClassRoomHelper {
 //                PermissionUtils.toSelfSetting(activity);
 //            }
 //        });
-        UiUtils.showPermissionTipDialog(activity.getSupportFragmentManager(),activity,"提示","请开启相机和麦克风访问权限");
+        UiUtils.showPermissionTipDialog(activity.getSupportFragmentManager(), activity, "提示", "请开启相机和麦克风访问权限");
     }
 }

classRoom/src/main/java/com/dayayuemeng/classroom/repository/ClassRepository.java

@@ -87,6 +87,7 @@ public class ClassRepository extends BaseRepository {
         bodyMap.put(PARAM_ROOM_ID, roomId);
         bodyMap.put(PARAM_USER_ID, userId);
         bodyMap.put("deviceNum", DeviceUtils.getAndroidID());
+        bodyMap.put("clientType",  ClientUtils.getClientType());
         sealClassService.leave(RetrofitUtil.createJsonRequest(bodyMap)).enqueue(new CallBackWrapper<Boolean>(callBack));
     }
 
@@ -96,6 +97,7 @@ public class ClassRepository extends BaseRepository {
         HashMap<String, Object> bodyMap = new HashMap<>();
         bodyMap.put(PARAM_ROOM_ID, roomId);
         bodyMap.put(PARAM_USER_ID, userId);
+        bodyMap.put("clientType",  ClientUtils.getClientType());
         sealClassService.kickOff(RetrofitUtil.createJsonRequest(bodyMap)).enqueue(new CallBackWrapper<Boolean>(callBack));
     }
 

tclive/src/main/java/com/daya/tclive/manager/TRTCSdkManager.java

@@ -14,7 +14,6 @@ import com.tencent.trtc.TRTCCloud;
 import com.tencent.trtc.TRTCCloudDef;
 import com.tencent.trtc.TRTCCloudListener;
 
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
@@ -121,7 +120,7 @@ public class TRTCSdkManager {
             params.put("level", level);
             jsonObject.put("params", params);
             mCloud.callExperimentalAPI(jsonObject.toString());
-        } catch (JSONException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -142,7 +141,7 @@ public class TRTCSdkManager {
             params.put("level", level);
             jsonObject.put("params", params);
             mCloud.callExperimentalAPI(jsonObject.toString());
-        } catch (JSONException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -163,7 +162,7 @@ public class TRTCSdkManager {
             params.put("level", level);
             jsonObject.put("params", params);
             mCloud.callExperimentalAPI(jsonObject.toString());
-        } catch (JSONException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -343,10 +342,12 @@ public class TRTCSdkManager {
 
     public void setRemoteRenderParams(String targetId, int type, int fillMode, int mirrorType) {
         // 将远端用户 denny 的主路画面设置为填充模式，并开启左右镜像模式
-        TRTCCloudDef.TRTCRenderParams param = new TRTCCloudDef.TRTCRenderParams();
-        param.fillMode = fillMode;
-        param.mirrorType = mirrorType;//TRTCCloudDef.TRTC_VIDEO_MIRROR_TYPE_DISABLE;
-        mCloud.setRemoteRenderParams(targetId, type, param);
+        if (mCloud != null) {
+            TRTCCloudDef.TRTCRenderParams param = new TRTCCloudDef.TRTCRenderParams();
+            param.fillMode = fillMode;
+            param.mirrorType = mirrorType;//TRTCCloudDef.TRTC_VIDEO_MIRROR_TYPE_DISABLE;
+            mCloud.setRemoteRenderParams(targetId, type, param);
+        }
     }
 
     public void stopRemoteView(String targetId, int type) {