moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Modify]兑换权限功能

Browse Source
This commit is contained in:
wushaocheng
2023-02-13 19:45:44 +08:00
parent 4ef55164bb
commit c91bd5f8d3
19 changed files with 349 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/AndroidManifest.xml
View File

@@ -112,10 +112,10 @@
android:scheme="pekoapp" />
</intent-filter>
</activity>
<meta-data
android:name="firebase_crashlytics_collection_enabled"
android:value="${CRASHLYTICS_COLLECTION_ENABLED}" />
<!-- 刘海屏适配 begin -->
android:value="${CRASHLYTICS_COLLECTION_ENABLED}" /> <!-- 刘海屏适配 begin -->
<!-- 小米 -->
<activity
android:name="com.soundcloud.android.crop.CropImageActivity"
@@ -958,6 +958,11 @@
android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
android:exported="false"
android:screenOrientation="portrait" />
<activity
android:name=".module_hall.hall.activity.ExchangePermissionActivity"
android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
android:exported="false"
android:screenOrientation="portrait" />
<meta-data
android:name="notch.config"

2
app/src/main/res/values/colors.xml
View File

@@ -643,5 +643,7 @@
<color name="color_EB82AB">#EB82AB</color>
<color name="color_413078">#413078</color>
<color name="color_5E4D98">#5E4D98</color>
<color name="color_ECE4FF">#ECE4FF</color>
<color name="color_D8D8D8">#D8D8D8</color>
</resources>

6
app/src/main/res/values/strings.xml
View File

@@ -5056,5 +5056,11 @@
<string name="the_default_dynamic_cannot_be_commented">默認動態不能評論</string>
<string name="on_the_mic_not_record">正在上麥中，不能錄音</string>
<string name="in_audit">審核中</string>
<string name="exchange_permission_setting">兌換權限設置</string>
<string name="inconvertibility">不可兌換</string>
<string name="exchangeable">可兌換</string>
<string name="no_more_members_with_gold_for_now">暫無更多不可兌換金幣的成員~</string>
<string name="open_exchange">開啓兌換</string>
<string name="gold_coin_balance">金幣餘額:%s</string>
</resources>

1
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ClanIncomeActivity.java
View File

@@ -38,7 +38,6 @@ import java.util.List;
* 家族所有公会的收入统计
* Created by lvzebiao on 2018/12/27.
*/
@CreatePresenter(ClanIncomePresenter.class)
public class ClanIncomeActivity extends BaseMvpActivity<IIncomeStatisticsView, ClanIncomePresenter>
implements IIncomeStatisticsView, TimePickerClanDialog.TimePickerListener,

42
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ExchangePermissionActivity.kt Normal file
View File

@@ -0,0 +1,42 @@
package com.yizhuan.erban.module_hall.hall.activity
import android.content.Context
import android.content.Intent
import com.netease.nim.uikit.StatusBarUtil
import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseViewBindingActivity
import com.yizhuan.erban.databinding.ActivityExchangePermissionBinding
import com.yizhuan.erban.module_hall.hall.adapter.NoExchangeAdapter
import com.yizhuan.xchat_android_library.utils.ResUtil
/**
* 兑换权限管理
* Created by wushaocheng on 2023/2/13.
*/
class ExchangePermissionActivity : BaseViewBindingActivity<ActivityExchangePermissionBinding>() {
private val mNoExchangeAdapter by lazy { NoExchangeAdapter() }
companion object {
@JvmStatic
fun start(context: Context) {
val intent = Intent(context, ExchangePermissionActivity::class.java)
context.startActivity(intent)
}
}
override fun init() {
initWhiteTitleBar(ResUtil.getString(R.string.exchange_permission_setting))
}
override fun needSteepStateBar(): Boolean {
return true
}
override fun setStatusBar() {
super.setStatusBar()
StatusBarUtil.transparencyBar(this)
StatusBarUtil.StatusBarLightMode(this)
}
}

13
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleClanActivity.java
View File

@@ -81,6 +81,7 @@ public class ModuleClanActivity extends BaseActivity implements View.OnClickList
binding.tvHallIncome.setOnClickListener(this);
binding.tvSingleRoomIncome.setOnClickListener(this);
binding.ivHallMemberSearch.setOnClickListener(this);
binding.tvHallExchange.setOnClickListener(this);
otherUid = getIntent().getLongExtra(KEY_OTHER_UID, AuthModel.get().getCurrentUid());
isSelfClan = otherUid == AuthModel.get().getCurrentUid();
binding.ivHallMemberSearch.setVisibility(isSelfClan ? View.VISIBLE : View.GONE);
@@ -138,6 +139,11 @@ public class ModuleClanActivity extends BaseActivity implements View.OnClickList
ImageLoadUtils.loadRectImage(context, clanInfo.getAvatar(), binding.ivClanAvatar, R.drawable.default_avatar, ScreenUtil.dip2px(8));
ImageLoadUtils.loadImage(context, clanInfo.getLevelIcon(), binding.ivClanLevel);
loadHallList();
if (clanInfo.isElderHasExchangeManagerAuth()) {
binding.tvHallExchange.setVisibility(View.VISIBLE);
} else {
binding.tvHallExchange.setVisibility(View.GONE);
}
} else {
binding.clClan.setVisibility(View.GONE);
}
@@ -247,7 +253,7 @@ public class ModuleClanActivity extends BaseActivity implements View.OnClickList
break;
case R.id.tv_single_room_income:
if (clanInfo != null) {
SingleRoomIncomeActivity.start(this, clanInfo.getId(),0);
SingleRoomIncomeActivity.start(this, clanInfo.getId(), 0);
} else {
toast(ResUtil.getString(R.string.hall_activity_moduleclanactivity_09));
}
@@ -255,6 +261,11 @@ public class ModuleClanActivity extends BaseActivity implements View.OnClickList
case R.id.iv_hall_member_search:
MemberSearchActivity.start(this);
break;
case R.id.tv_hall_exchange:
ExchangePermissionActivity.start(this);
break;
default:
break;
}
}

30
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/EnableExchangeAdapter.kt Normal file
View File

@@ -0,0 +1,30 @@
package com.yizhuan.erban.module_hall.hall.adapter
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.erban.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminInfo
import com.yizhuan.xchat_android_library.utils.ResUtil
/**
* 可兑换
* Created by wushaocheng on 2023/2/13.
*/
class EnableExchangeAdapter :
BaseQuickAdapter<String, BaseViewHolder>(R.layout.item_hall_exchange) {
override fun convert(helper: BaseViewHolder, item: String) {
// ImageLoadUtils.loadAvatar(item.avatar, helper.getView(R.id.iv_avatar))
// helper.setText(R.id.tv_nickname, item.nick)
// .setText(R.id.tv_id, item.erbanNo)
// .setText(R.id.tv_set, if (item.hasSet) ResUtil.getString(R.string.hall_adapter_searchadminadapter_01) else ResUtil.getString(R.string.hall_adapter_searchadminadapter_02))
// .setEnabled(R.id.tv_set, !item.hasSet)
// .setImageResource(
// R.id.iv_gender,
// if (item.gender == 1) R.drawable.ic_gender_male else R.drawable.ic_gender_female
// )
// .addOnClickListener(R.id.tv_set)
}
}

30
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/NoExchangeAdapter.kt Normal file
View File

@@ -0,0 +1,30 @@
package com.yizhuan.erban.module_hall.hall.adapter
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.erban.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminInfo
import com.yizhuan.xchat_android_library.utils.ResUtil
/**
* 不可兑换
* Created by wushaocheng on 2023/2/13.
*/
class NoExchangeAdapter :
BaseQuickAdapter<String, BaseViewHolder>(R.layout.item_hall_exchange) {
override fun convert(helper: BaseViewHolder, item: String) {
// ImageLoadUtils.loadAvatar(item.avatar, helper.getView(R.id.iv_avatar))
// helper.setText(R.id.tv_nickname, item.nick)
// .setText(R.id.tv_id, item.erbanNo)
// .setText(R.id.tv_set, if (item.hasSet) ResUtil.getString(R.string.hall_adapter_searchadminadapter_01) else ResUtil.getString(R.string.hall_adapter_searchadminadapter_02))
// .setEnabled(R.id.tv_set, !item.hasSet)
// .setImageResource(
// R.id.iv_gender,
// if (item.gender == 1) R.drawable.ic_gender_male else R.drawable.ic_gender_female
// )
// .addOnClickListener(R.id.tv_set)
}
}

BIN
app/src/module_labour_union/res/drawable-xhdpi/bg_hall_admin.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.8 KiB

BIN
app/src/module_labour_union/res/drawable-xhdpi/bg_hall_admin.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1000 B

BIN
app/src/module_labour_union/res/drawable-xhdpi/bg_hall_exchange.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
app/src/module_labour_union/res/drawable-xhdpi/bg_hall_income.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
app/src/module_labour_union/res/drawable-xhdpi/bg_hall_income.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/src/module_labour_union/res/drawable-xhdpi/bg_single_room_income.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.4 KiB

BIN
app/src/module_labour_union/res/drawable-xhdpi/bg_single_room_income.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

69
app/src/module_labour_union/res/layout/activity_exchange_permission.xml Normal file
View File

@@ -0,0 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".module_hall.hall.activity.ExchangePermissionActivity">
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_30"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvInconvertibility"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_ECE4FF"
android:paddingStart="@dimen/dp_15"
android:paddingTop="@dimen/dp_4"
android:paddingEnd="@dimen/dp_0"
android:paddingBottom="@dimen/dp_4"
android:text="@string/inconvertibility"
android:textColor="@color/color_6D6B89"
android:textSize="@dimen/sp_15"
app:layout_constraintTop_toBottomOf="@+id/title_bar" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/mRecyclerViewNo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintTop_toBottomOf="@+id/tvInconvertibility" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvNoMore"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:background="@color/color_F3F5FA"
android:gravity="center"
android:text="@string/no_more_members_with_gold_for_now"
android:textColor="@color/color_B3B3C3"
android:textSize="@dimen/sp_12"
app:layout_constraintTop_toBottomOf="@+id/mRecyclerViewNo" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvExchangeable"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_ECE4FF"
android:paddingStart="@dimen/dp_15"
android:paddingTop="@dimen/dp_4"
android:paddingEnd="@dimen/dp_0"
android:paddingBottom="@dimen/dp_4"
android:text="@string/exchangeable"
android:textColor="@color/color_6D6B89"
android:textSize="@dimen/sp_15"
app:layout_constraintTop_toBottomOf="@+id/tvNoMore" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/mRecyclerViewEnable"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintTop_toBottomOf="@+id/tvExchangeable" />
</androidx.constraintlayout.widget.ConstraintLayout>

24
app/src/module_labour_union/res/layout/activity_module_clan.xml
View File

@@ -121,6 +121,7 @@
android:layout_weight="1"
android:background="@drawable/bg_hall_income"
android:paddingStart="10dp"
android:paddingEnd="0dp"
android:paddingTop="10dp"
android:text="@string/layout_activity_module_clan_04"
android:textColor="@color/white"
@@ -134,13 +135,13 @@
android:layout_weight="1"
android:background="@drawable/bg_single_room_income"
android:paddingStart="10dp"
android:paddingEnd="0dp"
android:paddingTop="10dp"
android:visibility="gone"
android:text="@string/layout_activity_module_clan_05"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_hall_admin"
android:layout_width="0dp"
@@ -149,10 +150,27 @@
android:layout_weight="1"
android:background="@drawable/bg_hall_admin"
android:paddingStart="10dp"
android:paddingEnd="@dimen/dp_0"
android:paddingTop="10dp"
android:text="@string/layout_activity_module_clan_06"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_hall_exchange"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_weight="1"
android:background="@drawable/bg_hall_exchange"
android:paddingStart="10dp"
android:paddingEnd="@dimen/dp_0"
android:paddingTop="10dp"
android:visibility="gone"
android:text="@string/exchange_permission_setting"
android:textColor="@color/white"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
@@ -182,7 +200,7 @@
android:paddingEnd="14dp"
android:paddingBottom="5dp"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15dp"
android:textSize="@dimen/sp_15"
tools:text="@string/layout_activity_module_clan_07" />
<androidx.recyclerview.widget.RecyclerView
@@ -222,7 +240,7 @@
android:paddingBottom="10dp"
android:text="@string/layout_activity_module_clan_08"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15dp" />
android:textSize="@dimen/sp_15" />
<ImageView
android:id="@+id/iv_hall_member_search"

129
app/src/module_labour_union/res/layout/item_hall_exchange.xml Normal file
View File

@@ -0,0 +1,129 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="80dp"
tools:background="@color/bg_secondary_2a2a39">
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_avatar"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginStart="@dimen/dp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_nickname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_6"
android:textColor="@color/color_1F1A4E"
android:textSize="@dimen/sp_15"
app:layout_constraintStart_toEndOf="@id/iv_avatar"
app:layout_constraintTop_toTopOf="@id/iv_avatar"
tools:text="@string/layout_item_search_admin_01" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_gender"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_6"
app:layout_constraintBottom_toBottomOf="@id/tv_nickname"
app:layout_constraintStart_toEndOf="@id/tv_nickname"
app:layout_constraintTop_toTopOf="@id/tv_nickname"
tools:src="@mipmap/ic_user_level" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_level"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_4"
android:adjustViewBounds="true"
app:layout_constraintBottom_toBottomOf="@+id/iv_gender"
app:layout_constraintStart_toEndOf="@+id/iv_gender"
tools:src="@mipmap/ic_user_level" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_charm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_4"
android:adjustViewBounds="true"
app:layout_constraintBottom_toBottomOf="@+id/iv_user_level"
app:layout_constraintStart_toEndOf="@+id/iv_user_level"
tools:src="@drawable/ic_user_charm_level" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:textColor="@color/color_6D6B89"
android:textSize="@dimen/sp_10"
app:layout_constraintStart_toStartOf="@id/tv_nickname"
app:layout_constraintTop_toBottomOf="@id/tv_nickname"
tools:text="ID:886887" />
<View
android:id="@+id/view_id"
android:layout_width="0.5dp"
android:layout_height="@dimen/dp_8"
android:layout_marginStart="@dimen/dp_3"
android:background="@color/color_D8D8D8"
app:layout_constraintBottom_toBottomOf="@+id/tv_id"
app:layout_constraintStart_toEndOf="@+id/tv_id"
app:layout_constraintTop_toTopOf="@+id/tv_id" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_room_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_3"
android:textColor="@color/color_6D6B89"
android:textSize="@dimen/sp_10"
app:layout_constraintBaseline_toBaselineOf="@+id/tv_id"
app:layout_constraintStart_toEndOf="@+id/view_id"
tools:text="灌南的房间" />
<View
android:id="@+id/view_room_name"
android:layout_width="0.5dp"
android:layout_height="@dimen/dp_8"
android:layout_marginStart="@dimen/dp_3"
android:background="@color/color_D8D8D8"
app:layout_constraintBottom_toBottomOf="@+id/tv_room_name"
app:layout_constraintStart_toEndOf="@+id/tv_room_name"
app:layout_constraintTop_toTopOf="@+id/tv_room_name" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_gold_balance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_3"
android:text="@string/gold_coin_balance"
android:textColor="@color/color_6D6B89"
android:textSize="@dimen/sp_10"
app:layout_constraintBaseline_toBaselineOf="@+id/tv_id"
app:layout_constraintStart_toEndOf="@+id/view_room_name" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_set"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_marginEnd="@dimen/dp_12"
android:background="@drawable/bg_common_confirm"
android:gravity="center"
android:paddingStart="@dimen/dp_8"
android:paddingEnd="@dimen/dp_8"
android:text="@string/open_exchange"
android:textColor="@color/white"
android:textSize="@dimen/sp_13"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>