yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zlzw
2022-10-22 13:15:53 +08:00
parent f51237f04a 1ecad0f89f
commit 77f5d89f28
20 changed files with 735 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
View File

@@ -32,6 +32,21 @@ public class IMLoginManager extends BaseCacheManager {
private final static String IS_CHAT = "isChat";
private final static String IS_SLIDE = "isSlide";
private final static String IS_FLOAT = "is_float";
private final static String IS_HINT = "is_hint";
public boolean isHint() {
return 1 == getInt(IS_HINT, 0);
}
public void initISHint() {
if (getInt(IS_HINT, 0) < 2) {
int number = getInt(IS_HINT, 0) + 1;
put(IS_HINT, number);
}
}
/**
* 存储是否打开悬浮窗权限提示
@@ -43,7 +58,6 @@ public class IMLoginManager extends BaseCacheManager {
}
/**
*
* @return
*/
public boolean isFloat() {
@@ -279,6 +293,7 @@ public class IMLoginManager extends BaseCacheManager {
// IMCenter.getInstance().clearConversations(null, Conversation.ConversationType.PRIVATE);
RongcloudIMManager.logoutIM();
MessageIMManager.get(context).logout();
put(IS_HINT, 0);
}

9
common/src/main/java/com/yunbao/common/utils/RouteUtil.java
View File

@@ -28,6 +28,7 @@ public class RouteUtil {
public static final String PATH_MAIN = "/main/MainActivity";
public static final String PATH_ENTRY = "/main/EntryActivity";
public static final String PATH_LIVE_AUDIENCE = "/live/LiveAudienceActivity";
public static final String PATH_SETTING = "/main/SettingActivity";
/**
* 启动页
@@ -113,7 +114,13 @@ public class RouteUtil {
ARouter.getInstance().build(PATH_EDITPROFILE)
.navigation();
}
/**
* 修改个人资料
*/
public static void forwardSettingActivity() {
ARouter.getInstance().build(PATH_SETTING)
.navigation();
}
/**
* 打开直播页面
*/

3
common/src/main/java/com/yunbao/common/views/floatingview/APPEasyFloat.java
View File

@@ -168,5 +168,8 @@ public class APPEasyFloat implements Application.ActivityLifecycleCallbacks {
FloatingView.get().remove();
FloatingView.get().detach(activity);
activity.getApplication().unregisterActivityLifecycleCallbacks(this);
if (magnetViewListener != null) {
magnetViewListener.dismiss();
}
}
}

2
common/src/main/java/com/yunbao/common/views/floatingview/MagnetViewListener.java
View File

@@ -7,4 +7,6 @@ public interface MagnetViewListener {
void invoke(FloatingMagnetView magnetView);
void onRemove();
void dismiss();
}

10
common/src/main/java/com/yunbao/common/views/weight/LiveFloatView.java
View File

@@ -47,7 +47,7 @@ public class LiveFloatView implements Function1<FloatCallbacks.Builder, Unit> {
return instance;
}
public void builderFloat(Activity mContext, String url,Class<?> back) {
public void builderFloat(Activity mContext, String url, Class<?> back) {
this.mContext = mContext;
this.url = url;
APPEasyFloat.getInstance().layout(R.layout.view_flaot_live)
@@ -77,7 +77,13 @@ public class LiveFloatView implements Function1<FloatCallbacks.Builder, Unit> {
@Override
public void onRemove() {
// mPlayer.stopPlay();
//
}
@Override
public void dismiss() {
if (mPlayer != null)
mPlayer.stopPlay();
}
})
.show(mContext);