1.0.7

app/release/output-metadata.json

@@ -10,9 +10,9 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 106,
-      "versionName": "1.0.6",
-      "outputFile": "com.swago.app-release-1.0.6.apk"
+      "versionCode": 1070,
+      "versionName": "1.0.7.0",
+      "outputFile": "com.swago.app-release-1.0.7.0.apk"
     }
   ]
 }

baseswago/src/main/java/com/swago/baseswago/GradientIndicator.java

@@ -61,7 +61,7 @@ public class GradientIndicator extends View implements IPagerIndicator {
 
     @Override
     protected void onDraw(Canvas canvas) {
-        LinearGradient lg = new LinearGradient(mLineRect.left,mLineRect.top,mLineRect.right,mLineRect.bottom, Color.parseColor("#9FFD88"),Color.parseColor("#6EF2DF"), Shader.TileMode.CLAMP);
+        LinearGradient lg = new LinearGradient(mLineRect.left,mLineRect.top,mLineRect.right,mLineRect.bottom, Color.parseColor("#ff56b7"),Color.parseColor("#ff56b7"), Shader.TileMode.CLAMP);
         mPaint.setShader(lg);
         canvas.drawRoundRect(mLineRect, mRoundRadius, mRoundRadius, mPaint);
     }

baseswago/src/main/java/com/swago/baseswago/im/GroupMsgParser.kt

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.util.ParameterizedTypeImpl
 import com.google.gson.Gson
 import com.swago.baseswago.im.ImConstant.anchor_close_room
 import com.swago.baseswago.im.ImConstant.cancel_forbid_speak
+import com.swago.baseswago.im.ImConstant.diamond_wind_up
 import com.swago.baseswago.im.ImConstant.forbid_speak
 import com.swago.baseswago.im.ImConstant.lucky_gift
 import com.swago.baseswago.im.ImConstant.remove_room
@@ -11,10 +12,7 @@ import com.swago.baseswago.im.ImConstant.room_chat_text
 import com.swago.baseswago.im.ImConstant.svg_gift
 import com.swago.baseswago.im.ImConstant.user_exit_room
 import com.swago.baseswago.im.ImConstant.user_join_room
-import com.swago.baseswago.model.im.AnchorRoomClosedBean
-import com.swago.baseswago.model.im.CusNewMsgBean
-import com.swago.baseswago.model.im.RoomChatMsgBean
-import com.swago.baseswago.model.im.UserJoinRoomBean
+import com.swago.baseswago.model.im.*
 import com.swago.baseswago.model.live.ReceiveModel
 import com.swago.baseswago.model.live.gift.IMGiftModel
 import com.swago.baseswago.util.LogUtil
@@ -77,6 +75,15 @@ class GroupMsgParser : IGroupNewMsgParser {
                     parserModel = gson.fromJson(resultString,parameterizedTypeImpl)
                 }
 
+                diamond_wind_up -> {
+                    parameterizedTypeImpl = ParameterizedTypeImpl(
+                        arrayOf<Type>(DiamondWindupBean::class.java),
+                        CusNewMsgBean::class.java,
+                        CusNewMsgBean::class.java
+                    )
+                    parserModel = gson.fromJson(resultString,parameterizedTypeImpl)
+                }
+
                 svg_gift, lucky_gift -> {
                     parameterizedTypeImpl = ParameterizedTypeImpl(
                         arrayOf<Type>(IMGiftModel::class.java),

baseswago/src/main/java/com/swago/baseswago/im/ImConstant.kt

@@ -31,6 +31,11 @@ object ImConstant {
      */
     const val svg_gift = 201
 
+    /**
+     * 小数结算珍珠
+     */
+    const val diamond_wind_up = 203
+
     /**
      * 幸运礼物
      */

baseswago/src/main/java/com/swago/baseswago/model/im/DiamondWindupBean.java

@@ -0,0 +1,29 @@
+package com.swago.baseswago.model.im;
+
+/**
+ * @date 2022/3/18 14:08
+ * description:
+ */
+public class DiamondWindupBean {
+
+   private String roomId;
+   private String incomeCount;
+
+
+   public String getRoomId() {
+      return roomId;
+   }
+
+   public void setRoomId(String roomId) {
+      this.roomId = roomId;
+   }
+
+   public String getIncomeCount() {
+      return incomeCount;
+   }
+
+   public void setIncomeCount(String incomeCount) {
+      this.incomeCount = incomeCount;
+   }
+
+}

baseswago/src/main/res/values/colors.xml

@@ -5,10 +5,10 @@
     <color name="_ffffff">#ffffff</color>
     <color name="_868686">#868686</color>
 
-    <color name="startColor">#9ffd88</color>
-    <color name="startDownColor">#9ffd88</color>
-    <color name="endColor">#FF4A34</color>
-    <color name="arcColor">#9ffd88</color>
+    <color name="startColor">#ff56b7</color>
+    <color name="startDownColor">#ff56b7</color>
+    <color name="endColor">#ff56b7</color>
+    <color name="arcColor">#ff56b7</color>
     <color name="white">#ffffff</color>
-    <color name="scaleColor">#9ffd88</color>
+    <color name="scaleColor">#ff56b7</color>
 </resources>

room/src/main/java/com/swago/room/gift/GiftDialog.kt

@@ -2,6 +2,7 @@ package com.swago.room.gift
 
 import android.content.Context
 import android.graphics.Color
+import android.graphics.Typeface
 import android.os.Bundle
 import android.util.Log
 import android.view.Gravity
@@ -169,8 +170,9 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
                     simplePagerTitleView.text = titleList[index]
                     val padding = DpPxUtil.dip2px(15f).toFloat()
                     simplePagerTitleView.textSize = 16f
+                    simplePagerTitleView.typeface = Typeface.createFromAsset(AppContext.getContext().assets,"bold.otf")
                     simplePagerTitleView.setPadding(padding.toInt(), 0, padding.toInt(), 0)
-                    simplePagerTitleView.normalColor = Color.parseColor("#868686")
+                    simplePagerTitleView.normalColor = Color.parseColor("#828C9D")
                     simplePagerTitleView.selectedColor = Color.parseColor("#ffffff")
                     simplePagerTitleView.setOnClickListener {
                         binding.viewPager.currentItem = index

room/src/main/java/com/swago/room/gift/GiftVm.kt

@@ -9,6 +9,7 @@ import com.swago.baseswago.model.live.gift.GiftAllModel
 import com.swago.baseswago.model.live.gift.GiftSendModel
 import com.swago.baseswago.util.AppContext
 import com.swago.baseswago.util.BaseViewModel
+import com.swago.baseswago.util.UserInfo
 
 /**
  *@date 2021/12/12 17:03
@@ -50,6 +51,11 @@ class GiftVm(application: Application) : BaseViewModel(application) {
             requestData {
                 val data = ApiManager.roomApi.sendGift(room_id, gift_id, gift_batch, gift_receive_id, isCombo,gift_num)
                 sendResultLiveData.value = data
+                UserInfo.getUserInfo()?.let {
+                    if (data.user_coins.toLong() < it.user_coins.toLong()){
+                        it.user_coins = data.user_coins
+                    }
+                }
             }
 
             requestError {

room/src/main/java/com/swago/room/giftdandao/GiftDanDaoView.kt

@@ -69,7 +69,7 @@ class GiftDanDaoView : FrameLayout {
             clItemGift.removeCallbacks(showRunnable)
             clItemGift.postDelayed(showRunnable, 3000)
             
-            if (imGiftModel.multiple!=500){
+            if (imGiftModel.multiple!=0){
                 clWinPrize.visibility = View.VISIBLE
                 tvWinPrize.text = AppContext.getContext().resources.getString(R.string.win_num_prize).format(imGiftModel.multiple)
                 clWinPrize.removeCallbacks(winPrizeRunnable)

room/src/main/java/com/swago/room/vm/MsgVm.kt

@@ -9,18 +9,16 @@ import com.swago.baseswago.baseroom.viewmodel.AbsMsgVm
 import com.swago.baseswago.im.IRoomChat
 import com.swago.baseswago.im.ImConstant.anchor_close_room
 import com.swago.baseswago.im.ImConstant.cancel_forbid_speak
+import com.swago.baseswago.im.ImConstant.diamond_wind_up
 import com.swago.baseswago.im.ImConstant.forbid_speak
 import com.swago.baseswago.im.ImConstant.lucky_gift
 import com.swago.baseswago.im.ImConstant.remove_room
-import com.swago.baseswago.model.im.CusNewMsgBean
-import com.swago.baseswago.model.im.RoomChatMsgBean
 import com.swago.baseswago.im.ImConstant.room_chat_text
 import com.swago.baseswago.im.ImConstant.svg_gift
 import com.swago.baseswago.im.ImConstant.user_exit_room
 import com.swago.baseswago.im.ImConstant.user_join_room
 import com.swago.baseswago.inter.ApiManager
-import com.swago.baseswago.model.im.AnchorRoomClosedBean
-import com.swago.baseswago.model.im.UserJoinRoomBean
+import com.swago.baseswago.model.im.*
 import com.swago.baseswago.model.live.ReceiveModel
 import com.swago.baseswago.model.live.gift.IMGiftModel
 import com.swago.baseswago.model.mine.RoomBlack
@@ -130,6 +128,18 @@ class MsgVm (application: Application) : AbsMsgVm(application){
             }
         }
 
+        imGroupNewMsgListener.handleMsgType<CusNewMsgBean<DiamondWindupBean>>(diamond_wind_up){
+            SwagoRoomManager.iRoomInfo?.let { iRoomInfo ->
+                if (isReady){
+                    it.data?.let {
+                        if (iRoomInfo.getRoomId()== it.roomId?:""){
+                            inComeChange?.invoke(it.incomeCount)
+                        }
+                    }
+                }
+            }
+        }
+
 
         imGroupNewMsgListener.handleMsgType<CusNewMsgBean<ReceiveModel>>(remove_room){
             SwagoRoomManager.iRoomInfo?.let { iRoomInfo ->

room/src/main/res/layout/dialog_gift.xml

@@ -59,7 +59,7 @@
         <TextView
             android:id="@+id/tvToSend"
             android:textSize="14dp"
-            android:textColor="#2E2D2B"
+            android:textColor="#fff"
             android:text="@string/send"
             android:gravity="center"
             android:visibility="gone"