Skip to content

Commit

Permalink
toast
Browse files Browse the repository at this point in the history
  • Loading branch information
@jsbxyyx
jsbxyyx committed Jul 18, 2024
1 parent 0f9e812 commit 5475aae
Show file tree
Hide file tree
Showing 14 changed files with 108 additions and 73 deletions.
15 changes: 8 additions & 7 deletions app/src/main/java/com/github/jsbxyyx/xbook/DetailActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.github.jsbxyyx.xbook.common.LogUtil;
import com.github.jsbxyyx.xbook.common.ProgressListener;
import com.github.jsbxyyx.xbook.common.SPUtils;
import com.github.jsbxyyx.xbook.common.UiUtils;
import com.github.jsbxyyx.xbook.data.BookDbHelper;
import com.github.jsbxyyx.xbook.data.BookNetHelper;
import com.github.jsbxyyx.xbook.data.bean.Book;
Expand Down Expand Up @@ -51,7 +52,7 @@ protected void onCreate(Bundle savedInstanceState) {

detailUrl = getIntent().getStringExtra("detailUrl");
if (Common.isEmpty(detailUrl)) {
Toast.makeText(getBaseContext(), "书籍地址为空", Toast.LENGTH_LONG).show();
UiUtils.showToast("书籍地址为空");
return;
}

Expand All @@ -71,7 +72,7 @@ protected void onCreate(Bundle savedInstanceState) {
public void call(Book book, Throwable err) {
if (err != null) {
runOnUiThread(() -> {
Toast.makeText(getBaseContext(), "获取书籍详情失败:" + err.getMessage(), Toast.LENGTH_LONG).show();
UiUtils.showToast("获取书籍详情失败:" + err.getMessage());
});
return;
}
Expand All @@ -93,15 +94,15 @@ public void call(Book book, Throwable err) {

findViewById(R.id.btn_detail_download).setOnClickListener(v -> {
if (mBook == null || Common.isEmpty(mBook.getDownloadUrl())) {
Toast.makeText(getBaseContext(), "下载地址为空，请登录", Toast.LENGTH_LONG).show();
UiUtils.showToast("下载地址为空，请登录");
return;
}
bookNetHelper.download(mBook.getDownloadUrl(), Common.xbook_dir, mBook.getBid(), new DataCallback<File>() {
@Override
public void call(File file, Throwable err) {
if (err != null) {
runOnUiThread(() -> {
Toast.makeText(getBaseContext(), "书籍下载失败:" + err.getMessage(), Toast.LENGTH_LONG).show();
UiUtils.showToast("书籍下载失败:" + err.getMessage());
});
return;
}
Expand All @@ -121,7 +122,7 @@ public void call(File file, Throwable err) {
public void call(JsonNode o, Throwable err) {
if (err != null) {
runOnUiThread(() -> {
Toast.makeText(getBaseContext(), "同步失败:" + err.getMessage(), Toast.LENGTH_LONG).show();
UiUtils.showToast("同步失败:" + err.getMessage());
});
return;
}
Expand All @@ -135,15 +136,15 @@ public void call(JsonNode o, Throwable err) {

runOnUiThread(() -> {
if (book_db != null) {
Toast.makeText(getBaseContext(), "同步成功", Toast.LENGTH_LONG).show();
UiUtils.showToast("同步成功");
}
});
}
});
}
}
runOnUiThread(() -> {
Toast.makeText(getBaseContext(), "下载成功", Toast.LENGTH_LONG).show();
UiUtils.showToast("下载成功");
});
}
}, new ProgressListener() {
Expand Down
13 changes: 7 additions & 6 deletions app/src/main/java/com/github/jsbxyyx/xbook/ForgetpwdActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import com.github.jsbxyyx.xbook.common.DataCallback;
import com.github.jsbxyyx.xbook.common.SPUtils;
import com.github.jsbxyyx.xbook.common.SessionManager;
import com.github.jsbxyyx.xbook.common.UiUtils;
import com.github.jsbxyyx.xbook.data.BookNetHelper;

public class ForgetpwdActivity extends AppCompatActivity {
Expand Down Expand Up @@ -42,14 +43,14 @@ protected void onCreate(Bundle savedInstanceState) {
public void call(JsonNode dataObject, Throwable err) {
runOnUiThread(() -> {
if (err != null) {
Toast.makeText(getBaseContext(), "发送重置验证码:" + err.getMessage(), Toast.LENGTH_LONG).show();
UiUtils.showToast("发送重置验证码:" + err.getMessage());
return;
}
int success = dataObject.get("success").asInt();
if (success == 1) {
Toast.makeText(getBaseContext(), "发送成功", Toast.LENGTH_LONG).show();
UiUtils.showToast("发送成功");
} else {
Toast.makeText(getBaseContext(), dataObject.get("err").asText(), Toast.LENGTH_LONG).show();
UiUtils.showToast(dataObject.get("err").asText());
}
});
}
Expand All @@ -65,13 +66,13 @@ public void call(JsonNode dataObject, Throwable err) {
public void call(JsonNode respData, Throwable err) {
runOnUiThread(() -> {
if (err != null) {
Toast.makeText(getBaseContext(), "重置密码失败:" + err.getMessage(), Toast.LENGTH_LONG).show();
UiUtils.showToast("重置密码失败:" + err.getMessage());
return;
}
if (respData.get("success").asInt() == 1) {
Toast.makeText(getBaseContext(), "重置成功", Toast.LENGTH_LONG).show();
UiUtils.showToast("重置成功");
} else {
Toast.makeText(getBaseContext(), respData.get("message").asText(""), Toast.LENGTH_LONG).show();
UiUtils.showToast(respData.get("message").asText(""));
}
});
}
Expand Down
45 changes: 19 additions & 26 deletions app/src/main/java/com/github/jsbxyyx/xbook/HomeFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.github.jsbxyyx.xbook.common.DataCallback;
import com.github.jsbxyyx.xbook.common.LogUtil;
import com.github.jsbxyyx.xbook.common.UiUtils;
import com.github.jsbxyyx.xbook.data.BookNetHelper;

/**
Expand Down Expand Up @@ -55,7 +56,7 @@ public void call(JsonNode o, Throwable err) {
if (err != null) {
LogUtil.d(getClass().getSimpleName(), "%s", LogUtil.getStackTraceString(err));
mActivity.runOnUiThread(() -> {
Toast.makeText(mActivity, "获取版本更新失败:" + err.getMessage(), Toast.LENGTH_LONG).show();
UiUtils.showToast("获取版本更新失败:" + err.getMessage());
});
return;
}
Expand All @@ -64,33 +65,25 @@ public void call(JsonNode o, Throwable err) {
LogUtil.d(getClass().getSimpleName(), "versions empty.");
return;
}
try {
JsonNode update = data.get(0);
PackageInfo packageInfo = mActivity.getPackageManager().getPackageInfo(mActivity.getPackageName(), 0);
double localName = Double.parseDouble(packageInfo.versionName);
double cloudName = Double.parseDouble(update.get("name").asText().trim());
if (cloudName > localName) {
mActivity.runOnUiThread(() -> {
new AlertDialog.Builder(mActivity)
.setTitle("提示")
.setMessage("有新版本啦，前往 我的-设置 进行版本更新")
.setIcon(android.R.drawable.ic_dialog_alert)
.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
Intent localIntent = new Intent(mActivity, SettingsActivity.class);
startActivity(localIntent);
}
}).setNegativeButton(android.R.string.no, null)
.setCancelable(false)
.show();
});
}
} catch (PackageManager.NameNotFoundException e) {
LogUtil.e(TAG, "获取版本失败");
JsonNode update = data.get(0);
String versionName = UiUtils.getVersionName();
double localName = Double.parseDouble(versionName);
double cloudName = Double.parseDouble(update.get("name").asText().trim());
if (cloudName > localName) {
mActivity.runOnUiThread(() -> {
Toast.makeText(mActivity, "获取版本失败", Toast.LENGTH_LONG).show();
new AlertDialog.Builder(mActivity)
.setTitle("提示")
.setMessage("有新版本啦，前往 我的-设置 进行版本更新")
.setIcon(android.R.drawable.ic_dialog_alert)
.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
Intent localIntent = new Intent(mActivity, SettingsActivity.class);
startActivity(localIntent);
}
}).setNegativeButton(android.R.string.no, null)
.setCancelable(false)
.show();
});
return;
}
}
});
Expand Down
11 changes: 7 additions & 4 deletions app/src/main/java/com/github/jsbxyyx/xbook/IssuesActivity.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.github.jsbxyyx.xbook;

import android.app.Activity;
import android.os.Build;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
Expand All @@ -11,6 +12,7 @@

import com.github.jsbxyyx.xbook.common.Common;
import com.github.jsbxyyx.xbook.common.DataCallback;
import com.github.jsbxyyx.xbook.common.UiUtils;
import com.github.jsbxyyx.xbook.data.BookNetHelper;

/**
Expand Down Expand Up @@ -39,20 +41,21 @@ public void onClick(View v) {
String title = et_issues_title.getText().toString();
String body = et_issues_body.getText().toString();
if (Common.isEmpty(title) || Common.isEmpty(body)) {
Toast.makeText(getBaseContext(), "标题或内容不能为空", Toast.LENGTH_LONG).show();
UiUtils.showToast("标题或内容不能为空");
return;
}
body += ("\n\n来源：[" + android.os.Build.MODEL + "] " + android.os.Build.VERSION.RELEASE + "\n");
body += ("\n\n来源 : [" + android.os.Build.MODEL + " | " + android.os.Build.VERSION.RELEASE + "]\n\n" +
"[APP : " + UiUtils.getVersionName() + "]");
LoadingDialog loading = new LoadingDialog(mActivity, "疯狂提交中...");
loading.show();
bookNetHelper.cloudIssues(title, body, (o, err) -> {
runOnUiThread(() -> {
loading.dismiss();
if (err != null) {
Toast.makeText(getBaseContext(), "提交反馈失败：" + err.getMessage(), Toast.LENGTH_LONG).show();
UiUtils.showToast("提交反馈失败：" + err.getMessage());
return;
}
Toast.makeText(getBaseContext(), "提交成功", Toast.LENGTH_LONG).show();
UiUtils.showToast("提交成功");
});
});
}
Expand Down
12 changes: 10 additions & 2 deletions app/src/main/java/com/github/jsbxyyx/xbook/LifecycleApplication.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.github.jsbxyyx.xbook;

import android.app.Application;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Looper;
import android.widget.Toast;

Expand All @@ -10,6 +12,7 @@
import com.github.jsbxyyx.xbook.common.DataCallback;
import com.github.jsbxyyx.xbook.common.LogUtil;
import com.github.jsbxyyx.xbook.common.SPUtils;
import com.github.jsbxyyx.xbook.common.UiUtils;
import com.github.jsbxyyx.xbook.data.BookNetHelper;
import com.github.jsbxyyx.xbook.data.bean.MLog;

Expand All @@ -29,6 +32,8 @@ public class LifecycleApplication extends Application {
public void onCreate() {
super.onCreate();

UiUtils.initContext(getApplicationContext());

bookNetHelper = new BookNetHelper();

String languages = "chinese,japanese,traditional chinese,english,korean,";
Expand All @@ -49,9 +54,12 @@ public void onCreate() {
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
@Override
public void uncaughtException(@NonNull Thread t, @NonNull Throwable e) {

MLog mLog = new MLog();
mLog.setTitle(new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date()) + Common.log_suffix);
mLog.setRaw(("[" + android.os.Build.MODEL + " " + android.os.Build.VERSION.RELEASE + "]\n\n") + LogUtil.getStackTraceString(e));
mLog.setRaw(("[OS : " + android.os.Build.MODEL + " | " + android.os.Build.VERSION.RELEASE + "]"
+ "[APP : " + UiUtils.getVersionName() + "]\n\n")
+ LogUtil.getStackTraceString(e));
CountDownLatch latch = new CountDownLatch(1);
bookNetHelper.cloudLog(mLog, new DataCallback() {
@Override
Expand All @@ -62,7 +70,7 @@ public void call(Object o, Throwable err) {
} else {
new Thread(() -> {
Looper.prepare();
Toast.makeText(getBaseContext(), "闪退异常上报成功", Toast.LENGTH_LONG).show();
UiUtils.showToast("闪退异常上报成功");
Looper.loop();
}).start();
Thread.sleep(2000);
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/github/jsbxyyx/xbook/ListFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.github.jsbxyyx.xbook.common.Common;
import com.github.jsbxyyx.xbook.common.LogUtil;
import com.github.jsbxyyx.xbook.common.SPUtils;
import com.github.jsbxyyx.xbook.common.UiUtils;
import com.github.jsbxyyx.xbook.data.BookNetHelper;
import com.github.jsbxyyx.xbook.data.bean.Book;

Expand Down Expand Up @@ -100,7 +101,7 @@ private void showListView(boolean clear) {
mActivity.runOnUiThread(() -> {
loading.dismiss();
if (err != null) {
Toast.makeText(mActivity, "书籍搜索失败: " + err.getMessage(), Toast.LENGTH_LONG).show();
UiUtils.showToast("书籍搜索失败: " + err.getMessage());
return;
}
if (clear) {
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/github/jsbxyyx/xbook/LoginActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.github.jsbxyyx.xbook.common.DataCallback;
import com.github.jsbxyyx.xbook.common.SPUtils;
import com.github.jsbxyyx.xbook.common.SessionManager;
import com.github.jsbxyyx.xbook.common.UiUtils;
import com.github.jsbxyyx.xbook.data.BookNetHelper;

/**
Expand Down Expand Up @@ -42,7 +43,7 @@ protected void onCreate(Bundle savedInstanceState) {
public void call(String str, Throwable err) {
runOnUiThread(() -> {
if (err != null) {
Toast.makeText(getBaseContext(), "登录失败 : " + err.getMessage(), Toast.LENGTH_LONG).show();
UiUtils.showToast("登录失败 : " + err.getMessage());
return;
}
SessionManager.setSession(str);
Expand Down
Loading

0 comments on commit 5475aae

Please sign in to comment.