diff --git a/Share/src/main/res/values/strings.xml b/Share/src/main/res/values/strings.xml index b1b94a0b5..2cd7a3526 100644 --- a/Share/src/main/res/values/strings.xml +++ b/Share/src/main/res/values/strings.xml @@ -9,8 +9,8 @@ Messenger Instagram Share - Come and watch %s live on PDLIVE and meet more interesting people! + Come and watch %s live on PoYo and meet more interesting people! Invite Friends - Come to PDLIVE to discover more and better live streams. + Come to PoYo to discover more and better live streams. Copy \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 3378311dc..d9bbbb299 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -177,7 +177,7 @@ android { } else { server = '测试服' } - def fileName = "[${new Date().format("yyyy-MM-dd HHmmss", TimeZone.getTimeZone("GMT+8"))}]PDLive-${defaultConfig.versionName}-${defaultConfig.versionCode}-${channel}-${server}-${variant.buildType.name}.apk" + def fileName = "[${new Date().format("yyyy-MM-dd HHmmss", TimeZone.getTimeZone("GMT+8"))}]PoYo-${defaultConfig.versionName}-${defaultConfig.versionCode}-${channel}-${server}-${variant.buildType.name}.apk" variant.outputs.forEach { fe -> copy { from fe.outputFile @@ -207,7 +207,7 @@ android { } else { server = '测试服' } - def fileName = "[${new Date().format("yyyy-MM-dd HHmmss", TimeZone.getTimeZone("GMT+8"))}]PDLive-${defaultConfig.versionName}-${defaultConfig.versionCode}-${channel}-${server}-${variant.buildType.name}.aab" + def fileName = "[${new Date().format("yyyy-MM-dd HHmmss", TimeZone.getTimeZone("GMT+8"))}]PoYo-${defaultConfig.versionName}-${defaultConfig.versionCode}-${channel}-${server}-${variant.buildType.name}.aab" File finalFile = new File("${project.rootDir}\\outputs\\aab", fileName) finalBundleFile.set(finalFile) } diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 50257bea6..65571177e 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index 33cbef52d..65571177e 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index a70ceeb93..65571177e 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 072f87ff3..c89643834 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 2d52cdd94..c89643834 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1f229165b..004d07d5a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - PDLIVE + PoYo assertk.Assert \ No newline at end of file diff --git a/common/src/main/java/com/yunbao/common/HtmlConfig.java b/common/src/main/java/com/yunbao/common/HtmlConfig.java index d128d9001..3dabe06ff 100644 --- a/common/src/main/java/com/yunbao/common/HtmlConfig.java +++ b/common/src/main/java/com/yunbao/common/HtmlConfig.java @@ -7,8 +7,8 @@ package com.yunbao.common; public class HtmlConfig { //登录即代表同意服务和隐私条款 - public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=3"; - public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=Portal&m=Page&a=index&id=59"; + public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=706"; + public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=Portal&m=Page&a=index&id=705"; //注册用户协议 public static final String REG_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=2"; diff --git a/common/src/main/res/layout/notification_message.xml b/common/src/main/res/layout/notification_message.xml index 9cb3fd00d..cb54c3fa1 100644 --- a/common/src/main/res/layout/notification_message.xml +++ b/common/src/main/res/layout/notification_message.xml @@ -54,7 +54,7 @@ android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_marginRight="15dp" - android:text="PD LIVE" + android:text="PoYo" android:textColor="@color/gray3" /> \ No newline at end of file diff --git a/common/src/main/res/layout/rule_of_war_popup.xml b/common/src/main/res/layout/rule_of_war_popup.xml index b57f0eec2..7cea0bf94 100644 --- a/common/src/main/res/layout/rule_of_war_popup.xml +++ b/common/src/main/res/layout/rule_of_war_popup.xml @@ -37,7 +37,7 @@ android:layout_marginStart="14dp" android:layout_marginEnd="14dp" android:textColor="#0D21B2" - tools:text="1.戰令開啟時，完成戰令任務，提升戰令等級，可獲得大量等級獎勵。\n2.所有用戶免費解鎖普通版，戰令開啟時隨時可進階為精英版和尊享版，獲得豐厚額外專屬獎勵。\n3.三種戰令都會獎勵積分，可在兌換商城中兌換心儀的寶貝，部分寶貝兌換有戰令等級要求或兌換數量限制。\n4.每日任務0點刷新，未完成任務進度不再累計，每季任務將會在新一季戰令開啟時刷新。\n5.任務達成時需主動領取經驗，未领取經驗將會在任務刷新時過期。\n6.活動最終解釋權歸PDLIVE所有。" + tools:text="1.戰令開啟時，完成戰令任務，提升戰令等級，可獲得大量等級獎勵。\n2.所有用戶免費解鎖普通版，戰令開啟時隨時可進階為精英版和尊享版，獲得豐厚額外專屬獎勵。\n3.三種戰令都會獎勵積分，可在兌換商城中兌換心儀的寶貝，部分寶貝兌換有戰令等級要求或兌換數量限制。\n4.每日任務0點刷新，未完成任務進度不再累計，每季任務將會在新一季戰令開啟時刷新。\n5.任務達成時需主動領取經驗，未领取經驗將會在任務刷新時過期。\n6.活動最終解釋權歸PoYo所有。" android:textSize="14sp" /> diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index 6903ce046..e325ac19b 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -74,7 +74,7 @@ 退出連麥 所在地 編輯個人資料 - 進入PD LIVE + 進入POYO 是否確認使用一下資料 確認 暱稱重複，請重新輸入 @@ -645,7 +645,7 @@ 一次免費贈送禮物特權！ TA還沒有座騎 - 歡迎來到PDLIVE + 歡迎來到PoYo 恭喜你獲得了新人獎勵 com.pdsylive.yo.fileprovider @@ -1070,21 +1070,21 @@ 簽到中心 返回首頁 前往簽到中心 - 確認領取 + 知道了 無法登陸？點此聯繫客服 - 進入下一步即代表同意 + 登錄即代表您同意 用戶協議 和 隱私條款 條款和政策 - 歡迎來到PD LIVE，對於您的個人信息及隱私，我們將採用最高標準對待和保護。 + 歡迎來到POYO，對於您的個人信息及隱私，我們將採用最高標準對待和保護。 詳情請您閱讀以下安裝應用程序的消息： 為了給用戶提供更好的服務，我們的產品集成[友盟SDK]，SDK需要收集您的设备信息（IMEI/MAC/Android ID/IDFA/OpenUDID/GUID/IP地址/SIM 卡 IMSI 信息等），為便於您更好地了解[友盟SDK]采集的數據類型及用途，以及何保護您的個人信息，您可以登陸：https://www.umeng.com/page/policy 了解[友盟SDK]隱私權政策【友盟+】隐私政策【友盟+】,第三方全域大数据服务提供商,为客户提供PC/APP/线下统计,广告效果监测,消息推送/微社区/分享/IM等运营工具,DIP,全域指数与行业报告等。https://www.umeng.com/page/policy 同意 點擊同意後即代表您已閱讀並同意以上所有內容。 本應用會收集位置數據以支持登錄和註冊的功能使用。 - 歡迎來到PD LIVE。 - 註冊PD LIVE + 歡迎來到POYO。 + 註冊POYO 註冊並登錄 開通貴族，尊享超多特權！ 女神說 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 7a95a9e4f..07a65815f 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -659,7 +659,7 @@ Preservation Register No one is currently in the voice link - Welcome to PDLive + Welcome to PoYo Newcomer Bonus EXP Complete newcomer tasks for more rewards @@ -1052,11 +1052,11 @@ Privacy Policy Terms and policies For details, please read the following message to install the application: - Welcome to PD LIVE. For your personal information and privacy, we will adopt the highest standards of treatment and protection. + Welcome to POYO. For your personal information and privacy, we will adopt the highest standards of treatment and protection. In order to provide users with better services, our products integrate [Alliance SDK], SDK needs to collect your device information (IMEI/MAC/Android ID/IDFA/OpenUDID/GUID/IP address /SIM card IMSI information, etc.), In order for you to better understand the types and purposes of the data collected by [Alliance SDK] and how to protect your personal information, you can log on to: https://www.umeng.com/page/policy Learn about [Alliance SDK] Privacy Policy [Alliance +] Privacy Policy [Alliance +], a third-party global big data service provider, providing customers with PC/APP/ offline statistics, advertising effect monitoring, message push/micro community/sharing /IM and other operating tools,DIP, global index and industry reports. https://www.umeng.com/page/policy Clicking Agree means you have read and agree to all of the above.。 agreement - Welcome to PD LIVE. + Welcome to POYO. gift User service agreement 一 Fan privilege 一 diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java index 3c739cc9f..66d51b9be 100644 --- a/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java @@ -399,7 +399,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter { } else if (bean.getType() == LiveChatBean.SYSTEM) { boolean isContains = false; for (LiveChatBean model : mList) { - if (!TextUtils.isEmpty(model.getContent()) && (model.getContent().contains("堅決維護青少年群體精神文明健康") || model.getContent().contains("click to register if you like. pdlive conducts"))) { + if (!TextUtils.isEmpty(model.getContent()) && (model.getContent().contains("堅決維護青少年群體精神文明健康") || model.getContent().contains("click to register if you like. PoYo conducts"))) { isContains = true; } } diff --git a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java index 492773d4b..65f3d424e 100644 --- a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java +++ b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java @@ -265,7 +265,7 @@ public class SocketRyClient { int num = LiveAudienceActivity.fansNum + 1; LiveRoomViewHolder.setFansNum(num); } - if (map.getString("ct").contains("堅決維護青少年群體精神文明健康") || map.getString("ct").contains("click to register if you like. pdlive conducts")) { + if (map.getString("ct").contains("堅決維護青少年群體精神文明健康") || map.getString("ct").contains("click to register if you like. PoYo conducts")) { systemChatMessage(map.getString("ct")); } else { if (!WordUtil.isNewZh() && map.getString("ct").contains("退出比賽") && map.getString("ct").contains("獲得勝利")) { diff --git a/live/src/main/java/com/yunbao/live/socket/SocketSwClient.java b/live/src/main/java/com/yunbao/live/socket/SocketSwClient.java index d7917ade1..93bad8965 100644 --- a/live/src/main/java/com/yunbao/live/socket/SocketSwClient.java +++ b/live/src/main/java/com/yunbao/live/socket/SocketSwClient.java @@ -261,7 +261,7 @@ public class SocketSwClient { int num = LiveAudienceActivity.fansNum + 1; LiveRoomViewHolder.setFansNum(num); } - if (ct.contains("堅決維護青少年群體精神文明健康") ||ct.contains("click to register if you like. pdlive conducts")) { + if (ct.contains("堅決維護青少年群體精神文明健康") ||ct.contains("click to register if you like. PoYo conducts")) { systemChatMessage(ct); } else { if (!WordUtil.isNewZh() && ct.contains("退出比賽") && ct.contains("獲得勝利")) { 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/live/src/main/res/values-zh/strings.xml b/live/src/main/res/values-zh/strings.xml index 04f92fff9..cbd7412b8 100644 --- a/live/src/main/res/values-zh/strings.xml +++ b/live/src/main/res/values-zh/strings.xml @@ -102,7 +102,7 @@ 3. 專屬禮包與主播為 1 對 1 綁定關係，購買專屬 禮包中禮物資源只可送給該主播 4. 禮包中禮物資源有效期 30 天，有效期內均可正 常贈送；過期後禮物資源失效不可贈送 1. 當月只可購買一次，購買后禮包实时發放 - 2. 该禮包最終解釋權歸 PD Live 所有 + 2. 该禮包最終解釋權歸 POYO 所有 禮包介紹 購買規則 加入粉絲團,解鎖專屬禮物 diff --git a/live/src/main/res/values/strings.xml b/live/src/main/res/values/strings.xml index d0dcf7d23..1bf0ce743 100644 --- a/live/src/main/res/values/strings.xml +++ b/live/src/main/res/values/strings.xml @@ -104,7 +104,7 @@ 3 The exclusive gift package is bound to the anchor in a one-on-one relationship, and purchasing gift resources in the exclusive gift package can only be given to the anchor 4 The gift resources in the gift package are valid for 30 days and can be given normally during the validity period; Gift resources become invalid and cannot be given after expiration 1 Purchase can only be made once a month, and the gift package will be distributed in real-time after purchase - 2. The final interpretation rights of this gift package belong to PD Live + 2. The final interpretation rights of this gift package belong to PoYo Introduction Rules Join the fan group and unlock exclusive gifts 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/activity_entry.xml b/main/src/main/res/layout/activity_entry.xml index 289aefc1f..45e2ce5c5 100644 --- a/main/src/main/res/layout/activity_entry.xml +++ b/main/src/main/res/layout/activity_entry.xml @@ -119,7 +119,7 @@ @@ -257,7 +257,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="22dp" - android:layout_marginBottom="8dp" + android:layout_marginBottom="40dp" android:orientation="horizontal"> 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 @@ @@ -55,7 +55,7 @@ android:layout_weight="1" app:tbn_icon_array_id="@array/main_tab_video" app:tbn_icon_size="28dp" - app:tbn_tip="娛樂" + app:tbn_tip="@string/main_tab_yule" app:tbn_text_color_checked="#FFFF4598" app:tbn_text_color_unchecked="#FF101420" app:tbn_text_size="11sp" /> @@ -66,7 +66,7 @@ android:layout_weight="1" app:tbn_icon_array_id="@array/main_tab_list" app:tbn_icon_size="28dp" - app:tbn_tip="廣場" + app:tbn_tip="@string/main_tab_guangchang" app:tbn_text_color_checked="#FFFF4598" app:tbn_text_color_unchecked="#FF101420" app:tbn_text_size="11sp" /> @@ -77,7 +77,7 @@ android:layout_weight="1" app:tbn_icon_array_id="@array/main_tab_chat" app:tbn_icon_size="28dp" - app:tbn_tip="我的" + app:tbn_tip="@string/main_me" app:tbn_text_color_checked="#FFFF4598" app:tbn_text_color_unchecked="#FF101420" app:tbn_text_size="11sp" /> diff --git a/main/src/main/res/layout/view_main_home.xml b/main/src/main/res/layout/view_main_home.xml index dc97db9b1..a460aa44c 100644 --- a/main/src/main/res/layout/view_main_home.xml +++ b/main/src/main/res/layout/view_main_home.xml @@ -1,17 +1,22 @@ - + + @@ -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/layout/view_main_home_video.xml b/main/src/main/res/layout/view_main_home_video.xml index 88173de50..266b62e7f 100644 --- a/main/src/main/res/layout/view_main_home_video.xml +++ b/main/src/main/res/layout/view_main_home_video.xml @@ -63,7 +63,7 @@ android:layout_alignParentBottom="true" android:layout_marginLeft="10dp" android:textColor="@color/colorPrimary" - android:text="PD LIVE" + android:text="POYO" android:paddingTop="2dp" android:textSize="20sp" android:textStyle="bold" /> 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 000000000..6a81663ab Binary files /dev/null and b/main/src/main/res/mipmap-mdpi/icon_main_bangdan.png differ diff --git a/main/src/main/res/mipmap-mdpi/icon_main_search.png b/main/src/main/res/mipmap-mdpi/icon_main_search.png index 258b32ca5..b4ddb09a1 100644 Binary files a/main/src/main/res/mipmap-mdpi/icon_main_search.png and b/main/src/main/res/mipmap-mdpi/icon_main_search.png differ 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 000000000..5abbaf82f Binary files /dev/null and b/main/src/main/res/mipmap-mdpi/icon_main_start_live_new.png differ diff --git a/main/src/main/res/values-zh/strings.xml b/main/src/main/res/values-zh/strings.xml index d84064e0c..2f92b4a0e 100644 --- a/main/src/main/res/values-zh/strings.xml +++ b/main/src/main/res/values-zh/strings.xml @@ -42,4 +42,8 @@ 從相冊選取 拍照 一鍵領取 + 使用手機號登錄 + 遇見 + 娛樂 + 廣場 \ No newline at end of file diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml index 419fbe8a0..4d7f0171e 100644 --- a/main/src/main/res/values/strings.xml +++ b/main/src/main/res/values/strings.xml @@ -42,4 +42,8 @@ Select from album Photo shoot Receive all + Sign in with Phone Number + Meet + Game + Moment