diff --git a/OneToOne/build.gradle b/OneToOne/build.gradle index cae71a630..79f43b9f0 100644 --- a/OneToOne/build.gradle +++ b/OneToOne/build.gradle @@ -84,9 +84,24 @@ android { } applicationVariants.all { variant -> + String variantName = variant.name.capitalize() + def processManifestTask = project.tasks.getByName("process${variantName}Manifest") + processManifestTask.doLast { pm -> + String manifestPath = "build/intermediates/bundle_manifest/release/bundle-manifest/AndroidManifest.xml" + def isGooglePlay = rootProject.ext.manifestPlaceholders.isGooglePlay + if (file(manifestPath).exists() && isGooglePlay) { + def manifestContent = file(manifestPath).getText() + + manifestContent = manifestContent.replace('', '') + file(manifestPath).write(manifestContent) + } else { + print "not Exists = " + manifestPath + } + } + variant.outputs.all { - outputFileName = "[${new Date().format("MM-dd", TimeZone.getTimeZone("GMT+8"))}]1v1社交-${rootProject.ext.android.otoversionName}-${variant.buildType.name}.apk" + outputFileName = "[${new Date().format("MM-dd", TimeZone.getTimeZone("GMT+8"))}]友聊-${rootProject.ext.android.otoversionName}-${variant.buildType.name}.apk" } } @@ -95,7 +110,7 @@ android { minSdkVersion rootProject.ext.android.minSdkVersion targetSdkVersion rootProject.ext.android.targetSdkVersion versionCode rootProject.ext.android.otoversionCode - versionName rootProject.ext.android.otoversionName+new Date().format("HHmm", TimeZone.getTimeZone("GMT+8")) + versionName rootProject.ext.android.otoversionName manifestPlaceholders = rootProject.ext.manifestPlaceholders ndk { abiFilters "armeabi-v7a", "arm64-v8a" @@ -169,7 +184,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" //common api project(path: ':common') - api project(path:':FaceUnity')//新娱美颜 + //api project(path:':FaceUnity')//新娱美颜 api project(path:':Share') api project(path:':TabLayout') diff --git a/OneToOne/proguard-rules.pro b/OneToOne/proguard-rules.pro index 481bb4348..ca1655636 100644 --- a/OneToOne/proguard-rules.pro +++ b/OneToOne/proguard-rules.pro @@ -1,21 +1,250 @@ # Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. +# By default, the flags in this file are appended to flags specified +# in /Users/macpro/Library/Android/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. # # For more details, see # http://developer.android.com/guide/developing/tools/proguard.html +# Add any project specific keep options here: + # If your project uses WebView with JS, uncomment the following # and specify the fully qualified class name to the JavaScript interface # class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} +-keepclassmembers class fqcn.of.javascript.interface.for.webview { + public *; +} -# Uncomment this to preserve the line number information for +# Uncomment this to preserve the groupLast number information for # debugging stack traces. -#-keepattributes SourceFile,LineNumberTable +-keepattributes SourceFile,LineNumberTable -# If you keep the line number information, uncomment this to +# If you keep the groupLast number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +-renamesourcefileattribute SourceFile + +-keep class com.yunbao.**{ + public ; + protected ; +} +-keep class com.shayu.**{ + public ; + protected ; +} +-keep class * implements com.yunbao.common.bean.BaseModel { + *; +} + +-keep class com.yunbao.common.bean.** { + *; +} +-keep class com.shayu.onetoone.bean.** { + *; +} + +-keep class com.yunbao.common.views.weight.VerticalViewPager$LayoutParams{ + *; +} +-keep class android.**{ + *; +} + +-keep class **.R$* { + public static ; +} +-keep class com.tencent.** { *; } +-keep class com.adjust.sdk.**{ *; } +-keep class com.google.android.gms.common.ConnectionResult { + int SUCCESS; +} +-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient { + com.google.android.gms.ads.identifier.AdvertisingIdClient$Info getAdvertisingIdInfo(android.content.Context); +} +-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient$Info { + java.lang.String getId(); + boolean isLimitAdTrackingEnabled(); +} +-keep public class com.android.installreferrer.**{ *; } +-keep class * implements android.os.Parcelable.**{*;} +-keep class * implements android.os.Serializable.**{*;} +-dontwarn javax.annotation.** + +-dontwarn javax.inject.** + +# OkHttp3 + +-dontwarn okhttp3.logging.** + +-keep class okhttp3.internal.**{*;} + +-dontwarn okio.** +#okhttp +-dontwarn okhttp3.** +-keep class okhttp3.**{*;} + +#okio +-dontwarn okio.** +-keep class okio.**{*;} + +# Retrofit + +-dontwarn retrofit2.** + +-keep class retrofit2.** { *; } + +-keepattributes Signature-keepattributes,Exceptions + +# RxJava RxAndroid +-dontwarn java.util.concurrent.Flow* + +-dontwarn sun.misc.** + +-keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* { + +long producerIndex; + +long consumerIndex; + +} + +-keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueProducerNodeRef* { + +rx.internal.util.atomic.LinkedQueueNode* producerNode; + +} + +-keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueConsumerNodeRef* { + +rx.internal.util.atomic.LinkedQueueNode* consumerNode; + +} + +# Gson + +-keep class com.google.gson.stream.** { *; } +##---------------Begin: proguard configuration for Gson ---------- +# Gson uses generic type information stored in a class file when working with fields. Proguard +# removes such information by default, so configure it to keep all of it. +-keepattributes Signature + +# For using GSON @Expose annotation +-keepattributes *Annotation* + +# Gson specific classes +-dontwarn sun.misc.** +#-keep class com.google.gson.stream.** { *; } + +# Application classes that will be serialized/deserialized over Gson +-keep class com.google.gson.examples.android.model.** { ; } + +# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory, +# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter) +-keep class * extends com.google.gson.TypeAdapter +-keep class * implements com.google.gson.TypeAdapterFactory +-keep class * implements com.google.gson.JsonSerializer +-keep class * implements com.google.gson.JsonDeserializer + +# Prevent R8 from leaving Data object members always null +-keepclassmembers,allowobfuscation class * { + @com.google.gson.annotations.SerializedName ; +} + +# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher. +-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken +-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken + +##---------------End: proguard configuration for Gson ---------- + +-keepattributes EnclosingMethod +#--------融云 +-keepattributes Exceptions,InnerClasses +-keepattributes Signature +-keep class io.rong.** {*;} +-keep class cn.rongcloud.** {*;} +-keep class * implements io.rong.imlib.model.MessageContent {*;} +-dontwarn io.rong.push.** +-dontnote com.xiaomi.** +-dontnote com.google.android.gms.gcm.** +-dontnote io.rong.** +# 下方混淆使用了融云 IMKit 提供的 locationKit 位置插件时才需要配置，可参考高德官网的混淆方式:https://lbs.amap.com/api/android-sdk/guide/create-project/dev-attention +-keep class com.amap.api.maps.**{*;} +-keep class com.autonavi.**{*;} +-keep class com.amap.api.trace.**{*;} +-keep class com.amap.api.location.**{*;} +-keep class com.amap.api.fence.**{*;} +-keep class com.loc.**{*;} +-keep class com.autonavi.aps.amapapi.model.**{*;} +-keep class com.amap.api.services.**{*;} +-ignorewarnings + +#--------科大讯飞 +-keep class com.iflytek.**{*;} +-keepattributes Signature +#EvenBus +-keepattributes *Annotation* +-keepclassmembers class * { + @org.greenrobot.eventbus.Subscribe ; +} +-keep enum org.greenrobot.eventbus.ThreadMode { *; } + +# If using AsyncExecutord, keep required constructor of default event used. +# Adjust the class name if a custom failure event type is used. +-keepclassmembers class org.greenrobot.eventbus.util.ThrowableFailureEvent { + (java.lang.Throwable); +} + +# Accessed via reflection, avoid renaming or removal +-keep class org.greenrobot.eventbus.android.AndroidComponentsImpl* + +#--------ARouter +-keep public class com.alibaba.android.arouter.routes.**{*;} +-keep public class com.alibaba.android.arouter.facade.**{*;} +-keep class * implements com.alibaba.android.arouter.facade.template.ISyringe{*;} + +# If you use the byType method to obtain Service, add the following rules to protect the interface: +-keep interface * implements com.alibaba.android.arouter.facade.template.IProvider + +# If single-type injection is used, that is, no interface is defined to implement IProvider, the following rules need to be added to protect the implementation +# -keep class * implements com.alibaba.android.arouter.facade.template.IProvider + +#----retrofit2 +-keepattributes Signature, InnerClasses, EnclosingMethod +-keepattributes RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations +-keepattributes AnnotationDefault +-keepclassmembers,allowshrinking,allowobfuscation interface * { + @retrofit2.http.* ; +} +-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement* +-dontwarn javax.annotation.** +-dontwarn kotlin.Unit +-dontwarn retrofit2.KotlinExtensions* +-dontwarn retrofit2.KotlinExtensions$* +-if interface * { @retrofit2.http.* ; } +-keep,allowobfuscation interface <1> +-if interface * { @retrofit2.http.* ; } +-keep,allowobfuscation interface * extends <1> +-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation +-if interface * { @retrofit2.http.* public *** *(...); } +-keep,allowoptimization,allowshrinking,allowobfuscation class <3> + +#-----glide +-keep public class com.bumptech.glide.** {*;} +-keep public class jp.co.cyberagent.** {*;} +-dontwarn jp.co.cyberagent.android.gpuimage.** + +-printconfiguration tmp/full-r8-config.txt +#---美颜模块需要暴露出来的参数名 +-keep class com.yunbao.faceunity.utils.FURenderer{ + public static java.lang.String BUNDLE_AI_FACE; +} +-keep class com.yunbao.faceunity.utils.FaceUnityConfig{ + public static java.lang.String BUNDLE_FACE_BEAUTIFICATION; +} +-keep class com.faceunity.wrapper.faceunity$LoadConfig*{ + private static boolean sLoadedLibrary; +} +#--融云语聊-- +-keep public class cn.rongcloud.** {*;} +-ignorewarnings +-keep class io.rong.imkit.** {*;} \ No newline at end of file diff --git a/OneToOne/src/main/AndroidManifest.xml b/OneToOne/src/main/AndroidManifest.xml index 5de75be9a..2ef751d49 100644 --- a/OneToOne/src/main/AndroidManifest.xml +++ b/OneToOne/src/main/AndroidManifest.xml @@ -82,6 +82,7 @@ + () { @Override public void callback(ConfigBean configBean) { @@ -146,11 +151,13 @@ public class MainActivity extends AbsOTOActivity { } if (!VersionUtil.isLatest(configBean.getVersion())) { if (!APKManager.get().getApkVerNew()) { + new XPopup.Builder(mContext) .isDestroyOnDismiss(true) .dismissOnBackPressed(false) // 按返回键是否关闭弹窗，默认为true .dismissOnTouchOutside(false) // 点击外部是否关闭弹窗，默认为true - .asCustom(new APKUpdateOneToOnePopup(MainActivity.this, false)) + .asCustom(new APKUpdateOneToOnePopup(MainActivity.this, false) + .setOnShowListener(view -> isInstallApk = true)) .show(); } } else { @@ -179,7 +186,7 @@ public class MainActivity extends AbsOTOActivity { if (!isHome && data.getChat() != 0) { isShow = false; } - SpUtil.setStringValue("match_data",JSONObject.toJSONString(data)); + SpUtil.setStringValue("match_data", JSONObject.toJSONString(data)); Bus.get().post(new HomeBusEvent(HomeBusEvent.TYPE_UPDATE_MATCHING, data.getNum())); if (isShow) { new FirstTipsDialog(mContext) @@ -229,6 +236,9 @@ public class MainActivity extends AbsOTOActivity { super.onResume(); checkUserInfoIsSet(); initFirstLoginTips(); + if (isInstallApk) { + checkVersion(); + } } /** @@ -238,7 +248,7 @@ public class MainActivity extends AbsOTOActivity { OTONetManager.getInstance(mContext).getBaseInfos(false, new com.yunbao.common.http.base.HttpCallback() { @Override public void onSuccess(com.shayu.onetoone.bean.UserBean data) { - UserManager.saveUserBean(mContext,data); + UserManager.saveUserBean(mContext, data); if (data.getStatus() == 0) { RouteManager.forwardCompleteActivity(); } @@ -260,30 +270,38 @@ public class MainActivity extends AbsOTOActivity { } RongIMClient.getInstance().getUnreadCount(new Conversation.ConversationType[]{Conversation.ConversationType.PRIVATE} - ,false - ,new RongIMClient.ResultCallback() { - @Override - public void onSuccess(Integer integer) { - updateUnreadCount(MsgMessageFragment.systemPoint + integer); - Bus.get().post(new MessageMsgBusEvent(MessageMsgBusEvent.TYPE_UPDATE_POINT, MsgMessageFragment.systemPoint + integer)); - } + , false + , new RongIMClient.ResultCallback() { + @Override + public void onSuccess(Integer integer) { + updateUnreadCount(MsgMessageFragment.systemPoint + integer); + Bus.get().post(new MessageMsgBusEvent(MessageMsgBusEvent.TYPE_UPDATE_POINT, MsgMessageFragment.systemPoint + integer)); + } - @Override - public void onError(RongIMClient.ErrorCode e) { + @Override + public void onError(RongIMClient.ErrorCode e) { - } - }); + } + }); } private void updateUnreadCount(int count) { dslTabLayout.setDrawBadge(count > 0); - if(count>99){ - dslTabLayout.updateTabBadge(2, "99+"); - }else { + if (count > 99) { + dslTabLayout.updateTabBadge(2, "99+"); + } else { dslTabLayout.updateTabBadge(2, count + ""); } } + @Override + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + if (requestCode == 998) { + checkVersion(); + } + } + @Override protected int getLayoutId() { return R.layout.activity_main; @@ -309,10 +327,11 @@ public class MainActivity extends AbsOTOActivity { if (event.getNum() == -1) { showRedPoint(-1); } - }else if(event.getType()==MessageMsgBusEvent.TYPE_TO_HOME_PAGE){ + } else if (event.getType() == MessageMsgBusEvent.TYPE_TO_HOME_PAGE) { viewPager.setCurrentItem(event.getNum()); } } + /** * 用户被踢下线 * diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/RecommendFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/RecommendFragment.java index 8424818cb..33242cd0f 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/RecommendFragment.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/RecommendFragment.java @@ -60,6 +60,7 @@ public class RecommendFragment extends BaseFragment { mRefreshLayout.setRefreshHeader(new RongRefreshHeader(this.getContext())); mRefreshLayout.setRefreshFooter(new RongRefreshHeader(this.getContext())); recyclerView.setEmptyView(itemView.findViewById(R.id.view_empty)); + recyclerView.setHasFixedSize(true); recyclerView.setAutoLoadMore(true); mRefreshLayout.setOnRefreshListener(new OnRefreshListener() { public void onRefresh(@NonNull RefreshLayout refreshLayout) { diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java index 7e6407e2c..94fbbe30e 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java @@ -153,48 +153,52 @@ public class ChatMessageFragment extends AbsConversationFragment { // img.setOnClickListener(v -> cameraUtil.getImageByCamera()); initCamera(); - mSendBtn.setOnClickListener(v -> { - if (StringUtil.isEmpty(mEditText.getText().toString())) { - return; - } - SendMessageManager.sendMessageForText(targetId, mEditText.getText().toString(), new OnSendMessageListener() { - @Override - public void onSuccess(String token, SendConsumeBean bean) { - super.onSuccess(token, bean); - ChatMessageFragment.this.token = token; - sendText(); - + ViewClicksAntiShake.clicksAntiShake(mSendBtn, new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + if (StringUtil.isEmpty(mEditText.getText().toString())) { + return; } + SendMessageManager.sendMessageForText(targetId, mEditText.getText().toString(), new OnSendMessageListener() { + @Override + public void onSuccess(String token, SendConsumeBean bean) { + super.onSuccess(token, bean); + ChatMessageFragment.this.token = token; + sendText(); - @Override - public void onError(int status, String msg) { - super.onError(status, msg); - if (status == OnSendMessageListener.STATUS_NOT_PRICE) { - - MsgCheckUtils.checkPrice(mContext, targetId, new OnItemClickListener() { - @Override - public void onItemClick(MessageConsumeConfigBean bean, int position) { - new TipsDialog(mContext) - .setTitle(WordUtil.getNewString(R.string.not_money)) - .setContent(String.format(WordUtil.getNewString(R.string.not_money_tips), bean.getPrice())) - .setCancelText(WordUtil.getNewString(R.string.dialog_cancel_tip)) - .setApplyText(WordUtil.getNewString(R.string.dialog_to_money_tip)) - .setOnDialogClickListener(new OnDialogClickListener() { - - @Override - public void onApply(Dialog dialog) { - super.onApply(dialog); - } - }).showDialog(); - } - }); - - } else { - ToastUtil.show(msg); } - } - }); + + @Override + public void onError(int status, String msg) { + super.onError(status, msg); + if (status == OnSendMessageListener.STATUS_NOT_PRICE) { + + MsgCheckUtils.checkPrice(mContext, targetId, new OnItemClickListener() { + @Override + public void onItemClick(MessageConsumeConfigBean bean, int position) { + new TipsDialog(mContext) + .setTitle(WordUtil.getNewString(R.string.not_money)) + .setContent(String.format(WordUtil.getNewString(R.string.not_money_tips), bean.getPrice())) + .setCancelText(WordUtil.getNewString(R.string.dialog_cancel_tip)) + .setApplyText(WordUtil.getNewString(R.string.dialog_to_money_tip)) + .setOnDialogClickListener(new OnDialogClickListener() { + + @Override + public void onApply(Dialog dialog) { + super.onApply(dialog); + } + }).showDialog(); + } + }); + + } else { + ToastUtil.show(msg); + } + } + }); + } }); + updateMyInfo(); showRedPoint(); } diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallAudioActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallAudioActivity.java index 065065833..6361ee6f3 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallAudioActivity.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallAudioActivity.java @@ -263,6 +263,7 @@ public class CallAudioActivity extends AbsOTOActivity implements View.OnClickLis model = CallClientManager.AUDIO_CALL; } callMsg.setImageResource(R.mipmap.ic_call_audio_msg); + callMsg.setTag(true); } } diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/setting/SettingActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/setting/SettingActivity.java index 31587f379..8a13fad41 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/setting/SettingActivity.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/setting/SettingActivity.java @@ -162,6 +162,7 @@ public class SettingActivity extends AbsActivity { */ private void logout() { IMLoginManager.get(this).logout(this); + UserManager.logout(); CommonAppConfig.getInstance().clearLoginInfo(); RCRTCEngine.getInstance().unInit(); RongIMClient.getInstance().logout(); diff --git a/OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgMessageRecyclerViewAdapter.java b/OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgMessageRecyclerViewAdapter.java index 79aa714a9..3dd72dd53 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgMessageRecyclerViewAdapter.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgMessageRecyclerViewAdapter.java @@ -52,7 +52,6 @@ public class MsgMessageRecyclerViewAdapter extends ConversationListAdapter { if(conversation.mCore.getUnreadMessageCount()>99){ holder.setText(R.id.rc_conversation_unread_count,"99+"); } - } @Override diff --git a/OneToOne/src/main/java/com/shayu/onetoone/dialog/GiftDialog.java b/OneToOne/src/main/java/com/shayu/onetoone/dialog/GiftDialog.java index b0afcb7e2..c7c218a93 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/dialog/GiftDialog.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/dialog/GiftDialog.java @@ -103,34 +103,37 @@ public class GiftDialog extends AbsDialogPopupWindow { PagerConfig.setMillisecondsPreInch(150); gifList.setAdapter(mAdapter); initData(); - sendBtn.setOnClickListener(v -> { - SendMessageManager.sendMessageForGift(targetId, mAdapter.getItem().getId() + "", new OnSendMessageListener() { - @Override - public void onSuccess(String token, SendConsumeBean bean) { - super.onSuccess(token,bean); - GiftDialog.this.token = token; - sendGift(mAdapter.getItem()); + ViewClicksAntiShake.clicksAntiShake(sendBtn, new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + SendMessageManager.sendMessageForGift(targetId, mAdapter.getItem().getId() + "", new OnSendMessageListener() { + @Override + public void onSuccess(String token, SendConsumeBean bean) { + super.onSuccess(token,bean); + GiftDialog.this.token = token; + sendGift(mAdapter.getItem()); - } - - @Override - public void onError(int status, String msg) { - super.onError(status, msg); - if(status==OnSendMessageListener.STATUS_NOT_PRICE){ - new TipsDialog(mContext) - .setTitle(WordUtil.getNewString(R.string.money_title)) - .setApplyText(WordUtil.getNewString(R.string.money_apply)) - .setOnDialogClickListener(new OnDialogClickListener() { - @Override - public void onApply(Dialog dialog) { - super.onApply(dialog); - } - }) - .setCancelText(WordUtil.getNewString(R.string.money_cancel)) - .showDialog(); } - } - }); + + @Override + public void onError(int status, String msg) { + super.onError(status, msg); + if(status==OnSendMessageListener.STATUS_NOT_PRICE){ + new TipsDialog(mContext) + .setTitle(WordUtil.getNewString(R.string.money_title)) + .setApplyText(WordUtil.getNewString(R.string.money_apply)) + .setOnDialogClickListener(new OnDialogClickListener() { + @Override + public void onApply(Dialog dialog) { + super.onApply(dialog); + } + }) + .setCancelText(WordUtil.getNewString(R.string.money_cancel)) + .showDialog(); + } + } + }); + } }); ViewClicksAntiShake.clicksAntiShake(topUpBtn, new ViewClicksAntiShake.ViewClicksCallBack() { @Override diff --git a/OneToOne/src/main/java/com/shayu/onetoone/manager/CallClientManager.java b/OneToOne/src/main/java/com/shayu/onetoone/manager/CallClientManager.java index 7e506fb66..009157028 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/manager/CallClientManager.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/manager/CallClientManager.java @@ -18,7 +18,6 @@ import com.yunbao.common.CommonAppContext; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; -import com.yunbao.faceunity.FaceManager; import java.util.ArrayList; import java.util.HashMap; diff --git a/OneToOne/src/main/java/com/shayu/onetoone/utils/ConversationUtils.java b/OneToOne/src/main/java/com/shayu/onetoone/utils/ConversationUtils.java index 039532824..405074565 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/utils/ConversationUtils.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/utils/ConversationUtils.java @@ -3,6 +3,8 @@ package com.shayu.onetoone.utils; import android.content.Context; import android.os.Bundle; +import com.yunbao.common.utils.ToastUtil; + import io.rong.imkit.utils.RouteUtils; import io.rong.imlib.model.Conversation; import io.rong.imlib.model.ConversationIdentifier; @@ -16,6 +18,10 @@ public class ConversationUtils { } public static void startConversation(Context mContext, String targetId, Bundle bundle) { + if(targetId.equals(UserManager.getUserBean().getUser().getId()+"")){ + ToastUtil.show("不能与自己对话"); + return; + } ConversationIdentifier conversationIdentifier = new ConversationIdentifier(Conversation.ConversationType.PRIVATE, targetId); RouteUtils.routeToConversationActivity(mContext, conversationIdentifier, false, bundle); } diff --git a/OneToOne/src/main/java/com/shayu/onetoone/view/MsgInputPanelForGift.java b/OneToOne/src/main/java/com/shayu/onetoone/view/MsgInputPanelForGift.java index 27dd6bf89..e6b996374 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/view/MsgInputPanelForGift.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/view/MsgInputPanelForGift.java @@ -97,32 +97,35 @@ public class MsgInputPanelForGift extends AbsInputPanel { PagerConfig.setMillisecondsPreInch(150); gifList.setAdapter(mAdapter); initData(); - sendBtn.setOnClickListener(v -> { - GiftBean item = mAdapter.getItem(); - SendMessageManager.sendMessageForGift(targetId, item.getId() + "", new OnSendMessageListener() { - @Override - public void onSuccess(String token, SendConsumeBean bean) { - super.onSuccess(token, bean); - MsgInputPanelForGift.this.token = token; - sendGift(item); + ViewClicksAntiShake.clicksAntiShake(sendBtn, new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + GiftBean item = mAdapter.getItem(); + SendMessageManager.sendMessageForGift(targetId, item.getId() + "", new OnSendMessageListener() { + @Override + public void onSuccess(String token, SendConsumeBean bean) { + super.onSuccess(token, bean); + MsgInputPanelForGift.this.token = token; + sendGift(item); - } + } - @Override - public void onError(int status, String msg) { - super.onError(status, msg); - new TipsDialog(mContext) - .setTitle(WordUtil.getNewString(R.string.gift_not_money)) - .setApplyText(WordUtil.getNewString(R.string.money_apply)) - .setOnDialogClickListener(new OnDialogClickListener() { - @Override - public void onApply(Dialog dialog) { - super.onApply(dialog); - } - }) - .showDialog(); - } - }); + @Override + public void onError(int status, String msg) { + super.onError(status, msg); + new TipsDialog(mContext) + .setTitle(WordUtil.getNewString(R.string.gift_not_money)) + .setApplyText(WordUtil.getNewString(R.string.money_apply)) + .setOnDialogClickListener(new OnDialogClickListener() { + @Override + public void onApply(Dialog dialog) { + super.onApply(dialog); + } + }) + .showDialog(); + } + }); + } }); ViewClicksAntiShake.clicksAntiShake(topUpBtn, new ViewClicksAntiShake.ViewClicksCallBack() { @Override diff --git a/OneToOne/src/main/res/layout/activity_entry.xml b/OneToOne/src/main/res/layout/activity_entry.xml index b9efb98cd..e2b979023 100644 --- a/OneToOne/src/main/res/layout/activity_entry.xml +++ b/OneToOne/src/main/res/layout/activity_entry.xml @@ -23,7 +23,7 @@ android:textSize="30dp" android:layout_marginTop="95dp" android:layout_marginLeft="16dp" - android:textColor="@color/colorWhite" + android:textColor="@color/white" android:text="Hello,"/> diff --git a/OneToOne/src/main/res/layout/fragment_my.xml b/OneToOne/src/main/res/layout/fragment_my.xml index 1736a0584..8cfb1cbab 100644 --- a/OneToOne/src/main/res/layout/fragment_my.xml +++ b/OneToOne/src/main/res/layout/fragment_my.xml @@ -149,7 +149,7 @@ android:layout_marginLeft="5dp"> diff --git a/OneToOne/src/main/res/layout/item_home_recommend.xml b/OneToOne/src/main/res/layout/item_home_recommend.xml index 2a00c5252..89053adaa 100644 --- a/OneToOne/src/main/res/layout/item_home_recommend.xml +++ b/OneToOne/src/main/res/layout/item_home_recommend.xml @@ -53,7 +53,7 @@ app:layout_constraintTop_toTopOf="parent"> @@ -64,7 +64,7 @@ android:ellipsize="end" android:singleLine="true" android:layout_weight="1" - tools:text="用户——123456789012345" + tools:text="用户——1234" android:textColor="#333333" android:textSize="16sp" android:textStyle="bold" /> diff --git a/OneToOne/src/main/res/layout/item_user_avatar_select.xml b/OneToOne/src/main/res/layout/item_user_avatar_select.xml index d3a4605ad..cdc49370f 100644 --- a/OneToOne/src/main/res/layout/item_user_avatar_select.xml +++ b/OneToOne/src/main/res/layout/item_user_avatar_select.xml @@ -27,7 +27,6 @@ android:layout_marginTop="2dp" android:layout_marginEnd="2dp" android:layout_marginBottom="2dp" - android:src="@mipmap/icon_green_science" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/OneToOne/src/main/res/layout/rc_conversationlist_item.xml b/OneToOne/src/main/res/layout/rc_conversationlist_item.xml index 1f38c5e2c..2f3fa6d64 100644 --- a/OneToOne/src/main/res/layout/rc_conversationlist_item.xml +++ b/OneToOne/src/main/res/layout/rc_conversationlist_item.xml @@ -42,16 +42,20 @@ + tools:text="sssssssssssssssssssssssssssssssssssssssssss22222222222222222222" /> + + \ No newline at end of file diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/app_logo.png b/OneToOne/src/main/res/mipmap-xxhdpi/app_logo.png index e453d729b..5f378fe4f 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/app_logo.png and b/OneToOne/src/main/res/mipmap-xxhdpi/app_logo.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/apple.png b/OneToOne/src/main/res/mipmap-xxhdpi/apple.png index e748ed16d..4d422cc13 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/apple.png and b/OneToOne/src/main/res/mipmap-xxhdpi/apple.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/auth_add_bg.png b/OneToOne/src/main/res/mipmap-xxhdpi/auth_add_bg.png index 03d248eb2..fcc8b556f 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/auth_add_bg.png and b/OneToOne/src/main/res/mipmap-xxhdpi/auth_add_bg.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/auth_add_img.png b/OneToOne/src/main/res/mipmap-xxhdpi/auth_add_img.png index c47ff9369..e679bdf98 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/auth_add_img.png and b/OneToOne/src/main/res/mipmap-xxhdpi/auth_add_img.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/auth_img.png b/OneToOne/src/main/res/mipmap-xxhdpi/auth_img.png index 71bde5bed..be0e7c1af 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/auth_img.png and b/OneToOne/src/main/res/mipmap-xxhdpi/auth_img.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/auth_status.png b/OneToOne/src/main/res/mipmap-xxhdpi/auth_status.png index 4b21b8a38..654df6883 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/auth_status.png and b/OneToOne/src/main/res/mipmap-xxhdpi/auth_status.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/background_exchange_star_top.png b/OneToOne/src/main/res/mipmap-xxhdpi/background_exchange_star_top.png index c1b8f3d19..06f6c0439 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/background_exchange_star_top.png and b/OneToOne/src/main/res/mipmap-xxhdpi/background_exchange_star_top.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/background_my_arnings.png b/OneToOne/src/main/res/mipmap-xxhdpi/background_my_arnings.png index 749f7e448..006a1fe0d 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/background_my_arnings.png and b/OneToOne/src/main/res/mipmap-xxhdpi/background_my_arnings.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/bg_chat_click.9.png b/OneToOne/src/main/res/mipmap-xxhdpi/bg_chat_click.9.png index 530a61609..165dee44d 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/bg_chat_click.9.png and b/OneToOne/src/main/res/mipmap-xxhdpi/bg_chat_click.9.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/bg_firstlogin_tips.png b/OneToOne/src/main/res/mipmap-xxhdpi/bg_firstlogin_tips.png index ea5052742..dd8e986ba 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/bg_firstlogin_tips.png and b/OneToOne/src/main/res/mipmap-xxhdpi/bg_firstlogin_tips.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/bg_firstlogin_tips_man.png b/OneToOne/src/main/res/mipmap-xxhdpi/bg_firstlogin_tips_man.png index b2d1ef372..bab35ceb2 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/bg_firstlogin_tips_man.png and b/OneToOne/src/main/res/mipmap-xxhdpi/bg_firstlogin_tips_man.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/bg_firstlogin_tips_woman.png b/OneToOne/src/main/res/mipmap-xxhdpi/bg_firstlogin_tips_woman.png index 74663c8a2..9b65d6b7d 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/bg_firstlogin_tips_woman.png and b/OneToOne/src/main/res/mipmap-xxhdpi/bg_firstlogin_tips_woman.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/bg_friend_empty.png b/OneToOne/src/main/res/mipmap-xxhdpi/bg_friend_empty.png index 40ceb5aca..8ea2f6db1 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/bg_friend_empty.png and b/OneToOne/src/main/res/mipmap-xxhdpi/bg_friend_empty.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/bg_glamour_top.png b/OneToOne/src/main/res/mipmap-xxhdpi/bg_glamour_top.png index 4ecbf67e4..5f17e8431 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/bg_glamour_top.png and b/OneToOne/src/main/res/mipmap-xxhdpi/bg_glamour_top.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/bg_home_hot_live.png b/OneToOne/src/main/res/mipmap-xxhdpi/bg_home_hot_live.png index b84da969e..e57a484a5 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/bg_home_hot_live.png and b/OneToOne/src/main/res/mipmap-xxhdpi/bg_home_hot_live.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/bg_login.png b/OneToOne/src/main/res/mipmap-xxhdpi/bg_login.png index d697c28b4..2b600a7eb 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/bg_login.png and b/OneToOne/src/main/res/mipmap-xxhdpi/bg_login.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/bg_matching.png b/OneToOne/src/main/res/mipmap-xxhdpi/bg_matching.png index 5b1625984..74831ed55 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/bg_matching.png and b/OneToOne/src/main/res/mipmap-xxhdpi/bg_matching.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/bg_matching_star.png b/OneToOne/src/main/res/mipmap-xxhdpi/bg_matching_star.png index c150f19d0..e306c65e1 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/bg_matching_star.png and b/OneToOne/src/main/res/mipmap-xxhdpi/bg_matching_star.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/bg_message_msg_title_heartbeat.png b/OneToOne/src/main/res/mipmap-xxhdpi/bg_message_msg_title_heartbeat.png index cd9723b1d..891911b3f 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/bg_message_msg_title_heartbeat.png and b/OneToOne/src/main/res/mipmap-xxhdpi/bg_message_msg_title_heartbeat.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/bg_msg_more.png b/OneToOne/src/main/res/mipmap-xxhdpi/bg_msg_more.png index b1502ec33..03ba5f298 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/bg_msg_more.png and b/OneToOne/src/main/res/mipmap-xxhdpi/bg_msg_more.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/bg_w.png b/OneToOne/src/main/res/mipmap-xxhdpi/bg_w.png index 65d7add70..bdfbc79a0 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/bg_w.png and b/OneToOne/src/main/res/mipmap-xxhdpi/bg_w.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/diamond.png b/OneToOne/src/main/res/mipmap-xxhdpi/diamond.png index 30b877d98..252ea8c17 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/diamond.png and b/OneToOne/src/main/res/mipmap-xxhdpi/diamond.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/eid.png b/OneToOne/src/main/res/mipmap-xxhdpi/eid.png index bc922e6bb..e2163813c 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/eid.png and b/OneToOne/src/main/res/mipmap-xxhdpi/eid.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/facebook.png b/OneToOne/src/main/res/mipmap-xxhdpi/facebook.png index d1ef9b219..7c013eb59 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/facebook.png and b/OneToOne/src/main/res/mipmap-xxhdpi/facebook.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/google.png b/OneToOne/src/main/res/mipmap-xxhdpi/google.png index bd445906d..2ac984941 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/google.png and b/OneToOne/src/main/res/mipmap-xxhdpi/google.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/home_me_diamonds.png b/OneToOne/src/main/res/mipmap-xxhdpi/home_me_diamonds.png index 8a4c23359..8c56b642a 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/home_me_diamonds.png and b/OneToOne/src/main/res/mipmap-xxhdpi/home_me_diamonds.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_audio.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_audio.png index 883fa71c9..20892c908 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_audio.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_audio.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_audio_msg.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_audio_msg.png index b4e6f3318..13386cc7b 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_audio_msg.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_audio_msg.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_audio_select.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_audio_select.png index b2470644d..6a397943d 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_audio_select.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_audio_select.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_camera.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_camera.png index 7f377e2cd..e24f864f4 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_camera.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_camera.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_close.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_close.png index 9d6e7bf9b..ada858f5e 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_close.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_close.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_follow.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_follow.png index 13d269883..3e882c1cc 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_follow.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_follow.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_gift.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_gift.png index 6f3d39d8e..c5af51c67 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_gift.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_gift.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_money.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_money.png index 5e40a21c3..16a42254e 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_money.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_money.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_msg.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_msg.png index 50436a7a4..e45d356e0 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_msg.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_msg.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_stop.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_stop.png index 4b622fa22..7e57ee801 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_stop.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_stop.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_video.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_video.png index 3cbf12800..e3fb0a2cd 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_video.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_video.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_video_select.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_video_select.png index 378aef25c..ee6c13b4e 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_video_select.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_call_video_select.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_chat_video_btn.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_chat_video_btn.png index b8c7877cf..304ecced3 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_chat_video_btn.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_chat_video_btn.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_chat_video_close.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_chat_video_close.png index 35496ff03..bc908f14a 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_chat_video_close.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_chat_video_close.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_chat_video_text.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_chat_video_text.png index a653c2795..7fefc56d5 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_chat_video_text.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_chat_video_text.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_drill.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_drill.png index a362cc527..6ae818fdb 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_drill.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_drill.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_empty_list.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_empty_list.png index 1830af800..fe19fba0b 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_empty_list.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_empty_list.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_auth.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_auth.png index 3b1217f3b..8c290ec05 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_auth.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_auth.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_hot_chat.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_hot_chat.png index 24fce48bc..9e14584ed 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_hot_chat.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_hot_chat.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_hot_chat_up.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_hot_chat_up.png index 40147f0be..de96e046f 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_hot_chat_up.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_hot_chat_up.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_hot_status_busy.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_hot_status_busy.png index 77c1dda33..9c84c2adb 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_hot_status_busy.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_hot_status_busy.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_hot_status_offine.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_hot_status_offine.png index 27dd8c9b0..651ce8c9d 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_hot_status_offine.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_hot_status_offine.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_hot_status_online.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_hot_status_online.png index 344cdd104..e80364084 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_hot_status_online.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_hot_status_online.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_rank_top_1.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_rank_top_1.png index e4ad2b8ca..aa3daca3d 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_rank_top_1.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_rank_top_1.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_rank_top_2.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_rank_top_2.png index e0fa30b76..90db47c10 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_rank_top_2.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_rank_top_2.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_rank_top_3.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_rank_top_3.png index 956139356..de91d4424 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_rank_top_3.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_rank_top_3.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_recommend_chat.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_recommend_chat.png index 30a183376..739be9012 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_recommend_chat.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_recommend_chat.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_recommend_chat_up.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_recommend_chat_up.png index edd1e414a..8d22db063 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_recommend_chat_up.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_home_recommend_chat_up.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_matching.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_matching.png index 35fd30a2a..ac39567b5 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_matching.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_matching.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_matching_back.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_matching_back.png index b25faf449..0505a7c36 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_matching_back.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_matching_back.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_matching_free.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_matching_free.png index da39752c5..380de7963 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_matching_free.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_matching_free.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_msg_status_busy.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_msg_status_busy.png index 322a49235..21f3b6717 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_msg_status_busy.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_msg_status_busy.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_msg_status_offline.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_msg_status_offline.png index d639fe70d..886b91410 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_msg_status_offline.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_msg_status_offline.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_msg_status_online.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_msg_status_online.png index cdcebe6ad..e6f3835ea 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_msg_status_online.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_msg_status_online.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_tab_error.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_tab_error.png index f8450c603..f5ca326e6 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_tab_error.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_tab_error.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_tab_man.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_tab_man.png index 78af72b4f..e035f427c 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_tab_man.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_tab_man.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_tab_more.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_tab_more.png index 5d1219759..fb736fd5d 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_tab_more.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_tab_more.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_tab_right.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_tab_right.png index 0822d0828..3db791781 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_tab_right.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_tab_right.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_tab_woman.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_tab_woman.png index c987a5c62..d226aa8f7 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_tab_woman.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_message_tab_woman.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_add.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_add.png index 7d28aa797..328f4a49d 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_add.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_add.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_call.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_call.png index 92f7a55d9..c8e77b1c8 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_call.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_call.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_call_lock.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_call_lock.png index f96751e0c..a6415427f 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_call_lock.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_call_lock.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_emoji.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_emoji.png index 163496c6b..9bdee1807 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_emoji.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_emoji.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_gift.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_gift.png index deb5e90a5..12071ab3f 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_gift.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_gift.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_image.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_image.png index ad9dcab40..8fab6efb6 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_image.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_image.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_config.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_config.png index 75415ff1f..6f1e6ce29 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_config.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_config.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_config_add.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_config_add.png index 130b8e37b..0454c180d 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_config_add.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_config_add.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_config_add_image.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_config_add_image.png index 6f3c54a7c..21752c0a0 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_config_add_image.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_config_add_image.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_config_del.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_config_del.png index 9575865d4..8ddbf6e20 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_config_del.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_config_del.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_config_edit.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_config_edit.png index 67f470a5e..86d787297 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_config_edit.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_config_edit.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_read.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_read.png index 24e17fe04..c609ad256 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_read.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_more_read.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_video.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_video.png index 170e146fb..20729be16 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_video.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_video.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_video_lock.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_video_lock.png index 107f3e18a..f4b7c74a8 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_video_lock.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_msg_video_lock.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_recommend_top.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_recommend_top.png index 7e72bdff9..77166d5ff 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_recommend_top.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_recommend_top.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_refresh.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_refresh.png index b17f5cf63..2fccc5696 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_refresh.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_refresh.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_search.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_search.png index 73ae8a37a..c8704911d 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_search.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_search.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_dynamic.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_dynamic.png index f9a249ece..bf73c59fa 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_dynamic.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_dynamic.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_dynamic_filter.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_dynamic_filter.png index 77b30f406..10a66268f 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_dynamic_filter.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_dynamic_filter.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_dynamic_select.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_dynamic_select.png index a53cca0d0..f0330e20b 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_dynamic_select.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_dynamic_select.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_dynamic_top.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_dynamic_top.png index d0e42a8a7..33f4ee7b5 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_dynamic_top.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_dynamic_top.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_friends.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_friends.png index c7f787e76..cbdf37273 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_friends.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_friends.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_friends_select.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_friends_select.png index aae027322..36a49f3b3 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_friends_select.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_friends_select.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_msg.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_msg.png index 0ae521d81..d18a0f8a3 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_msg.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_msg.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_msg_select.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_msg_select.png index 92d07cda5..c5841953f 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_msg_select.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_msg_select.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_my.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_my.png index b991bc55b..2cf81067f 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_my.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_my.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_my_select.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_my_select.png index 50814b737..4d4295d4b 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_my_select.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_tab_my_select.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ic_top_break.png b/OneToOne/src/main/res/mipmap-xxhdpi/ic_top_break.png index 35916e402..958f4839a 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ic_top_break.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ic_top_break.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_active_add.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_active_add.png index 0597a7a39..65297c1ff 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_active_add.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_active_add.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_add.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_add.png index 9bc6626dc..0b846457f 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_add.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_add.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_album.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_album.png index 759665572..e4f4cb40d 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_album.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_album.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_arn_coin.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_arn_coin.png index 3ff223a13..ec0f367fa 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_arn_coin.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_arn_coin.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_camera.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_camera.png index 1d82674b2..a65e4fe0d 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_camera.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_camera.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_choose_img_camera.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_choose_img_camera.png index 73efea0ee..586d131bd 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_choose_img_camera.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_choose_img_camera.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_coin_01.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_coin_01.png index 30b877d98..252ea8c17 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_coin_01.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_coin_01.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_coin_02.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_coin_02.png index 7e3778ebc..e45eda179 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_coin_02.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_coin_02.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_coin_03.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_coin_03.png index d4f239f5a..740a8824b 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_coin_03.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_coin_03.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_complete_information.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_complete_information.png index f6d1e397a..8e0e9d864 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_complete_information.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_complete_information.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_fail.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_fail.png index 93d0eec21..9f68df544 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_fail.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_fail.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_level.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_level.png index 39f1e6d84..f2b2cc902 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_level.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_level.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_my_arn_back.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_my_arn_back.png index 00ea9d594..b0ff3c36f 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_my_arn_back.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_my_arn_back.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_one_back.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_one_back.png index e3b9bc6f2..260bbabcc 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_one_back.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_one_back.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_select_0.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_select_0.png index 2340256fa..602e4fbc8 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_select_0.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_select_0.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_select_1.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_select_1.png index 148bf795e..44e1fb561 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_select_1.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_select_1.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_suc.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_suc.png index 781f4068c..d71f6f1a1 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_suc.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_suc.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_user_sex_00.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_user_sex_00.png index cce2149e2..76eb0fecf 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_user_sex_00.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_user_sex_00.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_user_sex_01.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_user_sex_01.png index 480501c15..966d6c61a 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_user_sex_01.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_user_sex_01.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_user_sex_02.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_user_sex_02.png index 760b1e7b0..6cbe06bc3 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_user_sex_02.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_user_sex_02.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_vip_gold.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_vip_gold.png index 0df88d534..7f65a8b29 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_vip_gold.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_vip_gold.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_wealth.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_wealth.png index dbd5a0a63..e3ab2935a 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_wealth.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_wealth.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_yan.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_yan.png index 763b800d9..13cc64f82 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_yan.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_yan.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/icon_yan_bg.png b/OneToOne/src/main/res/mipmap-xxhdpi/icon_yan_bg.png index 36cc3060d..14805f511 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/icon_yan_bg.png and b/OneToOne/src/main/res/mipmap-xxhdpi/icon_yan_bg.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/iocn_exchange_star_toggle.png b/OneToOne/src/main/res/mipmap-xxhdpi/iocn_exchange_star_toggle.png index 013cf50e3..1aa3ce1c4 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/iocn_exchange_star_toggle.png and b/OneToOne/src/main/res/mipmap-xxhdpi/iocn_exchange_star_toggle.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/level_bg.png b/OneToOne/src/main/res/mipmap-xxhdpi/level_bg.png index b84da969e..e57a484a5 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/level_bg.png and b/OneToOne/src/main/res/mipmap-xxhdpi/level_bg.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/line.png b/OneToOne/src/main/res/mipmap-xxhdpi/line.png index 5f34ef966..dfc82f352 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/line.png and b/OneToOne/src/main/res/mipmap-xxhdpi/line.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/phone.png b/OneToOne/src/main/res/mipmap-xxhdpi/phone.png index 3633cf4d5..50d7693c3 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/phone.png and b/OneToOne/src/main/res/mipmap-xxhdpi/phone.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/sex_radio_1.png b/OneToOne/src/main/res/mipmap-xxhdpi/sex_radio_1.png index ea1be287d..407af7066 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/sex_radio_1.png and b/OneToOne/src/main/res/mipmap-xxhdpi/sex_radio_1.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/sex_radio_2.png b/OneToOne/src/main/res/mipmap-xxhdpi/sex_radio_2.png index 1267f26c7..c5c2d7809 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/sex_radio_2.png and b/OneToOne/src/main/res/mipmap-xxhdpi/sex_radio_2.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/tiw.png b/OneToOne/src/main/res/mipmap-xxhdpi/tiw.png index dd5fa05d4..00ef03a79 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/tiw.png and b/OneToOne/src/main/res/mipmap-xxhdpi/tiw.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/tobtn.png b/OneToOne/src/main/res/mipmap-xxhdpi/tobtn.png index 6f0e6f9d7..323ac4028 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/tobtn.png and b/OneToOne/src/main/res/mipmap-xxhdpi/tobtn.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/wealth_bg.png b/OneToOne/src/main/res/mipmap-xxhdpi/wealth_bg.png index 4827175b8..6e71f2710 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/wealth_bg.png and b/OneToOne/src/main/res/mipmap-xxhdpi/wealth_bg.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/wi_c.png b/OneToOne/src/main/res/mipmap-xxhdpi/wi_c.png index 93be462f0..0fcbaf36f 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/wi_c.png and b/OneToOne/src/main/res/mipmap-xxhdpi/wi_c.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ws_ind.png b/OneToOne/src/main/res/mipmap-xxhdpi/ws_ind.png index 8c95e487e..4722c2452 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ws_ind.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ws_ind.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/xl.png b/OneToOne/src/main/res/mipmap-xxhdpi/xl.png index 9acb7b673..6d7dff293 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/xl.png and b/OneToOne/src/main/res/mipmap-xxhdpi/xl.png differ diff --git a/OneToOne/src/main/res/mipmap-xxhdpi/ykdl.png b/OneToOne/src/main/res/mipmap-xxhdpi/ykdl.png index 9f9e21768..d8a65751c 100644 Binary files a/OneToOne/src/main/res/mipmap-xxhdpi/ykdl.png and b/OneToOne/src/main/res/mipmap-xxhdpi/ykdl.png differ diff --git a/app/google-services.json b/app/google-services.json index 4daabca5a..52d6ceae8 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -1,15 +1,15 @@ { "project_info": { - "project_number": "903482201540", - "project_id": "onetoone-71170", - "storage_bucket": "onetoone-71170.appspot.com" + "project_number": "292494634914", + "project_id": "pdlive-1631521064967", + "storage_bucket": "pdlive-1631521064967.appspot.com" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:903482201540:android:132978cdf497f4d8634091", + "mobilesdk_app_id": "1:292494634914:android:d8db197d7e7a6c3a3a4cfb", "android_client_info": { - "package_name": "com.shayu.onetoonenew" + "package_name": "com.pdlive.shayu" } }, "oauth_client": [ @@ -17,42 +17,49 @@ "client_id": "903482201540-ddno3ro8fp0lqqoeodbhbnpqf7f8d439.apps.googleusercontent.com", "client_type": 1, "android_info": { - "package_name": "com.shayu.onetoonenew", - "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872" - } - }, - { - "client_id": "903482201540-e9ua9huoejtubp7pgsbu3iq76tqkoorp.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.shayu.onetoonenew", - "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87" - } - }, - { - "client_id": "903482201540-k3cffuuhsed23kkiuopufhf54ano7do4.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.shayu.onetoonenew", + "package_name": "com.pdlive.shayu", "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d" } }, { - "client_id": "903482201540-s2j96h6k7go0ah51ksi7es8mt7qhankh.apps.googleusercontent.com", + "client_id": "292494634914-ctr3fptp5mkv2qqr4gkgjo9uluq2joqb.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.pdlive.shayu", + "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87" + } + }, + { + "client_id": "292494634914-ejtqvaj86a2lldv0di2pr3d5gngprahd.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.pdlive.shayu", + "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872" + } + }, + { + "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com", "client_type": 3 } ], "api_key": [ { - "current_key": "AIzaSyCrhj-7WjwdYUHBMzz9Ntie_S474slGjVY" + "current_key": "AIzaSyDVnuGnQzjI_vDrxh20Hv_S1OMUD7Vp3zU" } ], "services": { "appinvite_service": { "other_platform_oauth_client": [ { - "client_id": "903482201540-s2j96h6k7go0ah51ksi7es8mt7qhankh.apps.googleusercontent.com", + "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com", "client_type": 3 + }, + { + "client_id": "292494634914-v9j4rei86q2pfh9as4seotb23vr2744a.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "com.live.pd" + } } ] } diff --git a/common/src/main/java/com/yunbao/common/CommonAppConfig.java b/common/src/main/java/com/yunbao/common/CommonAppConfig.java index ee5be1227..33d19b55a 100644 --- a/common/src/main/java/com/yunbao/common/CommonAppConfig.java +++ b/common/src/main/java/com/yunbao/common/CommonAppConfig.java @@ -7,6 +7,7 @@ import android.os.Environment; import android.text.TextUtils; import android.util.Log; import android.util.SparseArray; + import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.yunbao.common.bean.ConfigBean; @@ -19,6 +20,7 @@ import com.yunbao.common.interfaces.CommonCallback; import com.yunbao.common.utils.L; import com.yunbao.common.utils.SpUtil; import com.yunbao.common.utils.WordUtil; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -78,8 +80,6 @@ public class CommonAppConfig { public static int alert_end_time = 1; - - private CommonAppConfig() { } @@ -148,6 +148,7 @@ public class CommonAppConfig { } return Constants.DIAMONDS; } + public String getGoldCoinName() { ConfigBean configBean = getConfig(); if (configBean != null) { @@ -183,7 +184,7 @@ public class CommonAppConfig { if (configBean != null) { callback.callback(configBean); } else { - CommonHttpUtil.getConfig(null,callback); + CommonHttpUtil.getConfig(null, callback); } } @@ -307,6 +308,7 @@ public class CommonAppConfig { mUid = null; mToken = null; mLoginIM = false; + mUserBean = null; SpUtil.getInstance().removeValue( SpUtil.UID, SpUtil.TOKEN, SpUtil.USER_INFO, SpUtil.IM_LOGIN ); @@ -385,13 +387,12 @@ public class CommonAppConfig { public String getAppName() { if (TextUtils.isEmpty(mAppName)) { int res = CommonAppContext.sInstance.getResources().getIdentifier("app_name", "string", "myname.pdlive.shayu"); - mAppName =WordUtil.getString(res); + mAppName = WordUtil.getString(res); } return mAppName; } - /** * 获取App图标的资源id */ @@ -447,9 +448,10 @@ public class CommonAppConfig { } catch (PackageManager.NameNotFoundException e) { e.printStackTrace(); } - Log.i("tag","url:"+res); + Log.i("tag", "url:" + res); return res; } + private static boolean getMetaDataBoolean(String key) { boolean res = false; try { @@ -670,40 +672,45 @@ public class CommonAppConfig { public void setBeautySdkType(String sproutType) { SpUtil.getInstance().setStringValue(SpUtil.BEAUTY_SDK_TYPE, sproutType); } + public String getBeautySdkType() { - return SpUtil.getInstance().getStringValue(SpUtil.BEAUTY_SDK_TYPE); + return SpUtil.getInstance().getStringValue(SpUtil.BEAUTY_SDK_TYPE); } //设置是否显示转盘功能 public void setTurnTableEnable(String enable) { SpUtil.getInstance().setStringValue(SpUtil.TURNTABLE_ENABLE, enable); } + public String getTurnTableEnable() { - return SpUtil.getInstance().getStringValue(SpUtil.TURNTABLE_ENABLE); + return SpUtil.getInstance().getStringValue(SpUtil.TURNTABLE_ENABLE); } //设置360美颜贴纸下载地址 public void setBeauty360TieZhiUrl(String tieZhiUrl) { SpUtil.getInstance().setStringValue(SpUtil.BEAUTY_360_TIEZHI_URL, tieZhiUrl); } + public String getBeauty360TieZhiUrl() { - return SpUtil.getInstance().getStringValue(SpUtil.BEAUTY_360_TIEZHI_URL); + return SpUtil.getInstance().getStringValue(SpUtil.BEAUTY_360_TIEZHI_URL); } //360贴纸已经下载过 public void setBeauty360TieZhiExist(boolean isExist) { SpUtil.getInstance().setBooleanValue(SpUtil.BEAUTY_360_TIEZHI_EXIST, isExist); } + public boolean getBeauty360TieZhiExist() { - return SpUtil.getInstance().getBooleanValue(SpUtil.BEAUTY_360_TIEZHI_EXIST); + return SpUtil.getInstance().getBooleanValue(SpUtil.BEAUTY_360_TIEZHI_EXIST); } //设置主播pk时间 - public void setAnchorPkTime(String pkTime){ + public void setAnchorPkTime(String pkTime) { SpUtil.getInstance().setStringValue(SpUtil.ANCHOR_PK_TIME, pkTime); } - public String getAnchorPkTime(){ - return SpUtil.getInstance().getStringValue(SpUtil.ANCHOR_PK_TIME); + + public String getAnchorPkTime() { + return SpUtil.getInstance().getStringValue(SpUtil.ANCHOR_PK_TIME); } } diff --git a/common/src/main/java/com/yunbao/common/views/APKUpdateOneToOnePopup.java b/common/src/main/java/com/yunbao/common/views/APKUpdateOneToOnePopup.java index 45c682b5d..21bfadf89 100644 --- a/common/src/main/java/com/yunbao/common/views/APKUpdateOneToOnePopup.java +++ b/common/src/main/java/com/yunbao/common/views/APKUpdateOneToOnePopup.java @@ -1,25 +1,31 @@ package com.yunbao.common.views; +import android.Manifest; import android.app.Activity; +import android.app.Dialog; import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Build; import android.os.Handler; import android.os.Looper; +import android.provider.Settings; import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.annotation.RequiresApi; import androidx.core.content.FileProvider; +import com.blankj.utilcode.util.PermissionUtils; import com.lxj.xpopup.core.CenterPopupView; import com.yunbao.common.CommonAppConfig; import com.yunbao.common.CommonAppContext; import com.yunbao.common.R; import com.yunbao.common.manager.APKManager; import com.yunbao.common.utils.APKDownloadUtil; +import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; @@ -42,6 +48,7 @@ public class APKUpdateOneToOnePopup extends CenterPopupView { private TextView updateText, versionImmediateUse, no_update; private Activity mContext; private boolean mInside; + private OnClickListener mOnClickListener; public APKUpdateOneToOnePopup(@NonNull Activity context, boolean inside) { super(context); @@ -63,10 +70,21 @@ public class APKUpdateOneToOnePopup extends CenterPopupView { initData(); } + public APKUpdateOneToOnePopup setOnShowListener(OnClickListener mOnClickListener) { + this.mOnClickListener = mOnClickListener; + return this; + } + private void initData() { } + @Override + protected void onShow() { + super.onShow(); + mOnClickListener.onClick(null); + } + private void initView() { if (!mInside) { if (!CommonAppConfig.IS_GOOGLE_PLAY && APKManager.get().getAPKGoogleIsUp() == 1) { @@ -178,8 +196,17 @@ public class APKUpdateOneToOnePopup extends CenterPopupView { * @param file */ public void installApk(Context context, File file, String authority) { - Intent intent = getInstallIntent(context, file, authority); - context.startActivity(intent); + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O || context.getPackageManager().canRequestPackageInstalls()) { + ToastUtil.showDebug("1"); + Intent intent = getInstallIntent(context, file, authority); + context.startActivity(intent); + mContext.finish(); + } else { + ToastUtil.showDebug("申请权限"); + Uri uri = Uri.parse("package:" + context.getPackageName()); + Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, uri); + mContext.startActivityForResult(intent, 998); + } } /** diff --git a/config.gradle b/config.gradle index 72a0143c9..0032de7b0 100644 --- a/config.gradle +++ b/config.gradle @@ -6,7 +6,7 @@ ext { targetSdkVersion : 33, versionCode : 445, versionName : "6.5.4", - otoversionCode : 101, + otoversionCode : 1, otoversionName : "1.0" ] manifestPlaceholders = [ @@ -16,9 +16,9 @@ ext { serverHost : "https://ceshi.yaoulive.com", //1v1社交正式服 - //otoServerHost : "https://napi.yaoulive.com", + otoServerHost : "https://mo.yomochat.com", //1v1社交测试服 - otoServerHost : "https://ceshi.yyouou.com", + //otoServerHost : "https://ceshi.yyouou.com", @@ -30,7 +30,7 @@ ext { baiduAppKey : "zgCgFhUKEOV7I3ZXDFpTfnRB", baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", // true表示谷歌支付 false - isGooglePlay : false, + isGooglePlay : true, //是否上报异常日志 isUploadLog : true, //是否打包成插件包模式