From 43e07e4dabb200b70e9a38ee0f14a9555f8d529b Mon Sep 17 00:00:00 2001
From: oujunhui <313127320@qq.com>
Date: Wed, 20 May 2020 17:14:34 +0800
Subject: [PATCH] bugfix

---
 app/src/main/AndroidManifest.xml              |  4 +-
 .../erban/home/fragment/GameHomeFragment.java | 86 -------------------
 .../layout/fragment_chatroom_game_main.xml    |  4 +-
 .../room/giftvalue/helper/GiftValueMrg.java   | 15 ++--
 gradle.properties                             |  6 +-
 5 files changed, 14 insertions(+), 101 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 290ff706a..50e2a24f5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -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" />
diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java
index 757e11304..424d81327 100644
--- a/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java
@@ -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();
-    }
-
-
 }
diff --git a/app/src/main/res/layout/fragment_chatroom_game_main.xml b/app/src/main/res/layout/fragment_chatroom_game_main.xml
index 0202fe430..3dfc0bcaa 100644
--- a/app/src/main/res/layout/fragment_chatroom_game_main.xml
+++ b/app/src/main/res/layout/fragment_chatroom_game_main.xml
@@ -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"
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java
index 60fa8981c..294cf4725 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java
@@ -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);
-                    }
                 }
             }
         }
diff --git a/gradle.properties b/gradle.properties
index fa183bffa..cc210702d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -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
\ No newline at end of file
+version_name=1.0.1
+version_code=101
\ No newline at end of file