Merge remote-tracking branch 'upstream/master'

jinanzhuan · jinanzhuan · commit 17e6a483e628 · 2021-04-28T11:55:34.000+08:00
diff --git a/ease-call-kit/build.gradle b/ease-call-kit/build.gradle
@@ -36,14 +36,15 @@ android {
 dependencies {
     //implementation fileTree(dir: 'libs', include: ['*.jar'])
     //api project(':hyphenatechatsdk')
-    implementation 'io.hyphenate:hyphenate-chat:3.8.0'
+    implementation 'io.hyphenate:hyphenate-chat:3.8.1'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.navigation:navigation-fragment:2.3.2'
     implementation 'androidx.navigation:navigation-ui:2.3.2'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'io.agora.rtc:full-sdk:3.2.1'
+    implementation 'io.agora.rtc:full-sdk:3.3.0'
+    implementation 'com.github.bumptech.glide:glide:4.9.0'
 }
 
 //apply from: "../upload_aar.gradle"
diff --git a/ease-call-kit/src/main/java/com/hyphenate/easecallkit/base/EaseCallKitConfig.java b/ease-call-kit/src/main/java/com/hyphenate/easecallkit/base/EaseCallKitConfig.java
@@ -85,4 +85,11 @@ public boolean isEnableRTCToken() {
     public void setEnableRTCToken(boolean enableRTCToken) {
         this.enableRTCToken = enableRTCToken;
     }
+
+    public void setUserInfo(String userName, EaseCallUserInfo userInfo){
+        if(userInfoMap == null){
+            userInfoMap = new HashMap<>();
+        }
+        userInfoMap.put(userName,userInfo);
+    }
 }
diff --git a/ease-call-kit/src/main/java/com/hyphenate/easecallkit/base/EaseCallKitListener.java b/ease-call-kit/src/main/java/com/hyphenate/easecallkit/base/EaseCallKitListener.java
@@ -63,4 +63,10 @@ public interface EaseCallKitListener{
      *
      */
     void onInViteCallMessageSent();
+
+
+    /**
+     *远端用户加入频道回调
+     */
+    void onRemoteUserJoinChannel(String channelName, String userName, int uid, EaseGetUserAccountCallback callback);
 }
diff --git a/ease-call-kit/src/main/java/com/hyphenate/easecallkit/base/EaseCallKitTokenCallback.java b/ease-call-kit/src/main/java/com/hyphenate/easecallkit/base/EaseCallKitTokenCallback.java
@@ -12,7 +12,7 @@ public interface EaseCallKitTokenCallback {
      *
      * @param token  token的值
      */
-    void onSetToken(String token);
+    void onSetToken(String token,int uId);
 
     /**
      * \~chinese
diff --git a/ease-call-kit/src/main/java/com/hyphenate/easecallkit/base/EaseCallMemberView.java b/ease-call-kit/src/main/java/com/hyphenate/easecallkit/base/EaseCallMemberView.java
@@ -14,6 +14,8 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.FutureTarget;
 import com.hyphenate.easecallkit.R;
 import com.hyphenate.easecallkit.utils.EaseCallKitUtils;
 import io.agora.rtc.models.UserInfo;
@@ -77,7 +79,6 @@ private void init() {
         audioOffView = (ImageView) findViewById(R.id.icon_mute);
         talkingView = (ImageView) findViewById(R.id.icon_talking);
         nameView = (TextView) findViewById(R.id.text_name);
-       // animator = new ValueAnimator();
         loading_dialog = findViewById(R.id.member_loading);
     }
 
@@ -102,11 +103,26 @@ public void setUserInfo(UserInfo info){
             if(headUrl != null){
                 loadHeadImage();
             }else{
-                avatarView.setBackgroundResource(R.drawable.call_memberview_background);
+                avatarView.setImageResource(R.drawable.call_memberview_background);
             }
         }
     }
 
+    public void updateUserInfo(){
+        if(userInfo != null){
+            nameView.setText(EaseCallKitUtils.getUserNickName(userInfo.userAccount));
+            headUrl = EaseCallKitUtils.getUserHeadImage(userInfo.userAccount);
+            if(headUrl != null){
+                loadHeadImage();
+            }else{
+                avatarView.setImageResource(R.drawable.call_memberview_background);
+            }
+        }
+    }
+
+    public UserInfo getUserInfo(){
+        return  userInfo;
+    }
     public String getUserAccount(){
         if(userInfo != null){
             return userInfo.userAccount;
@@ -160,46 +176,32 @@ public void setSpeak(boolean speak,int volume) {
               audioOffView.setVisibility(VISIBLE);
               if(value == 1){
                   audioOffView.setImageResource(R.drawable.ease_mic_level_01);
-                  //audioOffView.setImageBitmap(BitmapFactory.decodeResource(getResources(),R.drawable.ease_mic_level_01));
               }else if(value == 2){
                   audioOffView.setImageResource(R.drawable.ease_mic_level_02);
-                  //audioOffView.setImageBitmap(BitmapFactory.decodeResource(getResources(),R.drawable.ease_mic_level_02));
               }else if(value == 3){
                   audioOffView.setImageResource(R.drawable.ease_mic_level_03);
-                  //audioOffView.setImageBitmap(BitmapFactory.decodeResource(getResources(),R.drawable.ease_mic_level_03));
               }else if(value ==4){
                   audioOffView.setImageResource(R.drawable.ease_mic_level_04);
-                  //audioOffView.setImageBitmap(BitmapFactory.decodeResource(getResources(),R.drawable.ease_mic_level_04));
               }else if(value ==5){
                   audioOffView.setImageResource(R.drawable.ease_mic_level_05);
-                  //audioOffView.setImageBitmap(BitmapFactory.decodeResource(getResources(),R.drawable.ease_mic_level_05));
               }else if(value ==6){
                   audioOffView.setImageResource(R.drawable.ease_mic_level_06);
-                  //audioOffView.setImageBitmap(BitmapFactory.decodeResource(getResources(),R.drawable.ease_mic_level_06));
               }else if(value ==7){
                   audioOffView.setImageResource(R.drawable.ease_mic_level_07);
-                  //audioOffView.setImageBitmap(BitmapFactory.decodeResource(getResources(),R.drawable.ease_mic_level_07));
               }else if(value ==8){
                   audioOffView.setImageResource(R.drawable.ease_mic_level_08);
-                  //audioOffView.setImageBitmap(BitmapFactory.decodeResource(getResources(),R.drawable.ease_mic_level_08));
               }else if(value ==9){
                   audioOffView.setImageResource(R.drawable.ease_mic_level_09);
-                  //audioOffView.setImageBitmap(BitmapFactory.decodeResource(getResources(),R.drawable.ease_mic_level_09));
               }else if(value ==10){
                   audioOffView.setImageResource(R.drawable.ease_mic_level_10);
-                  //audioOffView.setImageBitmap(BitmapFactory.decodeResource(getResources(),R.drawable.ease_mic_level_10));
               }else if(value ==11){
                   audioOffView.setImageResource(R.drawable.ease_mic_level_11);
-                  //audioOffView.setImageBitmap(BitmapFactory.decodeResource(getResources(),R.drawable.ease_mic_level_11));
               }else if(value ==12){
                   audioOffView.setImageResource(R.drawable.ease_mic_level_12);
-                  //audioOffView.setImageBitmap(BitmapFactory.decodeResource(getResources(),R.drawable.ease_mic_level_12));
               }else if(value ==13){
                   audioOffView.setImageResource(R.drawable.ease_mic_level_13);
-                  //audioOffView.setImageBitmap(BitmapFactory.decodeResource(getResources(),R.drawable.ease_mic_level_13));
               }else if(value == 14){
                   audioOffView.setImageResource(R.drawable.ease_mic_level_14);
-//                  audioOffView.setImageBitmap(BitmapFactory.decodeResource(getResources(),R.drawable.ease_mic_level_14));
               }
         }else{
             audioOffView.setVisibility(GONE);
@@ -245,7 +247,7 @@ public void setUsername(String username) {
         if(headUrl != null){
             avatarView.setImageResource(R.drawable.call_memberview_background);
         }else{
-            avatarView.setImageResource(R.drawable.call_memberview_background);
+            loadHeadImage();
         }
         nameView.setText(EaseCallKitUtils.getUserNickName(username));
     }
@@ -289,19 +291,17 @@ private void loadHeadImage() {
                     @Override
                     protected Bitmap doInBackground(String... params) {
                         Bitmap bitmap = null;
+                        FutureTarget<Bitmap> futureTarget =
+                                Glide.with(getContext())
+                                        .asBitmap()
+                                        .load(headUrl)
+                                        .submit(200, 200);
                         try {
-                            String url = params[0];
-                            URL HttpURL = new URL(url);
-                            HttpURLConnection conn = (HttpURLConnection) HttpURL.openConnection();
-                            conn.setDoInput(true);
-                            conn.connect();
-                            InputStream is = conn.getInputStream();
-                            bitmap = BitmapFactory.decodeStream(is);
-                            is.close();
-                        } catch (IOException e) {
-                            e.printStackTrace();
+                            bitmap = futureTarget.get();
+                        }catch (Exception e){
+                            e.getStackTrace();
                         }
-                        return bitmap;
+                        return  bitmap;
                     }
 
                     //在doInBackground 执行完成后，onPostExecute 方法将被UI 线程调用，
@@ -310,7 +310,7 @@ protected Bitmap doInBackground(String... params) {
                     protected void onPostExecute(Bitmap bitmap) {
                         if (bitmap != null) {
                             avatarView.setImageBitmap(bitmap);
-                            avatarView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+                            avatarView.setScaleType(ImageView.ScaleType.CENTER);
                         }
                     }
                 }.execute(headUrl);
diff --git a/ease-call-kit/src/main/java/com/hyphenate/easecallkit/base/EaseCallUserInfo.java b/ease-call-kit/src/main/java/com/hyphenate/easecallkit/base/EaseCallUserInfo.java
@@ -8,12 +8,17 @@
 public class EaseCallUserInfo {
     private String nickName;
     private String headImage;
+    private String userId;
 
     public  EaseCallUserInfo(String nickName,String headImage){
         this.nickName = nickName;
         this.headImage = headImage;
     }
 
+    public  EaseCallUserInfo(){
+    }
+
+
     public String getNickName() {
         return nickName;
     }
@@ -29,4 +34,8 @@ public String getHeadImage() {
     public void setHeadImage(String headImage) {
         this.headImage = headImage;
     }
+
+    public String getUserId() { return userId; }
+
+    public void setUserId(String userId) { this.userId = userId; }
 }
diff --git a/ease-call-kit/src/main/java/com/hyphenate/easecallkit/base/EaseGetUserAccountCallback.java b/ease-call-kit/src/main/java/com/hyphenate/easecallkit/base/EaseGetUserAccountCallback.java
@@ -0,0 +1,28 @@
+package com.hyphenate.easecallkit.base;
+
+import java.util.List;
+
+
+/**
+ * 用户返回EaseUserAccount(加入频道的uId及对应的环信ID)
+ * onUserAccount          为返回channel里面存在用户的EaseUserAccount
+ * onSetUserAccountError 为返回channel信息错误的回调(错误码和错误描述)
+ */
+public interface EaseGetUserAccountCallback {
+    /**
+     *  \~chinese
+     * 获取到channel里面的用户信息
+     *
+     * @param userAccounts 用于加入channel用户Id信息
+     */
+    void onUserAccount(List<EaseUserAccount> userAccounts);
+
+    /**
+     * \~chinese
+     * 获取uid失败的错误回调
+     *
+     * @param error   获取uid失败的错误码
+     * @param errorMsg  获取uid失败的错误信息描述
+     */
+    void onSetUserAccountError(int error, final String errorMsg);
+}
diff --git a/ease-call-kit/src/main/java/com/hyphenate/easecallkit/base/EaseUserAccount.java b/ease-call-kit/src/main/java/com/hyphenate/easecallkit/base/EaseUserAccount.java
@@ -0,0 +1,36 @@
+package com.hyphenate.easecallkit.base;
+
+/**
+ * 用户账号信息
+ * uid      加入声网频道的uId
+ * userName  uid对应的环信Id
+ */
+public class EaseUserAccount {
+    private int uid;
+    private String userName;
+
+    public EaseUserAccount(){
+
+    }
+
+    public EaseUserAccount(int uid,String userName){
+        this.uid = uid;
+        this.userName = userName;
+    }
+
+    public int getUid() {
+        return uid;
+    }
+
+    public void setUid(int uid) {
+        this.uid = uid;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+}
diff --git a/ease-call-kit/src/main/java/com/hyphenate/easecallkit/ui/EaseCommingCallView.java b/ease-call-kit/src/main/java/com/hyphenate/easecallkit/ui/EaseCommingCallView.java
@@ -14,6 +14,11 @@
 import android.widget.TextView;
 
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.FutureTarget;
+import com.hyphenate.easecallkit.EaseCallKit;
+import com.hyphenate.easecallkit.base.EaseCallUserInfo;
+import com.hyphenate.easecallkit.livedatas.EaseLiveDataBus;
 import com.hyphenate.util.EMLog;
 
 import java.io.IOException;
@@ -103,19 +108,17 @@ private void loadHeadImage() {
                     @Override
                     protected Bitmap doInBackground(String... params) {
                         Bitmap bitmap = null;
+                        FutureTarget<Bitmap> futureTarget =
+                                Glide.with(getContext())
+                                        .asBitmap()
+                                        .load(headUrl)
+                                        .submit(500, 500);
                         try {
-                            String url = params[0];
-                            URL HttpURL = new URL(url);
-                            HttpURLConnection conn = (HttpURLConnection) HttpURL.openConnection();
-                            conn.setDoInput(true);
-                            conn.connect();
-                            InputStream is = conn.getInputStream();
-                            bitmap = BitmapFactory.decodeStream(is);
-                            is.close();
-                        } catch (IOException e) {
-                            e.printStackTrace();
+                            bitmap = futureTarget.get();
+                        }catch (Exception e){
+                            e.getStackTrace();
                         }
-                        return bitmap;
+                        return  bitmap;
                     }
 
                     //在doInBackground 执行完成后，onPostExecute 方法将被UI 线程调用，
diff --git a/ease-call-kit/src/main/java/com/hyphenate/easecallkit/ui/EaseMultipleVideoActivity.java b/ease-call-kit/src/main/java/com/hyphenate/easecallkit/ui/EaseMultipleVideoActivity.java
diff --git a/ease-call-kit/src/main/java/com/hyphenate/easecallkit/ui/EaseVideoCallActivity.java b/ease-call-kit/src/main/java/com/hyphenate/easecallkit/ui/EaseVideoCallActivity.java
diff --git a/ease-call-kit/src/main/java/com/hyphenate/easecallkit/utils/EaseCallKitUtils.java b/ease-call-kit/src/main/java/com/hyphenate/easecallkit/utils/EaseCallKitUtils.java

Original file line number	Diff line number	Diff line change
`@@ -85,4 +85,11 @@ public boolean isEnableRTCToken() {`
`85`	`85`	`public void setEnableRTCToken(boolean enableRTCToken) {`
`86`	`86`	`this.enableRTCToken = enableRTCToken;`
`87`	`87`	`}`
	`88`	`+`
	`89`	`+ public void setUserInfo(String userName, EaseCallUserInfo userInfo){`
	`90`	`+ if(userInfoMap == null){`
	`91`	`+ userInfoMap = new HashMap<>();`
	`92`	`+ }`
	`93`	`+ userInfoMap.put(userName,userInfo);`
	`94`	`+ }`
`88`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,4 +63,10 @@ public interface EaseCallKitListener{`
`63`	`63`	`*`
`64`	`64`	`*/`
`65`	`65`	`void onInViteCallMessageSent();`
	`66`	`+`
	`67`	`+`
	`68`	`+ /**`
	`69`	`+ *远端用户加入频道回调`
	`70`	`+ */`
	`71`	`+ void onRemoteUserJoinChannel(String channelName, String userName, int uid, EaseGetUserAccountCallback callback);`
`66`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public interface EaseCallKitTokenCallback {`
`12`	`12`	`*`
`13`	`13`	`* @param token token的值`
`14`	`14`	`*/`
`15`		`- void onSetToken(String token);`
	`15`	`+ void onSetToken(String token,int uId);`
`16`	`16`
`17`	`17`	`/**`
`18`	`18`	`* \~chinese`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,17 @@`
`8`	`8`	`public class EaseCallUserInfo {`
`9`	`9`	`private String nickName;`
`10`	`10`	`private String headImage;`
	`11`	`+ private String userId;`
`11`	`12`
`12`	`13`	`public EaseCallUserInfo(String nickName,String headImage){`
`13`	`14`	`this.nickName = nickName;`
`14`	`15`	`this.headImage = headImage;`
`15`	`16`	`}`
`16`	`17`
	`18`	`+ public EaseCallUserInfo(){`
	`19`	`+ }`
	`20`	`+`
	`21`	`+`
`17`	`22`	`public String getNickName() {`
`18`	`23`	`return nickName;`
`19`	`24`	`}`
`@@ -29,4 +34,8 @@ public String getHeadImage() {`
`29`	`34`	`public void setHeadImage(String headImage) {`
`30`	`35`	`this.headImage = headImage;`
`31`	`36`	`}`
	`37`	`+`
	`38`	`+ public String getUserId() { return userId; }`
	`39`	`+`
	`40`	`+ public void setUserId(String userId) { this.userId = userId; }`
`32`	`41`	`}`