Browse Source

家族长后台

honghengqiang 2 years ago
parent
commit
e67a506927

+ 1 - 10
.idea/misc.xml

@@ -29,8 +29,6 @@
         <entry key="baseswago/src/main/res/drawable/shape_2f3043_37.xml" value="0.283" />
         <entry key="baseswago/src/main/res/drawable/shape_3d7fff_36.xml" value="0.2375" />
         <entry key="baseswago/src/main/res/drawable/shape_3d8aff_3d7fff_all_15.xml" value="0.2375" />
-        <entry key="baseswago/src/main/res/drawable/shape_50ff56b7_37.xml" value="0.238" />
-        <entry key="baseswago/src/main/res/drawable/shape_54d925_10.xml" value="0.238" />
         <entry key="baseswago/src/main/res/drawable/shape_80000000_20.xml" value="0.13229166666666667" />
         <entry key="baseswago/src/main/res/drawable/shape_80ff56b7_all_38.xml" value="0.213" />
         <entry key="baseswago/src/main/res/drawable/shape_9ffd88_5_stroke.xml" value="0.3145833333333333" />
@@ -103,7 +101,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.4479695431472081" />
+        <entry key="home/src/main/res/layout/fragment_mine.xml" value="0.5799492385786802" />
         <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" />
@@ -237,7 +235,6 @@
         <entry key="tuikit/src/main/res/layout/title_bar_layout.xml" value="0.3015625" />
         <entry key="tuikit/src/main/res/layout/view_dialog.xml" value="0.3776041666666667" />
         <entry key="user/src/main/res/drawable/progress_bar.xml" value="0.3333333333333333" />
-        <entry key="user/src/main/res/drawable/selector_coin_click.xml" value="0.238" />
         <entry key="user/src/main/res/drawable/shape_37393f_444652.xml" value="0.33177083333333335" />
         <entry key="user/src/main/res/drawable/shape_c3a165_ead6a7_top_10.xml" value="0.3333333333333333" />
         <entry key="user/src/main/res/drawable/shape_eff1f4.xml" value="0.4078125" />
@@ -258,14 +255,10 @@
         <entry key="user/src/main/res/layout/activity_setting.xml" value="0.36302083333333335" />
         <entry key="user/src/main/res/layout/activity_tab_black.xml" value="0.3619791666666667" />
         <entry key="user/src/main/res/layout/activity_task.xml" value="0.3776041666666667" />
-        <entry key="user/src/main/res/layout/activity_transfer.xml" value="0.33" />
-        <entry key="user/src/main/res/layout/activity_transfer_details.xml" value="0.31302083333333336" />
         <entry key="user/src/main/res/layout/activity_user_edit.xml" value="0.3638968481375358" />
         <entry key="user/src/main/res/layout/dialog_edit.xml" value="0.39166666666666666" />
         <entry key="user/src/main/res/layout/dialog_exchange.xml" value="0.3776041666666667" />
-        <entry key="user/src/main/res/layout/dialog_recent_transfer.xml" value="0.390625" />
         <entry key="user/src/main/res/layout/dialog_sex.xml" value="0.34057971014492755" />
-        <entry key="user/src/main/res/layout/dialog_transfer_sure.xml" value="0.390625" />
         <entry key="user/src/main/res/layout/fragment_anchor.xml" value="0.3015625" />
         <entry key="user/src/main/res/layout/fragment_anchor_level.xml" value="0.3171875" />
         <entry key="user/src/main/res/layout/fragment_black.xml" value="0.17603850050658562" />
@@ -281,11 +274,9 @@
         <entry key="user/src/main/res/layout/item_follow_fan.xml" value="0.39166666666666666" />
         <entry key="user/src/main/res/layout/item_letter.xml" value="0.3625" />
         <entry key="user/src/main/res/layout/item_level.xml" value="0.39166666666666666" />
-        <entry key="user/src/main/res/layout/item_recent_transfer.xml" value="0.390625" />
         <entry key="user/src/main/res/layout/item_recharge.xml" value="0.39166666666666666" />
         <entry key="user/src/main/res/layout/item_room_black.xml" value="0.36302083333333335" />
         <entry key="user/src/main/res/layout/item_task.xml" value="0.25" />
-        <entry key="user/src/main/res/layout/item_transfer_detail.xml" value="0.31197916666666664" />
         <entry key="user/src/main/res/layout/item_xing_zuo.xml" value="0.3020833333333333" />
         <entry key="user/src/main/res/layout/layout_list.xml" value="0.39166666666666666" />
       </map>

+ 3 - 0
baseswago/src/main/java/com/swago/baseswago/constant/UrlConstant.kt

@@ -80,6 +80,9 @@ object UrlConstant {
 
     val TOP_UP = "${BASE_WEB_URL}/recharge/detail"
     val WITHDRAW = "${BASE_WEB_URL}/withdrawal"
+    //家族长后台
+    val FAMILY_MANAGEMENT = "${BASE_WEB_URL}/agent/guildIncome"
+
 
 
     var appGameRootPath =

+ 1 - 0
baseswago/src/main/res/values-ar/strings.xml

@@ -207,4 +207,5 @@
     <string name="remarks_no_more_than_words">Remarks no more than 50 words</string>
     <string name="coin_transfer_detail">金币转账详情</string>
     <string name="transfer_time">Transfer time</string>
+    <string name="family_menu">家族长后台</string>
 </resources>

+ 1 - 0
baseswago/src/main/res/values-in/strings.xml

@@ -219,4 +219,5 @@
     <string name="remarks_no_more_than_words">Remarks no more than 50 words</string>
     <string name="coin_transfer_detail">金币转账详情</string>
     <string name="transfer_time">Transfer time</string>
+    <string name="family_menu">家族长后台</string>
 </resources>

+ 1 - 0
baseswago/src/main/res/values-ms/strings.xml

@@ -218,4 +218,5 @@
     <string name="remarks_no_more_than_words">Remarks no more than 50 words</string>
     <string name="coin_transfer_detail">金币转账详情</string>
     <string name="transfer_time">Transfer time</string>
+    <string name="family_menu">家族长后台</string>
 </resources>

+ 1 - 0
baseswago/src/main/res/values-zh/strings.xml

@@ -207,4 +207,5 @@
     <string name="remarks_no_more_than_words">Remarks no more than 50 words</string>
     <string name="coin_transfer_detail">金币转账详情</string>
     <string name="transfer_time">Transfer time</string>
+    <string name="family_menu">家族长后台</string>
 </resources>

+ 1 - 0
baseswago/src/main/res/values/strings.xml

@@ -237,5 +237,6 @@
     <string name="remarks_no_more_than_words">Remarks no more than 50 words</string>
     <string name="coin_transfer_detail">金币转账详情</string>
     <string name="transfer_time">Transfer time</string>
+    <string name="family_menu">家族长后台</string>
 
 </resources>

+ 14 - 1
home/src/main/java/com/swago/home/MineFragment.kt

@@ -78,6 +78,15 @@ class MineFragment : BaseXFragment<FragmentMineBinding>() {
             }
 
         })
+
+        binding.tvFamily.setOnClickListener(object: NoDoubleClickListener(){
+            override fun onClick() {
+                ARouter.getInstance().build(ARouteConstant.Base.webView)
+                    .withString("url", UrlConstant.FAMILY_MANAGEMENT)
+                    .navigation()
+            }
+        })
+
         binding.tvSetting.setOnClickListener(object: NoDoubleClickListener(){
             override fun onClick() {
                 ARouter.getInstance().build(ARouteConstant.User.setting).navigation()
@@ -164,7 +173,11 @@ class MineFragment : BaseXFragment<FragmentMineBinding>() {
                 binding.tvOfficial.visibility = View.GONE
             }
 
-
+            if (it.user_type== 2){
+                binding.tvFamily.visibility = View.VISIBLE
+            }else{
+                binding.tvFamily.visibility = View.GONE
+            }
         }
 
         payVm.benefitLiveData.observe(this){

+ 15 - 0
home/src/main/res/layout/fragment_mine.xml

@@ -356,6 +356,21 @@
             android:textColor="#000"
             android:textSize="16dp" />
 
+        <com.swago.baseswago.cusview.MediumTextView
+            android:id="@+id/tvFamily"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:drawableStart="@mipmap/icon_mine_setting"
+            android:drawableEnd="@mipmap/more_small"
+            android:drawablePadding="5dp"
+            android:gravity="center_vertical"
+            android:paddingStart="20dp"
+            android:paddingEnd="20dp"
+            android:visibility="gone"
+            android:text="@string/family_menu"
+            android:textColor="#000"
+            android:textSize="16dp" />
+
         <com.swago.baseswago.cusview.MediumTextView
             android:id="@+id/tvSetting"
             android:layout_width="match_parent"