From 08bc59f80ebadbf2858355d54478af0872ba5cc9 Mon Sep 17 00:00:00 2001 From: Martin <13046765170@163.com> Date: Tue, 10 Sep 2024 16:11:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A0=81=E7=9B=B4?= =?UTF-8?q?=E6=92=ADUI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- live/src/main/res/drawable/button_cbd5e0.xml | 2 +- live/src/main/res/drawable/button_ffc621.xml | 2 +- .../main/activity/MyWalletActivity.java | 6 +- .../main/adapter/MainHomeLiveAdapter.java | 13 +- .../adapter/MainHomeLivesClassAdapter.java | 4 +- .../utils/ColorTransitionPagerTitleView.java | 51 ++++++++ .../views/AbsMainHomeParentViewHolder.java | 45 +++++-- .../views/MainHomeCommunityViewHolder.java | 67 +--------- .../main/views/MainHomeLiveViewHolder.java | 2 +- .../yunbao/main/views/MainHomeViewHolder.java | 122 ++++++++++++++++-- .../yunbao/main/views/MainListViewHolder.java | 1 - .../main/views/UserHomeViewHolder2.java | 3 +- .../res/layout/item_main_home_lives_class.xml | 4 +- main/src/main/res/layout/view_main_home.xml | 52 ++++---- .../res/mipmap-mdpi/icon_main_bangdan.png | Bin 0 -> 1746 bytes .../main/res/mipmap-mdpi/icon_main_search.png | Bin 1446 -> 2497 bytes .../mipmap-mdpi/icon_main_start_live_new.png | Bin 0 -> 5927 bytes 17 files changed, 241 insertions(+), 133 deletions(-) create mode 100644 main/src/main/java/com/yunbao/main/utils/ColorTransitionPagerTitleView.java create mode 100644 main/src/main/res/mipmap-mdpi/icon_main_bangdan.png create mode 100644 main/src/main/res/mipmap-mdpi/icon_main_start_live_new.png diff --git a/live/src/main/res/drawable/button_cbd5e0.xml b/live/src/main/res/drawable/button_cbd5e0.xml index 5cb18fe0d..966b06feb 100644 --- a/live/src/main/res/drawable/button_cbd5e0.xml +++ b/live/src/main/res/drawable/button_cbd5e0.xml @@ -2,7 +2,7 @@ - + diff --git a/live/src/main/res/drawable/button_ffc621.xml b/live/src/main/res/drawable/button_ffc621.xml index e4b6e8c04..5aed3c708 100644 --- a/live/src/main/res/drawable/button_ffc621.xml +++ b/live/src/main/res/drawable/button_ffc621.xml @@ -2,7 +2,7 @@ - + diff --git a/main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java b/main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java index 9afd0de94..8ce3b1caf 100644 --- a/main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java @@ -11,7 +11,6 @@ import android.view.animation.AccelerateInterpolator; import android.view.animation.DecelerateInterpolator; import android.widget.TextView; -import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentPagerAdapter; @@ -28,11 +27,11 @@ import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.pay.hw.HwBuilder; import com.yunbao.common.pay.samsung.SamsungUtil; import com.yunbao.common.utils.GoogleUtils; -import com.yunbao.common.utils.L; import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.ToastUtil; import com.yunbao.main.R; import com.yunbao.main.http.MainHttpUtil; +import com.yunbao.main.utils.ColorTransitionPagerTitleView; import com.yunbao.main.utils.HXLinePagerIndicator; import net.lucode.hackware.magicindicator.MagicIndicator; @@ -43,14 +42,11 @@ import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.CommonNav import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; import net.lucode.hackware.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; -import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import java.util.ArrayList; -import java.util.List; import java.util.Locale; @Route(path = RouteUtil.PATH_COIN) diff --git a/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java b/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java index 4f58b217e..c54acd668 100644 --- a/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java +++ b/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java @@ -67,10 +67,10 @@ public class MainHomeLiveAdapter extends RefreshAdapter { @Override public int getItemViewType(int position) { - if (position == 0) { + if (position == 4) { return HEAD; - } else if (position > 0) { - LiveBean mode = mList.get(position - 1); + } else{ + LiveBean mode = mList.get(position>4?position-1:position); if (TextUtils.equals(mode.getIs_week(), "1")) { return WEEKLAYOUT; } else { @@ -114,8 +114,9 @@ public class MainHomeLiveAdapter extends RefreshAdapter { @Override public void onBindViewHolder(@NonNull RecyclerView.ViewHolder vh, int position) { + int nowPosition = position>4?position-1:position; if (vh instanceof MainHomeLiveWeekItemViewHolder) { - ((MainHomeLiveWeekItemViewHolder) vh).loadViewDate(mList.get(position - 1), position - 1, Height, new MainHomeLiveWeekItemViewHolder.OnItemClickListener() { + ((MainHomeLiveWeekItemViewHolder) vh).loadViewDate(mList.get(nowPosition), nowPosition, Height, new MainHomeLiveWeekItemViewHolder.OnItemClickListener() { @Override public void onItemClick(LiveBean bean, int position) { if (mOnItemClickListener != null) { @@ -124,7 +125,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter { } }); } else if (vh instanceof MainHomeLiveItemViewHolder) { - ((MainHomeLiveItemViewHolder) vh).loadViewDate(mList.get(position - 1), position - 1, Height, new MainHomeLiveItemViewHolder.OnItemClickListener() { + ((MainHomeLiveItemViewHolder) vh).loadViewDate(mList.get(nowPosition), nowPosition, Height, new MainHomeLiveItemViewHolder.OnItemClickListener() { @Override public void onItemClick(LiveBean bean, int position) { if (mOnItemClickListener != null) { @@ -137,7 +138,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter { @Override public int getItemCount() { - return super.getItemCount() + 1; + return super.getItemCount(); } class HeadVh extends RecyclerView.ViewHolder { diff --git a/main/src/main/java/com/yunbao/main/adapter/MainHomeLivesClassAdapter.java b/main/src/main/java/com/yunbao/main/adapter/MainHomeLivesClassAdapter.java index 582bf1b5c..5e82e5b90 100644 --- a/main/src/main/java/com/yunbao/main/adapter/MainHomeLivesClassAdapter.java +++ b/main/src/main/java/com/yunbao/main/adapter/MainHomeLivesClassAdapter.java @@ -97,10 +97,10 @@ public class MainHomeLivesClassAdapter extends RecyclerView.Adapter= Build.VERSION_CODES.TIRAMISU) { + permissions = new String[]{ + //Manifest.permission.READ_MEDIA_IMAGES, 去掉选择图片的权限，到里面选择封面的时候再去申请 + Manifest.permission.CAMERA, + Manifest.permission.RECORD_AUDIO + }; + } else { + permissions = new String[]{ + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.CAMERA, + Manifest.permission.RECORD_AUDIO + }; + } + mProcessResultUtil.requestPermissions(permissions, mStartLiveRunnable); + } else { + ToastUtil.show(mContext.getString(R.string.only_open_anchor)); + } + } + }); img_trophy = (ImageView) findViewById(R.id.img_trophy); - - ImgLoader.display(mContext, "https://downs.yaoulive.com/gif_trophy.gif", img_trophy); - img_trophy.setOnLongClickListener(new View.OnLongClickListener() { @Override public boolean onLongClick(View view) { @@ -91,14 +129,76 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder { return true; } }); - findViewById(R.id.tvPlay).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - MobclickAgent.onEvent(mContext, "home_page_short_drama", "首页短剧按钮"); - RouteUtil.forwardCommunityActivity(); - } - }); } + + private Runnable mStartLiveRunnable = new Runnable() { + @Override + public void run() { + if (CommonAppConfig.LIVE_SDK_CHANGED) { + if (mGetLiveSdkCallback == null) { + mGetLiveSdkCallback = new HttpCallback() { + @Override + public void onSuccess(int code, String msg, final String[] info) { + if (code == 0 && info.length > 0) { + LiveHttpUtil.getisRong(new HttpCallback() { + @Override + public void onSuccess(int code, String msg, String[] info1) { + try { + LiveHttpUtil.getIsSw(new HttpCallback() { + @Override + public void onSuccess(int code, String msg, String[] infos) { + JSONObject obj = JSON.parseObject(info[0]); + JSONObject obj1 = JSON.parseObject(info1[0]); + try { + if(code==201){ //声网 + LiveSwAnchorActivity.forward(mContext, Constants.LIVE_SDK_SW, JSON.parseObject(obj.getString("android"), LiveKsyConfigBean.class)); + }else if(code==200){//融云 + LiveRyAnchorActivity.forward(mContext, obj.getIntValue("live_sdk"), JSON.parseObject(obj.getString("android"), LiveKsyConfigBean.class)); + } + } catch (Exception e) { + + } + } + }); + } catch (Exception e) { + + } + } + }); + } + } + }; + } + if (!CommonAppConfig.IS_PLUGIN_MODEL || PluginManager.getInstance().isDownloadApk()) { + PluginManager.getInstance().loadAnchorPlugin(it -> { + LiveHttpUtil.getLiveSdk(mGetLiveSdkCallback); + }); + } else { + String tips = "需要下載開播插件，是否下載"; + if (!WordUtil.isNewZh()) { + tips = "You need to download the plug-in, whether to download"; + } + DialogUitl.showSimpleDialog(mContext, tips, new DialogUitl.SimpleCallback() { + @Override + public void onConfirmClick(Dialog dialog, String content) { + Dialog downloadDialog = DialogUitl.loadingDialog(mContext, "Downloading..."); + downloadDialog.show(); + PluginManager.getInstance().loadAnchorPlugin(it -> { + LiveHttpUtil.getLiveSdk(mGetLiveSdkCallback); + downloadDialog.dismiss(); + }); + } + }); + } + } else { + LiveAnchorActivity.forward(mContext, CommonAppConfig.LIVE_SDK_USED, LiveConfig.getDefaultKsyConfig()); + } + } + }; + + private HttpCallback mGetLiveSdkCallback; + private ProcessResultUtil mProcessResultUtil; + private void testAes() { String aesStr ="yvNHDY/jYopEYMnjYKzm5p0WfeP/IqahmtN/zY8kH5OyAUcmqc4igt/6eSslvgSKA0fX8/imr+yHfLb2DZNKI7bikEAuagiKvJdRZ9GIvw9mix5Ap0E/BGVe3DrirxKf3XrmJL8mONw4OTn7JmDStB/SMt3tgWP9bvjVwa66BcRcIaRSxbMDm/6dN7QsLtBMjx+XzpRocH2ISTLhEhuxbjz9ovIDwETx4IgPj4LuHcPERDSeNE9TC9UWHqIo+hWoUiGc8MhSh3uO7ptOzno6Dg9Zk4uxnKZdLYeR+M9JLaja6NMloza5IjI15CIcGVT9o4HLeUVodShZjFGsw7JfMcoUBhnQEOHPSh2S8q6Py0Z0ofiTsJWUj2+XwYwyvjxx"; //byte[] msg = AesUtils.decrypt(aesStr.getBytes(), "LhHBfcsN2VmBpHCn".getBytes()); diff --git a/main/src/main/java/com/yunbao/main/views/MainListViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainListViewHolder.java index 789a6595e..cc4308f02 100644 --- a/main/src/main/java/com/yunbao/main/views/MainListViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainListViewHolder.java @@ -10,7 +10,6 @@ import android.widget.FrameLayout; import com.yunbao.common.adapter.ViewPagerAdapter; import com.yunbao.common.event.FollowEvent; import com.yunbao.common.utils.DpUtil; -import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.AbsMainViewHolder; import com.yunbao.main.R; diff --git a/main/src/main/java/com/yunbao/main/views/UserHomeViewHolder2.java b/main/src/main/java/com/yunbao/main/views/UserHomeViewHolder2.java index e4a566c88..c0b718a0d 100644 --- a/main/src/main/java/com/yunbao/main/views/UserHomeViewHolder2.java +++ b/main/src/main/java/com/yunbao/main/views/UserHomeViewHolder2.java @@ -33,7 +33,6 @@ import com.yunbao.common.Constants; import com.yunbao.common.activity.AbsActivity; import com.yunbao.common.adapter.ViewPagerAdapter; import com.yunbao.common.bean.ConfigBean; -import com.yunbao.common.bean.LevelBean; import com.yunbao.common.bean.LiveBean; import com.yunbao.common.bean.NewLevelModel; import com.yunbao.common.event.FollowEvent; @@ -71,6 +70,7 @@ import com.yunbao.main.activity.FollowActivity; import com.yunbao.main.activity.UserHomeActivity; import com.yunbao.main.http.MainHttpConsts; import com.yunbao.main.http.MainHttpUtil; +import com.yunbao.main.utils.ColorTransitionPagerTitleView; import net.lucode.hackware.magicindicator.MagicIndicator; import net.lucode.hackware.magicindicator.ViewPagerHelper; @@ -79,7 +79,6 @@ import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.CommonNav import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; import net.lucode.hackware.magicindicator.buildins.commonnavigator.indicators.WrapPagerIndicator; -import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView; import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView; import org.greenrobot.eventbus.EventBus; diff --git a/main/src/main/res/layout/item_main_home_lives_class.xml b/main/src/main/res/layout/item_main_home_lives_class.xml index c17159264..e60ed1c2b 100644 --- a/main/src/main/res/layout/item_main_home_lives_class.xml +++ b/main/src/main/res/layout/item_main_home_lives_class.xml @@ -3,7 +3,7 @@ android:orientation="vertical" android:gravity="center" android:paddingRight="5dp" - android:layout_marginLeft="15dp" + android:layout_marginLeft="10dp" android:paddingTop="12dp" android:paddingBottom="10dp" android:layout_width="wrap_content" @@ -12,7 +12,7 @@ - + + @@ -41,20 +46,6 @@ android:layout_width="wrap_content" android:layout_height="match_parent" /> - - @@ -65,10 +56,22 @@ android:layout_alignParentRight="true" android:layout_alignParentBottom="true"> + + - + android:padding="6dp" + android:src="@mipmap/icon_main_start_live_new" /> @@ -95,7 +98,8 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/main/src/main/res/mipmap-mdpi/icon_main_bangdan.png b/main/src/main/res/mipmap-mdpi/icon_main_bangdan.png new file mode 100644 index 0000000000000000000000000000000000000000..6a81663ab98a1cd7cebc82549f68920e0c07e807 GIT binary patch literal 1746 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 LNkvXXu0mjfi@mk? literal 1446 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+yeRz{DHi6XNP#;FFY;l$Ms3n3xD8 zfgm|K8At+^rKYB4Wn}@`Kn4T=*`cAK5D_4W27qedvMDJkKv|#&kOZ0!i{BGS;%05<{1fUtoiP!`SxiNdS{YJ__V$Oek5Z|5lj zM*O;xAirP+sb8XB&k6N2{^Pl{(*FE&w!ahR@yCB){qdc%VV1-1aaL3a^$y9^ESoW;isQvC~#q^}Tr(Al`4ZjSek{T#~^JTKRL zymz%+|7MJ4Sg>;k)BX8Zu7@5d_Q>?BxOF#o`fZurmM=7?-#H9S(z85W977@wznz{Q zE#)ZED$e36u+hbV(X~@I>y7QS8;g#~U9Nt=_xrpV_p0+}S?xDW4>M5oQ?B`3Xm_sq z-OanZ%irI*y5*+n;p>sR&p(g8{lEU;P4=w!LbXTlYh`!#8tmHmRf98nW^=d_$Mz>z zCce~O?PXdQm}GDytj2KNZnM=&DI04i2mN7MyiU*Nzr~hhjwkOge1Dc3w&Sl<>?{5~ z9Jk-?3Gv@PIeIBuY{>Qsjby0~&#QAUt9;Z9*|Mbn4DjOi+;(=x0qbo6Hm z1os?Cu;bB+$uUzg_`iA9f~r$)(i0kY1~uCnXrxU_{B`tXwk_xSTYLLmnGAlc`LI#d zAw9j(qG3K4oBTrSvrNhi_eFWa9JbG4b(`qi-Q;M^6Swhzg`M-%w&Vs!JMJ3gC(~Cs z3UjNtec)KB^MU!mf`kI5UAj6SL>ELJT)?rbNNff}#PSG_-;oO#5&{-Z@hO<&}+ zFAx`|$yy|TE?=!C7%(d=D{uYO(VcwBAv4K?>UXBwr0+ovpDb!O#p zDfcNdvznd5{=AsTohjc}uAaja_q+69N?%U#lH_^w4WE78SKhiQXPRY3uJ+ykE!OkD z|NlDg313w7Ps!sUU!3#vf_}_4iw^yj?|;s$|9J85V4cNb*EB3UR-Ik#`f`KuD)~;S opdi`1>pc!Hym^1)%&m3IYZv%(Z){Wk0?c0wp00i_>zopr0NWLR$^ZZW diff --git a/main/src/main/res/mipmap-mdpi/icon_main_start_live_new.png b/main/src/main/res/mipmap-mdpi/icon_main_start_live_new.png new file mode 100644 index 0000000000000000000000000000000000000000..5abbaf82f635edd515bfbb24e0128838a7538904 GIT binary patch literal 5927 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 JPDHLkV1l+FfDHfu literal 0 HcmV?d00001