xymp
/
TermApp
3
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

修复闪退bug

Browse Source
serial
Matthew 2 years ago
parent ff735944b3
commit b1af0bd01d
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File

9
app/src/main/java/com/xypower/mpapp/AppMaster.java
Unescape Escape View File

@ -42,8 +42,13 @@ public class AppMaster {
@Override @Override
protected void finalize() { protected void finalize() {
if (mWakelock != null) { try {
mWakelock.release(); if (mWakelock != null) {
mWakelock.release();
}
} catch (Exception e) {
e.printStackTrace();
} finally {
mWakelock = null; mWakelock = null;
} }
mService = null; mService = null;

36
app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
Unescape Escape View File

@ -30,7 +30,6 @@ import android.os.SystemClock;
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import android.telephony.CellSignalStrength;
import android.telephony.SignalStrength; import android.telephony.SignalStrength;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
@ -44,7 +43,6 @@ import com.dev.devapi.api.SysApi;
import java.io.File; import java.io.File;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
@ -417,7 +415,7 @@ public class MicroPhotoService extends Service {
return true; return true;
} }
private boolean registerCaptureSchedule(long startTime, long baseTime) { private boolean registerCaptureSchedule(long timeOfZeroPoint, long secondsOfToday) {
long[] photoTimeData = getPhotoTimeData(mNativeHandle); long[] photoTimeData = getPhotoTimeData(mNativeHandle);
if (photoTimeData == null) { if (photoTimeData == null) {
@ -431,7 +429,7 @@ public class MicroPhotoService extends Service {
long val = 0L; long val = 0L;
// int maxDuration = mHeartbeatDuration * 2 / 1000; // int maxDuration = mHeartbeatDuration * 2 / 1000;
int maxDuration = 35 * 60 * 1000 + 1000; int maxDuration = 35 * 60 * 1000 + 1000;
int currentTs = 0; int currentTs = -1;
List<Long> schedules = new ArrayList<>(); List<Long> schedules = new ArrayList<>();
int offset = 0; int offset = 0;
for (int day = 0; day < 2; day++, offset += 86400) { for (int day = 0; day < 2; day++, offset += 86400) {
@ -439,15 +437,15 @@ public class MicroPhotoService extends Service {
val = photoTimeData[idx]; val = photoTimeData[idx];
ts = (int) ((val & 0x00FFFFFF00000000L) >> 32) + offset; ts = (int) ((val & 0x00FFFFFF00000000L) >> 32) + offset;
if (ts < baseTime) { if (ts < secondsOfToday) {
continue; continue;
} }
if ((ts - baseTime) > maxDuration) { if ((ts - secondsOfToday) > maxDuration) {
break; break;
} }
if (currentTs == 0) { if (currentTs == -1) {
currentTs = ts; currentTs = ts;
channel = (short) ((val & 0xFF0000L) >> 16); channel = (short) ((val & 0xFF0000L) >> 16);
preset = (short) ((val & 0xFF00L) >> 8); preset = (short) ((val & 0xFF00L) >> 8);
@ -473,11 +471,11 @@ public class MicroPhotoService extends Service {
} }
if (!schedules.isEmpty()) { if (!schedules.isEmpty()) {
long expectedTs = startTime + ts; long expectedTs = timeOfZeroPoint + ts;
Date date = new Date(expectedTs * 1000); // Date date = new Date(expectedTs * 1000);
// Log.d(TAG, "Register Photo Time: " + date.toString() + " BaseTime=" + baseTime + " ts=" + ts + " startTime=" + startTime + " expectedTs=" + expectedTs); // Log.d(TAG, "Register Photo Time: " + date.toString() + " BaseTime=" + secondsOfToday + " ts=" + ts + " startTime=" + startTime + " expectedTs=" + expectedTs);
registerPhotoTimer(channel, preset, currentTs, (currentTs - baseTime) * 1000, schedules); registerPhotoTimer(channel, preset, expectedTs, expectedTs * 1000 - System.currentTimeMillis(), schedules);
} }
return true; return true;
@ -487,12 +485,13 @@ public class MicroPhotoService extends Service {
List<Long> schedules = new ArrayList<>(); List<Long> schedules = new ArrayList<>();
long ts = System.currentTimeMillis() / 1000; long ts = System.currentTimeMillis() / 1000;
long val = (ts << 24); // long val = (ts << 24);
long val = 0;
val |= ((long)channel << 16); val |= ((long)channel << 16);
val |= ((long)preset << 8); val |= ((long)preset << 8);
schedules.add(Long.valueOf(val)); schedules.add(Long.valueOf(val));
registerPhotoTimer(context, channel, preset, System.currentTimeMillis() / 1000, 0, schedules); registerPhotoTimer(context, channel, preset, 0, 0, schedules);
} }
@Override @Override
@ -545,7 +544,6 @@ public class MicroPhotoService extends Service {
} }
// registerPhotoTimer();
break; break;
case ACTION_STOP: case ACTION_STOP:
unregisterReceiver(mScreenaAtionReceiver); unregisterReceiver(mScreenaAtionReceiver);
@ -822,10 +820,12 @@ public class MicroPhotoService extends Service {
SignalStrength ss = telephonyManager.getSignalStrength(); SignalStrength ss = telephonyManager.getSignalStrength();
// List<CellSignalStrength> css = ss.getCellSignalStrengths(); // List<CellSignalStrength> css = ss.getCellSignalStrengths();
int signalLevel = ss.getLevel(); if (ss != null) {
sb.append("&Signal4G=" + signalLevel); int signalLevel = ss.getLevel();
sb.append("&Signal2G=" + signalLevel); sb.append("&Signal4G=" + signalLevel);
sb.append("&SL=" + signalLevel); sb.append("&Signal2G=" + signalLevel);
sb.append("&SL=" + signalLevel);
}
if (isXyPlatform) { if (isXyPlatform) {
java.text.DecimalFormat fmt=new java.text.DecimalFormat("0.0"); java.text.DecimalFormat fmt=new java.text.DecimalFormat("0.0");

Write Preview
Loading…
Cancel
Save