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

Merge branch 'master' into dev_680_礼物展馆

Browse Source 
# Conflicts:
#	common/src/main/res/values-zh-rHK/strings.xml
#	common/src/main/res/values-zh-rTW/strings.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	gradle.properties
#	live/build.gradle
This commit is contained in:
Martin
2024-07-17 09:53:22 +08:00
parent fe827482c9 a11d7f07e9
commit 152848a04f
215 changed files with 3143 additions and 872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main/build.gradle
View File

@@ -3,8 +3,8 @@ apply plugin: 'img-optimizer'
apply from: "../package_config.gradle"
android {
compileSdkVersion rootProject.ext.android.compileSdkVersion
buildToolsVersion rootProject.ext.android.buildToolsVersion
namespace "com.yunbao.main"
compileSdk rootProject.ext.android.compileSdkVersion
packagingOptions {
pickFirst "lib/armeabi/libyuvutils.so"
pickFirst "lib/arm64-v8a/libyuvutils.so"
@@ -31,7 +31,12 @@ android {
versionName rootProject.ext.android.versionName
manifestPlaceholders = rootProject.ext.manifestPlaceholders
ndk {
abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
// abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
if (rootProject.ext.manifestPlaceholders.isGooglePlay == 0) {
abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
} else {
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
javaCompileOptions {
@@ -54,8 +59,8 @@ android {
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_18
targetCompatibility JavaVersion.VERSION_18
}
}
repositories {
@@ -83,7 +88,6 @@ dependencies {
implementation project(path: ':lib_country_code')
//抽屉菜单
implementation 'com.justkiddingbaby:slidemenu:1.3.0'
implementation 'com.xj.marqueeView:marqueeView:0.1.20'
//引导层
implementation 'com.binioter:guideview:1.0.0'
implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'

28
main/src/main/AndroidManifest.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.yunbao.main">
>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
@@ -62,8 +62,8 @@
android:screenOrientation="portrait" />
<activity
android:name=".activity.LanguageSettingActivity"
android:screenOrientation="portrait"
android:configChanges="locale|layoutDirection|keyboard" />
android:configChanges="locale|layoutDirection|keyboard"
android:screenOrientation="portrait" />
<activity
android:name=".activity.SearchActivity"
android:screenOrientation="portrait"
@@ -156,15 +156,25 @@
<activity
android:name=".activity.RedPacketUsersActivity"
android:screenOrientation="portrait" />
<activity android:name=".activity.UserAvatarSelectActivity"
<activity
android:name=".activity.UserAvatarSelectActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.BattlePassActivity"
android:screenOrientation="portrait" />
<activity android:name=".activity.BattlePassActivity" />
<activity android:name=".activity.MainHomeCommunityActivity"
<activity
android:name=".activity.MainHomeCommunityActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.FeedbackActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.FeedbackSuccessActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.FeedbackEditActivity"
android:screenOrientation="portrait" />
<activity android:name=".activity.FeedbackActivity" />
<activity android:name=".activity.FeedbackSuccessActivity" />
<activity android:name=".activity.FeedbackEditActivity" />
</application>
</manifest>

25
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

@@ -1,6 +1,7 @@
package com.yunbao.main.activity;
import static com.yunbao.common.CommonAppContext.isReady;
import static com.yunbao.common.manager.imrongcloud.RongcloudIMManager.connectIM;
import android.Manifest;
import android.animation.Animator;
@@ -52,6 +53,7 @@ import com.tencent.imsdk.v2.V2TIMSDKListener;
import com.tencent.imsdk.v2.V2TIMUserFullInfo;
import com.yunbao.common.bean.QiniuLog;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.utils.AppManager;
import com.yunbao.common.utils.LogUtil;
import com.yunbao.common.utils.MobclickAgent;
import com.yunbao.common.CommonAppConfig;
@@ -375,7 +377,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
RouteUtil.forwardLoginInvalid("登錄失效");
return;
}
RongcloudIMManager.connectIM(mContext.getApplication());
connectIM(mContext.getApplication());
position = 0;
mTabButtonGroup.setCurPosition(0);
}
@@ -852,13 +854,30 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
}
private void showStartDialog() {
if (isReady == true) {
MainStartDialogFragment dialogFragment = new MainStartDialogFragment();
dialogFragment.setMainStartChooseCallback(true, this);
dialogFragment.show(getSupportFragmentManager(), "MainStartDialogFragment");
} else {
ToastUtil.show("正在初始化，請稍等....");
connectIM(AppManager.getInstance().getMainActivity(), new RongIMClient.ConnectCallback() {
@Override
public void onSuccess(String t) {
MainStartDialogFragment dialogFragment = new MainStartDialogFragment();
dialogFragment.setMainStartChooseCallback(true, MainActivity.this);
dialogFragment.show(getSupportFragmentManager(), "MainStartDialogFragment");
}
@Override
public void onError(RongIMClient.ConnectionErrorCode e) {
ToastUtil.show(R.string.net_error+""+e.toString());
}
@Override
public void onDatabaseOpened(RongIMClient.DatabaseOpenStatus code) {
ToastUtil.show(R.string.net_error+""+code);
}
});
}
}

69
main/src/main/java/com/yunbao/main/activity/SamsungFragment.java
View File

@@ -1,8 +1,6 @@
package com.yunbao.main.activity;
import static com.yunbao.main.activity.MyWalletActivity.dis;
import android.annotation.SuppressLint;
import android.os.Bundle;
import android.os.Handler;
@@ -16,13 +14,6 @@ import android.webkit.WebView;
import androidx.fragment.app.Fragment;
import com.facebook.appevents.AppEventsConstants;
import com.samsung.android.sdk.iap.lib.helper.HelperDefine;
import com.samsung.android.sdk.iap.lib.listener.OnPaymentListener;
import com.samsung.android.sdk.iap.lib.vo.ErrorVo;
import com.samsung.android.sdk.iap.lib.vo.PurchaseVo;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.pay.samsung.SamsungUtil;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
@@ -104,41 +95,38 @@ public class SamsungFragment extends Fragment {
mProductId = ProductId;
mOrderid = OrderNumber;
MoneyUsds = MoneyUsd;
SamsungUtil.newInstance(getActivity()).buy(mProductId, new OnPaymentListener() {
SamsungUtil.newInstance(getActivity()).buy(mProductId, new SamsungUtil.OnPaymentListener() {
@Override
public void onPayment(ErrorVo _errorVO, PurchaseVo _purchaseVO) {
if (_purchaseVO != null) {
SamsungUtil.newInstance(getActivity()).consume(_purchaseVO.getPurchaseId());
payHandler.post(new Runnable() {
@Override
public void run() {
CommonHttpUtil.notifySamsung(_purchaseVO.getPurchaseId(), mOrderid, new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
ToastUtil.show(getString(R.string.pay_suc));
dis();
}
}
});
}
});
} else {
payHandler.post(new Runnable() {
@Override
public void run() {
if (_errorVO.getErrorCode() == HelperDefine.IAP_PAYMENT_IS_CANCELED) {
ToastUtil.show(getString(R.string.pay_cancel));
} else {
ToastUtil.show(_errorVO.getErrorString());
}
}
});
}
public void onPaymentSuccess(String purchaseVo) {
SamsungUtil.newInstance(getActivity()).consume(purchaseVo);
payHandler.post(new Runnable() {
@Override
public void run() {
// CommonHttpUtil.notifySamsung(_purchaseVO.getPurchaseId(), mOrderid, new HttpCallback() {
// @Override
// public void onSuccess(int code, String msg, String[] info) {
// if (code == 0) {
// ToastUtil.show(getString(R.string.pay_suc));
// dis();
// }
// }
// });
}
});
}
@Override
public void onPaymentFailed(String errorVo) {
payHandler.post(new Runnable() {
@Override
public void run() {
ToastUtil.show(errorVo);
}
});
}
});
}
lastClickTime = currentTime;
Log.e(TAG, "ProductId" + ProductId + "OrderNumber" + OrderNumber + "MoneyUsd" + MoneyUsd);
@@ -154,6 +142,7 @@ public class SamsungFragment extends Fragment {
public void androidGoBack() {
getActivity().onBackPressed();
}
}

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

@@ -18,12 +18,9 @@ import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.AppManager;
import com.yunbao.common.utils.MobclickAgent;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.dialog.SkitCheckInWasSuccessfulPopup;
import com.yunbao.common.event.FloatWarOrderEvent;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.live.dialog.LiveBuyGuardDialog;
import com.yunbao.live.dialog.LiveGuardDialog;
import com.yunbao.live.dialog.LivePrankDialogFragment;
import com.yunbao.main.R;