yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
oujunhui
2020-05-20 17:14:34 +08:00
parent cfd4d70cd2
commit 43e07e4dab
5 changed files with 14 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View File

@@ -16,7 +16,7 @@
<!-- Required -->
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />-->
<uses-permission android:name="android.permission.GET_TASKS" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
@@ -27,7 +27,7 @@
tools:node="remove" />
<!-- 云信权限声明 -->
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<!-- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />-->
<!-- 控制呼吸灯，振动器等，用于新消息提醒 -->
<uses-permission android:name="android.permission.FLASHLIGHT" />

86
app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java
View File

@@ -302,16 +302,6 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
mFragmentsBottom.add(HomeDynamicFragment.newInstance());
mFragmentsBottom.add(HomePlayFragment.newInstance());
//init viewpager
// mBinding.viewPagerBottom.setAdapter(new RoomContributeListAdapter(getChildFragmentManager(), fragmentList));
//
// mBinding.viewPagerBottom.addOnPageChangeListener(new OnPageSelectedListener() {
// @Override
// public void onPageSelected(int position) {
// StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_SQUARE_RECOMMEND_FOLLOW,
// "切换推荐和关注tab-区分-" + ((position == 0) ? "动态" : "聊天交友"));
// }
// });
CommonNavigator commonNavigator = new CommonNavigator(getContext());
MainMagicIndicatorAdapter magicIndicatorAdapter = new MainMagicIndicatorAdapter(getContext(), tagList, false);
magicIndicatorAdapter.setOnBottomItemSelectListener(this);
@@ -673,9 +663,6 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
private void refreshData() {
isUserLogin = true;
UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
//登录的时候显示位置，更好的
Log.i("startLocation", "refreshData");
startLocation();
// 超管不展示开房按钮
mBinding.setOpenVisible(!(userInfo != null && userInfo.getPlatformRole() == 1));
initRoomTitleTab();
@@ -825,77 +812,4 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
mBinding.rollView.setVisibility(View.VISIBLE);
bannerAdapter.notifyDataSetChanged();
}
@SuppressLint("CheckResult")
@Subscribe(threadMode = ThreadMode.MAIN)
public void onLocationUploadEvent(LocationUploadEvent event) {
Log.i("startLocation", "onLocationUploadEvent");
startLocation();
}
@SuppressLint("CheckResult")
private void startLocation() {
Log.i("startLocation", "startLocation");
UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
//登录的时候显示位置，更好的
boolean showLocation = true;
if (userInfo != null && userInfo.getUserExpand() != null) {
showLocation = userInfo.getUserExpand().isShowLocation();
}
if (!showLocation) {
return;
}
final boolean tempShowLocation = showLocation;
Observable.create((ObservableOnSubscribe<Integer>) e -> {
//等待10s
int count = 0;
while (!isResumed() && count < 50) {
Thread.sleep(200);
count++;
}
if (isResumed()) {
e.onNext(count);
return;
}
e.onError(new Throwable("wait too long"));
})
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.flatMap((Function<Integer, ObservableSource<Boolean>>) aBoolean
-> checkPermission(Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.ACCESS_FINE_LOCATION))
.compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
.doOnNext(aBoolean -> {
Log.i("startLocation", "result:" + aBoolean);
LocationManager.saveUploadTime();
if (aBoolean) {
if (mLocationClient != null) {
mLocationClient.startLocation();
}
} else {
toast("给予位置权限更好的展示您的位置信息");
Log.i("startLocation", "tempShowLocation:" + tempShowLocation);
if (tempShowLocation) {
SettingsModel.get().showLocation(AuthModel.get().getCurrentUid(), false)
.compose(bindUntilEvent(FragmentEvent.DESTROY))
.compose(RxHelper.singleMainResult())
.compose(RxHelper.handleSchAndExce())
.subscribe();
}
}
})
.doOnError(throwable -> {
LogUtil.print("location throwable");
})
.subscribe();
}
}

4
app/src/main/res/layout/fragment_chatroom_game_main.xml
View File

@@ -53,7 +53,7 @@
android:layout_marginEnd="@dimen/dp_5"
android:drawablePadding="5dp"
android:gravity="center_vertical"
android:maxWidth="170dp"
android:maxWidth="150dp"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="15sp"
@@ -130,7 +130,7 @@
android:textSize="@dimen/sp_13"
android:textColor="@color/white"
android:layout_toEndOf="@+id/ll_room_info"
android:layout_marginStart="@dimen/dp_9"
android:layout_marginStart="@dimen/dp_5"
android:gravity="center"
android:layout_marginTop="@dimen/dp_5"
android:background="@drawable/bg_room_follow_room"

15
core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java
View File

@@ -206,8 +206,13 @@ public class GiftValueMrg {
//没人礼物值肯定是0
if (roomQueueInfo != null && roomQueueInfo.giftValueData != null) {
GiftValueData giftValueData = roomQueueInfo.giftValueData;
if (roomQueueInfo.mChatRoomMember == null) {
if (roomQueueInfo.mChatRoomMember != null) {
long micUid = JavaUtil.str2long(roomQueueInfo.mChatRoomMember.getAccount());
long newValue = array.get(micUid, 0L);
if (newValue > 0){
giftValueData.updateValue(newValue);
}
} else {
if (AvRoomDataManager.get().isLeaveMode() && key == -1) { // 离开模式礼物值变化
long micUid = AvRoomDataManager.get().getRoomUid();
long newValue = array.get(micUid, 0L);
@@ -217,12 +222,6 @@ public class GiftValueMrg {
} else{
giftValueData.updateValue(0);
}
} else {
long micUid = JavaUtil.str2long(roomQueueInfo.mChatRoomMember.getAccount());
long newValue = array.get(micUid, 0L);
if (newValue > 0){
giftValueData.updateValue(newValue);
}
}
}
}

6
gradle.properties
View File

@@ -18,8 +18,8 @@ android.injected.testOnly=false
android.useAndroidX=true
android.enableJetifier=true
with_jenkins=false
#打支持x86的模拟器包使用
#\u6253\u652F\u6301x86\u7684\u6A21\u62DF\u5668\u5305\u4F7F\u7528
ndk_abi_filters=arm
version_name=1.0.0
version_code=100
version_name=1.0.1
version_code=101