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

fix: bugfix

Browse Source
This commit is contained in:
eggmanQQQ
2024-12-18 17:40:22 +08:00
parent 9c480c14df
commit 52ee9fdfac
9 changed files with 232 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/chwl/app/avroom/adapter/UpMicAdapter.java
View File

@@ -15,6 +15,7 @@ import com.chwl.library.utils.ResUtil;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import io.reactivex.Single;
import io.reactivex.functions.Consumer;
@@ -86,13 +87,13 @@ public class UpMicAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
} else if (AvRoomDataManager.get().isDatingMode()) {
textView.setText(ResUtil.getString(R.string.avroom_adapter_upmicadapter_01));
} else {
textView.setText(String.format(context.getResources().getString(R.string.which_mic_position), position));
textView.setText(String.format(Locale.US,context.getResources().getString(R.string.which_mic_position), position));
}
} else {
if (AvRoomDataManager.get().isDatingMode()) {
textView.setText(position + (Constants.maleIndex.contains(position - 1) ? ResUtil.getString(R.string.avroom_adapter_upmicadapter_03) : ResUtil.getString(R.string.avroom_adapter_upmicadapter_04)));
} else {
textView.setText(String.format(context.getResources().getString(R.string.which_mic_position), position));
textView.setText(String.format(Locale.US,context.getResources().getString(R.string.which_mic_position), position));
}
}
}

34
app/src/main/java/com/chwl/app/home/fragment/HomeRecommendFragment.kt
View File

@@ -216,14 +216,17 @@ class HomeRecommendFragment : BaseViewBindingFragment<FragmentHomeRecommendBindi
}
binding.tabLayoutMore.id->{
val listData = arrayListOf<CountryBean>()
tabList.forEachIndexed { index, homeTagInfo ->
listData.add(CountryBean().apply {
id = homeTagInfo.id
name = homeTagInfo.name
icon = homeTagInfo.icon
checked = index == mPosition
})
if (homeTagInfo.regionId != -1) {
listData.add(CountryBean().apply {
id = homeTagInfo.id
name = homeTagInfo.name
icon = homeTagInfo.icon
checked = index == mPosition
})
}
}
CountrySelectDialog().apply {
@@ -231,7 +234,21 @@ class HomeRecommendFragment : BaseViewBindingFragment<FragmentHomeRecommendBindi
mData = listData
mActionCallBack = object : BaseDialogFragment.Action {
override fun onAction(type: Int, data: Any?) {
selectTabView(type)
if (data is CountryBean) {
val indexOfFirst = tabList.indexOfFirst { tab ->
tab.id == data.id
}
if (indexOfFirst != -1) {
selectTabView(indexOfFirst)
this@HomeRecommendFragment.binding.tabLayout.postDelayed({
this@HomeRecommendFragment.binding.tabLayout.scrollToTab(mPosition, 0f)
}, 200)
}
}
}
}
}.show(context)
@@ -340,9 +357,6 @@ class HomeRecommendFragment : BaseViewBindingFragment<FragmentHomeRecommendBindi
val tabView = ItemHomeRecommentdTagBinding.bind(oldView)
tabView.bg.changeStrikeColor("#ff8c03".toColor())
}
binding.tabLayout.postDelayed({
binding.tabLayout.scrollToTab(mPosition, 0f)
}, 200)
}
override fun onDestroyView() {

11
app/src/main/java/com/chwl/app/home/fragment/MeFragment.kt
View File

@@ -36,6 +36,7 @@ import com.chwl.app.ui.relation.FansListActivity
import com.chwl.app.ui.utils.ImageLoadUtils
import com.chwl.app.ui.wallet.WalletActivity
import com.chwl.app.ui.webview.CommonWebViewActivity
import com.chwl.app.ui.widget.UserInfoDialog
import com.chwl.app.utils.HomeUIManager
import com.chwl.app.view.GenderAgeTextView
import com.chwl.app.vip.VipCenterActivity
@@ -385,12 +386,12 @@ class MeFragment : BaseFragment(), View.OnClickListener {
// view.loadUrl(url);
// UserInfoDialog.showNewUserInfoDialog(
// mContext,
// AuthModel.get().currentUid
// )
UserInfoDialog.showNewUserInfoDialog(
mContext,
AuthModel.get().currentUid
)
UIHelper.showAddInfoAct(it)
// UIHelper.showAddInfoAct(it)
// CountrySelectDialog().apply {
// isRegion = true

4
app/src/main/java/com/chwl/app/ui/bean/CountryBean.java
View File

@@ -1,5 +1,9 @@
package com.chwl.app.ui.bean;
import lombok.Data;
@Data
public class CountryBean {
public String name;
public String icon;

41
app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java
View File

@@ -16,6 +16,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
@@ -302,21 +303,20 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
mBinding.follow.setVisibility(View.VISIBLE);
}
mBinding.ivUserCardWearMp4.post(new Runnable() {
@Override
public void run() {
int width = (int) (mBinding.ivUserCardWearMp4.getWidth() / 0.8636);
OtherExtKt.setViewWH(mBinding.ivUserCardWearMp4,width,mBinding.ivUserCardWearMp4.getHeight(),false);
}
mBinding.ivUserCardWearMp4.post(() -> {
int width = (int) (mBinding.ivUserCardWearMp4.getWidth() / 0.8636);
OtherExtKt.setViewWH(mBinding.ivUserCardWearMp4,width,mBinding.ivUserCardWearMp4.getHeight(),false);
});
mBinding.userCardWearLayout.post(new Runnable() {
@Override
public void run() {
int width = (int) (mBinding.userCardWearLayout.getWidth() / 0.8636);
OtherExtKt.setViewWH(mBinding.userCardWearLayout,width,mBinding.userCardWearLayout.getHeight(),false);
}
mBinding.userCardWearLayout.post(() -> {
int width = (int) (mBinding.userCardWearLayout.getWidth() / 0.8636);
// int width = mBinding.userCardWearLayout.getWidth();
// int height = (int) (mBinding.userCardWearLayout.getHeight() / 0.6111);
int height = mBinding.userCardWearLayout.getHeight();
OtherExtKt.setViewWH(mBinding.userCardWearLayout,width,height,false);
});
}
private void initAttentData() {
@@ -436,6 +436,23 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
} else {
mBinding.flexbox.setVisibility(View.VISIBLE);
mBinding.flexboxLine.setVisibility(View.VISIBLE);
//超出屏幕時 不居中
mBinding.flexboxLine.post(() -> {
mBinding.flexbox.post(() -> {
int lineWidth = mBinding.flexboxLine.getWidth();
int boxWidth = mBinding.flexbox.getWidth();
if (boxWidth > lineWidth) {
try {
FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) mBinding.flexbox.getLayoutParams();
lp.gravity = Gravity.START;
mBinding.flexbox.setLayoutParams(lp);
} catch (Exception e) {
}
}
});
});
}
}
});

9
app/src/main/res/layout/dialog_user_info.xml
View File

@@ -98,7 +98,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/fl_avatar_layout"
tools:background="@drawable/bg_user_card_wear"
tools:visibility="visible" />
tools:visibility="gone" />
<FrameLayout
@@ -448,16 +448,17 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/flexboxLine"
tools:layout_height="20dp">
tools:layout_height="40dp">
<LinearLayout
android:id="@+id/flexbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_gravity="center_horizontal"
android:orientation="horizontal"
android:paddingVertical="10dp"
tools:layout_height="20dp" />
tools:layout_height="20dp"
tools:layout_width="80dp" />
</HorizontalScrollView>

19
app/src/module_game/res/values-tr/strings.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="matchmaking">Eşleştirme</string>
<string name="match_successfully">Eşleştirme başarılı</string>
<string name="match_failed">Eşleştirme başarısız</string>
<string name="game_award_tips_coins_text">Altın</string>
<string name="game_award_tips_format">%s altın kazandınız</string>
<string name="start">Başlat</string>
<string name="game_ticket_format">Giriş ücreti(%s)</string>
<string name="game_exit_tips">Oyun başladı, odadan çıkarsanız oyunu kaybedersiniz, çıkmak istediğinize emin misiniz?</string>
<string name="game_exit_tips_matching">Oyun eşleştirme aşamasında, odadan çıkarsanız eşleştirme sona erecek, çıkmak istiyor musunuz?</string>
<string name="game_match_failed">Eşleştirme başarısız, tekrar denemek ister misiniz?</string>
<string name="game_rematch">Yeniden eşleştir</string>
<string name="resume_game_tips">Oyun devam ediyor, odasına geri dönmek istiyor musunuz?</string>
<string name="game_end_tips">Oyun sona erdi~</string>
<string name="continue_game">Oyuna devam et</string>
</resources>