d

.idea/misc.xml

@@ -57,7 +57,7 @@
         <entry key="home/src/main/res/layout/fragment_home.xml" value="0.25" />
         <entry key="home/src/main/res/layout/fragment_hot.xml" value="0.35" />
         <entry key="home/src/main/res/layout/fragment_message.xml" value="0.25" />
-        <entry key="home/src/main/res/layout/fragment_mine.xml" value="0.36302083333333335" />
+        <entry key="home/src/main/res/layout/fragment_mine.xml" value="0.25" />
         <entry key="home/src/main/res/layout/fragment_moment.xml" value="0.25" />
         <entry key="home/src/main/res/layout/fragment_new.xml" value="0.35" />
         <entry key="home/src/main/res/layout/item_home.xml" value="0.3964984552008239" />

app/release/output-metadata.json

@@ -10,9 +10,9 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 6,
-      "versionName": "1.0.5",
-      "outputFile": "com.swago.app-release-1.0.5.apk"
+      "versionCode": 5,
+      "versionName": "1.0.4",
+      "outputFile": "com.swago.app-release-1.0.4.apk"
     }
   ]
 }

baseswago/src/main/res/values-in/strings.xml

@@ -28,7 +28,7 @@
     <string name="my_level">Level saya</string>
     <string name="top_up_center">Pusat Top up</string>
     <string name="task_center">Pusat Tugas</string>
-    <string name="contact_service">Layanan Pelanggan</string>
+    <string name="contact_service">Layanan Pelanggan\ngmail:Swagoliveservice@gmail.com\nWhatsApp：+86  18758880853</string>
     <string name="sex">Jenis kelamin</string>
     <string name="age">Umur</string>
     <string name="constellation">Konstelasi</string>
@@ -76,8 +76,8 @@
     <string name="report_three">Nickname nya ilegal</string>
     <string name="report_four">Diduga menghina pengguna dan ucapan kekerasan</string>
     <string name="tips">mengingatkan</string>
-    <string name="consume_order">Pesanan\n%s\n tidak berhasil, silakan tagih balik sekarang!</string>
-    <string name="sure_consume">立即补单</string>
+    <string name="consume_order">Pesanan\n%s\n tidak berhasil, silakan klik kirim ulang pesanan!</string>
+    <string name="sure_consume">kirim ulang sekarang</string>
     <string name="send">Memberikan</string>
     <string name="hot">Hot</string>
     <string name="luxury">Premium Hadiah</string>

baseswago/src/main/res/values-zh/strings.xml

@@ -28,7 +28,7 @@
     <string name="my_level">我的等级</string>
     <string name="top_up_center">充值中心</string>
     <string name="task_center">任务中心</string>
-    <string name="contact_service">联系客服</string>
+    <string name="contact_service">联系客服\ngmail:Swagoliveservice@gmail.com\nWhatsApp：+86  18758880853</string>
     <string name="sex">性别</string>
     <string name="age">年龄</string>
     <string name="constellation">星座</string>
@@ -76,8 +76,8 @@
     <string name="report_three">非法用户昵称</string>
     <string name="report_four">涉嫌辱骂用户和暴力言论</string>
     <string name="tips">提示</string>
-    <string name="consume_order">该笔订单\n%s\n未消费成功，请确认消费!</string>
-    <string name="sure_consume">确认消费</string>
+    <string name="consume_order">该笔订单\n%s\n未消费成功，请立即补单!</string>
+    <string name="sure_consume">立即补单</string>
     <string name="send">赠送</string>
     <string name="hot">热门</string>
     <string name="luxury">高级</string>

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

@@ -18,61 +18,61 @@
     <string name="blacklist">Blacklist</string>
     <string name="setting">Setting</string>
     <string name="edit_profile">Edit profile</string>
-    <string name="male">male</string>
-    <string name="female">female</string>
+    <string name="male">Male</string>
+    <string name="female">Female</string>
     <string name="save">Save</string>
     <string name="start_live">GO LIVE</string>
-    <string name="room_has_been_closed">The live has been closed</string>
+    <string name="room_has_been_closed">The live has been end</string>
     <string name="leave">Back</string>
     <string name="join_room">join room</string>
     <string name="id_x">ID:%s</string>
-    <string name="swago_offical_msg">Swago官方信息</string>
-    <string name="message">信息</string>
-    <string name="coin">金币</string>
-    <string name="diamond">钻石</string>
-    <string name="my_level">我的等级</string>
-    <string name="top_up_center">充值中心</string>
-    <string name="task_center">任务中心</string>
-    <string name="contact_service">联系客服</string>
-    <string name="sex">性别</string>
-    <string name="age">年龄</string>
-    <string name="constellation">星座</string>
-    <string name="country">国家</string>
-    <string name="sign">个性签名</string>
-    <string name="selecte_country">选择国家</string>
-    <string name="rich_level">财富等级</string>
-    <string name="anchor_level">主播等级</string>
-    <string name="get_exp">获取经验值</string>
-    <string name="level_up_exp">升级所需经验：%s</string>
-    <string name="know_detail">了解详情</string>
-    <string name="level_medal">等级徽章</string>
-    <string name="show_first">优先展示</string>
-    <string name="vip_server">专属客服</string>
-    <string name="level_privilege">等级特权</string>
-    <string name="levek_compare_table">等级对照表</string>
-    <string name="home_hot">热门</string>
-    <string name="home_new">新星</string>
-    <string name="home_follow">关注</string>
-    <string name="mine_balance">我的余额</string>
-    <string name="recharge_gear">充值档位</string>
-    <string name="recharge">储值</string>
-    <string name="daily_task">每日任务</string>
-    <string name="newer_task">新人任务</string>
-    <string name="reward">奖励：</string>
-    <string name="exp">经验</string>
-    <string name="receive">领取</string>
-    <string name="uncomplete">未完成</string>
-    <string name="complete">已完成</string>
-    <string name="live_end">直播已结束</string>
-    <string name="sure_close">确认</string>
-    <string name="search_name_or_id">搜索昵称/ID</string>
-    <string name="fans_list">粉丝排行榜</string>
+    <string name="swago_offical_msg">Swago official information</string>
+    <string name="message">Message</string>
+    <string name="coin">Coin</string>
+    <string name="diamond">Diamond</string>
+    <string name="my_level">My Level</string>
+    <string name="top_up_center">Top up Center</string>
+    <string name="task_center">Task Center</string>
+    <string name="contact_service">Customer Service\ngmail:Swagoliveservice@gmail.com\nWhatsApp：+86  18758880853</string>
+    <string name="sex">Gender</string>
+    <string name="age">Age</string>
+    <string name="constellation">Constellation</string>
+    <string name="country">Country</string>
+    <string name="sign">Bio</string>
+    <string name="selecte_country">Choose your country</string>
+    <string name="rich_level">Rich level</string>
+    <string name="anchor_level">Host level</string>
+    <string name="get_exp">Get experience points</string>
+    <string name="level_up_exp">Experience required to upgrade: %s</string>
+    <string name="know_detail">Learn more</string>
+    <string name="level_medal">Badge</string>
+    <string name="show_first">Priority display</string>
+    <string name="vip_server">Dedicated customer service</string>
+    <string name="level_privilege">Level Privilege</string>
+    <string name="levek_compare_table">Level comparison table</string>
+    <string name="home_hot">Hot</string>
+    <string name="home_new">New Star</string>
+    <string name="home_follow">Following</string>
+    <string name="mine_balance">My balance</string>
+    <string name="recharge_gear">Recharge list</string>
+    <string name="recharge">Recharge</string>
+    <string name="daily_task">Daily task</string>
+    <string name="newer_task">Newbie task</string>
+    <string name="reward">Rewards：</string>
+    <string name="exp">Experience</string>
+    <string name="receive">Receive</string>
+    <string name="uncomplete">Unfinished</string>
+    <string name="complete">Finished</string>
+    <string name="live_end">The live has come to been closed</string>
+    <string name="sure_close">Confirm</string>
+    <string name="search_name_or_id">Search nickname/ID</string>
+    <string name="fans_list">Fans Ranking</string>
     <string name="daily">Daily</string>
     <string name="weekly">Weekly</string>
     <string name="monthly">Monthly</string>
-    <string name="need_exp">所需经验值</string>
-    <string name="exp_explain">每送出10金币的礼物，经验值+1</string>
-    <string name="exp_explain2">每收到10金币的礼物，经验值+1</string>
+    <string name="need_exp">Required experience points</string>
+    <string name="exp_explain">For every gift of 10 gold coins, experience points +1</string>
+    <string name="exp_explain2">For every gift of 10 gold coins received, experience points +1</string>
     <string name="level">Lv.%s</string>
     <string name="report">Report</string>
     <string name="report_success">Report success</string>
@@ -81,8 +81,8 @@
     <string name="report_three">Illegal user nickname</string>
     <string name="report_four">Suspected of insulting users and violent speech</string>
     <string name="tips">Tips</string>
-    <string name="consume_order">This order\n %s \nhas not been consumed successfully, please confirm the consumption!</string>
-    <string name="sure_consume">Sure consume</string>
+    <string name="consume_order">The order\n%s\n was not successfully consumed, please click resubmit order!</string>
+    <string name="sure_consume">Resubmit order now</string>
     <string name="send">Send</string>
     <string name="hot">Hot</string>
     <string name="luxury">Luxury</string>

home/src/main/java/com/swago/home/HomeActivity.kt

@@ -1,6 +1,7 @@
 package com.swago.home
 
 import android.Manifest
+import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.fragment.app.viewModels
@@ -37,6 +38,11 @@ class HomeActivity : BaseXActivity<ActivityHomeBinding>(), IPayCallback {
     private val listFragment =
         arrayListOf(MomentFragment(), HomeFragment(),MessageFragment(), MineFragment())
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setImmersionBar(true,false)
+    }
+
     override fun loadData() {
 
     }

home/src/main/res/layout/fragment_mine.xml

@@ -266,22 +266,20 @@
             app:drawableStartCompat="@mipmap/level"
             app:drawableEndCompat="@mipmap/more_small" />
 
-        <TextView
-            android:id="@+id/tvCustomer"
-            android:drawablePadding="5dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:textColor="#000"
-            android:textSize="16dp"
-            android:gravity="center_vertical"
-            android:text="@string/contact_service"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            app:drawableStartCompat="@mipmap/level"
-            app:drawableEndCompat="@mipmap/more_small" />
+    </LinearLayout>
 
 
-    </LinearLayout>
+    <TextView
+        android:text="@string/contact_service"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginBottom="30dp"
+        android:gravity="center"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:textColor="#000"
+        android:textSize="14dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -2,12 +2,15 @@ package com.swago.room.user
 
 import android.content.Intent
 import android.os.Bundle
+import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import androidx.activity.viewModels
 import com.alibaba.android.arouter.facade.annotation.Autowired
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.alibaba.android.arouter.launcher.ARouter
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.RequestOptions
 import com.gyf.immersionbar.ImmersionBar
 import com.gyf.immersionbar.OnKeyboardListener
 import com.swago.baseswago.SwagoAdapter
@@ -32,6 +35,7 @@ import com.swago.room.vm.MsgVm
 import com.swago.room.vm.RoomVm
 import com.tencent.qcloud.tim.uikit.TUIKitImpl
 import com.tencent.qcloud.tim.uikit.base.IMEventListener
+import jp.wasabeef.glide.transformations.BlurTransformation
 import java.util.concurrent.CopyOnWriteArrayList
 
 /**
@@ -59,15 +63,15 @@ class UserRoomActivity : AbsUserActivity<ActivityAbsRoomUserBinding, UserRoomMod
     @JvmField
     var data: ArrayList<MomentModel>? = null
 
-    lateinit var bindingCoverView:LayoutUserRoomBinding
+    var bindingCoverView:LayoutUserRoomBinding? = null
 
     private var userRoomFragment:UserRoomFragment? = null
 
     override val roomCoverView: ViewGroup by lazy {
         bindingCoverView = LayoutUserRoomBinding.inflate(layoutInflater)
-        bindingCoverView.viewPager.adapter = adapter
-        bindingCoverView.viewPager.currentItem = 1
-        bindingCoverView.root
+        bindingCoverView!!.viewPager.adapter = adapter
+        bindingCoverView!!.viewPager.currentItem = 1
+        bindingCoverView!!.root
     }
 
 
@@ -116,16 +120,27 @@ class UserRoomActivity : AbsUserActivity<ActivityAbsRoomUserBinding, UserRoomMod
     }
 
     override fun changeRoom(iRoomInfo: IRoomInfo) {
+        bindingCoverView?.let {
+            Glide.with(this)
+                .load(iRoomInfo.getRoomCover())
+                .dontAnimate()
+                .apply(RequestOptions.bitmapTransform(BlurTransformation(5,100)))
+                .into(it.ivCover)
+            it.ivCover.visibility = View.VISIBLE
+        }
     }
 
     override fun leaveRoom(iRoomInfo: IRoomInfo) {
-        AgoraManager.changeRoom(iRoomInfo.getAnchorId().toInt(),bindingCoverView.flRoot)
+        AgoraManager.changeRoom(iRoomInfo.getAnchorId().toInt(),bindingCoverView?.flRoot)
     }
 
     override fun joinedRoom(iRoomInfo: IRoomInfo) {
-        UserInfo.getUserInfo()?.let {
-            AgoraManager.joinChannel(iRoomInfo.getChannelName(),it.id.toInt(), iRoomInfo.getAgoraToken())
-            AgoraManager.setupRemoteVideo(this@UserRoomActivity,iRoomInfo.getAnchorId().toInt(),bindingCoverView.flRoot)
+        bindingCoverView?.let {
+            it.ivCover.visibility = View.GONE
+            UserInfo.getUserInfo()?.let { userInfoModel ->
+                AgoraManager.joinChannel(iRoomInfo.getChannelName(),userInfoModel.id.toInt(), iRoomInfo.getAgoraToken())
+                AgoraManager.setupRemoteVideo(this@UserRoomActivity,iRoomInfo.getAnchorId().toInt(),it.flRoot)
+            }
         }
     }
 

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

@@ -37,14 +37,14 @@
 
     <com.swago.room.piaotiao.WaftView
         android:id="@+id/waftView"
-        android:layout_marginTop="40dp"
+        android:layout_marginTop="60dp"
         app:layout_constraintTop_toTopOf="parent"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
 
     <com.swago.room.piaotiao.WaftView
         android:id="@+id/waftView2"
-        android:layout_marginTop="85dp"
+        android:layout_marginTop="105dp"
         app:layout_constraintTop_toTopOf="parent"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>

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

@@ -13,4 +13,11 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
+    <ImageView
+        android:id="@+id/ivCover"
+        android:scaleType="centerCrop"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>