yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/新改版_poyo' into 新改版_poyo

Browse Source
This commit is contained in:
老皮 2024-09-13 10:06:53 +08:00
commit b68b334e00
12 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/res/layout/activity_launcher.xml
View File

@ -63,6 +63,7 @@
android:scaleType="centerCrop" /> android:scaleType="centerCrop" />
<ImageView <ImageView
android:visibility="gone"
android:layout_gravity="bottom|center_horizontal" android:layout_gravity="bottom|center_horizontal"
android:layout_width="84dp" android:layout_width="84dp"
android:src="@mipmap/logo" android:src="@mipmap/logo"

4
common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java
View File

@ -186,7 +186,7 @@ public class LiveHttpUtil {
* 直播间解除禁言 * 直播间解除禁言
*/ */
public static void liveCancelShutUp(String liveUid, String toUid, HttpCallback callback) { public static void liveCancelShutUp(String liveUid, String toUid, HttpCallback callback) {
HttpClient.getInstance().get("Livemanage.cancelShut", LiveHttpConsts.LIVE_CANCEL_SHUT_UP) HttpClient.getInstance().get("jiechujinyan", LiveHttpConsts.LIVE_CANCEL_SHUT_UP)
.params("liveuid", liveUid) .params("liveuid", liveUid)
.params("touid", toUid) .params("touid", toUid)
.execute(callback); .execute(callback);
@ -206,7 +206,7 @@ public class LiveHttpUtil {
* 直播间解除拉黑 * 直播间解除拉黑
*/ */
public static void liveCancelBlack(String liveUid, String toUid, HttpCallback callback) { public static void liveCancelBlack(String liveUid, String toUid, HttpCallback callback) {
HttpClient.getInstance().get("Livemanage.cancelKick", LiveHttpConsts.LIVE_CANCEL_BLACK) HttpClient.getInstance().get("jiechutichu", LiveHttpConsts.LIVE_CANCEL_BLACK)
.params("liveuid", liveUid) .params("liveuid", liveUid)
.params("touid", toUid) .params("touid", toUid)
.execute(callback); .execute(callback);

2
main/src/main/java/com/yunbao/main/dialog/SigninDialog.java
View File

@ -63,7 +63,7 @@ public class SigninDialog extends AbsDialogFragment {
if (bundle == null) { if (bundle == null) {
return; return;
} }
gold.setText(bundle.getString("send_gold") + "金豆+" + bundle.getString("send_exp") + "經驗值"); gold.setText(bundle.getString("send_gold") + mContext.getString(R.string.golden_beans) +"+"+ bundle.getString("send_exp") + mContext.getString(R.string.new_exp));
} }
@Override @Override

2
main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
View File

@ -16,6 +16,7 @@ import android.widget.TextView;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import androidx.fragment.app.FragmentActivity;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@ -85,6 +86,7 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
@Override @Override
public void init() { public void init() {
super.init(); super.init();
mProcessResultUtil = new ProcessResultUtil((FragmentActivity) mContext);
findViewById(R.id.btn_start_live).setOnClickListener(new View.OnClickListener() { findViewById(R.id.btn_start_live).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

12
main/src/main/java/com/yunbao/main/views/SearchRecommendBodyItemViewHolder.java
View File

@ -59,7 +59,7 @@ public class SearchRecommendBodyItemViewHolder extends RecyclerView.ViewHolder {
public void showData(AnchorRecommendItemModel model, int height) { public void showData(AnchorRecommendItemModel model, int height) {
Context mContext = itemView.getContext(); Context mContext = itemView.getContext();
liveType.setImageDrawable(null); liveType.setImageDrawable(null);
if (model.getContentPicSizeTwo() != null && !model.getContentPicSizeTwo().equals("") && height <= 1920) { /*if (model.getContentPicSizeTwo() != null && !model.getContentPicSizeTwo().equals("") && height <= 1920) {
Picasso.with(mContext) Picasso.with(mContext)
.load(model.getContentPicSizeTwo()) .load(model.getContentPicSizeTwo())
.into(liveType); .into(liveType);
@ -67,7 +67,7 @@ public class SearchRecommendBodyItemViewHolder extends RecyclerView.ViewHolder {
Picasso.with(mContext) Picasso.with(mContext)
.load(model.getContentPicSizeThree()) .load(model.getContentPicSizeThree())
.into(liveType); .into(liveType);
} }*/
ImgLoader.display(itemView.getContext(), model.getThumb(), mCover); ImgLoader.display(itemView.getContext(), model.getThumb(), mCover);
bgs.setVisibility(View.VISIBLE); bgs.setVisibility(View.VISIBLE);
pkico.setVisibility(View.GONE); pkico.setVisibility(View.GONE);
@ -95,22 +95,22 @@ public class SearchRecommendBodyItemViewHolder extends RecyclerView.ViewHolder {
mNum.setText(formatBigNum.formatBigNum(String.valueOf(model.getHotNum()))); mNum.setText(formatBigNum.formatBigNum(String.valueOf(model.getHotNum())));
views.setVisibility(View.GONE); views.setVisibility(View.GONE);
if (TextUtils.equals("1", model.getIslive())) { if (TextUtils.equals("1", model.getIslive())) {
views.setVisibility(View.VISIBLE); //views.setVisibility(View.VISIBLE);
//直播中 //直播中
mType.setImageResource(MainIconUtil.getLiveTypeIcon(Integer.parseInt(model.getType()))); mType.setImageResource(MainIconUtil.getLiveTypeIcon(Integer.parseInt(model.getType())));
mType.setVisibility(View.VISIBLE); mType.setVisibility(View.VISIBLE);
mLiveIco.setImageResource(R.mipmap.icon_main_rest_work); mLiveIco.setImageResource(R.mipmap.icon_main_rest_work);
mNum.setVisibility(View.VISIBLE); mNum.setVisibility(View.VISIBLE);
liveType.setVisibility(View.VISIBLE); //liveType.setVisibility(View.VISIBLE);
mLiveState.setText(mContext.getString(R.string.lives_state)); mLiveState.setText(mContext.getString(R.string.lives_state));
} else { } else {
views.setVisibility(View.VISIBLE); //views.setVisibility(View.VISIBLE);
//休息中 //休息中
mType.setImageResource(MainIconUtil.getLiveTypeIcon(Constants.LIVE_TYPE_RESTING)); mType.setImageResource(MainIconUtil.getLiveTypeIcon(Constants.LIVE_TYPE_RESTING));
mType.setVisibility(View.GONE); mType.setVisibility(View.GONE);
mLiveIco.setImageResource(R.mipmap.icon_main_rest_spot); mLiveIco.setImageResource(R.mipmap.icon_main_rest_spot);
mLiveState.setText(mContext.getString(R.string.rest_state)); mLiveState.setText(mContext.getString(R.string.rest_state));
liveType.setVisibility(View.GONE); //liveType.setVisibility(View.GONE);
mNum.setVisibility(View.GONE); mNum.setVisibility(View.GONE);
}//防抖 }//防抖
RxView.clicks(mCover) RxView.clicks(mCover)

8
main/src/main/res/layout/item_main_home_lives.xml
View File

@ -121,14 +121,16 @@
android:textSize="10sp" android:textSize="10sp"
android:background="@drawable/bg_main_live_item_title" /> android:background="@drawable/bg_main_live_item_title" />
<RelativeLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="5dp"> android:layout_marginBottom="5dp">
<TextView <TextView
android:id="@+id/name" android:id="@+id/name"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
@ -150,7 +152,7 @@
app:dt_left_height="12dp" app:dt_left_height="12dp"
app:dt_left_width="10dp" /> app:dt_left_width="10dp" />
</RelativeLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

32
main/src/main/res/layout/item_main_home_lives2.xml
View File

@ -49,6 +49,7 @@
android:layout_width="46dp" android:layout_width="46dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:visibility="gone"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:background="@mipmap/live_zt"> android:background="@mipmap/live_zt">
@ -93,29 +94,34 @@
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="15dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:gravity="center_vertical"
android:ellipsize="end" android:ellipsize="end"
android:includeFontPadding="false" android:includeFontPadding="false"
android:maxLines="1" android:maxLines="1"
android:textColor="#fff" android:textColor="#fff"
android:textSize="13sp" android:textSize="10sp"
android:textStyle="bold" /> android:background="@drawable/bg_main_live_item_title" />
<RelativeLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="5dp"> android:layout_marginBottom="5dp">
<TextView <TextView
android:id="@+id/name" android:id="@+id/name"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:textColor="#fff" android:textColor="#fff"
android:textSize="10sp" /> android:textSize="12sp" />
<com.yunbao.common.custom.DrawableTextView <com.yunbao.common.custom.DrawableTextView
android:id="@+id/num" android:id="@+id/num"
@ -125,14 +131,14 @@
android:drawablePadding="4dp" android:drawablePadding="4dp"
android:gravity="center" android:gravity="center"
android:singleLine="true" android:singleLine="true"
android:textColor="#B3ffffff" android:textColor="@color/white"
android:textSize="10sp" android:textSize="12sp"
android:textStyle="bold" android:textStyle="bold"
app:dt_left_drawable="@mipmap/icon_main_live_num" app:dt_left_drawable="@mipmap/icon_main_live_num_new"
app:dt_left_height="14dp" app:dt_left_height="12dp"
app:dt_left_width="14dp" /> app:dt_left_width="10dp" />
</RelativeLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

3
main/src/main/res/layout/signin_dialog.xml
View File

@ -16,7 +16,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="170dp" android:layout_marginTop="170dp"
android:text="簽到成功" android:text="@string/sign_in_successful"
android:textColor="#FF000000" android:textColor="#FF000000"
android:textSize="24sp" android:textSize="24sp"
android:textStyle="bold" /> android:textStyle="bold" />
@ -34,7 +34,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:text="200 金豆 + 2000 EXP"
android:textColor="#FFFF2D73" android:textColor="#FFFF2D73"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" /> android:textStyle="bold" />

2
main/src/main/res/layout/view_main_home.xml
View File

@ -98,7 +98,7 @@
<androidx.viewpager.widget.ViewPager <androidx.viewpager.widget.ViewPager
android:id="@+id/viewPager" android:id="@+id/viewPager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_marginTop="80dp" android:layout_marginTop="78dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:overScrollMode="never" android:overScrollMode="never"
app:layout_behavior="@string/appbar_scrolling_view_behavior" /> app:layout_behavior="@string/appbar_scrolling_view_behavior" />

BIN
main/src/main/res/mipmap-xxhdpi/icon_cange.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.2 KiB

2
main/src/main/res/values-zh/strings.xml
View File

@ -46,4 +46,6 @@
<string name="main_tab_main">遇見</string> <string name="main_tab_main">遇見</string>
<string name="main_tab_yule">娛樂</string> <string name="main_tab_yule">娛樂</string>
<string name="main_tab_guangchang">廣場</string> <string name="main_tab_guangchang">廣場</string>
<string name="new_exp">經驗值</string>
<string name="sign_in_successful">簽到成功</string>
</resources> </resources>

2
main/src/main/res/values/strings.xml
View File

@ -46,4 +46,6 @@
<string name="main_tab_main">Meet</string> <string name="main_tab_main">Meet</string>
<string name="main_tab_yule">Game</string> <string name="main_tab_yule">Game</string>
<string name="main_tab_guangchang">Moment</string> <string name="main_tab_guangchang">Moment</string>
<string name="new_exp">EXP</string>
<string name="sign_in_successful">Sign in successful</string>
</resources> </resources>