Skip to content

Y
YGOMobile
Commit 8fc1ad5f authored by fallenstardust's avatar fallenstardust
Browse files
Options

接入bugly 

移除pgyer
parent fe40188f
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 112 deletions
mobile/build.gradle
View file @ 8fc1ad5f
......@@ -104,7 +104,6 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
//
implementation(name: 'paysdk-release-1.2.4', ext: 'aar')
implementation "com.pgyersdk:sdk:3.0.11"
//dialog库
implementation(name: 'dialogutils2-release', ext: 'aar')
//recyclerview的adapter库
......@@ -114,5 +113,8 @@ dependencies {
//图片选择
implementation 'com.yuyh.imgsel:library:2.0.6'
//跨进程SharedPreferencesPlus工具
implementation 'com.github.zhangliangming:PreferencesProvider:v1.3''
implementation 'com.github.zhangliangming:PreferencesProvider:v1.3'
//Tencent bugly
implementation(name: 'bugly_crashreport_upgrade-1.4.2', ext: 'aar')
}
mobile/proguard-rules.pro
View file @ 8fc1ad5f
......@@ -38,4 +38,7 @@
-dontwarn android.support.**
-dontwarn java.lang.invoke.**
-dontwarn org.slf4j.**
-dontwarn org.chromium.**
\ No newline at end of file
-dontwarn org.chromium.**
-dontwarn com.tencent.bugly.**
-keep public class com.tencent.bugly.**{*;}
-keep class android.support.**{*;}
\ No newline at end of file
mobile/src/main/AndroidManifest.xml
View file @ 8fc1ad5f
......@@ -7,9 +7,9 @@
android:name="cn.garymb.ygomobile.App"
android:allowBackup="false"
android:icon="@drawable/ic_icon"
android:roundIcon="@drawable/ic_icon_round"
android:label="@string/app_name"
android:largeHeap="true"
android:roundIcon="@drawable/ic_icon_round"
android:supportsRtl="false"
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true"
......@@ -184,6 +184,11 @@
android:configChanges="orientation|keyboardHidden|navigation|screenSize"
android:exported="true"
android:windowSoftInputMode="adjustResize|stateHidden" />
<activity
android:name="com.tencent.bugly.beta.ui.BetaActivity"
android:configChanges="keyboardHidden|orientation|screenSize|locale"
android:theme="@android:style/Theme.Translucent" />
<meta-data
android:name="PGYER_APPID"
android:value="${PGYER_APPID}" />
......@@ -194,9 +199,14 @@
android:priority="1000" />
<provider
android:authorities="cn.garymb.ygomobile.ui.preference.YGOPreferencesProvider"
android:name="cn.garymb.ygomobile.ui.preference.YGOPreferencesProvider"
android:exported="false"/>
android:authorities="cn.garymb.ygomobile.ui.preference.YGOPreferencesProvider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths" />
</provider>
</application>
......
mobile/src/main/java/cn/garymb/ygomobile/App.java
View file @ 8fc1ad5f
......@@ -30,8 +30,6 @@ public class App extends GameApplication {
}
//初始化图片选择器
initImgsel();
// QbSdk.initX5Environment(this, null);
// QbSdk.setCurrentID("");
}
@Override
......
mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java
View file @ 8fc1ad5f
......@@ -32,10 +32,8 @@ import com.google.android.material.navigation.NavigationView;
import com.nightonke.boommenu.BoomButtons.BoomButton;
import com.nightonke.boommenu.BoomButtons.TextOutsideCircleButton;
import com.nightonke.boommenu.BoomMenuButton;
import com.pgyersdk.update.DownloadFileListener;
import com.pgyersdk.update.PgyUpdateManager;
import com.pgyersdk.update.UpdateManagerListener;
import com.pgyersdk.update.javabean.AppBean;
import com.tencent.bugly.Bugly;
import com.tencent.bugly.beta.Beta;
import com.tencent.smtt.sdk.QbSdk;
import com.tubb.smrv.SwipeMenuRecyclerView;
......@@ -83,103 +81,6 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
private ServerListAdapter mServerListAdapter;
private ServerListManager mServerListManager;
/*
*isToastCheckUpdateing 是否提示正在检查更新
*isToastNoUpdata 没有更新是否提示
* isErrorIntent 检查更新失败是否跳转下载地址
*/
public static void checkPgyerUpdateSilent(Context context, boolean isToastCheckUpdateing, boolean isToastNoUpdata, boolean isErrorIntent) {
final DialogPlus builder = new DialogPlus(context);
if (isToastCheckUpdateing) {
builder.showProgressBar();
builder.hideTitleBar();
builder.setMessage(R.string.Checking_Update);
builder.show();
}
//蒲公英自动检查更新
new PgyUpdateManager.Builder()
.setForced(true)
.setUserCanRetry(false)
.setDeleteHistroyApk(false)
.setUpdateManagerListener(new UpdateManagerListener() {
@Override
public void onNoUpdateAvailable() {
if (isToastNoUpdata) {
builder.dismiss();
Toast.makeText(context, R.string.Already_Lastest, Toast.LENGTH_SHORT).show();
}
}
@Override
public void onUpdateAvailable(AppBean appBean) {
final String versionName, updateMessage;
versionName = appBean.getVersionName();
updateMessage = appBean.getReleaseNote();
builder.hideProgressBar();
builder.showTitleBar();
builder.setTitle(context.getResources().getString(R.string.Update_Found) + versionName);
builder.setMessage(updateMessage);
builder.setRightButtonText(R.string.Download);
builder.setRightButtonListener((dlg, i) -> {
builder.showProgressBar2();
builder.hideButton();
builder.setTitle(R.string.Downloading);
PgyUpdateManager.downLoadApk(appBean.getDownloadURL());
});
builder.show();
}
@Override
public void checkUpdateFailed(Exception e) {
if (isErrorIntent) {
builder.hideProgressBar();
builder.showTitleBar();
builder.setTitle(context.getResources().getString(R.string.Checking_Update_Failed));
builder.setMessage(e.getMessage()
+ context.getResources().getString(R.string.Ask_to_Change_Other_Way));
builder.setLeftButtonText(R.string.Cancel);
builder.setRightButtonText(R.string.OK);
builder.setRightButtonListener(new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Intent intent = new Intent();
intent.setAction(Intent.ACTION_VIEW);
intent.setData(Uri.parse("https://www.taptap.com/app/37972"));
context.startActivity(intent);
dialog.dismiss();
}
});
builder.setLeftButtonListener(new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
}
});
builder.show();
}
}
})
.setDownloadFileListener(new DownloadFileListener() {
@Override
public void downloadFailed() {
builder.dismiss();
}
@Override
public void downloadSuccessful(File file) {
builder.dismiss();
PgyUpdateManager.installApk(file);
}
@Override
public void onProgressUpdate(Integer... file) {
builder.getProgressBar2().setProgress(file[0]);
}
})
.register();
}
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
......@@ -223,8 +124,10 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
QbSdk.initX5Environment(this, cb);
//trpay
TrPay.getInstance(HomeActivity.this).initPaySdk("e1014da420ea4405898c01273d6731b6", "YGOMobile");
//autoupadte checking
checkPgyerUpdateSilent(getContext(), false, false, false);
//初始化bugly
Bugly.init(getApplicationContext(), "0b6f110306", true);
//check update
Beta.checkUpgrade(false,true);
//ServiceDuelAssistant
startDuelService(this);
......
mobile/src/main/java/cn/garymb/ygomobile/ui/preference/fragments/SettingFragment.java
View file @ 8fc1ad5f
......@@ -23,6 +23,7 @@ import android.widget.Toast;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.signature.StringSignature;
import com.tencent.bugly.beta.Beta;
import java.io.DataOutputStream;
import java.io.File;
......@@ -231,7 +232,7 @@ public class SettingFragment extends PreferenceFragmentPlus {
.show();
}
if (PREF_CHECK_UPDATE.equals(key)) {
HomeActivity.checkPgyerUpdateSilent(getActivity(), true, true, true);
Beta.checkUpgrade();
}
if (PREF_PENDULUM_SCALE.equals(key)) {
CheckBoxPreference checkBoxPreference = (CheckBoxPreference) preference;
......
mobile/src/main/res/xml/provider_paths.xml 0 → 100644
View file @ 8fc1ad5f
<?xml version="1.0" encoding="utf-8"?>
<paths xmlns:android="http://schemas.android.com/apk/res/android">
<!-- /storage/emulated/0/Download/${applicationId}/.beta/apk-->
<external-path name="beta_external_path" path="Download/"/>
<!--/storage/emulated/0/Android/data/${applicationId}/files/apk/-->
<external-path name="beta_external_files_path" path="Android/data/"/>
</paths>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment