yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.2.4]merge

Browse Source
This commit is contained in:
zhongchao
2023-12-14 15:28:45 +08:00
parent d611c93dbc 4507cfc640
commit 360e3ac169
73 changed files with 563 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/geometry/Real.java
View File

@@ -63,7 +63,7 @@ strictfp class Real extends Number {
epsilon *= 0.5;
} while (1.0 + epsilon != 1.0);
int mantissaBits = (int) Math.round(-Math.log(epsilon) / Math.log(2));
SPLITTER = (1 << ((mantissaBits + 1) / 2)) + 1;
SPLITTER = (double) (1 << ((mantissaBits + 1) / 2)) + 1;
}
/** Returns the result of a + b, without loss of precision. */

2
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/storage/lrucache/DiskCacheManager.java
View File

@@ -24,7 +24,7 @@ public class DiskCacheManager {
private static DiskLruCache mDiskLruCache = null;
private DiskLruCache.Editor mEditor = null;
private DiskLruCache.Snapshot mSnapshot = null;
public static final long CACHE_MAXSIZE = 10 * 1024 * 1024;
public static final long CACHE_MAXSIZE = 10L * 1024 * 1024;
public DiskCacheManager( Context context, String uniqueName) {
try {

13
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/CommonUtils.java
View File

@@ -540,8 +540,12 @@ public class CommonUtils {
try {
packageName = TextUtils.isEmpty(packageName) ? context.getPackageName() : packageName;
PackageManager packageManager = context.getPackageManager();
PackageInfo packInfo = packageManager.getPackageInfo(packageName, 0);
return packInfo.versionName;
if(packageManager != null){
PackageInfo packInfo = packageManager.getPackageInfo(packageName, 0);
return packInfo.versionName;
}else {
return "";
}
} catch (Exception e) {
return "";
}
@@ -558,6 +562,9 @@ public class CommonUtils {
try {
packageName = TextUtils.isEmpty(packageName) ? context.getPackageName() : packageName;
PackageManager packageManager = context.getPackageManager();
if(packageManager == null){
return 0;
}
PackageInfo packInfo = packageManager.getPackageInfo(packageName, 0);
return packInfo.versionCode;
} catch (Exception e) {
@@ -580,7 +587,7 @@ public class CommonUtils {
}
BufferedReader in = new BufferedReader(new InputStreamReader(proc.getInputStream()));
StringBuffer stringBuffer = new StringBuffer();
String line = null;
String line;
while ((line = in.readLine()) != null) {
stringBuffer.append(line + " ");

1
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/FileUtils.java
View File

@@ -114,7 +114,6 @@ public final class FileUtils {
Uri uri = Uri.parse(filePath);
ContentResolver cr = Utils.getApp().getContentResolver();
AssetFileDescriptor afd = cr.openAssetFileDescriptor(uri, "r");
if (afd == null) return false;
try {
afd.close();
} catch (IOException ignore) {

6
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ImageUtils.java
View File

@@ -1072,17 +1072,17 @@ public final class ImageUtils {
Bitmap ret = Bitmap.createBitmap(srcWidth, srcHeight + reflectionHeight, src.getConfig());
Canvas canvas = new Canvas(ret);
canvas.drawBitmap(src, 0, 0, null);
canvas.drawBitmap(reflectionBitmap, 0, srcHeight + REFLECTION_GAP, null);
canvas.drawBitmap(reflectionBitmap, 0, (float) (srcHeight + REFLECTION_GAP), null);
Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
LinearGradient shader = new LinearGradient(
0, srcHeight,
0, ret.getHeight() + REFLECTION_GAP,
0, (float) (ret.getHeight() + REFLECTION_GAP),
0x70FFFFFF,
0x00FFFFFF,
Shader.TileMode.MIRROR);
paint.setShader(shader);
paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_IN));
canvas.drawRect(0, srcHeight + REFLECTION_GAP, srcWidth, ret.getHeight(), paint);
canvas.drawRect(0, (float) (srcHeight + REFLECTION_GAP), srcWidth, ret.getHeight(), paint);
if (!reflectionBitmap.isRecycled()) reflectionBitmap.recycle();
if (recycle && !src.isRecycled() && ret != src) src.recycle();
return ret;

6
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/SpanUtils.java
View File

@@ -1158,7 +1158,7 @@ public final class SpanUtils {
p.setStyle(Paint.Style.FILL);
p.setColor(this.color);
c.drawRect(x, top, x + dir * stripeWidth, bottom, p);
c.drawRect(x, top, (float) (x + dir * stripeWidth), bottom, p);
p.setStyle(style);
p.setColor(color);
@@ -1388,9 +1388,9 @@ public final class SpanUtils {
} else if (mVerticalAlignment == ALIGN_CENTER) {
transY = (bottom + top - rect.height()) / 2.0f;
} else if (mVerticalAlignment == ALIGN_BASELINE) {
transY = y - rect.height();
transY = (float) (y - rect.height());
} else {
transY = bottom - rect.height();
transY = (float) (bottom - rect.height());
}
canvas.translate(x, transY);
} else {