d

app/debug/output-metadata.json

@@ -1,18 +0,0 @@
-{
-  "version": 2,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "com.swago.app",
-  "variantName": "debug",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "versionCode": 106,
-      "versionName": "1.0.6",
-      "outputFile": "com.swago.app-debug-1.0.6.apk"
-    }
-  ]
-}

baseswago/src/main/java/com/swago/baseswago/dialog/BenefitBagDialog.kt

@@ -4,9 +4,12 @@ import android.os.Bundle
 import android.view.Gravity
 import android.widget.Toast
 import androidx.fragment.app.viewModels
+import com.alibaba.android.arouter.launcher.ARouter
 import com.android.billingclient.api.Purchase
 import com.swago.baseswago.PayVm
 import com.swago.baseswago.R
+import com.swago.baseswago.constant.ARouteConstant
+import com.swago.baseswago.constant.UrlConstant
 import com.swago.baseswago.databinding.DialogBenefitBagBinding
 import com.swago.baseswago.libpay.IPayCallback
 import com.swago.baseswago.libpay.PayManager
@@ -20,7 +23,7 @@ import com.swago.baseswago.util.UserInfo
  *@date 2022/1/18 20:29
  *description:
  */
-class BenefitBagDialog : BaseXDFragment<DialogBenefitBagBinding>(), IPayCallback {
+class BenefitBagDialog : BaseXDFragment<DialogBenefitBagBinding>() {
 
     private val payVm by viewModels<PayVm>()
     var benefitIconDismissFun:(()->Unit)? = null
@@ -37,8 +40,8 @@ class BenefitBagDialog : BaseXDFragment<DialogBenefitBagBinding>(), IPayCallback
     }
 
     override fun initOther() {
-        PayManager.listener.add(this)
         payVm.getBenefit()
+        binding.tvRecharge.text = AppContext.getContext().resources.getString(R.string.recharge)
         binding.ivClose.setOnClickListener(object:NoDoubleClickListener(){
             override fun onClick() {
                 dismissAllowingStateLoss()
@@ -46,10 +49,10 @@ class BenefitBagDialog : BaseXDFragment<DialogBenefitBagBinding>(), IPayCallback
         })
         binding.tvRecharge.setOnClickListener(object:NoDoubleClickListener(){
             override fun onClick() {
-                activity?.let {
-                    SwagoLoading.showLoadingDialog(it)
-                    PayManager.queryUnConsumeOrder(productId)
-                }
+                ARouter.getInstance().build(ARouteConstant.Base.webView)
+                    .withString("url", UrlConstant.TOP_UP)
+                    .navigation()
+                dismissAllowingStateLoss()
             }
         })
     }
@@ -63,7 +66,6 @@ class BenefitBagDialog : BaseXDFragment<DialogBenefitBagBinding>(), IPayCallback
             payModel.product_coins = it.product_coins
             val list = ArrayList<PayModel>()
             list.add(payModel)
-            PayManager.queryProductPrice(list)
 
             if (it.is_pop_discount_package == 0){
                 payVm.surePopBenefit()
@@ -71,63 +73,9 @@ class BenefitBagDialog : BaseXDFragment<DialogBenefitBagBinding>(), IPayCallback
         }
     }
 
-    override fun onDestroyView() {
-        PayManager.listener.remove(this)
-        super.onDestroyView()
-    }
-
     init {
         setCanCancel(false)
         setGravity(Gravity.CENTER)
         setDimAmount(0.5f)
     }
-
-    override fun onConnectedServer() {
-    }
-
-    override fun onPaySuccess(data: List<Purchase>?) {
-        data?.forEach {
-            payVm.payOrderToServer(it, 1)
-            UserInfo.getUserInfo()?.is_benefit = 1
-            benefitIconDismissFun?.invoke()
-        }
-    }
-
-    override fun onQueryProductPrice(data: List<PayModel>) {
-        SwagoLoading.cancelLoadingDialog()
-        binding.tvRecharge.text = data[0].product_price
-        PayManager.queryUnConsumeOrder("")
-    }
-
-    override fun onPayError(code: Int) {
-        SwagoLoading.cancelLoadingDialog()
-        Toast.makeText(AppContext.getContext(), AppContext.getContext().resources.getString(R.string.pay_fail)+"-$code", Toast.LENGTH_SHORT).show()
-        payVm.payOrderToServer(null, 2)
-    }
-
-    override fun onPayCancel() {
-        Toast.makeText(AppContext.getContext(), AppContext.getContext().resources.getString(R.string.pay_cancel), Toast.LENGTH_SHORT).show()
-        payVm.payOrderToServer(null, 3)
-    }
-
-    override fun onUnConsumeOrder(data: List<Purchase>) {
-        data.forEach {
-            val orderLostDialog = OrderLostDialog.newInstance(it.orderId)
-            orderLostDialog.commitLostOrderFun = {
-                payVm.payOrderToServer(it,4)
-            }
-            orderLostDialog.show(childFragmentManager, "OrderLostDialog")
-        }
-    }
-
-    override fun consumeOrderSuccess() {
-        dismissAllowingStateLoss()
-    }
-
-    override fun consumeOrderFail(code: Int) {
-    }
-
-    override fun toCreateNewOrder(productId: String) {
-        payVm.createOrder(productId)
-    }
 }

room/src/main/java/com/swago/room/anchor/AnchorRoomActivity.kt

@@ -120,7 +120,7 @@ class AnchorRoomActivity : AbsAnchorActivity<ActivityAnchorRoomBinding,IRoomInfo
 
         binding.ivPrepareCamera.setOnClickListener(object : NoDoubleClickListener() {
             override fun onClick() {
-                mVideoManager.switchCamera()
+                switchCamera()
             }
         })
         binding.ivPrepareClose.setOnClickListener(object : NoDoubleClickListener() {
@@ -180,6 +180,10 @@ class AnchorRoomActivity : AbsAnchorActivity<ActivityAnchorRoomBinding,IRoomInfo
         }
     }
 
+    fun switchCamera() {
+        mVideoManager.switchCamera()
+    }
+
     override fun changeRoom(iRoomInfo: IRoomInfo) {
     }
 

room/src/main/java/com/swago/room/anchor/AnchorRoomFragment.kt

@@ -42,6 +42,14 @@ class AnchorRoomFragment : BaseComFragment<FragmentBaseComBinding>() {
             BeautyDialogFragment().show(childFragmentManager, "BeautyDialogFragment")
         }
 
+        footerView?.switchCameraFun = {
+            activity?.let {
+                if (it is AnchorRoomActivity){
+                    it.switchCamera()
+                }
+            }
+        }
+
         (iHeader as ComHeaderView).showUserInfo = {
             PersonDataDFragment.newInstance(it, isAnchor = true, inRoom = true)
                 .apply {

room/src/main/java/com/swago/room/user/UserRoomFragment.kt

@@ -4,6 +4,8 @@ import android.view.View
 import android.widget.Toast
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.fragment.app.activityViewModels
+import com.bumptech.glide.Glide
+import com.google.gson.Gson
 import com.swago.baseswago.PersonDataDFragment
 import com.swago.baseswago.baseroom.IRoomInfo
 import com.swago.baseswago.baseroom.SwagoRoomManager
@@ -11,6 +13,7 @@ import com.swago.baseswago.dialog.BenefitBagDialog
 import com.swago.baseswago.dialog.ReportDialog
 import com.swago.baseswago.util.AppContext
 import com.swago.baseswago.util.NoDoubleClickListener
+import com.swago.baseswago.util.SpUtil
 import com.swago.baseswago.util.UserInfo
 import com.swago.room.R
 import com.swago.room.base.BaseComFragment
@@ -134,6 +137,16 @@ class UserRoomFragment : BaseComFragment<FragmentBaseComBinding>() {
                 }.show(childFragmentManager, "PersonDataDFragment")
         }
 
+
+        userVm.userInfoLiveData.observe(this) {
+            UserInfo.setUserInfo(it)
+            SpUtil.putString("user_info", Gson().toJson(it))
+            if (it.is_benefit == 0) {
+                binding.ivBenefit.visibility = View.VISIBLE
+            } else {
+                binding.ivBenefit.visibility = View.VISIBLE
+            }
+        }
     }
 
     private fun openShareDialog() {
@@ -164,7 +177,6 @@ class UserRoomFragment : BaseComFragment<FragmentBaseComBinding>() {
                     roomVm.getUserRoomAuth(it.id, iRoomInfo.getRoomId())
                 }
             }
-
             if (it.is_benefit == 0) {
                 binding.ivBenefit.visibility = View.VISIBLE
             } else {
@@ -187,4 +199,16 @@ class UserRoomFragment : BaseComFragment<FragmentBaseComBinding>() {
     override val iFooter: IFooter by lazy {
         UserFooterView(requireContext())
     }
+
+
+    var isFirst = true
+    override fun onResume() {
+        super.onResume()
+        if (isFirst){
+            isFirst = false
+        }else{
+            userVm.getUserInfo()
+        }
+    }
+
 }

room/src/main/java/com/swago/room/widget/AnchorFooterView.kt

@@ -25,6 +25,7 @@ class AnchorFooterView : ConstraintLayout, IFooter, IRoomActiveListener {
     var openMessageFun:(()->Unit)? = null
     var openGameFun:(()->Unit)? = null
     var openBeautyFun:(()->Unit)? = null
+    var switchCameraFun:(()->Unit)? = null
 
     constructor(context: Context) : this(context, null)
     constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
@@ -42,7 +43,7 @@ class AnchorFooterView : ConstraintLayout, IFooter, IRoomActiveListener {
         binding = LayoutAnchorFooterViewBinding.inflate(LayoutInflater.from(context), this, true)
         binding.ivSwitchCamera.setOnClickListener(object : NoDoubleClickListener() {
             override fun onClick() {
-                AgoraManager.changeCameraOrientation()
+                switchCameraFun?.invoke()
             }
         })
         binding.ivChat.setOnClickListener(object : NoDoubleClickListener() {