Merge remote-tracking branch 'origin/master'

common/src/main/java/com/yunbao/common/manager/IMLoginManager.java

@@ -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);
 
     }
 

common/src/main/java/com/yunbao/common/utils/RouteUtil.java

@@ -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();
+    }
     /**
      * 打开直播页面
      */

common/src/main/java/com/yunbao/common/views/floatingview/APPEasyFloat.java

@@ -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();
+        }
     }
 }

common/src/main/java/com/yunbao/common/views/floatingview/MagnetViewListener.java

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

common/src/main/java/com/yunbao/common/views/weight/LiveFloatView.java

@@ -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);

common/src/main/res/layout/view_effects_settings.xml

@@ -57,7 +57,7 @@
 
         <ImageView
             android:id="@+id/special_mount_switch"
-            android:layout_width="40.8dp"
+            android:layout_width="37dp"
             android:layout_height="24.8dp"
             android:layout_gravity="end|center_vertical"
             android:src="@mipmap/special_icon_off" />

common/src/main/res/values-en/strings.xml

@@ -921,4 +921,14 @@ Limited ride And limited avatar frame</string>
     <string name="system_window">ALL Minimize Play</string>
     <string name="system_window_hint">Show on other apps and pages \n Need to open the display</string>
     <string name="to_open_the">Go to open</string>
+    <string name="do_you_like">Don\'t like the small window play?\n You can turn it off in [Personal Center] - [Settings]</string>
+    <string name="to_set_up">Go to Settings</string>
+    <string name="know_the">Got it</string>
+    <string name="individual_set">Personal Settings</string>
+    <string name="reward">Rewards</string>
+    <string name="change_the_password">Change password</string>
+    <string name="blacklist">Blacklist</string>
+    <string name="alerts">Message Settings</string>
+    <string name="studio_gift_effects">Blocking gift effects</string>
+    <string name="studio_ride_effects">Blocking seat effects</string>
 </resources>

common/src/main/res/values/strings.xml

@@ -933,4 +933,14 @@
     <string name="system_window">APP全應用小窗播放</string>
     <string name="system_window_hint">在其他應用上及所有界面显示小窗\n需打開懸浮窗權限。</string>
     <string name="to_open_the">前往打開</string>
+    <string name="do_you_like">不喜歡小窗播放吗？\n 可以在「個人中心」-「設定」中關閉</string>
+    <string name="to_set_up">去設置</string>
+    <string name="know_the">知道了</string>
+    <string name="individual_set">個人設定</string>
+    <string name="reward">獎勵</string>
+    <string name="change_the_password">修改密碼</string>
+    <string name="blacklist">黑名单</string>
+    <string name="alerts">消息通知</string>
+    <string name="studio_gift_effects">屏蔽直播間禮物特效</string>
+    <string name="studio_ride_effects">屏蔽直播間座駕特效</string>
 </resources>