pk房完成,剩余禁止对方麦未完成
拍卖房完成 点歌房完成,音乐播放需要测试
This commit is contained in:
@@ -52,6 +52,7 @@ dependencies {
|
||||
implementation project(':modulecircle')
|
||||
implementation project(':modulevocal')
|
||||
implementation project(':modulenews')
|
||||
implementation project(':moduleroom')
|
||||
|
||||
testImplementation libs.junit
|
||||
androidTestImplementation libs.ext.junit
|
||||
|
||||
@@ -1,16 +1,26 @@
|
||||
package com.qxcm.modulemain.activity;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.provider.Settings;
|
||||
import android.text.TextUtils;
|
||||
import android.view.View;
|
||||
import android.view.animation.Animation;
|
||||
import android.view.animation.AnimationUtils;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import com.alibaba.android.arouter.facade.annotation.Route;
|
||||
import com.alibaba.android.arouter.launcher.ARouter;
|
||||
import com.blankj.utilcode.util.ActivityUtils;
|
||||
import com.blankj.utilcode.util.FragmentUtils;
|
||||
import com.blankj.utilcode.util.ToastUtils;
|
||||
import com.example.modulecircle.fragment.CircleFragment;
|
||||
import com.example.modulenews.fragment.NewsFragment;
|
||||
import com.example.moduleroom.activity.RoomActivity;
|
||||
import com.example.modulevocal.fragment.VocalRangeFragment;
|
||||
import com.example.modulevoice.fragment.VoiceFragment;
|
||||
import com.qxcm.modulemain.R;
|
||||
@@ -18,10 +28,16 @@ import com.qxcm.modulemain.contacts.HomeContacts;
|
||||
import com.qxcm.modulemain.databinding.ActivityMainBinding;
|
||||
import com.qxcm.modulemain.presenter.HomePresenter;
|
||||
import com.qxcm.moduleutil.activity.BaseMvpActivity;
|
||||
import com.qxcm.moduleutil.base.CommonAppContext;
|
||||
import com.qxcm.moduleutil.event.RoomOutEvent;
|
||||
import com.qxcm.moduleutil.utils.ARouteConstants;
|
||||
import com.qxcm.moduleutil.utils.ImageLoader;
|
||||
import com.qxcm.moduleutil.utils.logger.Logger;
|
||||
|
||||
import org.greenrobot.eventbus.EventBus;
|
||||
|
||||
import org.greenrobot.eventbus.Subscribe;
|
||||
import org.greenrobot.eventbus.ThreadMode;
|
||||
@Route(path = ARouteConstants.ME)
|
||||
public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBinding> implements HomeContacts.View, View.OnClickListener {
|
||||
private static int index = -1;
|
||||
// private AppUpdateDialog appUpdateDialog;
|
||||
@@ -58,17 +74,49 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
|
||||
FragmentUtils.add(getSupportFragmentManager(), fragments, R.id.frame_layout, 0);
|
||||
MvpPre.initData();
|
||||
MvpPre.userFiles();
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
||||
if (!Settings.canDrawOverlays(this)) {
|
||||
Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
|
||||
Uri.parse("package:" + getPackageName()));
|
||||
startActivityForResult(intent, 100);
|
||||
}
|
||||
} else {
|
||||
// 对于低于 Android 6.0 的设备,无需请求悬浮窗权限
|
||||
// 可在此处添加针对旧版本的处理逻辑(如果需要)
|
||||
}
|
||||
|
||||
|
||||
// 每11秒执行一次飘屏消息
|
||||
// new android.os.Handler().postDelayed(new Runnable() {
|
||||
// @Override
|
||||
// public void run() {
|
||||
showPiaoPingMessage("这是一个飘屏消息", 10000); // 5秒飘过
|
||||
|
||||
// 通过递归调用实现循环定时
|
||||
// new android.os.Handler().postDelayed(this, 1000);
|
||||
// }
|
||||
// }, 1000);
|
||||
//
|
||||
}
|
||||
@Override
|
||||
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
|
||||
super.onActivityResult(requestCode, resultCode, data);
|
||||
if (requestCode == 100) {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
||||
if (Settings.canDrawOverlays(this)) {
|
||||
ToastUtils.showShort("已获得悬浮窗权限");
|
||||
// showPiaoPingMessage("测试飘屏", 3000);
|
||||
showPiaoPingMessage("这是一个飘屏消息", 10000); // 5秒飘过
|
||||
} else {
|
||||
ToastUtils.showShort("未获得悬浮窗权限,功能无法使用");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||
public void onUserInfoEvent(String event) {
|
||||
MvpPre.address_ip(event);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onNewIntent(Intent intent) {
|
||||
@@ -91,8 +139,8 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
|
||||
// mBinding.rlParty.setOnClickListener(this);
|
||||
mBinding.rlNews.setOnClickListener(this);
|
||||
mBinding.rlMe.setOnClickListener(this);
|
||||
// mBinding.ivGuanbi.setOnClickListener(this);
|
||||
// mBinding.riv.setOnClickListener(this);
|
||||
mBinding.ivGuanbi.setOnClickListener(this);
|
||||
mBinding.riv.setOnClickListener(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -132,21 +180,22 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
|
||||
//C0101我的界面
|
||||
// AppLogUtil.reportAppLog(AppLogEvent.C0101);
|
||||
}
|
||||
// else if (id == R.id.iv_guanbi) {
|
||||
// mBinding.ll.setVisibility(View.INVISIBLE);
|
||||
// MyApplication.getInstance().isShow = false;
|
||||
// MyApplication.getInstance().isPlaying = false;
|
||||
else if (id == R.id.iv_guanbi) {
|
||||
mBinding.ll.setVisibility(View.INVISIBLE);
|
||||
CommonAppContext.getInstance().isShow = false;
|
||||
CommonAppContext.getInstance().isPlaying = false;
|
||||
// if (RoomActivity.sDestroied) {
|
||||
// MvpPre.quitRoom(MyApplication.getInstance().playId);
|
||||
// MvpPre.quitRoom(CommonAppContext.getInstance().playId);
|
||||
// } else {
|
||||
// EventBus.getDefault().post(new RoomOutEvent());
|
||||
EventBus.getDefault().post(new RoomOutEvent());
|
||||
// }
|
||||
// } else if (id == R.id.riv) {
|
||||
// String roomId = MyApplication.getInstance().playId;
|
||||
// if (!TextUtils.isEmpty(roomId)) {
|
||||
// ARouter.getInstance().build(ARouteConstants.LIVE_ROOM).withString("form", "首页").withString("roomId", roomId).navigation();
|
||||
// }
|
||||
// }
|
||||
}
|
||||
else if (id == R.id.riv) {
|
||||
String roomId = CommonAppContext.getInstance().playId;
|
||||
if (!TextUtils.isEmpty(roomId)) {
|
||||
ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", roomId).navigation();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -220,17 +269,17 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
|
||||
MvpPre.appUpdate();
|
||||
MvpPre.signSwitch();
|
||||
refreshUnread();
|
||||
// boolean b = MyApplication.getInstance().isPlaying;
|
||||
// if (b) {
|
||||
// ImageLoader.loadHead(MainActivity.this, mBinding.riv, MyApplication.getInstance().playCover);
|
||||
// mBinding.riv.postDelayed(mRivAnimationTask, 1000);
|
||||
// mBinding.ll.setVisibility(View.VISIBLE);
|
||||
// } else {
|
||||
// mBinding.ll.setVisibility(View.INVISIBLE);
|
||||
// }
|
||||
// if (MyApplication.getInstance().isPlaying && MyApplication.getInstance().isShow) {
|
||||
// ARouter.getInstance().build(ARouteConstants.LIVE_ROOM).withString("form", "首页").withString("roomId", MyApplication.getInstance().playId).navigation();
|
||||
// }
|
||||
boolean b = CommonAppContext.getInstance().isPlaying;
|
||||
if (b) {
|
||||
ImageLoader.loadHead(MainActivity.this, mBinding.riv, CommonAppContext.getInstance().playCover);
|
||||
mBinding.riv.postDelayed(mRivAnimationTask, 1000);
|
||||
mBinding.ll.setVisibility(View.VISIBLE);
|
||||
} else {
|
||||
mBinding.ll.setVisibility(View.INVISIBLE);
|
||||
}
|
||||
if (CommonAppContext.getInstance().isPlaying && CommonAppContext.getInstance().isShow) {
|
||||
ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", CommonAppContext.getInstance().playId).navigation();
|
||||
}
|
||||
// Logger.i("isPlay", "onResume: " + b + "view:" + mBinding.ll.getVisibility());
|
||||
}
|
||||
|
||||
@@ -248,8 +297,8 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
|
||||
}
|
||||
|
||||
private final Runnable mRivAnimationTask = () -> {
|
||||
// Animation rivRotateAnimation = AnimationUtils.loadAnimation(MainActivity.this, R.anim.rotate_anim);
|
||||
// mBinding.riv.startAnimation(rivRotateAnimation);
|
||||
Animation rivRotateAnimation = AnimationUtils.loadAnimation(MainActivity.this, com.qxcm.moduleutil.R.anim.rotate_anim);
|
||||
mBinding.riv.startAnimation(rivRotateAnimation);
|
||||
};
|
||||
|
||||
private void refreshUnread() {
|
||||
|
||||
@@ -40,5 +40,7 @@ public final class HomeContacts {
|
||||
|
||||
void userFiles();
|
||||
|
||||
void address_ip(String ip);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,6 +15,7 @@ import androidx.annotation.RequiresApi;
|
||||
import com.blankj.utilcode.util.NetworkUtils;
|
||||
import com.blankj.utilcode.util.ThreadUtils;
|
||||
import com.qxcm.modulemain.contacts.HomeContacts;
|
||||
import com.qxcm.moduleutil.http.BaseObserver;
|
||||
import com.qxcm.moduleutil.presenter.BasePresenter;
|
||||
|
||||
import io.reactivex.disposables.Disposable;
|
||||
@@ -130,6 +131,21 @@ public class HomePresenter extends BasePresenter<HomeContacts.View> implements H
|
||||
// });
|
||||
}
|
||||
|
||||
@Override
|
||||
public void address_ip(String ip) {
|
||||
api.address_ip(ip, new BaseObserver<String>() {
|
||||
@Override
|
||||
public void onSubscribe(Disposable d) {
|
||||
addDisposable(d);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNext(String s) {
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initData() {
|
||||
// GrabMarblesManager.INSTANCE.setToken(SpUtils.getToken());
|
||||
|
||||
@@ -173,7 +173,46 @@
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
<com.qxcm.moduleutil.widget.DropView
|
||||
android:id="@+id/ll"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="@dimen/dp_52"
|
||||
android:layout_marginBottom="@dimen/dp_100"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible">
|
||||
|
||||
<com.qxcm.moduleutil.widget.GifAvatarOvalView
|
||||
android:id="@+id/riv"
|
||||
android:layout_width="@dimen/dp_45"
|
||||
android:layout_height="@dimen/dp_45"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_margin="@dimen/dp_4"
|
||||
android:src="@mipmap/default_avatar"
|
||||
app:gav_border_color="#FFF"
|
||||
app:gav_border_width="@dimen/dp_2"
|
||||
app:riv_border_color="#FFF"
|
||||
app:riv_border_width="@dimen/dp_2"
|
||||
app:riv_oval="true" />
|
||||
|
||||
<View
|
||||
android:layout_width="@dimen/dp_1"
|
||||
android:layout_height="@dimen/dp_20"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/dp_7"
|
||||
android:layout_marginRight="@dimen/dp_7"
|
||||
android:background="#FFFFFFFF"
|
||||
android:visibility="visible"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_guanbi"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginRight="@dimen/dp_14"
|
||||
android:src="@mipmap/icon_guanbi" />
|
||||
</com.qxcm.moduleutil.widget.DropView>
|
||||
</RelativeLayout>
|
||||
|
||||
</layout>
|
||||
Reference in New Issue
Block a user