Compare commits
12 Commits
新潘多拉_6.9.0
...
8_26修改首页
| Author | SHA1 | Date | |
|---|---|---|---|
|
7e8eb7ba47 | ||
|
|
10adb60303 | ||
|
|
f03b66364b | ||
|
|
d68c8a7627 | ||
|
|
02dc40b1bf | ||
| cfb5a5aac2 | |||
|
|
3143ec2be4 | ||
|
|
d61d142ec1 | ||
|
|
27c2261fac | ||
|
|
730f681f31 | ||
|
|
1c3c0badfc | ||
| 520491a804 |
@@ -1,55 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/*
|
||||
** Copyright 2006, The Android Open Source Project
|
||||
**
|
||||
** Licensed under the Apache License, Version 2.0 (the "License");
|
||||
** you may not use this file except in compliance with the License.
|
||||
** You may obtain a copy of the License at
|
||||
**
|
||||
** http://www.apache.org/licenses/LICENSE-2.0
|
||||
**
|
||||
** Unless required by applicable law or agreed to in writing, software
|
||||
** distributed under the License is distributed on an "AS IS" BASIS,
|
||||
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
** See the License for the specific language governing permissions and
|
||||
** limitations under the License.
|
||||
**
|
||||
** Created with STMS Automation System
|
||||
*/ -->
|
||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<!-- MIDS_SAPPS_POP_UNKNOWN_ERROR_OCCURRED -->
|
||||
<string name="mids_sapps_pop_unknown_error_occurred">Unbekannter Fehler aufgetreten</string>
|
||||
<!-- MIDS_SAPPS_HEADER_SAMSUNG_IN_APP_PURCHASE_ABB -->
|
||||
<string name="mids_sapps_header_samsung_in_app_purchase_abb">Samsung In-App Purchase</string>
|
||||
<!-- MIDS_SAPPS_POP_UNABLE_TO_OPEN_SAMSUNG_IN_APP_PURCHASE_MSG -->
|
||||
<string name="mids_sapps_pop_unable_to_open_samsung_in_app_purchase_msg">Samsung In-App Purchase kann nicht geöffnet werden. Wechseln Sie zu „Berechtigungen“, erteilen Sie die erforderlichen Berechtigungen und versuchen Sie es anschließend erneut.</string>
|
||||
<!-- DREAM_SAPPS_BODY_AUTHENTICATING_ING -->
|
||||
<string name="dream_sapps_body_authenticating_ing">Authentifizierung wird durchgeführt\u2026</string>
|
||||
<!-- DREAM_SAPPS_BODY_CONTACT_CUSTOMER_SERVICE_TO_COMPLETE_YOUR_PURCHASE -->
|
||||
<string name="dream_sapps_body_contact_customer_service_to_complete_your_purchase">Wenden Sie sich an den Kundendienst, um Ihren Einkauf abzuschließen.</string>
|
||||
<!-- DREAM_SAPPS_BODY_YOUR_PURCHASE_IS_COMPLETE -->
|
||||
<string name="dream_sapps_body_your_purchase_is_complete">Ihr Kauf ist abgeschlossen.</string>
|
||||
<!-- DREAM_PH_PHEADER_COULDNT_COMPLETE_PURCHASE -->
|
||||
<string name="dream_ph_pheader_couldnt_complete_purchase">Abschließen des Kaufs nicht möglich</string>
|
||||
<!-- DREAM_PH_BODY_TO_COMPLETE_THIS_PURCHASE_YOU_NEED_TO_UPDATE_THE_GALAXY_STORE -->
|
||||
<string name="dream_ph_body_to_complete_this_purchase_you_need_to_update_the_galaxy_store">Sie müssen Galaxy Store aktualisieren, um diesen Kauf abzuschließen.</string>
|
||||
<!-- DREAM_PH_BODY_TO_COMPLETE_THIS_PURCHASE_YOU_NEED_TO_ENABLE_THE_GALAXY_STORE_IN_SETTINGS -->
|
||||
<string name="dream_ph_body_to_complete_this_purchase_you_need_to_enable_the_galaxy_store_in_settings">Sie müssen Galaxy Store in den Einstellungen aktivieren, um diesen Kauf abzuschließen.</string>
|
||||
<!-- DREAM_PH_BODY_CONTACT_P1SSCUSTOMER_SERVICEP2SS_FOR_MORE_INFORMATION_N_NERROR_CODE_C_P3SS -->
|
||||
<string name="dream_ph_body_contact_p1sscustomer_servicep2ss_for_more_information_n_nerror_code_c_p3ss">Weitere Informationen erhalten Sie vom %1$sKundendienst%2$s.\n\nFehlercode: %3$s</string>
|
||||
<!-- IDS_COM_BODY_ERROR_CODE_C -->
|
||||
<string name="ids_com_body_error_code_c">Fehlercode:</string>
|
||||
<!-- MIDS_SAPPS_POP_TO_PURCHASE_ITEMS_YOU_NEED_TO_INSTALL_SAMSUNG_IN_APP_PURCHASE_INSTALL_Q -->
|
||||
<string name="mids_sapps_pop_to_purchase_items_you_need_to_install_samsung_in_app_purchase_install_q">Wenn Sie Artikel kaufen möchten, müssen Sie Samsung In-App-Kauf installieren. Installieren?</string>
|
||||
<!-- MIDS_SAPPS_POP_AN_INVALID_VALUE_HAS_BEEN_PROVIDED_FOR_SAMSUNG_IN_APP_PURCHASE -->
|
||||
<string name="mids_sapps_pop_an_invalid_value_has_been_provided_for_samsung_in_app_purchase">Es wurde ein ungültiger Wert für Samsung In-App Purchase angegeben.</string>
|
||||
<!-- MIDS_SAPPS_BODY_WAITING_ING -->
|
||||
<string name="mids_sapps_body_waiting_ing">Warten\u2026</string>
|
||||
<!-- MIDS_SAPPS_POP_PAYMENT_CANCELLED -->
|
||||
<string name="mids_sapps_pop_payment_canceled">Zahlung abgebrochen</string>
|
||||
<!-- MIDS_SAPPS_HEADER_UPDATE_GALAXY_APPS -->
|
||||
<string name="mids_sapps_header_update_galaxy_apps">Aktualisieren von Galaxy Apps</string>
|
||||
<!-- MIDS_SAPPS_POP_A_NEW_VERSION_IS_AVAILABLE_GALAXY_APPS_WILL_BE_UPDATED_TO_THE_LATEST_VERSION_TO_COMPLETE_THIS_PURCHASE -->
|
||||
<string name="mids_sapps_pop_a_new_version_is_available_galaxy_apps_will_be_updated_to_the_latest_version_to_complete_this_purchase">Eine neue Version ist verfügbar. Galaxy Apps wird auf die neueste Version aktualisiert, um diesen Kauf abzuschließen.</string>
|
||||
</resources>
|
||||
@@ -1,55 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/*
|
||||
** Copyright 2006, The Android Open Source Project
|
||||
**
|
||||
** Licensed under the Apache License, Version 2.0 (the "License");
|
||||
** you may not use this file except in compliance with the License.
|
||||
** You may obtain a copy of the License at
|
||||
**
|
||||
** http://www.apache.org/licenses/LICENSE-2.0
|
||||
**
|
||||
** Unless required by applicable law or agreed to in writing, software
|
||||
** distributed under the License is distributed on an "AS IS" BASIS,
|
||||
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
** See the License for the specific language governing permissions and
|
||||
** limitations under the License.
|
||||
**
|
||||
** Created with STMS Automation System
|
||||
*/ -->
|
||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<!-- MIDS_SAPPS_POP_UNKNOWN_ERROR_OCCURRED -->
|
||||
<string name="mids_sapps_pop_unknown_error_occurred">Дојде до непозната грешка.</string>
|
||||
<!-- MIDS_SAPPS_HEADER_SAMSUNG_IN_APP_PURCHASE_ABB -->
|
||||
<string name="mids_sapps_header_samsung_in_app_purchase_abb">Samsung In-App Purchase</string>
|
||||
<!-- MIDS_SAPPS_POP_UNABLE_TO_OPEN_SAMSUNG_IN_APP_PURCHASE_MSG -->
|
||||
<string name="mids_sapps_pop_unable_to_open_samsung_in_app_purchase_msg">Не може да се отвори Samsung In-App Purchase. Одете во Дозволи, а потоа овозможете ги бараните дозволи и обидете се повторно.</string>
|
||||
<!-- DREAM_SAPPS_BODY_AUTHENTICATING_ING -->
|
||||
<string name="dream_sapps_body_authenticating_ing">Се потврдува\u2026</string>
|
||||
<!-- DREAM_SAPPS_BODY_CONTACT_CUSTOMER_SERVICE_TO_COMPLETE_YOUR_PURCHASE -->
|
||||
<string name="dream_sapps_body_contact_customer_service_to_complete_your_purchase">Контактирајте со Службата за корисници за да го завршите Вашето купување.</string>
|
||||
<!-- DREAM_SAPPS_BODY_YOUR_PURCHASE_IS_COMPLETE -->
|
||||
<string name="dream_sapps_body_your_purchase_is_complete">Купувањето Ви е завршено.</string>
|
||||
<!-- DREAM_PH_PHEADER_COULDNT_COMPLETE_PURCHASE -->
|
||||
<string name="dream_ph_pheader_couldnt_complete_purchase">Не може да се заврши купувањето</string>
|
||||
<!-- DREAM_PH_BODY_TO_COMPLETE_THIS_PURCHASE_YOU_NEED_TO_UPDATE_THE_GALAXY_STORE -->
|
||||
<string name="dream_ph_body_to_complete_this_purchase_you_need_to_update_the_galaxy_store">За да го завршите ова купување, треба да го ажурирате Galaxy Store.</string>
|
||||
<!-- DREAM_PH_BODY_TO_COMPLETE_THIS_PURCHASE_YOU_NEED_TO_ENABLE_THE_GALAXY_STORE_IN_SETTINGS -->
|
||||
<string name="dream_ph_body_to_complete_this_purchase_you_need_to_enable_the_galaxy_store_in_settings">За да го завршите ова купување, треба да го овозможите Galaxy Store во Поставувања.</string>
|
||||
<!-- DREAM_PH_BODY_CONTACT_P1SSCUSTOMER_SERVICEP2SS_FOR_MORE_INFORMATION_N_NERROR_CODE_C_P3SS -->
|
||||
<string name="dream_ph_body_contact_p1sscustomer_servicep2ss_for_more_information_n_nerror_code_c_p3ss">Контактирајте со %1$sУслугите за корисниците%2$s за повеќе информации.\n\nШифра на грешка: %3$s</string>
|
||||
<!-- IDS_COM_BODY_ERROR_CODE_C -->
|
||||
<string name="ids_com_body_error_code_c">Шифра на грешка:</string>
|
||||
<!-- MIDS_SAPPS_POP_TO_PURCHASE_ITEMS_YOU_NEED_TO_INSTALL_SAMSUNG_IN_APP_PURCHASE_INSTALL_Q -->
|
||||
<string name="mids_sapps_pop_to_purchase_items_you_need_to_install_samsung_in_app_purchase_install_q">За да купувате ставки, треба да го инсталирате Samsung купување во апликација. Да се инсталира?</string>
|
||||
<!-- MIDS_SAPPS_POP_AN_INVALID_VALUE_HAS_BEEN_PROVIDED_FOR_SAMSUNG_IN_APP_PURCHASE -->
|
||||
<string name="mids_sapps_pop_an_invalid_value_has_been_provided_for_samsung_in_app_purchase">Дадена е неважечка вредност за Samsung In-App Purchase.</string>
|
||||
<!-- MIDS_SAPPS_BODY_WAITING_ING -->
|
||||
<string name="mids_sapps_body_waiting_ing">Се чека\u2026</string>
|
||||
<!-- MIDS_SAPPS_POP_PAYMENT_CANCELLED -->
|
||||
<string name="mids_sapps_pop_payment_canceled">Плаќањето е одложено.</string>
|
||||
<!-- MIDS_SAPPS_HEADER_UPDATE_GALAXY_APPS -->
|
||||
<string name="mids_sapps_header_update_galaxy_apps">Ажурирање на Galaxy Apps</string>
|
||||
<!-- MIDS_SAPPS_POP_A_NEW_VERSION_IS_AVAILABLE_GALAXY_APPS_WILL_BE_UPDATED_TO_THE_LATEST_VERSION_TO_COMPLETE_THIS_PURCHASE -->
|
||||
<string name="mids_sapps_pop_a_new_version_is_available_galaxy_apps_will_be_updated_to_the_latest_version_to_complete_this_purchase">Достапна е нова верзија. Galaxy Apps ќе се ажурира на најновата верзија за да го завршите купувањево.</string>
|
||||
</resources>
|
||||
@@ -4,7 +4,7 @@
|
||||
>
|
||||
|
||||
<queries>
|
||||
<package android:name="com.pandora.sy"/>
|
||||
<package android:name="com.pandora.cs"/>
|
||||
<package android:name="com.facebook.orca"/>
|
||||
|
||||
<package
|
||||
|
||||
@@ -1,18 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="com.twitter.sdk.android.CONSUMER_KEY" >ZWRrZnRUNlBlcHVxMXpsMzVmb2k6MTpjaQ</string>
|
||||
<string name="com.twitter.sdk.android.CONSUMER_SECRET">aq0eV4R1pqMK_AAeKRWnjPr7ErGMGgTPGgZJdm73WeRY-Kluws</string>
|
||||
<string name="com.twitter.sdk.android.CONSUMER_KEY">ZWRrZnRUNlBlcHVxMXpsMzVmb2k6MTpjaQ</string>
|
||||
<string name="com.twitter.sdk.android.CONSUMER_SECRET">aq0eV4R1pqMK_AAeKRWnjPr7ErGMGgTPGgZJdm73WeRY-Kluws</string>
|
||||
|
||||
<string name="dialog_share_title">分享</string>
|
||||
<string name="dialog_share_info">快來 PDLIVE觀看%s直播，認識更多有趣的朋友吧！</string>
|
||||
<string name="dialog_share_app_facebook" >Facebook</string>
|
||||
<string name="dialog_share_app_line" >Line</string>
|
||||
<string name="dialog_share_app_twitter">Twitter</string>
|
||||
<string name="dialog_share_app_whatsapp" >WhatsApp</string>
|
||||
<string name="dialog_share_app_messenger">Messenger</string>
|
||||
<string name="dialog_share_app_instagram" >Instagram</string>
|
||||
<string name="dialog_share_title">分享</string>
|
||||
<string name="dialog_share_app_internal">站內好友</string>
|
||||
<string name="dialog_share_info">快來 PDLIVE觀看%s直播，認識更多有趣的朋友吧！</string>
|
||||
<string name="dialog_share_app_facebook">Facebook</string>
|
||||
<string name="dialog_share_app_line">Line</string>
|
||||
<string name="dialog_share_app_twitter">Twitter</string>
|
||||
<string name="dialog_share_app_whatsapp">WhatsApp</string>
|
||||
<string name="dialog_share_app_messenger">Messenger</string>
|
||||
<string name="dialog_share_app_instagram">Instagram</string>
|
||||
|
||||
<string name="dialog_invite_title">邀請好友</string>
|
||||
<string name="dialog_invite_info">快來 PDLIVE觀看直播，認識更多有趣的朋友吧！</string>
|
||||
<string name="dialog_share_copy">複製</string>
|
||||
<string name="dialog_invite_title">邀請好友</string>
|
||||
<string name="dialog_invite_info">快來 PDLIVE觀看直播，認識更多有趣的朋友吧！</string>
|
||||
<string name="dialog_share_copy">複製</string>
|
||||
</resources>
|
||||
@@ -1,24 +1,24 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="dialog_share_title">Share</string>
|
||||
<string name="dialog_share_info">Come and watch %s live on PDLIVE and meet more interesting people!</string>
|
||||
<string name="dialog_invite_title">Invite Friends</string>
|
||||
<string name="dialog_invite_info">Come to PDLIVE to discover more and better live streams.</string>
|
||||
<string name="dialog_share_copy">Copy</string>
|
||||
<string name="dialog_share_app_internal">Site friends</string>
|
||||
<string name="dialog_share_internal_title">Share To</string>
|
||||
<string name="dialog_share_internal_cancel">cancel</string>
|
||||
<string name="dialog_share_internal_search">Search nickname</string>
|
||||
<string name="dialog_share_internal_list_btn">Send</string>
|
||||
<string name="dialog_share_success">Share success</string>
|
||||
<string name="dialog_share_success_btn">Go chat</string>
|
||||
<string name="dialog_share_failure_not_select">Please select friends</string>
|
||||
|
||||
<string name="dialog_share_title">分享</string>
|
||||
<string name="dialog_share_info">快來 PDLIVE觀看%s直播，認識更多有趣的朋友吧！</string>
|
||||
<string name="dialog_share_app_facebook" translatable="false">Facebook</string>
|
||||
<string name="dialog_share_app_line" translatable="false">Line</string>
|
||||
<string name="dialog_share_app_twitter" translatable="false">Twitter</string>
|
||||
<string name="dialog_share_app_whatsapp" translatable="false">WhatsApp</string>
|
||||
<string name="dialog_share_app_messenger" translatable="false">Messenger</string>
|
||||
<string name="dialog_share_app_instagram" translatable="false">Instagram</string>
|
||||
<string name="dialog_share_app_internal">站內好友</string>
|
||||
|
||||
<string name="dialog_invite_title">邀請好友</string>
|
||||
<string name="dialog_invite_info">快來 PDLIVE觀看直播，認識更多有趣的朋友吧！</string>
|
||||
<string name="dialog_share_copy">複製</string>
|
||||
<string name="dialog_share_internal_title">分享至</string>
|
||||
<string name="dialog_share_internal_search">搜索昵稱</string>
|
||||
<string name="dialog_share_internal_list_btn">發送</string>
|
||||
<string name="dialog_share_success">分享成功</string>
|
||||
<string name="dialog_share_success_btn">去聊聊</string>
|
||||
<string name="dialog_share_failure_not_select">请选择好友</string>
|
||||
<string name="dialog_share_app_facebook" >Facebook</string>
|
||||
<string name="dialog_share_app_line" >Line</string>
|
||||
<string name="dialog_share_app_twitter">Twitter</string>
|
||||
<string name="dialog_share_app_whatsapp" >WhatsApp</string>
|
||||
<string name="dialog_share_app_messenger">Messenger</string>
|
||||
<string name="dialog_share_app_instagram" >Instagram</string>
|
||||
|
||||
</resources>
|
||||
@@ -298,7 +298,7 @@ android {
|
||||
|
||||
defaultConfig {
|
||||
// applicationId "myname.pdlive.shayu"
|
||||
applicationId "com.pandora.sy"
|
||||
applicationId "com.pandora.cs"
|
||||
minSdkVersion rootProject.ext.android.minSdkVersion
|
||||
//版本在这里修改
|
||||
targetSdkVersion rootProject.ext.android.targetSdkVersion
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
"client_info": {
|
||||
"mobilesdk_app_id": "1:867032862719:android:841a73fdfb6c37453ae1ca",
|
||||
"android_client_info": {
|
||||
"package_name": "com.pandora.sy"
|
||||
"package_name": "com.pandora.cs"
|
||||
}
|
||||
},
|
||||
"oauth_client": [
|
||||
@@ -17,7 +17,7 @@
|
||||
"client_id": "867032862719-af2dnojobjd8s6ekdr1is1vev8nk36sv.apps.googleusercontent.com",
|
||||
"client_type": 1,
|
||||
"android_info": {
|
||||
"package_name": "com.pandora.sy",
|
||||
"package_name": "com.pandora.cs",
|
||||
"certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
|
||||
}
|
||||
},
|
||||
@@ -25,7 +25,7 @@
|
||||
"client_id": "867032862719-ohaa1f18e186qpasvgt7qkk1i1pivniq.apps.googleusercontent.com",
|
||||
"client_type": 1,
|
||||
"android_info": {
|
||||
"package_name": "com.pandora.sy",
|
||||
"package_name": "com.pandora.cs",
|
||||
"certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
|
||||
}
|
||||
},
|
||||
@@ -33,7 +33,7 @@
|
||||
"client_id": "867032862719-snpbqruvqcc9fsifjnmm1h3dcgtr8am4.apps.googleusercontent.com",
|
||||
"client_type": 1,
|
||||
"android_info": {
|
||||
"package_name": "com.pandora.sy",
|
||||
"package_name": "com.pandora.cs",
|
||||
"certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
|
||||
}
|
||||
},
|
||||
|
||||
@@ -29,6 +29,7 @@ import com.facebook.appevents.AppEventsLogger;
|
||||
import com.fm.openinstall.OpenInstall;
|
||||
import com.google.gson.Gson;
|
||||
import com.pandoralive.shayu.R;
|
||||
import com.yunbao.common.utils.DebugUtils;
|
||||
import com.yunbao.common.utils.LogUtils;
|
||||
import com.tencent.imsdk.v2.V2TIMGroupMemberInfo;
|
||||
import com.yunbao.common.http.Data;
|
||||
@@ -291,6 +292,7 @@ public class AppContext extends CommonAppContext {
|
||||
MessageChatNotifyManager.getInstance().addShieldClass(LoginActivity.class);
|
||||
MessageChatNotifyManager.getInstance().addShieldClass(RegisterActivity.class);
|
||||
MessageChatNotifyManager.getInstance().addShieldClass(UCropActivity.class);
|
||||
MessageChatNotifyManager.getInstance().addShieldClass(MainActivity.class);
|
||||
|
||||
|
||||
RongcloudIMManager.addRongcloudIMOnReceiveMessageListener(new RongIMClient.OnReceiveMessageWrapperListener() {
|
||||
@@ -482,7 +484,7 @@ public class AppContext extends CommonAppContext {
|
||||
NeverCrashUtils.getInstance().setDebugMode(BuildConfig.DEBUG).setMainCrashHandler((t, e) -> {
|
||||
Log.e("ApplicationError", "主线程异常");//此处log只是展示，当debug为true时，主类内部log会打印异常信息
|
||||
e.printStackTrace();
|
||||
AppManager.runDebugCode(() -> {
|
||||
DebugUtils.runDebugCode(() -> {
|
||||
//闪退后finish所有Activity并且杀死进程
|
||||
for (WeakReference<Activity> activity : activities) {
|
||||
if (activity != null && activity.get() != null) {
|
||||
|
||||
@@ -10,6 +10,7 @@ import android.widget.Toast;
|
||||
|
||||
import com.yunbao.common.bean.CrashSaveBean;
|
||||
import com.yunbao.common.utils.AppManager;
|
||||
import com.yunbao.common.utils.DebugUtils;
|
||||
import com.yunbao.common.utils.FileUtil;
|
||||
import com.yunbao.common.utils.SpUtil;
|
||||
|
||||
@@ -105,10 +106,10 @@ public class NeverCrashUtils {
|
||||
}
|
||||
e.printStackTrace();
|
||||
AppContext.setFirebaseCrashData();
|
||||
AppManager.runDebugCode(() -> Toast.makeText(application, "发生闪退:" + e.getMessage(), Toast.LENGTH_SHORT).show());
|
||||
DebugUtils.runDebugCode(() -> Toast.makeText(application, "发生闪退:" + e.getMessage(), Toast.LENGTH_SHORT).show());
|
||||
FileUtil.saveStringToFile(new File(application.getDir("files", Context.MODE_PRIVATE).getAbsolutePath()), throwableToString(e), "error.log");
|
||||
getMainCrashHandler().mainException(Looper.getMainLooper().getThread(), e);
|
||||
AppManager.runDebugCode(() -> errorWhile = false);
|
||||
DebugUtils.runDebugCode(() -> errorWhile = false);
|
||||
// return;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
<provider
|
||||
android:name="androidx.core.content.FileProvider"
|
||||
android:authorities="com.pandora.sy.fileprovider"
|
||||
android:authorities="com.pandora.cs.fileprovider"
|
||||
android:exported="false"
|
||||
android:grantUriPermissions="true">
|
||||
<meta-data
|
||||
|
||||
@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.yunbao.common.bean.ConfigBean;
|
||||
import com.yunbao.common.bean.FansMedalBean;
|
||||
import com.yunbao.common.bean.LiveGiftBean;
|
||||
import com.yunbao.common.bean.NewCommunityType;
|
||||
import com.yunbao.common.bean.UserBean;
|
||||
import com.yunbao.common.bean.UserItemBean;
|
||||
@@ -537,38 +538,32 @@ public class CommonAppConfig {
|
||||
* 个人中心功能列表
|
||||
*/
|
||||
public List<UserItemBean> getUserItemList() {
|
||||
if (mUserItemList == null || mUserItemList.size() == 0) {
|
||||
String userBeanJson = SpUtil.getInstance().getStringValue(SpUtil.USER_INFO);
|
||||
if (!TextUtils.isEmpty(userBeanJson)) {
|
||||
JSONObject obj = JSON.parseObject(userBeanJson);
|
||||
if (obj != null) {
|
||||
setUserItemList(obj.getString("list"));
|
||||
}
|
||||
setUserItemList(obj.getString("pdl_list"));
|
||||
}
|
||||
}
|
||||
return mUserItemList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 个人中心功能列表 新
|
||||
*/
|
||||
public List<UserItemBean> getUserItemNewList() {
|
||||
String userBeanJson = SpUtil.getInstance().getStringValue(SpUtil.USER_INFO);
|
||||
if (!TextUtils.isEmpty(userBeanJson)) {
|
||||
JSONObject obj = JSON.parseObject(userBeanJson);
|
||||
if (obj != null) {
|
||||
setUserItemList(obj.getString("pdl_settings"));
|
||||
}
|
||||
}
|
||||
return mUserItemList;
|
||||
}
|
||||
|
||||
public void setUserItemList(String listString) {
|
||||
UserItemBean[][] arr = JSON.parseObject(listString, UserItemBean[][].class);
|
||||
if (arr != null && arr.length > 0) {
|
||||
List<UserItemBean> newList = new ArrayList<>();
|
||||
for (int i = 0, length1 = arr.length; i < length1; i++) {
|
||||
for (int j = 0, length2 = arr[i].length; j < length2; j++) {
|
||||
UserItemBean bean = arr[i][j];
|
||||
if (j == length2 - 1) {
|
||||
if (i < length1 - 1) {
|
||||
bean.setGroupLast(true);
|
||||
} else {
|
||||
bean.setAllLast(true);
|
||||
}
|
||||
}
|
||||
newList.add(bean);
|
||||
}
|
||||
}
|
||||
mUserItemList = newList;
|
||||
}
|
||||
mUserItemList = JSON.parseArray(listString, UserItemBean.class);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -13,12 +13,14 @@ import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
import com.blankj.utilcode.util.LogUtils;
|
||||
import com.yunbao.common.R;
|
||||
import com.yunbao.common.glide.ImgLoader;
|
||||
import com.yunbao.common.interfaces.OnRecyclerListRefreshListener;
|
||||
import com.yunbao.common.manager.IMLoginManager;
|
||||
import com.yunbao.common.message.content.MessageChatCardContent;
|
||||
import com.yunbao.common.utils.AppManager;
|
||||
import com.yunbao.common.utils.ChatMsgTypeUtils;
|
||||
import com.yunbao.common.utils.DateFormatUtil;
|
||||
import com.yunbao.common.utils.StringUtil;
|
||||
import com.yunbao.common.utils.ViewUtils;
|
||||
@@ -39,8 +41,11 @@ import io.rong.imkit.widget.adapter.ViewHolder;
|
||||
import io.rong.imlib.RongIMClient;
|
||||
import io.rong.imlib.model.Conversation;
|
||||
import io.rong.imlib.model.Message;
|
||||
import io.rong.message.HQVoiceMessage;
|
||||
import io.rong.message.ImageMessage;
|
||||
import io.rong.message.SightMessage;
|
||||
import io.rong.message.TextMessage;
|
||||
import io.rong.message.VoiceMessage;
|
||||
|
||||
public class MainConversationListAdapter extends ConversationListAdapter {
|
||||
public static final int TYPE_SEARCH_TITLE = 500;
|
||||
@@ -134,18 +139,19 @@ public class MainConversationListAdapter extends ConversationListAdapter {
|
||||
Log.i("列表", "bindDefault: 用户名字:" + conversation.mCore.getConversationTitle());
|
||||
ImgLoader.display(holder.getContext(), conversation.mCore.getPortraitUrl(), holder.getView(R.id.rc_conversation_portrait));
|
||||
holder.setText(R.id.rc_conversation_title, conversation.mCore.getConversationTitle());
|
||||
((TextView) holder.getView(R.id.rc_conversation_content)).setText(ChatMsgTypeUtils.getMsg(conversation.mConversationContent.toString()));
|
||||
if (conversation.mCore.getSentTime() != -1 && holder.getView(R.id.rc_conversation_date) != null) {
|
||||
holder.setText(R.id.rc_conversation_date, DateFormatUtil.getDateTimeString(conversation.mCore.getSentTime(), true, holder.getContext()));
|
||||
holder.getView(R.id.rc_conversation_date).setVisibility(View.VISIBLE);
|
||||
} else if (holder.getView(R.id.rc_conversation_date) != null) {
|
||||
holder.getView(R.id.rc_conversation_date).setVisibility(View.GONE);
|
||||
}
|
||||
if("0".equals(conversation.mCore.getDraft())){
|
||||
holder.setImageDrawable(R.id.rc_conversation_live_online_icon,mContext.getResources().getDrawable(R.mipmap.msg_online));
|
||||
holder.setText(R.id.rc_conversation_live_online,WordUtil.isNewZh()?"在線":"Online");
|
||||
}else{
|
||||
holder.setImageDrawable(R.id.rc_conversation_live_online_icon,mContext.getResources().getDrawable(R.mipmap.msg_off));
|
||||
holder.setText(R.id.rc_conversation_live_online,WordUtil.isNewZh()?"離線":"Offline");
|
||||
if ("0".equals(conversation.mCore.getDraft())) {
|
||||
holder.setImageDrawable(R.id.rc_conversation_live_online_icon, mContext.getResources().getDrawable(R.mipmap.msg_online));
|
||||
holder.setText(R.id.rc_conversation_live_online, WordUtil.isNewZh() ? "在線" : "Online");
|
||||
} else {
|
||||
holder.setImageDrawable(R.id.rc_conversation_live_online_icon, mContext.getResources().getDrawable(R.mipmap.msg_off));
|
||||
holder.setText(R.id.rc_conversation_live_online, WordUtil.isNewZh() ? "離線" : "Offline");
|
||||
}
|
||||
if (holder.getView(R.id.rc_conversation_live_status) == null || IMLoginManager.get(holder.getContext()).getAnchorB() != 1) {
|
||||
return;
|
||||
@@ -182,8 +188,11 @@ public class MainConversationListAdapter extends ConversationListAdapter {
|
||||
}
|
||||
}
|
||||
|
||||
private int listHashCode = 0;
|
||||
@Override
|
||||
public void setDataCollection(List<BaseUiConversation> data) {
|
||||
public synchronized void setDataCollection(List<BaseUiConversation> data) {
|
||||
if (data.hashCode() == listHashCode) return;
|
||||
listHashCode = data.hashCode();
|
||||
List<BaseUiConversation> tmp = new ArrayList<>();
|
||||
Log.i("聊天数据源", "setDataCollection: " + data.hashCode());
|
||||
List<String> urls = new ArrayList<>();
|
||||
@@ -214,8 +223,11 @@ public class MainConversationListAdapter extends ConversationListAdapter {
|
||||
}
|
||||
urls.add(item.mCore.getTargetId());
|
||||
Log.i("聊天数据源", item.mCore.getConversationTitle() + "|" + item.mCore.getPortraitUrl() + "|" + item.mCore.getTargetId());
|
||||
if (!tmpUids.contains(item.mCore.getTargetId())) {
|
||||
BaseUiConversation cn = new SingleConversation(mContext, item.mCore);
|
||||
srcList.add(cn);
|
||||
tmpUids.add(item.mCore.getTargetId());
|
||||
}
|
||||
|
||||
if (item.mCore.getConversationType() == Conversation.ConversationType.PRIVATE) {
|
||||
if (item.mCore.getLatestMessage() instanceof MessageChatCardContent) {
|
||||
@@ -228,6 +240,8 @@ public class MainConversationListAdapter extends ConversationListAdapter {
|
||||
super.setDataCollection(tmp);
|
||||
}
|
||||
|
||||
private List<String> tmpUids = new ArrayList<>();
|
||||
|
||||
public void clear() {
|
||||
mDataList.clear();
|
||||
if (srcList != null) {
|
||||
@@ -337,10 +351,15 @@ public class MainConversationListAdapter extends ConversationListAdapter {
|
||||
conversation.mCore.setUnreadMessageCount(integer);
|
||||
if(bean.getContent() instanceof SightMessage){
|
||||
conversation.mConversationContent = new SpannableString(WordUtil.isNewZh()?"[小視頻]":"[Video]");
|
||||
}else{
|
||||
}else if(bean.getContent() instanceof HQVoiceMessage){
|
||||
conversation.mConversationContent = new SpannableString(WordUtil.isNewZh()?"[語音]":"[Voice]");
|
||||
} else if(bean.getContent() instanceof ImageMessage){
|
||||
conversation.mConversationContent = new SpannableString(WordUtil.isNewZh()?"[圖片]":"[picture]");
|
||||
}else if(bean.getContent() instanceof MessageChatCardContent){
|
||||
conversation.mConversationContent = new SpannableString(WordUtil.isNewZh()?"[站內分享]":"[In-app sharing]");
|
||||
} else{
|
||||
conversation.mConversationContent = new SpannableString(((TextMessage) bean.getContent()).getContent());
|
||||
}
|
||||
|
||||
mDataList.set(id, conversation);
|
||||
notifyItemChanged(id);
|
||||
}
|
||||
|
||||
@@ -87,7 +87,7 @@ public class LiveTaskModel extends BaseModel {
|
||||
|
||||
public String getEndTime() {
|
||||
if (!StringUtil.isEmpty(endTime)) {
|
||||
endTime =WordUtil.getString(R.string.live_task_new_user_timer) + new SimpleDateFormat("yyyy/MM/dd HH:mm", Locale.getDefault()).format(new Date(Long.parseLong(endTime) * 1000));
|
||||
endTime = new SimpleDateFormat("yyyy/MM/dd HH:mm", Locale.getDefault()).format(new Date(Long.parseLong(endTime) * 1000));
|
||||
}
|
||||
return endTime;
|
||||
}
|
||||
|
||||
@@ -277,7 +277,7 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
|
||||
|
||||
void initData() {
|
||||
adapter.setList_type(list_type);
|
||||
if (isAnchor) {
|
||||
if (isAnchor || (isTab2Enter && isStar)) {
|
||||
if (isStar) {
|
||||
gift_hall_type = 2;
|
||||
} else {
|
||||
|
||||
@@ -14,6 +14,7 @@ import com.yunbao.common.R;
|
||||
import com.yunbao.common.bean.MessageUserInfoBean;
|
||||
import com.yunbao.common.custom.RatioRoundImageView;
|
||||
import com.yunbao.common.glide.ImgLoader;
|
||||
import com.yunbao.common.utils.ChatMsgTypeUtils;
|
||||
import com.yunbao.common.utils.DpUtil;
|
||||
import com.yunbao.common.utils.StringUtil;
|
||||
|
||||
@@ -93,7 +94,7 @@ public class MessageChatNotifyDialog extends AbsDialogPositionPopupWindow {
|
||||
if (StringUtil.isEmpty(liveBean.getExtras())) {
|
||||
((TextView) findViewById(R.id.description)).setText(liveBean.getUser().getSignature());
|
||||
} else {
|
||||
((TextView) findViewById(R.id.description)).setText(liveBean.getExtras());
|
||||
((TextView) findViewById(R.id.description)).setText(ChatMsgTypeUtils.getMsg(liveBean.getExtras()));
|
||||
}
|
||||
new Handler(Looper.getMainLooper()).postDelayed(() -> {
|
||||
dismiss();
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.yunbao.common.fragment;
|
||||
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.text.SpannableString;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
|
||||
@@ -23,6 +24,7 @@ import com.yunbao.common.interfaces.OnRecyclerListRefreshListener;
|
||||
import com.yunbao.common.adapter.MainConversationListAdapter;
|
||||
import com.yunbao.common.manager.IMLoginManager;
|
||||
import com.yunbao.common.manager.InstructorRemarkManager;
|
||||
import com.yunbao.common.utils.ChatMsgTypeUtils;
|
||||
import com.yunbao.common.utils.StringUtil;
|
||||
|
||||
import org.greenrobot.eventbus.EventBus;
|
||||
@@ -141,7 +143,7 @@ public abstract class AbsMainMessageChatListFragment extends Fragment {
|
||||
isNet = true;
|
||||
for (BaseUiConversation conversation : srcList) {
|
||||
map.put(conversation.mCore.getTargetId(), conversation);
|
||||
if (conversation.mCore.getConversationType() == Conversation.ConversationType.PRIVATE) {
|
||||
if (conversation.mCore.getConversationType() == Conversation.ConversationType.PRIVATE&& !conversation.mCore.getTargetId().equals("__system__")) {
|
||||
uids.add(conversation.mCore.getTargetId());
|
||||
}
|
||||
}
|
||||
@@ -158,7 +160,7 @@ public abstract class AbsMainMessageChatListFragment extends Fragment {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
srcList.get(i).mConversationContent =new SpannableString(ChatMsgTypeUtils.getMsg(srcList.get(i).mConversationContent.toString()));
|
||||
}
|
||||
onRefreshListener.onFinish(srcList);
|
||||
isNet = false;
|
||||
|
||||
@@ -3,6 +3,7 @@ package com.yunbao.common.fragment;
|
||||
import android.content.Context;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.text.SpannableString;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
@@ -23,6 +24,7 @@ import com.yunbao.common.interfaces.OnRecyclerListRefreshListener;
|
||||
import com.yunbao.common.manager.IMLoginManager;
|
||||
import com.yunbao.common.manager.InstructorRemarkManager;
|
||||
import com.yunbao.common.utils.Bus;
|
||||
import com.yunbao.common.utils.ChatMsgTypeUtils;
|
||||
import com.yunbao.common.utils.L;
|
||||
import com.yunbao.common.utils.StringUtil;
|
||||
|
||||
@@ -39,6 +41,7 @@ import io.rong.imkit.widget.refresh.listener.OnRefreshListener;
|
||||
import io.rong.imlib.model.Conversation;
|
||||
import io.rong.imlib.model.Message;
|
||||
import io.rong.imlib.model.UserInfo;
|
||||
import io.rong.message.VoiceMessage;
|
||||
|
||||
public class MainMessageChatListFragment extends AbsMainMessageChatListFragment {
|
||||
private static final String TAG = "MainMessageChatListFragment";
|
||||
@@ -72,6 +75,9 @@ public class MainMessageChatListFragment extends AbsMainMessageChatListFragment
|
||||
@Override
|
||||
public void onFinish(List<BaseUiConversation> baseUiConversations) {
|
||||
InstructorRemarkManager.get(mContext).getNetInstructorRemark();
|
||||
for (int i = 0; i <baseUiConversations.size(); i++) {
|
||||
baseUiConversations.get(i).mCore.getMessage();
|
||||
}
|
||||
loadLiveLookTime(baseUiConversations, new OnRecyclerListRefreshListener<Map<String, Integer>>() {
|
||||
@Override
|
||||
public void onFinish(Map<String, Integer> stringIntegerMap) {
|
||||
|
||||
@@ -417,7 +417,7 @@ public class CommonHttpUtil {
|
||||
.params("purchaseToken", purchaseToken)
|
||||
.params("productId", productId)
|
||||
.params("orderno", orderno)
|
||||
.params("package_name", "com.pandora.sy")
|
||||
.params("package_name", "com.pandora.cs")
|
||||
.execute(callback);
|
||||
}
|
||||
|
||||
@@ -428,7 +428,7 @@ public class CommonHttpUtil {
|
||||
.params("trade_no", tradeNo)
|
||||
.params("allData", allData)
|
||||
.params("gps_adid", gps_adid)
|
||||
.params("package_name", "com.pandora.sy")
|
||||
.params("package_name", "com.pandora.cs")
|
||||
.execute(callback);
|
||||
}
|
||||
|
||||
@@ -437,7 +437,7 @@ public class CommonHttpUtil {
|
||||
.params("purchaseToken", purchaseToken)
|
||||
.params("orderno", orderNo)
|
||||
.params("trade_no", tradeNo)
|
||||
.params("package_name", "com.pandora.sy")
|
||||
.params("package_name", "com.pandora.cs")
|
||||
.execute(callback);
|
||||
}
|
||||
|
||||
|
||||
@@ -543,6 +543,13 @@ public class LiveHttpUtil {
|
||||
HttpClient.getInstance().get("Live.getGiftListApp", LiveHttpConsts.GET_GIFT_LIST)
|
||||
.execute(callback);
|
||||
}
|
||||
/**
|
||||
* 获取礼物列表，同时会返回剩余的钱（新版） -用于获取联系方式时的礼物设置
|
||||
*/
|
||||
public static void getHotGiftList(HttpCallback callback) {
|
||||
HttpClient.getInstance().get("Gift.getHotGiftList", LiveHttpConsts.GET_GIFT_LIST)
|
||||
.execute(callback);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取包裹列表
|
||||
|
||||
@@ -123,6 +123,7 @@ public class InstructorRemarkManager extends BaseCacheManager {
|
||||
@Override
|
||||
public void run() {
|
||||
IMLoginModel userInfo = IMLoginManager.get(context).getUserInfo();
|
||||
if(userInfo==null)return;
|
||||
HttpClient.getInstance().get("User.getInstructorRemark", "getInstructorRemark")
|
||||
.params("uid", userInfo.getId(), true)
|
||||
.params("token", userInfo.getToken(), true)
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
package com.yunbao.common.manager.imrongcloud;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
import io.rong.imkit.userinfo.RongUserInfoManager;
|
||||
import io.rong.imlib.model.UserInfo;
|
||||
|
||||
public class PDRongUserInfoManager {
|
||||
public static void saveUserInfo(UserInfo userInfo) {
|
||||
RongUserInfoManager instance = RongUserInfoManager.getInstance();
|
||||
try {
|
||||
Method method = instance.getClass().getDeclaredMethod("saveUserInfoCache", userInfo.getClass());
|
||||
method.setAccessible(true);
|
||||
method.invoke(instance, userInfo);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -179,14 +179,6 @@ public class AppManager {
|
||||
activityStack.clear();
|
||||
}
|
||||
|
||||
/**
|
||||
* 仅在debug下运行的代码
|
||||
*/
|
||||
public static void runDebugCode(Runnable runnable) {
|
||||
if (BuildConfig.DEBUG) {
|
||||
runnable.run();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
package com.yunbao.common.utils;
|
||||
|
||||
/**
|
||||
* 消息类型翻译管理器
|
||||
*/
|
||||
public class ChatMsgTypeUtils {
|
||||
public static String getMsg(String msg) {
|
||||
String rsult = msg;
|
||||
switch (msg) {
|
||||
case "[小视频]":
|
||||
rsult = WordUtil.isNewZh() ? "[小視頻]" : "[Video]";
|
||||
break;
|
||||
case "[语音]":
|
||||
rsult = WordUtil.isNewZh() ? "[語音]" : "[Voice]";
|
||||
break;
|
||||
case "[图片]":
|
||||
rsult = WordUtil.isNewZh() ? "[圖片]" : "[Image]";
|
||||
break;
|
||||
}
|
||||
return rsult;
|
||||
}
|
||||
}
|
||||
30
common/src/main/java/com/yunbao/common/utils/DebugUtils.java
Normal file
30
common/src/main/java/com/yunbao/common/utils/DebugUtils.java
Normal file
@@ -0,0 +1,30 @@
|
||||
package com.yunbao.common.utils;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
import com.yunbao.common.BuildConfig;
|
||||
|
||||
public class DebugUtils {
|
||||
/**
|
||||
* 打印堆栈信息
|
||||
*/
|
||||
public static void showStackTrace(){
|
||||
StackTraceElement[] stackTrace = new Throwable().getStackTrace();
|
||||
StringBuilder sb=new StringBuilder();
|
||||
for (StackTraceElement element : stackTrace) {
|
||||
if(element!=null){
|
||||
sb.append(element).append("\n");
|
||||
}
|
||||
}
|
||||
Log.e("DebugUtils",sb.toString());
|
||||
}
|
||||
/**
|
||||
* 仅在debug下运行的代码
|
||||
*/
|
||||
public static void runDebugCode(Runnable runnable) {
|
||||
if (BuildConfig.DEBUG) {
|
||||
runnable.run();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -83,7 +83,7 @@ public class ProcessImageUtil extends ProcessResultUtil {
|
||||
if (mNeedCrop) {
|
||||
Uri uri = null;
|
||||
if (Build.VERSION.SDK_INT >= 24) {
|
||||
uri = FileProvider.getUriForFile(mContext, "com.pandora.sy.fileprovider", mCameraResult);
|
||||
uri = FileProvider.getUriForFile(mContext, "com.pandora.cs.fileprovider", mCameraResult);
|
||||
} else {
|
||||
uri = Uri.fromFile(mCameraResult);
|
||||
}
|
||||
@@ -195,7 +195,7 @@ public class ProcessImageUtil extends ProcessResultUtil {
|
||||
mCameraResult = getNewFile();
|
||||
Uri uri = null;
|
||||
if (Build.VERSION.SDK_INT >= 24) {
|
||||
uri = FileProvider.getUriForFile(mContext, "com.pandora.sy.fileprovider", mCameraResult);
|
||||
uri = FileProvider.getUriForFile(mContext, "com.pandora.cs.fileprovider", mCameraResult);
|
||||
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
|
||||
} else {
|
||||
uri = Uri.fromFile(mCameraResult);
|
||||
@@ -255,7 +255,7 @@ public class ProcessImageUtil extends ProcessResultUtil {
|
||||
startActivityForResult(intent, mCropResultCallback);
|
||||
} catch (Exception e) {
|
||||
try {
|
||||
Uri resultUri = FileProvider.getUriForFile(mContext, "com.pandora.sy.fileprovider", mCorpResult);
|
||||
Uri resultUri = FileProvider.getUriForFile(mContext, "com.pandora.cs.fileprovider", mCorpResult);
|
||||
if (resultUri == null || mFragment == null || mContext == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -63,7 +63,7 @@ public class VersionUtil {
|
||||
@Override
|
||||
public void onConfirmClick(Dialog dialog, String content) {
|
||||
Intent i = new Intent(android.content.Intent.ACTION_VIEW);
|
||||
i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.pandora.sy"));
|
||||
i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.pandora.cs"));
|
||||
context.startActivity(i);
|
||||
context.finish();
|
||||
}
|
||||
@@ -85,7 +85,7 @@ public class VersionUtil {
|
||||
@Override
|
||||
public void onConfirmClick(Dialog dialog, String content) {
|
||||
Intent i = new Intent(android.content.Intent.ACTION_VIEW);
|
||||
i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.pandora.sy"));
|
||||
i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.pandora.cs"));
|
||||
context.startActivity(i);
|
||||
context.finish();
|
||||
}
|
||||
|
||||
@@ -128,7 +128,7 @@ public class APKUpdateCustomPopup extends CenterPopupView {
|
||||
public void onViewClicks() {
|
||||
if (CommonAppConfig.IS_GOOGLE_PLAY == 1) {
|
||||
Intent i = new Intent(android.content.Intent.ACTION_VIEW);
|
||||
i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.pandora.sy"));
|
||||
i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.pandora.cs"));
|
||||
mContext.startActivity(i);
|
||||
mContext.finish();
|
||||
} else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
package com.yunbao.common.views;
|
||||
|
||||
import android.content.Context;
|
||||
import android.graphics.Canvas;
|
||||
import android.graphics.Rect;
|
||||
import android.graphics.drawable.ColorDrawable;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.view.View;
|
||||
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
/**
|
||||
* Created by cxf on 2018/1/27.
|
||||
* RecyclerView顶部渐变的itemDecoration
|
||||
*/
|
||||
|
||||
public class DividerItemDecoration extends RecyclerView.ItemDecoration {
|
||||
|
||||
private Drawable mDivider;
|
||||
|
||||
public DividerItemDecoration(Context context, int dividerHeight, int dividerColor) {
|
||||
// 创建一个带有颜色和高度的Drawable作为分割线
|
||||
mDivider = new ColorDrawable(dividerColor);
|
||||
// 如果你想让分割线有一定的内边距（比如左右边距），可以使用LayerDrawable或自定义Drawable
|
||||
// 这里简单起见，我们只设置高度
|
||||
mDivider.setBounds(0, 0, 0, dividerHeight);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
|
||||
drawVertical(c, parent);
|
||||
}
|
||||
|
||||
private void drawVertical(Canvas c, RecyclerView parent) {
|
||||
final int left = parent.getPaddingLeft();
|
||||
final int right = parent.getWidth() - parent.getPaddingRight();
|
||||
|
||||
final int childCount = parent.getChildCount();
|
||||
for (int i = 0; i < childCount - 1; i++) {
|
||||
final View child = parent.getChildAt(i);
|
||||
final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams();
|
||||
final int top = child.getBottom() + params.bottomMargin;
|
||||
final int bottom = top + mDivider.getIntrinsicHeight();
|
||||
|
||||
mDivider.setBounds(left, top, right, bottom);
|
||||
mDivider.draw(c);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
|
||||
if (mDivider == null) return;
|
||||
outRect.set(0, 0, 0, mDivider.getIntrinsicHeight());
|
||||
}
|
||||
}
|
||||
@@ -2,8 +2,8 @@
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<gradient
|
||||
android:angle="-45"
|
||||
android:endColor="#EB6FFF"
|
||||
android:startColor="#FF83C6" />
|
||||
android:endColor="#FF0FA4FF"
|
||||
android:startColor="#FF0FA4FF" />
|
||||
<corners
|
||||
android:bottomLeftRadius="90dp"
|
||||
android:bottomRightRadius="90dp"
|
||||
|
||||
@@ -11,7 +11,11 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="10dp"
|
||||
android:orientation="horizontal">
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<com.makeramen.roundedimageview.RoundedImageView
|
||||
android:id="@+id/avatar"
|
||||
@@ -21,33 +25,16 @@
|
||||
android:src="@mipmap/icon_data_empty"
|
||||
app:riv_oval="true" />
|
||||
|
||||
<LinearLayout
|
||||
<TextView
|
||||
android:id="@+id/name"
|
||||
android:layout_weight="1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="10dp"
|
||||
android:layout_marginTop="7dp"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/name"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="栗子栗子🌰zzz"
|
||||
android:textColor="#777777"
|
||||
android:textSize="12dp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="5dp"
|
||||
android:text="栗子栗子🌰zzz"
|
||||
android:textColor="#333333"
|
||||
android:textSize="12dp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/author"
|
||||
android:layout_width="45dp"
|
||||
@@ -62,11 +49,6 @@
|
||||
android:textSize="10dp"
|
||||
android:visibility="gone" />
|
||||
|
||||
<View
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/del"
|
||||
android:layout_width="wrap_content"
|
||||
@@ -99,6 +81,19 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="15dp"
|
||||
android:layout_marginStart="40dp"
|
||||
android:layout_marginTop="5dp"
|
||||
android:text="栗子栗子🌰栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子zzz"
|
||||
android:textColor="#333333"
|
||||
android:textSize="12dp" />
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/replyLayout"
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@@ -27,30 +27,6 @@
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@mipmap/beauty_jingbai" />
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/rc_conversation_unread"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_alignParentEnd="true">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/rc_conversation_unread_bg"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:src="@drawable/rc_unread_count_bg_normal" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/rc_conversation_unread_count"
|
||||
style="@style/TextStyle.Alignment"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:text="15"
|
||||
android:textColor="@color/rc_white_color"
|
||||
android:textSize="@dimen/rc_font_auxiliary_size" />
|
||||
</RelativeLayout>
|
||||
</RelativeLayout>
|
||||
|
||||
<LinearLayout
|
||||
@@ -191,6 +167,39 @@
|
||||
android:background="@color/rc_divider_color"
|
||||
app:layout_constraintStart_toStartOf="@id/rc_conversation_title_layout"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/rc_conversation_unread"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_marginTop="20dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
android:layout_marginEnd="5dp"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:ignore="MissingConstraints">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/rc_conversation_unread_bg"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:src="@drawable/rc_unread_count_bg_normal" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/rc_conversation_unread_count"
|
||||
style="@style/TextStyle.Alignment"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:text="15"
|
||||
android:textColor="@color/rc_white_color"
|
||||
android:textSize="@dimen/rc_font_auxiliary_size" />
|
||||
</RelativeLayout>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 104 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 38 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 32 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 41 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 320 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 66 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 42 KiB |
BIN
common/src/main/res/mipmap-mdpi/icon_collectibles.png
Normal file
BIN
common/src/main/res/mipmap-mdpi/icon_collectibles.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 8.9 KiB |
|
Before Width: | Height: | Size: 8.9 KiB After Width: | Height: | Size: 8.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 321 KiB After Width: | Height: | Size: 320 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 38 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 41 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 66 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 37 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 42 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 101 KiB After Width: | Height: | Size: 104 KiB |
|
Before Width: | Height: | Size: 73 KiB After Width: | Height: | Size: 73 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 32 KiB |
BIN
common/src/main/res/mipmap-zh/background_quick_gift_reminder.png
Normal file
BIN
common/src/main/res/mipmap-zh/background_quick_gift_reminder.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 101 KiB |
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 32 KiB |
BIN
common/src/main/res/mipmap-zh/icon_cinema_ticket_title.png
Normal file
BIN
common/src/main/res/mipmap-zh/icon_cinema_ticket_title.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 37 KiB |
BIN
common/src/main/res/mipmap-zh/icon_enjoy_image.png
Normal file
BIN
common/src/main/res/mipmap-zh/icon_enjoy_image.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 30 KiB |
BIN
common/src/main/res/mipmap-zh/icon_img_up_label.png
Normal file
BIN
common/src/main/res/mipmap-zh/icon_img_up_label.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
BIN
common/src/main/res/mipmap-zh/icon_liveing.gif
Normal file
BIN
common/src/main/res/mipmap-zh/icon_liveing.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 321 KiB |
BIN
common/src/main/res/mipmap-zh/icon_order_rule.png
Normal file
BIN
common/src/main/res/mipmap-zh/icon_order_rule.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 66 KiB |
BIN
common/src/main/res/mipmap-zh/icon_user_game_living.png
Normal file
BIN
common/src/main/res/mipmap-zh/icon_user_game_living.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 5.6 KiB |
BIN
common/src/main/res/mipmap-zh/recommed_msg_bg.png
Normal file
BIN
common/src/main/res/mipmap-zh/recommed_msg_bg.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 39 KiB |
File diff suppressed because it is too large
Load Diff
@@ -208,6 +208,7 @@
|
||||
<string name="login_auth_failure">授權失敗</string>
|
||||
<string name="login_auth_cancle">授權取消</string>
|
||||
<string name="live">直播</string>
|
||||
<string name="community">社區</string>
|
||||
<string name="shopmall">商城</string>
|
||||
<string name="cust_server">客服</string>
|
||||
<string name="live_anchor">主播</string>
|
||||
@@ -651,7 +652,7 @@
|
||||
<string name="welcome_pdlive">歡迎來到PDLIVE</string>
|
||||
<string name="newcomer">恭喜你獲得了新人獎勵</string>
|
||||
|
||||
<string name="FILE_PROVIDER">com.pandora.sy.fileprovider</string>
|
||||
<string name="FILE_PROVIDER">com.pandora.cs.fileprovider</string>
|
||||
<string name="ren">人</string>
|
||||
<string name="ge">個</string>
|
||||
<string name="count">數量</string>
|
||||
|
||||
@@ -78,4 +78,6 @@
|
||||
<color name="gray_f6f7fb">#F6F7FB</color>
|
||||
|
||||
<color name="gray_F4F4F4">#F4F4F4</color>
|
||||
|
||||
<color name="gray_8A8A8A">#FFEFEFEF</color>
|
||||
</resources>
|
||||
|
||||
@@ -204,6 +204,7 @@
|
||||
<string name="login_ing">Logon</string>
|
||||
<string name="login_auth_ing">Authorizing login</string>
|
||||
<string name="live">Live</string>
|
||||
<string name="community">Community</string>
|
||||
<string name="login_tip_4">Log in</string>
|
||||
<string name="recomment">Hot</string>
|
||||
<string name="main_type_find">Find</string>
|
||||
@@ -812,6 +813,7 @@ Limited ride And limited avatar frame</string>
|
||||
|
||||
<string name="random_pk_dialog_apply">accept</string>
|
||||
<string name="random_pk_dialog_refuse">refuse</string>
|
||||
<string name="random_pk_dialog_refuse_again">Persist in refusing</string>
|
||||
<string name="random_pk_dialog_title">Random PK hint</string>
|
||||
|
||||
<string name="speech_robot_setup">Automatic speech robot setup</string>
|
||||
@@ -1279,41 +1281,41 @@ Limited ride And limited avatar frame</string>
|
||||
<string name="dialog_message_chat_notify_btn">Reply</string>
|
||||
<string name="activity_msg_chat_top_status_online">Online</string>
|
||||
<string name="activity_msg_chat_top_status_offline">Offline</string>
|
||||
<string name="commen_user_active">个人动态</string>
|
||||
<string name="commen_user_active">Personal updates</string>
|
||||
<string name="real_person">Real person</string>
|
||||
<string name="trade_union">工会</string>
|
||||
<string name="trade_union">tradeUnion</string>
|
||||
<string name="praise">Liked</string>
|
||||
<string name="cancel_back">取消黑名单</string>
|
||||
<string name="user_home_img_del_dialog">確定刪除圖片？</string>
|
||||
<string name="upload_success">上传成功</string>
|
||||
<string name="upload_failed">上傳成功</string>
|
||||
<string name="_9">最多添加9張圖片</string>
|
||||
<string name="not_interested">不感興趣</string>
|
||||
<string name="person_like">人覺得很讚</string>
|
||||
<string name="fan_group_name">主播守護團</string>
|
||||
<string name="user_home_anchor">主播粉絲團</string>
|
||||
<string name="main_active_type_01">美圖</string>
|
||||
<string name="main_active_type_02">新秀</string>
|
||||
<string name="main_active_type_03">身材</string>
|
||||
<string name="main_active_type_04">直播</string>
|
||||
<string name="main_active_type_05">生活</string>
|
||||
<string name="send_active_time">選擇時間</string>
|
||||
<string name="now_send">立即發表</string>
|
||||
<string name="choose_topic">選擇話題</string>
|
||||
<string name="pricture">圖文</string>
|
||||
<string name="_200">请输入200字以内的文字</string>
|
||||
<string name="focus_on">關注</string>
|
||||
<string name="see_more">查看更多</string>
|
||||
<string name="close">收起</string>
|
||||
<string name="time_cannot_be_greater_than_the_current_time">时间不能大于当前时间</string>
|
||||
<string name="msg_del_sure">是否確認刪除？</string>
|
||||
<string name="not_blackmail">不能拉黑自己</string>
|
||||
<string name="active_author">作者</string>
|
||||
<string name="active_count">共%1$s條回復></string>
|
||||
<string name="uploading">上傳中...</string>
|
||||
<string name="upload_fail">上傳失敗</string>
|
||||
<string name="please_input_content">請填寫發佈內容</string>
|
||||
<string name="comm_details">詳情</string>
|
||||
<string name="cancel_back">Cancel blacklist</string>
|
||||
<string name="user_home_img_del_dialog">Are you sure you want to delete the picture?？</string>
|
||||
<string name="upload_success">Upload successful</string>
|
||||
<string name="upload_failed">upload failed</string>
|
||||
<string name="_9">Add up to 9 pictures</string>
|
||||
<string name="not_interested">not interested</string>
|
||||
<string name="person_like">people liked it</string>
|
||||
<string name="fan_group_name">Fan group name</string>
|
||||
<string name="user_home_anchor">Anchor fan group</string>
|
||||
<string name="main_active_type_01">Beauty</string>
|
||||
<string name="main_active_type_02">Rookie</string>
|
||||
<string name="main_active_type_03">Figure</string>
|
||||
<string name="main_active_type_04">Live</string>
|
||||
<string name="main_active_type_05">Life</string>
|
||||
<string name="send_active_time">Selection period</string>
|
||||
<string name="now_send">Now</string>
|
||||
<string name="choose_topic">Select topic</string>
|
||||
<string name="pricture">picture</string>
|
||||
<string name="_200">Please enter text within 200 words</string>
|
||||
<string name="focus_on">Focus on</string>
|
||||
<string name="see_more">See more</string>
|
||||
<string name="close">close</string>
|
||||
<string name="time_cannot_be_greater_than_the_current_time">Time cannot be greater than the current time</string>
|
||||
<string name="msg_del_sure">Do you confirm deletion?</string>
|
||||
<string name="not_blackmail">Cannot blackmail oneself</string>
|
||||
<string name="active_author">author</string>
|
||||
<string name="active_count">altogether %1$s strip reply></string>
|
||||
<string name="uploading">Uploading...</string>
|
||||
<string name="upload_fail">Upload failed</string>
|
||||
<string name="please_input_content">Please fill in the publication content</string>
|
||||
<string name="comm_details">Details</string>
|
||||
|
||||
<string name="guard_buy_type_1">【Star Guardian】</string>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ ext {
|
||||
buildToolsVersion: "29.0.2",
|
||||
minSdkVersion : 23,
|
||||
targetSdkVersion : 34,
|
||||
versionCode : 546,
|
||||
versionCode : 550,
|
||||
versionName : "6.8.0",
|
||||
namespace : "com.pandoralive.shayu"
|
||||
]
|
||||
|
||||
@@ -422,8 +422,9 @@ public class SWAuManager extends BaseCacheManager {
|
||||
|
||||
public void preloadChannel(List<LiveBean> uids){
|
||||
for (int i = 0; i <uids.size(); i++) {
|
||||
L.eSw("设置秒开数据 uid"+uids.get(i).getUid()+" --- userName:"+uids.get(i).getUserNiceName());
|
||||
int code = mRtcEngine.preloadChannel(CommonAppConfig.SWToken,getChannelName(uids.get(i).getUid()),Integer.parseInt(CommonAppConfig.getInstance().getUid()));
|
||||
L.eSw("设置秒开数据 uid"+uids.get(i).getUid()+" --- userName:"+uids.get(i).getUserNiceName()+" code "+code);
|
||||
//L.eSw("设置秒开数据 uid"+uids.get(i).getUid()+" --- userName:"+uids.get(i).getUserNiceName()+" code "+code);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -223,7 +223,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
|
||||
initFaceManager();
|
||||
leave_img = findViewById(R.id.leave_img);
|
||||
mLiveSDK = intent.getIntExtra(Constants.LIVE_SDK, Constants.LIVE_SDK_KSY);
|
||||
if (mLiveSDK == Constants.LIVE_SDK_SW) {
|
||||
if(mLiveSDK ==Constants.LIVE_SDK_SW){
|
||||
isSw = true;
|
||||
}
|
||||
mLiveKsyConfigBean = intent.getParcelableExtra(Constants.LIVE_KSY_CONFIG);
|
||||
@@ -289,23 +289,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
|
||||
}
|
||||
});
|
||||
|
||||
/*DebugDialog.getInstance(new DebugDialog.DebugDialogRunnable() {
|
||||
@Override
|
||||
public void run(DebugDialog dialog) {
|
||||
dialog.setShowPattern(ShowPattern.ALL_TIME);
|
||||
dialog.show();
|
||||
dialog.setView("测试", new Button(mContext), new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
android.os.Message msg = android.os.Message.obtain();
|
||||
msg.what = Constants.SOCKET_WHAT_BROADCAST;
|
||||
String json = "{\"msg\":[{\"_method_\":\"StartEndLive\",\"action\":\"18\",\"ct\":\"直播关闭\",\"touid\":\"\",\"equipment\":\"app\",\"msgtype\":\"1\",\"uname\":\"1\",\"timestamp\":\"\",\"touname\":\"\",\"uid\":\"98274\",\"tougood\":\"\",\"ugood\":\"\",\"roomnum\":\"98274\",\"riskDescription\":\"色情:性行为:中度色情\",\"enRiskDescription\":\"Pornography: Sexual behavior: Moderate pornography\",\"riskhType\":\"封禁1分钟\",\"enRiskhType\":\"Banned for 1 minute\",\"date\":\"2024-07-30 15:03:11\"}],\"retcode\":\"000000\",\"retmsg\":\"OK\"}";
|
||||
msg.obj = json;
|
||||
SocketSwClient.mSocketHandler.sendMessage(msg);
|
||||
}
|
||||
});
|
||||
}
|
||||
});*/
|
||||
|
||||
}
|
||||
|
||||
private void initFaceManager() {
|
||||
@@ -894,9 +878,8 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
|
||||
getAiRobotStatus();
|
||||
MicedUserManager.get().removeAllMicUserList();
|
||||
MicUserManager.get().removeAllMicUserList();
|
||||
|
||||
if(mLiveRoomViewHolder!=null){
|
||||
//加载整蛊
|
||||
if(mLiveRoomViewHolder!=null){
|
||||
mLiveRoomViewHolder.initPrankProgress(2);
|
||||
mLiveRoomViewHolder.sendMsgPrank();
|
||||
|
||||
@@ -1264,9 +1247,9 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
|
||||
.param("uhead", CommonAppConfig.getInstance().getUserBean().getAvatar())
|
||||
.param("pkname", CommonAppConfig.getInstance().getUserBean().getUserNiceName());
|
||||
//判断是否是随机PK
|
||||
if(extra){
|
||||
if (extra) {
|
||||
msg1.param("random_pk", "1");
|
||||
msg1.param("msgtype","11");
|
||||
msg1.param("msgtype", "11");
|
||||
if (RandomPkManager.getInstance().isRankModel()) {
|
||||
msg1.param("is_ladders", "https://downs.yaoulive.com/rank_top_box.png");
|
||||
}
|
||||
@@ -1321,7 +1304,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
|
||||
}
|
||||
}
|
||||
|
||||
public void linkDrMicRemoveListUid(String uid) {
|
||||
public void linkDrMicRemoveListUid(String uid){
|
||||
if (mLiveAnchorViewHolder != null) {
|
||||
mLiveAnchorViewHolder.removeYaoqing(uid);
|
||||
}
|
||||
@@ -1498,7 +1481,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
|
||||
|
||||
@Override
|
||||
public void onUpdatePrankProgress(String prankString) {
|
||||
if (mLiveRoomViewHolder != null) {
|
||||
if (mLiveRoomViewHolder != null){
|
||||
mLiveRoomViewHolder.refreshPrank(prankString);
|
||||
}
|
||||
}
|
||||
@@ -1689,7 +1672,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
|
||||
case LEAVE_DR_ROOM:
|
||||
if (mLiveRoomViewHolder != null) {
|
||||
mLiveRoomViewHolder.seisShowGif(true);
|
||||
if (DRPKing == 1) {
|
||||
if(DRPKing==1){
|
||||
mLiveRoomViewHolder.endDRGif();
|
||||
}
|
||||
}
|
||||
@@ -1916,6 +1899,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
|
||||
.setIcon("https://downs.yaoulive.com/xzs_tab.png")
|
||||
.setNameColor("#f19ec2")
|
||||
.setSystemBubble("https://downs.yaoulive.com/xzs_qipao.9.png")
|
||||
.setIconEn("https://downs.yaoulive.com/Robot_en.png")
|
||||
.setUserName("")
|
||||
.setContent(content);
|
||||
SocketSendBean msg =
|
||||
@@ -1990,6 +1974,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||
public void onAllServerNotifyFFGGGDJANEvent(AllServerNotifyFFGGGDJANEvent event) {
|
||||
if (mLiveRoomViewHolder != null) {
|
||||
|
||||
@@ -176,6 +176,7 @@ public class LiveAnchorEditCallMeAdapter extends RecyclerView.Adapter<LiveAnchor
|
||||
public void onDismiss() {
|
||||
}
|
||||
})
|
||||
.setHotGiftListUrl(true)
|
||||
.setShowNumber(false)
|
||||
.setTitle(mContext.getString(R.string.live_anchor_edit_call_me_select_gift))
|
||||
.setHideGiftType(true)
|
||||
|
||||
@@ -62,7 +62,12 @@ public class GiftPopDialog extends AbsDialogPopupWindow implements ActionListene
|
||||
private TextView mTitle;
|
||||
private boolean isOldGiftList = false;
|
||||
private boolean hideGiftType = false;
|
||||
private boolean isHotGiftListUrl = false;
|
||||
|
||||
public GiftPopDialog setHotGiftListUrl(boolean hotGiftListUrl) {
|
||||
isHotGiftListUrl = hotGiftListUrl;
|
||||
return this;
|
||||
}
|
||||
|
||||
public GiftPopDialog(@NonNull Context context) {
|
||||
super(context);
|
||||
@@ -183,6 +188,25 @@ public class GiftPopDialog extends AbsDialogPopupWindow implements ActionListene
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFinish() {
|
||||
if (mLoading != null) {
|
||||
mLoading.setVisibility(View.INVISIBLE);
|
||||
}
|
||||
}
|
||||
});
|
||||
} else if (isHotGiftListUrl) {
|
||||
LiveHttpUtil.getHotGiftList(new HttpCallback() {
|
||||
@Override
|
||||
public void onSuccess(int code, String msg, String[] info) {
|
||||
if (code == 0 && info.length > 0) {
|
||||
JSONObject obj = JSON.parseObject(info[0]);
|
||||
JSONArray list = obj.getJSONArray("listarray");
|
||||
setDate(list);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFinish() {
|
||||
if (mLoading != null) {
|
||||
|
||||
@@ -62,6 +62,7 @@ import com.yunbao.common.interfaces.OnItemClickListener;
|
||||
import com.yunbao.common.manager.IMLoginManager;
|
||||
import com.yunbao.common.utils.AppManager;
|
||||
import com.yunbao.common.utils.Bus;
|
||||
import com.yunbao.common.utils.DebugUtils;
|
||||
import com.yunbao.common.utils.DialogUitl;
|
||||
import com.yunbao.common.utils.DpUtil;
|
||||
import com.yunbao.common.utils.GiftCacheUtil;
|
||||
@@ -1092,7 +1093,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
|
||||
Bus.get().post(event);
|
||||
}).build().show();
|
||||
|
||||
AppManager.runDebugCode(() -> {
|
||||
DebugUtils.runDebugCode(() -> {
|
||||
Log.i("gifBean", mLiveGiftBean.toString());
|
||||
});
|
||||
} else if (code == 1001) {
|
||||
|
||||
@@ -44,6 +44,7 @@ import com.opensource.svgaplayer.SVGADrawable;
|
||||
import com.opensource.svgaplayer.SVGAImageView;
|
||||
import com.opensource.svgaplayer.SVGAParser;
|
||||
import com.opensource.svgaplayer.SVGAVideoEntity;
|
||||
import com.yunbao.common.utils.DebugUtils;
|
||||
import com.yunbao.common.utils.L;
|
||||
import com.yunbao.common.utils.MobclickAgent;
|
||||
import com.yunbao.common.CommonAppConfig;
|
||||
@@ -836,7 +837,11 @@ public class LiveGiftPopup extends AbsDialogFragment {
|
||||
@Override
|
||||
public void onSuccess(GiftNamingInfoModel data) {
|
||||
if (TextUtils.equals(data.getNamingStatus(), "1")) {
|
||||
boolean isPageGift = liveGiftModel.isPageGift();
|
||||
liveGiftModel = JSONObject.parseObject(GsonUtils.toJson(data), LiveGiftBean.class);
|
||||
liveGiftModel.setPageGift(isPageGift);
|
||||
liveGiftModel.setGift_id(giftId);
|
||||
liveGiftModel.setId(giftId);
|
||||
if (!TextUtils.isEmpty(liveGiftModel.getNamingLiveuid()) &&
|
||||
!TextUtils.isEmpty(liveGiftModel.getNamingUid()) &&
|
||||
!TextUtils.equals(liveGiftModel.getNamingLiveuid(), "0") &&
|
||||
@@ -1428,7 +1433,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
|
||||
Bus.get().post(event);
|
||||
}).build().show();
|
||||
|
||||
AppManager.runDebugCode(() -> {
|
||||
DebugUtils.runDebugCode(() -> {
|
||||
Log.i("gifBean", mGiftBean.toString());
|
||||
});
|
||||
} else if (code == 1001) {
|
||||
|
||||
@@ -147,7 +147,7 @@ public class LiveTaskDialog extends AbsDialogPopupWindow {
|
||||
if (task.isNew()) {
|
||||
newStarImg.setVisibility(VISIBLE);
|
||||
newStarTime.setVisibility(VISIBLE);
|
||||
newStarTime.setText(task.getEndTime());
|
||||
newStarTime.setText(WordUtil.isNewZh()?"新秀主播時效截止至 ":"The statute of limitations for new anchors expires " +task.getEndTime());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -83,6 +83,7 @@ public class LiveUserAnchorMsgPopDialog extends AbsDialogFragment {
|
||||
mIndicator = (MagicIndicator) findViewById(R.id.indicator);
|
||||
viewPager = (ViewPager2) findViewById(R.id.viewPager);
|
||||
titleCount= (TextView) findViewById(R.id.titleCount);
|
||||
titleCount.setText(getResources().getString(R.string.message_chat_msg_all_an_a)+"(0)");
|
||||
fragmentList = new ArrayList<>();
|
||||
fragmentList.add(new MainMessageChatListFragment(AppManager.getInstance().getLiveActivity()));
|
||||
viewPager.setAdapter(new FragmentStateAdapter((FragmentActivity) AppManager.getInstance().getLiveActivity()) {
|
||||
|
||||
@@ -70,6 +70,7 @@ import com.opensource.svgaplayer.SVGAParser;
|
||||
import com.opensource.svgaplayer.SVGAVideoEntity;
|
||||
import com.yunbao.common.bean.PrankProgressBean;
|
||||
import com.yunbao.common.fragment.GiftWallMainTab1Fragment;
|
||||
import com.yunbao.common.utils.DebugUtils;
|
||||
import com.yunbao.common.utils.L;
|
||||
import com.yunbao.common.utils.MobclickAgent;
|
||||
import com.yunbao.common.CommonAppConfig;
|
||||
@@ -2360,7 +2361,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
||||
if (!IMLoginManager.get(mContext).hintChat()) {
|
||||
msgLayout.setVisibility(View.VISIBLE);
|
||||
}
|
||||
AppManager.runDebugCode(() -> msgLayout.setVisibility(View.GONE));
|
||||
DebugUtils.runDebugCode(() -> msgLayout.setVisibility(View.GONE));
|
||||
if (d_pk_view != null) {
|
||||
d_pk_view.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
@@ -33,6 +33,7 @@ import com.lzf.easyfloat.permission.PermissionUtils;
|
||||
import com.lzf.easyfloat.utils.LifecycleUtils;
|
||||
import com.yunbao.common.event.LiveMsgWindowsCloseEvent;
|
||||
import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
|
||||
import com.yunbao.common.utils.DebugUtils;
|
||||
import com.yunbao.common.utils.MobclickAgent;
|
||||
import com.yunbao.common.CommonAppConfig;
|
||||
import com.yunbao.common.CommonAppContext;
|
||||
@@ -287,7 +288,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
|
||||
liveImDeletUtil = new LiveImDeletUtil();
|
||||
portraitLiveManager = this;
|
||||
ininView();
|
||||
AppManager.runDebugCode(() -> waitShowTopBannerTime = 1000);
|
||||
DebugUtils.runDebugCode(() -> waitShowTopBannerTime = 1000);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -875,7 +876,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
|
||||
}
|
||||
}
|
||||
//liveHandler.postDelayed(loadTimeoutRunnableGone, 15_000);
|
||||
AppManager.runDebugCode(() -> {
|
||||
DebugUtils.runDebugCode(() -> {
|
||||
liveHandler.postDelayed(loadTimeoutRunnableGone, 1_000);
|
||||
});
|
||||
liveHandler.postDelayed(loadTimeoutRunnableGone, 4_000);
|
||||
|
||||
@@ -36,9 +36,9 @@
|
||||
android:textSize="16sp" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.1"
|
||||
android:layout_weight="1"
|
||||
android:gravity="end|center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
@@ -46,12 +46,15 @@
|
||||
android:id="@+id/live_data_img"
|
||||
android:layout_width="13dp"
|
||||
android:layout_height="13dp"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:layout_marginEnd="5dp"
|
||||
tools:srcCompat="@mipmap/icon_free_pk_waring" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxLines="1"
|
||||
android:ellipsize="end"
|
||||
android:textSize="14dp"
|
||||
android:text="@string/live_data_msg2"
|
||||
android:textColor="#595959" />
|
||||
</LinearLayout>
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="600dp"
|
||||
|
||||
android:background="#000002">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
@@ -24,11 +23,11 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_marginEnd="14dp"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textSize="12sp"
|
||||
android:visibility="invisible"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<ImageView
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="點擊查看"
|
||||
android:text="@string/click_to_view"
|
||||
android:textColor="#ffaaaaaa"
|
||||
android:textSize="12sp" />
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 80 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 84 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 48 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 346 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 80 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 84 KiB |
|
Before Width: | Height: | Size: 990 KiB After Width: | Height: | Size: 990 KiB |
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 65 KiB After Width: | Height: | Size: 65 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 48 KiB |
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user