diff --git a/app/build.gradle b/app/build.gradle index dda2f3e..9f01d78 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,5 +109,6 @@ dependencies { compile 'com.github.houxg:FlexLayout:1.2' compile 'net.danlew:android.joda:2.9.5' - compile 'com.tencent.bugly:crashreport:2.4.0' + compile group: 'com.tencent.bugly', name: 'crashreport_upgrade', version: '1.2.1' + } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 92b0117..cda9c38 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -53,6 +53,10 @@ android:label="NoteSyncService" /> + + \ No newline at end of file diff --git a/app/src/main/java/org/houxg/leamonax/Leamonax.java b/app/src/main/java/org/houxg/leamonax/Leamonax.java index aefb878..c7b9049 100644 --- a/app/src/main/java/org/houxg/leamonax/Leamonax.java +++ b/app/src/main/java/org/houxg/leamonax/Leamonax.java @@ -3,15 +3,18 @@ package org.houxg.leamonax; import android.app.Application; import android.content.Context; +import android.content.res.Resources; import com.facebook.stetho.Stetho; import com.raizlabs.android.dbflow.config.FlowConfig; import com.raizlabs.android.dbflow.config.FlowManager; -import com.tencent.bugly.crashreport.CrashReport; +import com.tencent.bugly.Bugly; +import com.tencent.bugly.beta.Beta; import net.danlew.android.joda.JodaTimeAndroid; import org.greenrobot.eventbus.EventBus; +import org.houxg.leamonax.ui.MainActivity; public class Leamonax extends Application { @@ -25,7 +28,8 @@ public class Leamonax extends Application { public void onCreate() { super.onCreate(); mContext = this; - CrashReport.initCrashReport(this, BuildConfig.BUGLY_KEY, BuildConfig.DEBUG); + initBugly(); + EventBus.builder() .logNoSubscriberMessages(false) .sendNoSubscriberEvent(false) @@ -35,4 +39,37 @@ public class Leamonax extends Application { Stetho.initializeWithDefaults(this); JodaTimeAndroid.init(this); } + + private void initBugly() { + Beta.canShowUpgradeActs.add(MainActivity.class); + Beta.upgradeCheckPeriod = 60 * 1000; // 1 minute + + Resources res = getResources(); + Beta.strToastYourAreTheLatestVersion =res.getString(R.string.your_are_the_latest_version); + Beta.strToastCheckUpgradeError =res.getString(R.string.check_upgrade_error); + Beta.strToastCheckingUpgrade =res.getString(R.string.checking_upgrade); + Beta.strNotificationDownloading =res.getString(R.string.downloading); + Beta.strNotificationClickToView =res.getString(R.string.click_to_view); + Beta.strNotificationClickToInstall =res.getString(R.string.click_to_install); + Beta.strNotificationClickToRetry =res.getString(R.string.click_to_retry); + Beta.strNotificationClickToContinue =res.getString(R.string.continue_download); + Beta.strNotificationDownloadSucc =res.getString(R.string.download_successful); + Beta.strNotificationDownloadError =res.getString(R.string.download_error); + Beta.strNotificationHaveNewVersion =res.getString(R.string.have_new_version); + Beta.strNetworkTipsMessage =res.getString(R.string.should_continue_download); + Beta.strNetworkTipsTitle =res.getString(R.string.network_prompt); + Beta.strNetworkTipsConfirmBtn =res.getString(R.string.continue_download); + Beta.strNetworkTipsCancelBtn =res.getString(R.string.cancel); + Beta.strUpgradeDialogVersionLabel =res.getString(R.string.version); + Beta.strUpgradeDialogFileSizeLabel =res.getString(R.string.file_size); + Beta.strUpgradeDialogUpdateTimeLabel =res.getString(R.string.update_time); + Beta.strUpgradeDialogFeatureLabel =res.getString(R.string.what_s_new); + Beta.strUpgradeDialogUpgradeBtn =res.getString(R.string.upgrade_now); + Beta.strUpgradeDialogInstallBtn =res.getString(R.string.install); + Beta.strUpgradeDialogRetryBtn =res.getString(R.string.retry); + Beta.strUpgradeDialogContinueBtn =res.getString(R.string.continue_text); + Beta.strUpgradeDialogCancelBtn =res.getString(R.string.next_time); + + Bugly.init(this, BuildConfig.BUGLY_KEY, BuildConfig.DEBUG); + } } diff --git a/app/src/main/java/org/houxg/leamonax/ui/NotePreviewActivity.java b/app/src/main/java/org/houxg/leamonax/ui/NotePreviewActivity.java index 6417968..b36ff53 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/NotePreviewActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/NotePreviewActivity.java @@ -1,6 +1,5 @@ package org.houxg.leamonax.ui; -import android.app.ProgressDialog; import android.content.Context; import android.content.Intent; import android.net.Uri; diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 77da284..1643723 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -66,7 +66,7 @@ 致谢 昨天 %s 标题 - + 未命名 使用自定义服务器 使用Leanote.com 用户名 @@ -76,4 +76,25 @@ 反馈 注册 找不到该笔记，请重试 + 你已经是最新版了 + 检查新版本失败，请稍后重试 + 正在检查，请稍候 + 正在下载 + 点击查看 + 点击安装 + 点击重试 + 下载完成 + 下载失败 + 有新版本 + 你已切换到移动网络，是否继续当前下载？ + 网络提示 + 继续下载 + 包大小 + 更新时间 + 更新说明 + 立即更新 + 安装 + 重试 + 继续 + 下次再说 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0774d13..3ae1f2f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -75,4 +75,26 @@ Feedback Sign up Note not found, please try again + An error occurs while checking latest version, please try again + Checking latest version, please wait + Click to install + Click to retry + Click to view + Continue download + Continue + Download failed + Dowload finished + Dowloading + What\'s new + File size + Have new version + Install + Network prompt + Next time + Retry + You already switch to mobile network, would you like to continue download? + Update time + Upgrade now + You are using latest version +