修改部分错误代码

BaseLibrary/src/main/java/com/cooleshow/base/utils/GlideImageLoaderUtils.java

@@ -76,6 +76,19 @@ public class GlideImageLoaderUtils {
     /**
      * 加载图片(默认)
      */
+    public void loadImage(Context context, Object url, ImageView imageView,int defaultRes) {
+        RequestOptions options = new RequestOptions()
+                .centerCrop()
+                .placeholder(defaultRes) //占位图
+                .error(defaultRes)       //错误图
+                .diskCacheStrategy(DiskCacheStrategy.NONE);
+        Glide.with(context).load(url).apply(options).into(imageView);
+
+    }
+
+    /**
+     * 加载图片(默认)
+     */
     public void loadImageCenterInside(Context context, Object url, ImageView imageView) {
         RequestOptions options = new RequestOptions()
                 .centerInside()

BaseLibrary/src/main/java/com/cooleshow/base/utils/TimeUtils.java

@@ -1653,4 +1653,16 @@ public final class TimeUtils {
         date = formatter.parse(strTime);
         return date;
     }
+
+    public static String secondToTime(int second) {
+//        int hour = second / 3600; // 得到分钟数
+//        second = second % 3600;//剩余的秒数
+        int minute = second / 60;//得到分
+        second = second % 60;//剩余的秒
+        return String.format(Locale.getDefault(), "%02d:%02d", minute, second);
+    }
+
+    public static String msToTime(int ms) {
+        return secondToTime(ms/1000);
+    }
 }

BaseLibrary/src/main/java/com/cooleshow/base/widgets/dialog/CommonConfirmDialog.java

@@ -18,6 +18,7 @@ public class CommonConfirmDialog extends Dialog {
     private TextView mTvContent;
     private TextView mTvCancel;
     private TextView mTvConfirm;
+    private View mViewLine1;
 
     public CommonConfirmDialog(@NonNull Context context) {
         super(context, R.style.BaseDialog);
@@ -30,6 +31,7 @@ public class CommonConfirmDialog extends Dialog {
         mTvContent = findViewById(R.id.tv_content);
         mTvCancel = findViewById(R.id.tv_cancel);
         mTvConfirm = findViewById(R.id.tv_confirm);
+        mViewLine1 = findViewById(R.id.view_line1);
         mTvCancel.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -76,4 +78,13 @@ public class CommonConfirmDialog extends Dialog {
             mTvConfirm.setOnClickListener(listener);
         }
     }
+
+    public void hideCancel() {
+        if (mViewLine1 != null) {
+            mViewLine1.setVisibility(View.GONE);
+        }
+        if (mTvCancel != null) {
+            mTvCancel.setVisibility(View.GONE);
+        }
+    }
 }

chatModule/build.gradle

@@ -55,7 +55,7 @@ dependencies {
     api project(':tuisearch')
     api project(':tuigroup')
     api project(':tuiofflinepush')
-    api project(':tuicallkit')
+//    api project(':tuicallkit')
     //ARouter
     annotationProcessor("com.alibaba:arouter-compiler:$rootProject.ext.android.arouter_api_version")
     implementation 'com.alibaba:arouter-api:1.5.2'

settings.gradle

@@ -74,9 +74,10 @@ include ':tuiofflinepush'
 project(':tuiofflinepush').projectDir = new File(settingsDir, '/TUIKit/TUIOfflinePush/tuiofflinepush')
 
 
-// 引入音视频通话功能模块
-include ':tuicallkit'
-project(':tuicallkit').projectDir = new File(settingsDir, '/TUIKit/TUICallKit/tuicallkit')
+//// 引入音视频通话功能模块
+//include ':tuicallkit'
+//project(':tuicallkit').projectDir = new File(settingsDir, '/TUIKit/TUICallKit/tuicallkit')
 
 
 include ':chatModule'
+include ':tclive'

student/src/main/java/com/cooleshow/student/helper/ShareHelper.java

@@ -45,12 +45,12 @@ public class ShareHelper {
 
     public static void saveImg(Context context, String base64, ResultCallBack resultCallBack) {
         Observable.create(new ObservableOnSubscribe<File>() {
-            @Override
-            public void subscribe(ObservableEmitter<File> emitter) throws Exception {
-                File file = saveImgToLocalFile(base64);
-                emitter.onNext(file);
-            }
-        }).subscribeOn(Schedulers.newThread())
+                    @Override
+                    public void subscribe(ObservableEmitter<File> emitter) throws Exception {
+                        File file = saveImgToLocalFile(base64);
+                        emitter.onNext(file);
+                    }
+                }).subscribeOn(Schedulers.newThread())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Observer<File>() {
                     @Override
@@ -93,12 +93,12 @@ public class ShareHelper {
 
     public static void saveImg(Context context, Bitmap bitmap, ResultCallBack resultCallBack) {
         Observable.create(new ObservableOnSubscribe<File>() {
-            @Override
-            public void subscribe(ObservableEmitter<File> emitter) throws Exception {
-                File file = saveImageToGallery(bitmap);
-                emitter.onNext(file);
-            }
-        }).subscribeOn(Schedulers.newThread())
+                    @Override
+                    public void subscribe(ObservableEmitter<File> emitter) throws Exception {
+                        File file = saveImageToGallery(bitmap);
+                        emitter.onNext(file);
+                    }
+                }).subscribeOn(Schedulers.newThread())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Observer<File>() {
                     @Override
@@ -177,7 +177,33 @@ public class ShareHelper {
         void onResult(boolean isSuccess);
     }
 
+    public static void parseShareContactData(File file, Intent data) {
+        if (data == null) {
+            return;
+        }
+        String targetId = data.getStringExtra("targetId");
+        int conversationValue = data.getIntExtra("conversation", -1);
+        if (file != null) {
+            if (!file.exists()) {
+                return;
+            }
+            IMShareHelper.toShare(file, targetId, ChatGroupHelper.isGroupConversation(conversationValue), new IMShareHelper.ResultCallBack() {
+                @Override
+                public void onResult(boolean isSuccess) {
+                    if (isSuccess) {
+                        ToastUtil.getInstance().showShort("分享成功");
+                    } else {
+                        ToastUtil.getInstance().showShort("分享失败");
+                    }
+                }
+            });
+        }
+    }
+
     public static void parseShareContactData(String base64, Intent data) {
+        if (data == null) {
+            return;
+        }
         String targetId = data.getStringExtra("targetId");
         int conversationValue = data.getIntExtra("conversation", -1);
         if (!TextUtils.isEmpty(base64)) {