From 80f820b505e1b4b230f9b77a67476905baa4865b Mon Sep 17 00:00:00 2001
From: francescotescari <36578133+francescotescari@users.noreply.github.com>
Date: Fri, 15 Mar 2019 15:07:15 +0100
Subject: [PATCH] pre-release 9.3.14 alpha
---
.idea/artifacts/XiaoMiTool_jar2.xml | 22 +
...m_mortennobel_java_image_scaling_0_8_6.xml | 11 +
.idea/libraries/jMTPe.xml | 13 -
.idea/libraries/lib.xml | 13 +
.idea/misc.xml | 2 +-
.idea/vcs.xml | 6 +
.idea/workspace.xml | 1282 +++++++++--------
XiaoMiTool.iml | 6 +-
proguard.conf | 41 +-
src/com/xiaomitool/v2/adb/AdbCommons.java | 2 +-
.../xiaomitool/v2/adb/AdbCommunication.java | 37 +-
.../xiaomitool/v2/adb/FastbootCommons.java | 11 +
src/com/xiaomitool/v2/adb/device/Device.java | 39 +-
.../v2/adb/device/DeviceAnswers.java | 10 +
.../v2/adb/device/DeviceGroups.java | 133 +-
.../v2/adb/device/DeviceManager.java | 7 +-
src/com/xiaomitool/v2/engine/ToolManager.java | 4 +-
.../v2/engine/actions/ActionsDynamic.java | 267 +++-
.../v2/engine/actions/ActionsStatic.java | 33 +-
src/com/xiaomitool/v2/gui/WindowManager.java | 38 +-
.../v2/gui/deviceView/Animatable.java | 28 +
.../gui/deviceView/AnimatableDeviceView.java | 42 +
.../v2/gui/deviceView/DeviceRecoveryView.java | 17 +-
.../v2/gui/deviceView/DeviceView.java | 206 ++-
.../v2/gui/drawable/device_auth.png | Bin 158075 -> 2158153 bytes
src/com/xiaomitool/v2/gui/drawable/milogo.png | Bin 0 -> 6214 bytes
.../v2/gui/drawable/pcsuiteicon.png | Bin 10883 -> 15425 bytes
.../xiaomitool/v2/gui/drawable/usbdbg1.png | Bin 0 -> 3020859 bytes
.../xiaomitool/v2/gui/drawable/usbdbg2.png | Bin 0 -> 127503 bytes
.../xiaomitool/v2/gui/drawable/usbdbg3.png | Bin 0 -> 174767 bytes
.../xiaomitool/v2/gui/drawable/usbdbg4.png | Bin 0 -> 119576 bytes
.../xiaomitool/v2/gui/drawable/usbdbg5.png | Bin 0 -> 99249 bytes
.../xiaomitool/v2/gui/drawable/usbdbg6.png | Bin 0 -> 162140 bytes
.../xiaomitool/v2/gui/drawable/usbdbg7.png | Bin 0 -> 160553 bytes
.../gui/visual/DeviceImgInstructionPane.java | 149 ++
.../v2/gui/visual/IDClickReceiver.java | 21 +
.../xiaomitool/v2/gui/visual/InstallPane.java | 14 +-
src/com/xiaomitool/v2/language/LRes.java | 58 +-
src/com/xiaomitool/v2/logging/Log.java | 2 +-
.../v2/procedure/ProcedureRunner.java | 8 +-
src/com/xiaomitool/v2/procedure/RInstall.java | 21 +-
src/com/xiaomitool/v2/procedure/RNode.java | 37 +-
.../v2/procedure/device/ManageDevice.java | 51 +-
.../v2/procedure/device/RebootDevice.java | 72 +-
.../procedure/fetch/StockRecoveryFetch.java | 13 +-
.../v2/procedure/install/AdbInstall.java | 5 +-
.../v2/procedure/install/FastbootInstall.java | 117 +-
.../v2/procedure/install/GenericInstall.java | 35 +-
.../install/StockRecoveryInstall.java | 6 +-
.../v2/procedure/install/TwrpInstall.java | 35 +-
.../v2/procedure/uistuff/ChooseProcedure.java | 13 +-
.../uistuff/ConfirmationProcedure.java | 56 +-
.../v2/resources/ResourceImages.java | 3 +-
src/com/xiaomitool/v2/rom/Installable.java | 6 +
src/com/xiaomitool/v2/rom/MiuiRom.java | 4 +
src/com/xiaomitool/v2/rom/MiuiTgzRom.java | 3 +
src/com/xiaomitool/v2/rom/ZipRom.java | 5 +-
.../rom/chooser/InstallationRequirement.java | 35 +-
.../xiaomitool/v2/tasks/AdbSideloadTask.java | 11 +-
src/com/xiaomitool/v2/test/GuiTest.java | 124 +-
src/com/xiaomitool/v2/test/GuiTest2.java | 15 +-
src/com/xiaomitool/v2/test/Main.java | 18 +-
.../v2/utility/SilentCompleteFuture.java | 14 +
.../v2/utility/utils/NumberUtils.java | 4 +
.../xiaomitool/v2/xiaomi/XiaomiUtilities.java | 26 +
.../v2/xiaomi/miuithings/Branch.java | 4 +
.../miuithings/DefaultRequestParams.java | 4 +-
.../v2/xiaomi/miuithings/MiuiVersion.java | 11 +
.../v2/xiaomi/romota/MiuiRomOta.java | 14 +-
.../xiaomi/unlock/UnlockCommonRequests.java | 54 +-
src_rel2/META-INF/MANIFEST.MF | 3 +
71 files changed, 2365 insertions(+), 976 deletions(-)
create mode 100644 .idea/artifacts/XiaoMiTool_jar2.xml
create mode 100644 .idea/libraries/com_mortennobel_java_image_scaling_0_8_6.xml
delete mode 100644 .idea/libraries/jMTPe.xml
create mode 100644 .idea/libraries/lib.xml
create mode 100644 .idea/vcs.xml
create mode 100644 src/com/xiaomitool/v2/gui/deviceView/AnimatableDeviceView.java
create mode 100644 src/com/xiaomitool/v2/gui/drawable/milogo.png
create mode 100644 src/com/xiaomitool/v2/gui/drawable/usbdbg1.png
create mode 100644 src/com/xiaomitool/v2/gui/drawable/usbdbg2.png
create mode 100644 src/com/xiaomitool/v2/gui/drawable/usbdbg3.png
create mode 100644 src/com/xiaomitool/v2/gui/drawable/usbdbg4.png
create mode 100644 src/com/xiaomitool/v2/gui/drawable/usbdbg5.png
create mode 100644 src/com/xiaomitool/v2/gui/drawable/usbdbg6.png
create mode 100644 src/com/xiaomitool/v2/gui/drawable/usbdbg7.png
create mode 100644 src/com/xiaomitool/v2/gui/visual/DeviceImgInstructionPane.java
create mode 100644 src/com/xiaomitool/v2/utility/SilentCompleteFuture.java
create mode 100644 src_rel2/META-INF/MANIFEST.MF
diff --git a/.idea/artifacts/XiaoMiTool_jar2.xml b/.idea/artifacts/XiaoMiTool_jar2.xml
new file mode 100644
index 0000000..1f9d68c
--- /dev/null
+++ b/.idea/artifacts/XiaoMiTool_jar2.xml
@@ -0,0 +1,22 @@
+
+
+ $PROJECT_DIR$/out/artifacts/XiaoMiTool_jar2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/com_mortennobel_java_image_scaling_0_8_6.xml b/.idea/libraries/com_mortennobel_java_image_scaling_0_8_6.xml
new file mode 100644
index 0000000..3c6e4db
--- /dev/null
+++ b/.idea/libraries/com_mortennobel_java_image_scaling_0_8_6.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/jMTPe.xml b/.idea/libraries/jMTPe.xml
deleted file mode 100644
index 67bb056..0000000
--- a/.idea/libraries/jMTPe.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml
new file mode 100644
index 0000000..526231b
--- /dev/null
+++ b/.idea/libraries/lib.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0548357..35bdbab 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 099edcf..9788782 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,10 +3,71 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -34,41 +95,45 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -76,68 +141,66 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
@@ -155,23 +218,6 @@
- com.xiaomitool.v2.test.Rtest.
- adn
- progre
- listener
- fetching
- RUNNING RU
- FLLLL
- getDownloadFile
- selecte
- PROGRESS_TEXT
- PARTITION_FORMATTING
- REBOOTING_TO_MODE
- SEARCHING_LATEST_ROM
- Format speci
- PROCEDURE_EXC_DETAILS
- Missin
- installable
rebooting_
abort
LATEST_ROM
@@ -185,6 +231,23 @@
Download
Extract
download
+ getrom
+ Overla
+ give
+ Your device is of
+ suffix
+ TODO
+ Magisk
+ .run
+ running now
+ WAITIN
+ WAITING_DEVICE_ACTIVE
+ 163846982
+ PROCEDURE EXC
+ setCo
+ content
+ imageWr
+ ...
protected
@@ -203,60 +266,63 @@
checkAccessible
+
+
+
@@ -276,16 +342,20 @@
-
-
-
-
+
+
+
+
+
+
+
+
@@ -341,6 +411,37 @@
-
@@ -772,47 +890,58 @@
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
-
-
+
+
-
-
+
+
-
+
-
+
+
@@ -829,7 +958,7 @@
file://$PROJECT_DIR$/src/com/xiaomitool/v2/xiaomi/miuithings/DefaultRequestParams.java
- 67
+ 69
@@ -842,504 +971,436 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1350,11 +1411,11 @@
- XiaoMiTool:jar
+ XiaoMiTool:jar2
@@ -1402,7 +1463,8 @@
@@ -1422,11 +1484,11 @@
- org.apache.commons:commons-compress:1.17
+ com.mortennobel:java-image-scaling:0.8.6
diff --git a/XiaoMiTool.iml b/XiaoMiTool.iml
index 41332df..b75e6f7 100644
--- a/XiaoMiTool.iml
+++ b/XiaoMiTool.iml
@@ -1,11 +1,11 @@
-
+
-
+
@@ -23,5 +23,7 @@
+
+
\ No newline at end of file
diff --git a/proguard.conf b/proguard.conf
index 97dc552..5db2e00 100644
--- a/proguard.conf
+++ b/proguard.conf
@@ -1,8 +1,8 @@
--injars out\artifacts\XiaoMiTool_jar\XiaoMiTool.jar
--outjars out\artifacts\XiaoMiTool.jar
+-injars out\artifacts\XiaoMiTool_jar2\XiaoMiTool.jar
+-outjars out\artifacts\XiaoMiTool_jar2\XiaoMiTool_guarded.jar
--libraryjars 'C:\Program Files\Java\jdk1.8.0_172\jre\lib\rt.jar'
--libraryjars 'C:\Program Files\Java\jdk1.8.0_172\jre\lib\ext\jfxrt.jar'
+-libraryjars 'C:\Program Files\Java\jdk-11\jmods'
+-libraryjars out\artifacts\XiaoMiTool_jar2\openjfx-jmods
-dontshrink
-dontoptimize
@@ -30,8 +30,6 @@
;
}
-
-
# Keep - Applications. Keep all application classes, along with their 'main' methods.
-keepclasseswithmembers public class * {
public static void main(java.lang.String[]);
@@ -58,6 +56,20 @@
native ;
}
+# Remove - System method calls. Remove all invocations of System
+# methods without side effects whose return values are not used.
+-assumenosideeffects public class java.lang.System {
+ public static long currentTimeMillis();
+ static java.lang.Class getCallerClass();
+ public static int identityHashCode(java.lang.Object);
+ public static java.lang.SecurityManager getSecurityManager();
+ public static java.util.Properties getProperties();
+ public static java.lang.String getProperty(java.lang.String);
+ public static java.lang.String getenv(java.lang.String);
+ public static java.lang.String mapLibraryName(java.lang.String);
+ public static java.lang.String getProperty(java.lang.String,java.lang.String);
+}
+
# Remove - Math method calls. Remove all invocations of Math
# methods without side effects whose return values are not used.
-assumenosideeffects public class java.lang.Math {
@@ -306,21 +318,6 @@
public java.lang.String substring(int,int);
}
-# Remove - System method calls. Remove all invocations of System
-# methods without side effects whose return values are not used.
--assumenosideeffects public class java.lang.System {
- public static long currentTimeMillis();
- static java.lang.Class getCallerClass();
- public static int identityHashCode(java.lang.Object);
- public static java.lang.SecurityManager getSecurityManager();
- public static java.util.Properties getProperties();
- public static java.lang.String getProperty(java.lang.String);
- public static java.lang.String getenv(java.lang.String);
- public static java.lang.String mapLibraryName(java.lang.String);
- public static java.lang.String getProperty(java.lang.String,java.lang.String);
-
-}
-
-assumenosideeffects public class com.xiaomitool.v2.logging.Log {
- public static *** debug(...);
+ public static *** debug(...);
}
diff --git a/src/com/xiaomitool/v2/adb/AdbCommons.java b/src/com/xiaomitool/v2/adb/AdbCommons.java
index 4818a37..8df4ab2 100644
--- a/src/com/xiaomitool/v2/adb/AdbCommons.java
+++ b/src/com/xiaomitool/v2/adb/AdbCommons.java
@@ -98,7 +98,7 @@ public class AdbCommons {
return runner.getOutputString();
}
- private static String adb_shellWithOr(String cmd, String device, int timeout){
+ public static String adb_shellWithOr(String cmd, String device, int timeout){
cmd += " || echo "+CHECK_RETURN_CODE;
String output = adb_shell(cmd, device, timeout);
return (output == null || output.contains(CHECK_RETURN_CODE)) ? null : output;
diff --git a/src/com/xiaomitool/v2/adb/AdbCommunication.java b/src/com/xiaomitool/v2/adb/AdbCommunication.java
index 9b458ab..3728dbb 100644
--- a/src/com/xiaomitool/v2/adb/AdbCommunication.java
+++ b/src/com/xiaomitool/v2/adb/AdbCommunication.java
@@ -12,18 +12,23 @@ import java.util.Map;
public class AdbCommunication {
public static Thread trackDevicesThread, refreshDevicesThread;
- private static boolean canInterrupt = true, isTrackDeviceActive=false;
+ private static int cannotInterruptCount = 0; private static boolean isTrackDeviceActive=false;
private static final int REFRESH_TIME_MS = 2500;
private static AdbRunner trackDeviceProcess;
+ private static final Object sync = new Object();
+ public static boolean canInterrupt(){
+ return cannotInterruptCount == 0;
+ }
+
public static void startServer(){
- if (!canInterrupt){
+ if (!canInterrupt()){
Log.debug("Cannot interrupt adb connection");
}
AdbCommons.start_server();
}
public static void killServer(){
- if (!canInterrupt){
+ if (!canInterrupt()){
Log.debug("Cannot interrupt adb connection");
return;
}
@@ -34,14 +39,14 @@ public class AdbCommunication {
startServer();
}
- public static boolean canInterrupt() {
- return canInterrupt;
- }
+
public static void registerAutoScanDevices(){
- if (refreshDevicesThread != null){
- return;
+ synchronized (sync) {
+ if (refreshDevicesThread != null) {
+ return;
+ }
}
Runnable trackDevices = new Runnable() {
@Override
@@ -109,15 +114,19 @@ public class AdbCommunication {
refreshFastbootDevices();
}
- public static void closeAccess() {
- canInterrupt = false;
+ public static void getAllAccess() {
+ cannotInterruptCount++;
unregisterAutoScanDevices();
}
- public static void openAccess(){
- canInterrupt = true;
- registerAutoScanDevices();
+ public static void giveAllAccess(){
+ if (cannotInterruptCount > 0){
+ cannotInterruptCount--;
+ }
+ if (canInterrupt()) {
+ registerAutoScanDevices();
+ }
}
- private static void unregisterAutoScanDevices(){
+ public static void unregisterAutoScanDevices(){
if (trackDeviceProcess != null){
trackDeviceProcess.kill();
}
diff --git a/src/com/xiaomitool/v2/adb/FastbootCommons.java b/src/com/xiaomitool/v2/adb/FastbootCommons.java
index 6f382f5..1b115c3 100644
--- a/src/com/xiaomitool/v2/adb/FastbootCommons.java
+++ b/src/com/xiaomitool/v2/adb/FastbootCommons.java
@@ -183,4 +183,15 @@ public class FastbootCommons {
}
return flash(serial,dummyPath.toFile(), "antirbpass");
}
+ public static boolean oemRebootRecovery(String serial){
+ FastbootRunner runner = FastbootCommons.command_fast(serial,5,"oem","reboot-recovery");
+ if (runner == null || runner.getExitValue() != 0){
+ return false;
+ }
+ String out = runner.getOutputString();
+ if (out == null || out.toLowerCase().contains("fail")){
+ return false;
+ }
+ return true;
+ }
}
diff --git a/src/com/xiaomitool/v2/adb/device/Device.java b/src/com/xiaomitool/v2/adb/device/Device.java
index 22d4020..f9a926b 100644
--- a/src/com/xiaomitool/v2/adb/device/Device.java
+++ b/src/com/xiaomitool/v2/adb/device/Device.java
@@ -5,8 +5,8 @@ import com.xiaomitool.v2.adb.AdbCommons;
import com.xiaomitool.v2.adb.AdbException;
import com.xiaomitool.v2.adb.FastbootCommons;
import com.xiaomitool.v2.logging.Log;
+import com.xiaomitool.v2.utility.NotNull;
import com.xiaomitool.v2.utility.WaitSemaphore;
-import org.jetbrains.annotations.NotNull;
public class Device {
@@ -104,6 +104,8 @@ public class Device {
isConnected = connected;
if (connected){
deviceActiveSem.setPermits(1);
+ } else {
+ deviceActiveSem.setPermits(0);
}
}
public boolean isConnected() {
@@ -135,6 +137,7 @@ public class Device {
return rebootNoWait(toStatus, false);
}
private boolean rebootInternal(Status toStatus, boolean wait) throws InterruptedException, AdbException {
+ deviceActiveSem.setPermits(0);
if (Status.FASTBOOT.equals(this.status)){
return fastbootReboot(toStatus, wait);
} else {
@@ -144,26 +147,30 @@ public class Device {
private boolean fastbootReboot(Status toStatus, boolean wait) throws AdbException, InterruptedException {
if (Status.FASTBOOT.equals(toStatus)){
FastbootCommons.rebootBootloader(serial);
- return rebootWait(toStatus);
+ return wait ? rebootWait(toStatus) : true;
} else if (Status.EDL.equals(toStatus)){
FastbootCommons.oemEdl(serial);
- return rebootWait(toStatus);
- } else {
- if (!Status.DEVICE.equals(toStatus) && !wait){
- throw new AdbException("Cannot reboot from fastboot to "+toStatus.toString()+" without waiting");
+ return wait ? rebootWait(toStatus) : true;
+ } else if (Status.SIDELOAD.equals(toStatus) || Status.RECOVERY.equals(toStatus)){
+ if (FastbootCommons.oemRebootRecovery(serial)){
+ return wait ? rebootNoWait(toStatus) : true;
}
- FastbootCommons.reboot(serial);
- if (!wait){
+ }
+ if (!Status.DEVICE.equals(toStatus) && !wait){
+ throw new AdbException("Cannot reboot from fastboot to "+toStatus.toString()+" without waiting");
+ }
+ FastbootCommons.reboot(serial);
+ if (!wait){
+ return true;
+ }
+ if (!rebootWait(Status.DEVICE)){
+ if (isConnected && toStatus.equals(this.status)){
return true;
}
- if (!rebootWait(Status.DEVICE)){
- if (isConnected && toStatus.equals(this.status)){
- return true;
- }
- return false;
- }
- return reboot(toStatus,false);
+ return false;
}
+ return reboot(toStatus,false);
+
}
@@ -183,6 +190,8 @@ public class Device {
String status = toStatus.toString();
if (Status.FASTBOOT.equals(toStatus)){
status = "bootloader";
+ } else if (Status.SIDELOAD.equals(toStatus)){
+ status = Status.RECOVERY.toString();
}
AdbCommons.reboot(serial,status);
return !wait || rebootWait(toStatus);
diff --git a/src/com/xiaomitool/v2/adb/device/DeviceAnswers.java b/src/com/xiaomitool/v2/adb/device/DeviceAnswers.java
index 2139d40..4c6b4fd 100644
--- a/src/com/xiaomitool/v2/adb/device/DeviceAnswers.java
+++ b/src/com/xiaomitool/v2/adb/device/DeviceAnswers.java
@@ -4,8 +4,11 @@ import com.xiaomitool.v2.adb.AdbCommons;
import com.xiaomitool.v2.crypto.Hash;
import com.xiaomitool.v2.logging.Log;
import com.xiaomitool.v2.process.AdbRunner;
+import com.xiaomitool.v2.rom.MiuiRom;
import com.xiaomitool.v2.utility.YesNoMaybe;
import com.xiaomitool.v2.utility.utils.StrUtils;
+import com.xiaomitool.v2.xiaomi.miuithings.Branch;
+import com.xiaomitool.v2.xiaomi.miuithings.MiuiVersion;
import com.xiaomitool.v2.xiaomi.miuithings.UnlockStatus;
import java.util.HashMap;
@@ -108,4 +111,11 @@ public class DeviceAnswers {
setAnswer(NEED_DEVICE_DEBUG, answer);
}
+ public MiuiRom.Specie getCurrentSpecie() {
+ String product = (String) device.getDeviceProperties().get(DeviceProperties.CODENAME);
+ MiuiVersion version = MiuiVersion.fromObject(device.getDeviceProperties().get(DeviceProperties.FULL_VERSION));
+ Branch branch = version == null ? Branch.DEVELOPER : version.getBranch();
+ branch = branch == null ? Branch.DEVELOPER : branch;
+ return MiuiRom.Specie.fromStringBranch(product,branch);
+ }
}
diff --git a/src/com/xiaomitool/v2/adb/device/DeviceGroups.java b/src/com/xiaomitool/v2/adb/device/DeviceGroups.java
index 4188ec0..1af4f42 100644
--- a/src/com/xiaomitool/v2/adb/device/DeviceGroups.java
+++ b/src/com/xiaomitool/v2/adb/device/DeviceGroups.java
@@ -6,9 +6,134 @@ public class DeviceGroups {
private static final HashSet ALWAYS_UNLOCKED_DEVICES = getAlwaysUnlockedSet();
private static final HashSet EEA_REGION_DEVICES = getEeaRegionDevices();
private static final HashSet ANDROID_ONE_DEVICES = getAndroidOneDevices();
+ private static final HashSet RECOVERY_SAFE = removeUnsafeDevices(getCurrentDevices());
+
+ public static boolean isSafeToChangeRecoveryLocked(String codename){
+ codename = stripCodename(codename);
+ for (String c : RECOVERY_SAFE){
+ if (codename.startsWith(c)){
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static final HashSet removeUnsafeDevices(HashSet toRemove){
+ toRemove.remove("ugg");
+ toRemove.remove("ugglite");
+ toRemove.remove("rosy");
+ toRemove.remove("riva");
+ toRemove.remove("vince");
+ toRemove.remove("whyred");
+ toRemove.remove("versace");
+ toRemove.remove("wayne");
+ toRemove.remove("ysl");
+ toRemove.remove("sirius");
+ toRemove.remove("polaris");
+ toRemove.remove("sakura");
+ toRemove.remove("sakura_india");
+ toRemove.remove("ursa");
+ toRemove.remove("beryllium");
+ toRemove.remove("comet");
+ toRemove.remove("clover");
+ toRemove.remove("cactus");
+ toRemove.remove("cereus");
+ toRemove.remove("nitrogen");
+ toRemove.remove("dipper");
+ toRemove.remove("tulip");
+ toRemove.remove("platina");
+ toRemove.remove("lilium");
+ toRemove.remove("equuleus");
+ toRemove.remove("perseus");
+ toRemove.remove("cepheus");
+ toRemove.remove("onc");
+ toRemove.remove("onclite");
+ toRemove.remove("lavender");
+ toRemove.remove("grus");
+ toRemove.remove("violet");
+ toRemove.remove("davinci");
+ toRemove.remove("raphael");
+ return toRemove;
+ }
+
+ private static final HashSet getCurrentDevices(){
+ HashSet set = new HashSet<>();
+ set.add("mione");
+ set.add("aries");
+ set.add("taurus");
+ set.add("pisces");
+ set.add("cancro");
+ set.add("armani");
+ set.add("mocha");
+ set.add("hammerhead");
+ set.add("dior");
+ set.add("virgo");
+ set.add("gucci");
+ set.add("ferrari");
+ set.add("leo");
+ set.add("hermes");
+ set.add("libra");
+ set.add("latte");
+ set.add("ido");
+ set.add("hennessy");
+ set.add("aqua");
+ set.add("gemini");
+ set.add("kenzo");
+ set.add("capricorn");
+ set.add("scorpio");
+ set.add("hydrogen");
+ set.add("land");
+ set.add("omega");
+ set.add("markw");
+ set.add("nikel");
+ set.add("natrium");
+ set.add("lithium");
+ set.add("helium");
+ set.add("prada");
+ set.add("mido");
+ set.add("rolex");
+ set.add("meri");
+ set.add("sagit");
+ set.add("santoni");
+ set.add("cappu");
+ set.add("oxygen");
+ set.add("tiffany");
+ set.add("jason");
+ set.add("ugglite");
+ set.add("ugg");
+ set.add("tissot");
+ set.add("chiron");
+ set.add("riva");
+ set.add("vince");
+ set.add("rosy");
+ set.add("dipper");
+ set.add("whyred");
+ set.add("polaris");
+ set.add("wayne");
+ set.add("nitrogen");
+ set.add("ysl");
+ set.add("sirius");
+ set.add("sakura");
+ set.add("cactus");
+ set.add("cereus");
+ set.add("beryllium");
+ set.add("clover");
+ set.add("ursa");
+ set.add("platina");
+ set.add("perseus");
+ set.add("equuleus");
+ set.add("cepheus");
+ set.add("lotus");
+ set.add("lavender");
+ set.add("grus");
+ return set;
+ }
+
private static final HashSet getAndroidOneDevices(){
HashSet set = new HashSet<>();
set.add("tiare");
+ set.add("tissot_sprout");
+ set.add("jasmine_sprout");
return set;
}
private static HashSet getEeaRegionDevices(){
@@ -46,7 +171,7 @@ public class DeviceGroups {
return set;
}
- private static String stripCode(String codename){
+ public static String stripCodename(String codename){
if (codename == null){
return "";
}
@@ -57,21 +182,21 @@ public class DeviceGroups {
if (codename == null){
return false;
}
- return ALWAYS_UNLOCKED_DEVICES.contains(stripCode(codename));
+ return ALWAYS_UNLOCKED_DEVICES.contains(stripCodename(codename));
}
public static boolean hasEEARegion(String codename){
if (codename == null){
return false;
}
- return EEA_REGION_DEVICES.contains(stripCode(codename));
+ return EEA_REGION_DEVICES.contains(stripCodename(codename));
}
public static boolean isAndroidOneDevice(String codename){
if (codename == null){
return false;
}
- codename = stripCode(codename);
+ codename = stripCodename(codename);
return codename.contains("_sprout") || ANDROID_ONE_DEVICES.contains(codename);
}
}
diff --git a/src/com/xiaomitool/v2/adb/device/DeviceManager.java b/src/com/xiaomitool/v2/adb/device/DeviceManager.java
index 4046c36..86086a4 100644
--- a/src/com/xiaomitool/v2/adb/device/DeviceManager.java
+++ b/src/com/xiaomitool/v2/adb/device/DeviceManager.java
@@ -21,7 +21,12 @@ public class DeviceManager {
public static void initScanThreads(){
AdbCommunication.registerAutoScanDevices();
}
- public void addDevice(Device device){
+
+ public static void stopScanThreads() {
+ AdbCommunication.unregisterAutoScanDevices();
+ }
+
+ public static void addDevice(Device device){
deviceMap.put(device.getSerial(), device);
}
public static void setSelectedDevice(Device device){
diff --git a/src/com/xiaomitool/v2/engine/ToolManager.java b/src/com/xiaomitool/v2/engine/ToolManager.java
index a5173f7..e6c5e29 100644
--- a/src/com/xiaomitool/v2/engine/ToolManager.java
+++ b/src/com/xiaomitool/v2/engine/ToolManager.java
@@ -17,9 +17,9 @@ import java.util.ArrayList;
import java.util.List;
public class ToolManager {
- public static String TOOL_VERSION = "8.9.24";
+ public static String TOOL_VERSION = "9.3.14";
public static String URL_DONATION = "https://xiaomitool.page.link/donate";
- public static String TOOL_VERSION_EX = "unbrick only";
+ public static String TOOL_VERSION_EX = "alpha";
public static String XMT_HOST = "https://www.xiaomitool.com/V2/";
public static String URL_UPDATE = XMT_HOST+"update.php";
public static String URL_LATEST = XMT_HOST+"latest";
diff --git a/src/com/xiaomitool/v2/engine/actions/ActionsDynamic.java b/src/com/xiaomitool/v2/engine/actions/ActionsDynamic.java
index d9e4ec2..b9d9ed8 100644
--- a/src/com/xiaomitool/v2/engine/actions/ActionsDynamic.java
+++ b/src/com/xiaomitool/v2/engine/actions/ActionsDynamic.java
@@ -5,8 +5,12 @@ import com.xiaomitool.v2.adb.device.Device;
import com.xiaomitool.v2.adb.device.DeviceManager;
import com.xiaomitool.v2.adb.device.DeviceProperties;
import com.xiaomitool.v2.engine.CommonsMessages;
+import com.xiaomitool.v2.engine.ToolManager;
import com.xiaomitool.v2.gui.GuiUtils;
+import com.xiaomitool.v2.gui.PopupWindow;
import com.xiaomitool.v2.gui.WindowManager;
+import com.xiaomitool.v2.gui.deviceView.Animatable;
+import com.xiaomitool.v2.gui.deviceView.DeviceRecoveryView;
import com.xiaomitool.v2.gui.deviceView.DeviceView;
import com.xiaomitool.v2.gui.drawable.DrawableManager;
import com.xiaomitool.v2.gui.other.DeviceTableEntry;
@@ -17,8 +21,13 @@ import com.xiaomitool.v2.procedure.GuiListener;
import com.xiaomitool.v2.procedure.ProcedureRunner;
import com.xiaomitool.v2.procedure.RInstall;
import com.xiaomitool.v2.procedure.RMessage;
+import com.xiaomitool.v2.procedure.device.ManageDevice;
+import com.xiaomitool.v2.procedure.device.RebootDevice;
import com.xiaomitool.v2.procedure.install.GenericInstall;
+import com.xiaomitool.v2.procedure.install.InstallException;
import com.xiaomitool.v2.procedure.uistuff.ChooseProcedure;
+import com.xiaomitool.v2.procedure.uistuff.ConfirmationProcedure;
+import com.xiaomitool.v2.utility.CommandClass;
import com.xiaomitool.v2.utility.Nullable;
import com.xiaomitool.v2.utility.RunnableMessage;
@@ -38,9 +47,13 @@ import javafx.scene.layout.*;
import javafx.scene.text.Font;
import javafx.scene.text.Text;
import javafx.scene.text.TextAlignment;
+import javafx.stage.Stage;
+
+import java.util.HashMap;
import static com.xiaomitool.v2.engine.CommonsMessages.NOOP;
+
public class ActionsDynamic {
public static RunnableMessage MAIN_SCREEN_LOADING(LRes message){
return MAIN_SCREEN_LOADING(message.toString());
@@ -81,7 +94,7 @@ public class ActionsDynamic {
case RECOVERY:
msg = LRes.NO_DEVICE_CONNECTED_RECOVERY;
button = LRes.HT_GO_RECOVERY;
- howto = ActionsStatic.HOWTO_GO_RECOVERY();
+ howto = HOWTO_GO_RECOVERY(null);
break;
case FASTBOOT:
msg = LRes.NO_DEVICE_CONNECTED_FASTBOOT;
@@ -90,6 +103,7 @@ public class ActionsDynamic {
default:
msg = LRes.NO_DEVICE_CONNECTED;
button = LRes.HT_ENABLE_USB_DEBUG;
+ howto = ActionsDynamic.HOW_TO_ENABLE_USB_DEBUGGING(null, DeviceManager.getDevices().isEmpty());
}
ButtonPane pane = new ButtonPane(LRes.SEARCH_AGAIN, button);
@@ -103,7 +117,7 @@ public class ActionsDynamic {
vBox.setAlignment(Pos.CENTER);
vBox.setSpacing(20);
pane.setContent(vBox);
- Log.debug("SDSDSASEW");
+
WindowManager.setMainContent(pane);
DeviceManager.addMessageReceiver(pane.getIdClickReceiver());
int message = CommonsMessages.NOOP;
@@ -111,7 +125,7 @@ public class ActionsDynamic {
message=pane.waitClick();
if (message > 0 && howto != null){
message = howto.run();
- if (message >= 0){
+ if (message == 0){
message = NOOP;
}
}
@@ -240,7 +254,7 @@ public class ActionsDynamic {
vBox.setAlignment(Pos.CENTER);
vBox.setSpacing(20);
pane.setContent(vBox);
- WindowManager.setMainContent(pane);
+ WindowManager.setMainContent(pane, false);
IDClickReceiver receiver = pane.getIdClickReceiver();
DeviceManager.addMessageReceiver(receiver);
int message = NOOP;
@@ -254,14 +268,16 @@ public class ActionsDynamic {
if (message == 0){
MAIN_SCREEN_LOADING(LRes.SEARCHING_CONNECTED_DEVICES).run();
ActionsStatic.RESTART_ADB_SERVER().run();
+ WindowManager.removeTopContent();
if (device.isConnected()){
break;
}
- WindowManager.removeTopContent();
+
}
message = NOOP;
}
DeviceManager.removeMessageReceiver(receiver);
+ WindowManager.removeTopContent();
return 1;
};
}
@@ -272,6 +288,7 @@ public class ActionsDynamic {
public static RunnableMessage WAIT_USB_DEBUG_ENABLE(Device device, String text){
return () -> {
ButtonPane pane = new ButtonPane(LRes.HT_ENABLE_USB_DEBUG, LRes.SEARCH_AGAIN);
+ pane.setContentText(LRes.WAITING_USB_ENABLE.toString(LRes.SEARCH_AGAIN));
WindowManager.setMainContent(pane);
IDClickReceiver receiver = pane.getIdClickReceiver();
DeviceManager.addMessageReceiver(receiver);
@@ -285,11 +302,18 @@ public class ActionsDynamic {
}
if (message == 1){
ActionsStatic.RESTART_ADB_SERVER().run();
- if (device.isTurnedOn()){
+ WindowManager.removeTopContent();
+ if (device.isTurnedOn() || Device.Status.UNAUTHORIZED.equals(device.getStatus())){
break;
}
- WindowManager.removeTopContent();
+
+ } else if (message == 0){
+ if (HOW_TO_ENABLE_USB_DEBUGGING(device, true).run() > 0){
+ if (device.isTurnedOn() || Device.Status.UNAUTHORIZED.equals(device.getStatus())){
+ break;
+ }
+ }
}
message = NOOP;
@@ -299,6 +323,52 @@ public class ActionsDynamic {
return 0;};
}
+ public static RunnableMessage REBOOT_STOCK_RECOVERY(Device device, boolean force){
+ return new RunnableMessage() {
+ @Override
+ public int run() throws InterruptedException {
+
+ if (device == null){
+ return 0;
+ }
+ if (!force){
+ if (Device.Status.SIDELOAD.equals(device.getStatus())){
+ return 1;
+ }
+ }
+ REQUIRE_DEVICE_CONNECTED(device).run();
+ REQUIRE_DEVICE_AUTH(device).run();
+ if (Device.Status.FASTBOOT.equals(device.getStatus())){
+ try {
+ if (!device.reboot(Device.Status.DEVICE)){
+ throw new AdbException("Failed to reboot device to device mode");
+ }
+ } catch (AdbException e) {
+ REQUIRE_DEVICE_CONNECTED(device).run();
+ REQUIRE_DEVICE_AUTH(device).run();
+ if (!device.isTurnedOn()){
+ return 0;
+ }
+
+ }
+ }
+ Thread.sleep(1000);
+ try {
+ if (!device.rebootNoWait(Device.Status.SIDELOAD,force)){
+ throw new AdbException("Failed to reboot device to recovery mode");
+ }
+ HOWTO_GO_RECOVERY(device).run();
+ if(!device.waitStatus(Device.Status.SIDELOAD)){
+ throw new AdbException("Failed to reboot device to recovery mode");
+ }
+ } catch (AdbException e) {
+ return 0;
+ }
+ return 1;
+ }
+ };
+ }
+
public static RunnableMessage FIND_DEVICE_INFO(Device device){
return () -> {
Text texts[] = new Text[10];
@@ -354,7 +424,7 @@ public class ActionsDynamic {
ActionsUtil.setDevicePropertiesText(device, texts);
}
- if (!device.getDeviceProperties().getSideloadProperties().isParsed()) {
+ if (!device.getDeviceProperties().getSideloadProperties().isParsed() && !device.getDeviceProperties().getRecoveryProperties().isParsed()) {
try {
if (UnlockStatus.UNLOCKED.equals(device.getAnswers().getUnlockStatus())) {
Platform.runLater(new Runnable() {
@@ -365,11 +435,13 @@ public class ActionsDynamic {
});
} else {
- if (!device.reboot(Device.Status.RECOVERY)) {
- throw new Exception("Failed to reboot to recovery");
- } else {
- ActionsUtil.setDevicePropertiesText(device, texts);
+
+ boolean result = REBOOT_STOCK_RECOVERY(device, true).run() != 0;
+ if (!result){
+ throw new Exception("Failed to reboot to stock recovery");
}
+ ActionsUtil.setDevicePropertiesText(device, texts);
+
}
} catch (Exception e) {
Platform.runLater(new Runnable() {
@@ -411,32 +483,31 @@ public class ActionsDynamic {
IDClickReceiver receiver = pane.getIdClickReceiver();
DeviceManager.addMessageReceiver(receiver);
- DeviceView deviceView = new DeviceView(DeviceView.DEVICE_18_9, 900);
+ DeviceView deviceView = new DeviceView(DeviceView.DEVICE_18_9, 880);
ImageView image = new ImageView(DrawableManager.getPng(DrawableManager.DEVICE_AUTH).toString());
- image.setViewport(new Rectangle2D(0,image.getImage().getHeight()-2160,1080,2160));
+ //image.setViewport(new Rectangle2D(0,image.getImage().getHeight()-2160,1080,2160));
deviceView.setContent(image);
deviceView.buildCircleTransition(800,2060,Animation.INDEFINITE);
- Pane cropped = GuiUtils.crop(deviceView,0,550,900/deviceView.getOuterAspectRatio(),350);
- cropped.setPrefSize(900/deviceView.getOuterAspectRatio(),350);
- GuiUtils.debug(cropped);
+
+ //GuiUtils.debug(cropped);
Text text = new Text(LRes.AUTH_DEVICE_TEXT.toString());
text.setTextAlignment(TextAlignment.CENTER);
text.setFont(Font.font(16));
text.setWrappingWidth(600);
- VBox vBox = new VBox(GuiUtils.center(cropped),text);
+ VBox vBox = new VBox(GuiUtils.center(DeviceView.crop(deviceView,310,570)),text);
vBox.setAlignment(Pos.CENTER);
vBox.setSpacing(20);
pane.setContent(vBox);
- WindowManager.setMainContent(pane);
+ WindowManager.setMainContent(pane, false);
int messsage = NOOP;
while (messsage == NOOP){
messsage = receiver.waitClick();
if(messsage == CommonsMessages.DEVICE_UPDATE_FINISH){
- if (!device.needAuthorization()){
+ if (!device.needAuthorization() && device.isConnected()){
break;
}
}
@@ -447,16 +518,20 @@ public class ActionsDynamic {
DeviceManager.refresh();
if (device.needAuthorization()) {
ActionsStatic.RESTART_ADB_SERVER().run();
- if (!device.needAuthorization()){
+ if (!device.needAuthorization() && device.isConnected()){
break;
} else {
- WindowManager.setMainContent(pane);
+ WindowManager.setMainContent(pane, false);
}
+ } else {
+ break;
}
messsage = NOOP;
}
}
+
DeviceManager.removeMessageReceiver(receiver);
+ WindowManager.removeTopContent();
return 1;
};
}
@@ -489,27 +564,159 @@ public class ActionsDynamic {
//runner.setContext("prop_"+DeviceProperties.CODENAME,"whyred");
//FastbootFetch.findAllLatestFastboot().run(runner);
+ RInstall main = GenericInstall.main();
try {
+ try {
+ /* RebootDevice.rebootNoWaitIfConnected().run(runner);
Log.debug("PRO0 CHOOSE CAT");
ChooseProcedure.chooseRomCategory().run(runner);
Log.debug("PRO0 CHOOSE ROM");
ChooseProcedure.chooseRom().run(runner);
Log.debug("PRO0 FETCH RESOURCE");
+ ConfirmationProcedure.confirmInstallableProcedure().run(runner);
+ ConfirmationProcedure.confirmInstallationStart().run(runner);
+ runner.text(LRes.WAITING_DEVICE_ACTIVE);
+ ManageDevice.waitDevice(60);
+ GenericInstall.satisfyAllRequirements().run(runner);
GenericInstall.resourceFetchWait().run(runner);
- Log.debug("PRO0 INSTALL ROM");
+ DeviceManager.refresh();
GenericInstall.runInstallProcedure().run(runner);
- Log.debug("PRO0 FINISHED");
- GenericInstall.installationSuccess().run(runner);
- } catch (Exception e){
- e.printStackTrace();
- } catch (RMessage rMessage) {
+ GenericInstall.installationSuccess().run(runner);*/
+ main.run(runner);
+
+ } catch (Exception e) {
+ try {
+ runner.handleException(new InstallException(e.getMessage(), InstallException.Code.INTERNAL_ERROR, false), main);
+ } catch (InstallException e1) {
+ throw new RMessage(e1);
+ }
+ }
+ }catch (RMessage rMessage) {
+ Log.debug("RMSG: "+rMessage.getCmd());
rMessage.printStackTrace();
+ if (CommandClass.Command.ABORT.equals(rMessage.getCmd())){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ ActionsStatic.MOD_CHOOSE_SCREEN().run();
+ } catch (InterruptedException e) {
+ Log.debug(e.getMessage());
+ }
+ }
+ }).start();
+ return 0;
+ }
+ Stage st = WindowManager.launchPopup(new PopupWindow.ImageTextPopup("A fatal error has occured: type: "+rMessage.getCmd()+"\nThe tool will now exit",PopupWindow.Icon.ERROR));
+ if (st != null){
+ while (st.isShowing()){
+ Thread.sleep(100);
+ }
+
+ }
+ ToolManager.exit(1);
+ System.exit(1);
}
-
-
return 0;
}
};
}
+ public static RunnableMessage HOWTO_GO_RECOVERY(Device device){
+ return HOWTO_GO_RECOVERY(true,device);
+ }
+
+ public static RunnableMessage HOWTO_GO_RECOVERY(boolean rebootingText, Device device){
+ return () -> {
+ ButtonPane buttonPane = new ButtonPane(LRes.OK_FINISHED);
+ SidePane sidePane = new SidePane();
+ DeviceRecoveryView deviceRecoveryView = new DeviceRecoveryView(DeviceView.DEVICE_18_9,640);
+ deviceRecoveryView.animateSelectThird(3000);
+ String nText;
+ if (!rebootingText){
+ nText = "1) "+LRes.BTN_VOLUP_POW.toString()+"\n2) "+LRes.HT_RECOVERY_TEXT_1.toString();
+ } else {
+ nText = LRes.ENTER_STOCK_RECOVERY_MODE.toString();
+ }
+ Text t = new Text(nText);
+
+ t.setWrappingWidth(400);
+ t.setFont(Font.font(15));
+ sidePane.setLeft(t);
+ Pane p = DeviceView.crop(deviceRecoveryView,410);
+
+ //GuiUtils.debug(p);
+ sidePane.setRight(GuiUtils.center(p));
+ buttonPane.setContent(sidePane);
+ WindowManager.setMainContent(buttonPane,false);
+ DeviceManager.addMessageReceiver(buttonPane.getIdClickReceiver());
+ int msg = NOOP;
+ int exitcode = 0;
+ while (msg < 0){
+ exitcode = 0;
+
+ if (device != null && device.isConnected() && Device.Status.SIDELOAD.equals(device.getStatus())){
+ exitcode = 1;
+ break;
+ }
+ //Log.debug(msg+" - "+DeviceManager.count(Device.Status.SIDELOAD));
+ msg = buttonPane.waitClick();
+ }
+ DeviceManager.removeMessageReceiver(buttonPane.getIdClickReceiver());
+ WindowManager.removeTopContent();
+ return exitcode;
+ };
+ }
+
+ public static RunnableMessage HOW_TO_ENABLE_USB_DEBUGGING(Device device, boolean search){
+ return new RunnableMessage() {
+ @Override
+ public int run() throws InterruptedException {
+ String[] text = new String[]{LRes.HT_ENABLE_USB_1.toString(),LRes.HT_ENABLE_USB_2.toString(),LRes.HT_ENABLE_USB_3.toString(),LRes.HT_ENABLE_USB_4.toString(),LRes.HT_ENABLE_USB_5.toString(),LRes.HT_ENABLE_USB_6.toString(),LRes.HT_ENABLE_USB_7.toString(),};
+ Image[] images = new Image[7];
+ for (int i = 0; i<7; i++){
+ images[i] = new Image(DrawableManager.getPng("usbdbg"+(i+1)).toString(),false);
+ }
+ HashMap animations = new HashMap<>();
+ animations.put(0,new Animatable.AnimationPayload(664,1323,Animation.INDEFINITE, true));
+ animations.put(1,new Animatable.AnimationPayload(400,435,Animation.INDEFINITE, true));
+ animations.put(2,new Animatable.AnimationPayload(400,1050,Animation.INDEFINITE, true));
+ animations.put(3,new Animatable.AnimationPayload(400,1954,Animation.INDEFINITE, true));
+ animations.put(4,new Animatable.AnimationPayload(400,1746,Animation.INDEFINITE, true));
+ animations.put(5,new Animatable.AnimationPayload(950,1082,Animation.INDEFINITE, true));
+ animations.put(6,new Animatable.AnimationPayload(800,2060,Animation.INDEFINITE, true));
+ DeviceImgInstructionPane instructionPane = new DeviceImgInstructionPane(WindowManager.getContentHeight() + 30, WindowManager.getContentHeight() - 10, text, images, animations);
+ //instructionPane.setOverlayLen(WindowManager.requireOverlayPane(), 0.6);
+
+ IDClickReceiver receiver = instructionPane.getIdClickReceiver();
+ WindowManager.setMainContent(instructionPane, false);
+ if (search) {
+ DeviceManager.addMessageReceiver(receiver);
+ }
+ int message = CommonsMessages.NOOP;
+ int exitcode = 0;
+ while (message < 0){
+ exitcode = 0;
+ if (device != null) {
+ if (Device.Status.DEVICE.equals(device.getStatus()) || Device.Status.UNAUTHORIZED.equals(device.getStatus())) {
+ exitcode = 1;
+ break;
+ }
+ } else {
+ if (message == CommonsMessages.NEW_DEVICE && !DeviceManager.getDevices().isEmpty()){
+ Device d = DeviceManager.getFirstDevice();
+ if (d != null && (Device.Status.DEVICE.equals(d.getStatus()) || Device.Status.UNAUTHORIZED.equals(d.getStatus()))) {
+ exitcode = 1;
+ break;
+ }
+ }
+ }
+ message = instructionPane.waitClick();
+ }
+ DeviceManager.removeMessageReceiver(receiver);
+ WindowManager.removeTopContent();
+ return exitcode;
+ }
+ };
+ }
}
diff --git a/src/com/xiaomitool/v2/engine/actions/ActionsStatic.java b/src/com/xiaomitool/v2/engine/actions/ActionsStatic.java
index b4a81ca..47b32c5 100644
--- a/src/com/xiaomitool/v2/engine/actions/ActionsStatic.java
+++ b/src/com/xiaomitool/v2/engine/actions/ActionsStatic.java
@@ -182,34 +182,7 @@ public class ActionsStatic {
};
}
- public static RunnableMessage HOWTO_GO_RECOVERY(){
- return () -> {
- ButtonPane buttonPane = new ButtonPane(LRes.OK_UNDERSTAND);
- SidePane sidePane = new SidePane();
- DeviceRecoveryView deviceRecoveryView = new DeviceRecoveryView(DeviceView.DEVICE_18_9,640);
- deviceRecoveryView.animateSelectThird(2500);
- Text t = new Text("1) "+LRes.BTN_VOLUP_POW.toString()+"\n2) "+LRes.HT_RECOVERY_TEXT_1.toString());
- t.setWrappingWidth(400);
- t.setFont(Font.font(15));
- sidePane.setLeft(t);
- Pane p = DeviceView.crop(deviceRecoveryView,410);
-
- GuiUtils.debug(p);
- sidePane.setRight(GuiUtils.center(p));
- buttonPane.setContent(sidePane);
- WindowManager.setMainContent(buttonPane,false);
- DeviceManager.addMessageReceiver(buttonPane.getIdClickReceiver());
- int msg = NOOP;
- while (msg < 0 && (msg != CommonsMessages.NEW_DEVICE || DeviceManager.count(Device.Status.SIDELOAD) < 1)){
- //Log.debug(msg+" - "+DeviceManager.count(Device.Status.SIDELOAD));
- msg = buttonPane.waitClick();
- }
- DeviceManager.removeMessageReceiver(buttonPane.getIdClickReceiver());
- WindowManager.removeTopContent();
- return msg;
- };
- }
public static RunnableMessage REQUIRE_INTERNET_CONNECTION(){
return () -> {
@@ -260,6 +233,8 @@ public class ActionsStatic {
+
+
public static RunnableMessage FIRST_DISCLAIMER() { return () -> {
ButtonPane buttonPane = new ButtonPane(LRes.DONT_AGREE.toString(),LRes.AGREE.toString());
Text t2 = new Text(RawManager.getDisclaimer());
@@ -280,7 +255,7 @@ public class ActionsStatic {
DeviceView running = new DeviceView(DeviceView.DEVICE_18_9,height, Color.WHITE,null), recover = new DeviceView(DeviceView.DEVICE_18_9,height, Color.BLACK, null);
running.getImagePane().setCursor(Cursor.HAND);
recover.getImagePane().setCursor(Cursor.HAND);
- recover.setContent(DrawableManager.getPng(DrawableManager.FASTBOOT_LOGO));
+ recover.setContent(DrawableManager.getPng(DrawableManager.FASTBOOT_LOGO),true);
running.setContent(DrawableManager.getPng(DrawableManager.MIUI10));
Button b1 = new CustomButton(LRes.CHOOSE);
Button b2 = new CustomButton(LRes.CHOOSE);
@@ -310,4 +285,6 @@ public class ActionsStatic {
});
return idClickReceiver.waitClick()%2;
};}
+
+
}
diff --git a/src/com/xiaomitool/v2/gui/WindowManager.java b/src/com/xiaomitool/v2/gui/WindowManager.java
index 5a6e7ec..3eb6633 100644
--- a/src/com/xiaomitool/v2/gui/WindowManager.java
+++ b/src/com/xiaomitool/v2/gui/WindowManager.java
@@ -9,6 +9,7 @@ import com.xiaomitool.v2.gui.visual.ToastPane;
import com.xiaomitool.v2.gui.visual.VisiblePane;
import com.xiaomitool.v2.logging.Log;
import com.xiaomitool.v2.utility.Pointer;
+import com.xiaomitool.v2.utility.SilentCompleteFuture;
import javafx.application.Platform;
import javafx.event.EventHandler;
import javafx.fxml.FXMLLoader;
@@ -149,17 +150,30 @@ public class WindowManager {
toastPane.toast(message);
}
public static Stage launchPopup(PopupWindow popupWindow){
- Pointer pointer = new Pointer();
- PopupController controller = new PopupController(popupWindow);
- Stage stage = launchWindow(FRAME_POPUP,controller,null,pointer);
- Parent p = stage.getScene().getRoot();
- StackPane mainPane = (StackPane) p;
- ((Pane) pointer.pointed).setMinSize(popupWindow.getWidth(),popupWindow.getHeight());
+ SilentCompleteFuture future = new SilentCompleteFuture<>();
- stage.setTitle(DEFAULT_TITLE);
- stage.sizeToScene();
- centerStage(stage);
- return stage;
+ Runnable runnable = new Runnable() {
+ @Override
+ public void run() {
+ Pointer pointer = new Pointer();
+ PopupController controller = new PopupController(popupWindow);
+ Stage stage = launchWindow(FRAME_POPUP,controller,null,pointer);
+ Parent p = stage.getScene().getRoot();
+ StackPane mainPane = (StackPane) p;
+ ((Pane) pointer.pointed).setMinSize(popupWindow.getWidth(),popupWindow.getHeight());
+
+ stage.setTitle(DEFAULT_TITLE);
+ stage.sizeToScene();
+ centerStage(stage);
+ future.complete(stage);
+ }
+ };
+ if (Platform.isFxApplicationThread()){
+ runnable.run();
+ } else {
+ Platform.runLater(runnable);
+ }
+ return future.getSilently();
}
private static Stage launchWindow(String fxml, DefaultController controller, Stage primaryStage){
@@ -268,4 +282,8 @@ public class WindowManager {
});
}
+
+ public static OverlayPane requireOverlayPane() {
+ return mainOverlay;
+ }
}
diff --git a/src/com/xiaomitool/v2/gui/deviceView/Animatable.java b/src/com/xiaomitool/v2/gui/deviceView/Animatable.java
index 8ce0a56..593c326 100644
--- a/src/com/xiaomitool/v2/gui/deviceView/Animatable.java
+++ b/src/com/xiaomitool/v2/gui/deviceView/Animatable.java
@@ -3,4 +3,32 @@ package com.xiaomitool.v2.gui.deviceView;
public interface Animatable {
public void animate(int times, long duration);
+
+
+ public static class AnimationPayload {
+ private double x,y;
+ private int times;
+ private boolean unique;
+ public AnimationPayload(double x, double y, int times, boolean unique){
+ this.x = x;
+ this.y = y;
+ this.times = times;
+ this.unique = unique;
+ }
+ public double getX(){
+ return x;
+ }
+
+ public double getY() {
+ return y;
+ }
+
+ public int getTimes() {
+ return times;
+ }
+
+ public boolean isUnique() {
+ return unique;
+ }
+ }
}
diff --git a/src/com/xiaomitool/v2/gui/deviceView/AnimatableDeviceView.java b/src/com/xiaomitool/v2/gui/deviceView/AnimatableDeviceView.java
new file mode 100644
index 0000000..cbf4c29
--- /dev/null
+++ b/src/com/xiaomitool/v2/gui/deviceView/AnimatableDeviceView.java
@@ -0,0 +1,42 @@
+package com.xiaomitool.v2.gui.deviceView;
+
+import com.xiaomitool.v2.utility.RunnableWithArg;
+
+public abstract class AnimatableDeviceView extends DeviceView implements Animatable {
+
+ public AnimatableDeviceView(DeviceImage deviceImage, double wantedHeight) {
+ super(deviceImage, wantedHeight);
+ }
+
+ private RunnableWithArg animationCallback;
+ public void setAnimationCallback(RunnableWithArg animationCallback){
+ this.animationCallback = animationCallback;
+ }
+
+ @Override
+ public void animate(int times, long duration) {
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ for (int i = 0; i {
selectOption(1);
diff --git a/src/com/xiaomitool/v2/gui/deviceView/DeviceView.java b/src/com/xiaomitool/v2/gui/deviceView/DeviceView.java
index 96fd82a..32eb7dc 100644
--- a/src/com/xiaomitool/v2/gui/deviceView/DeviceView.java
+++ b/src/com/xiaomitool/v2/gui/deviceView/DeviceView.java
@@ -1,5 +1,9 @@
package com.xiaomitool.v2.gui.deviceView;
+import com.mortennobel.imagescaling.AdvancedResizeOp;
+import com.mortennobel.imagescaling.MultiStepRescaleOp;
+import com.mortennobel.imagescaling.ResampleFilters;
+import com.mortennobel.imagescaling.ResampleOp;
import com.xiaomitool.v2.gui.GuiUtils;
import com.xiaomitool.v2.gui.drawable.DrawableManager;
import com.xiaomitool.v2.gui.visual.OverlayPane;
@@ -7,9 +11,12 @@ import com.xiaomitool.v2.logging.Log;
import com.xiaomitool.v2.utility.Nullable;
import com.xiaomitool.v2.utility.Pointer;
+import com.xiaomitool.v2.utility.utils.NumberUtils;
import javafx.animation.*;
+import javafx.application.Platform;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
+import javafx.embed.swing.SwingFXUtils;
import javafx.event.EventHandler;
import javafx.geometry.Insets;
import javafx.geometry.Rectangle2D;
@@ -24,10 +31,16 @@ import javafx.scene.shape.Circle;
import javafx.scene.shape.Rectangle;
import javafx.util.Duration;
+import java.awt.*;
+import java.awt.image.BufferedImage;
import java.net.URL;
+import java.util.HashSet;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ExecutionException;
public class DeviceView extends StackPane {
- private DeviceImage deviceImage;
+ protected DeviceImage deviceImage;
private ImageView deviceBorders, displayedImageView;
protected double wantedHeight, scaleRatio;
private Color background = Color.rgb(49, 53, 57), innerShadow = Color.BLACK;
@@ -93,6 +106,7 @@ public class DeviceView extends StackPane {
super.getChildren().add(containerPane);
}
+ protected double contentScaleRatio;
public void setContent(ImageView image){
setContent(image,false);
}
@@ -107,7 +121,7 @@ public class DeviceView extends StackPane {
setContent(new Image(url.toString()));
}
public void setContent(URL url, boolean keepratio){
- setContent(new Image(url.toString(), keepratio));
+ setContent(new Image(url.toString(), false),keepratio);
}
public double getOuterAspectRatio(){
return deviceImage.getOuterHeight()/deviceImage.getOuterWidth();
@@ -115,49 +129,147 @@ public class DeviceView extends StackPane {
public double getInnerAspectRatio(){
return deviceImage.getInnerHeight()/deviceImage.getInnerWidth();
}
-
- public void setContent(ImageView image, boolean keepRatio) {
-
-
- image.setPreserveRatio(true);
- displayedImage = image.getImage();
- if (keepRatio){
- image.setViewport(new Rectangle2D(0,-1*(deviceImage.getInnerHeight()-displayedImage.getHeight())/2,displayedImage.getWidth(), deviceImage.getInnerHeight()));
+ private double getInnerHeight(){
+ return this.deviceImage.getInnerHeight()*this.scaleRatio;
}
- //image.setSmooth(true);
- double offsetX = 0, offsetY =0 , height, width;
- if (image.getViewport() != null){
- height = image.getViewport().getHeight();
- width = image.getViewport().getWidth();
- offsetX = image.getViewport().getMinX();
- offsetY = image.getViewport().getMinY();
+ private double getInnerWidth(){
+ return this.deviceImage.getInnerWidth()*this.scaleRatio;
+ }
+
+ protected double imageOffsetX, imageOffsetY;
+ protected boolean keepRatio;
+ public void setContent(ImageView image, boolean keepRatio) {
+ this.keepRatio = keepRatio;
+ displayedImage = image.getImage();
+ Log.debug("Original image size: "+displayedImage.getHeight()+"x"+displayedImage.getWidth());
+ double origImgRatio = displayedImage.getHeight()/displayedImage.getWidth();
+ int resizeWidth, resizeHeight;
+ Rectangle2D viewport;
+ if (origImgRatio < this.getInnerAspectRatio()){
+ resizeWidth = NumberUtils.double2int(this.getInnerWidth());
+ resizeHeight = NumberUtils.double2int(keepRatio ? resizeWidth*origImgRatio : this.getInnerHeight());
+ imageOffsetY = keepRatio ? (this.getInnerHeight()-resizeHeight)/2 : 0;
+ imageOffsetX = 0;
+ viewport = keepRatio ? new Rectangle2D(0,-1*imageOffsetY,this.getInnerWidth(), this.getInnerHeight()) : null;
+
} else {
+ resizeHeight = NumberUtils.double2int(this.getInnerHeight());
+ resizeWidth = NumberUtils.double2int(keepRatio ? resizeHeight/origImgRatio : this.getInnerWidth());
+ imageOffsetX = keepRatio ? (this.getInnerWidth()-resizeWidth)/2 : 0;
+ imageOffsetY = 0;
+ viewport = keepRatio ? new Rectangle2D(-1*imageOffsetX,0,this.getInnerWidth(), this.getInnerHeight()) : null;
+ }
+ Log.debug("Viewport: "+viewport);
+ Log.debug("iOX = "+imageOffsetX+", iOY = "+imageOffsetY);
+ contentScaleRatio = ((double) resizeHeight)/displayedImage.getHeight();
+ Log.debug("RSW: "+resizeWidth+", RSH: "+resizeHeight+", CSR: "+contentScaleRatio+", DIH:"+displayedImage.getHeight());
+ BufferedImage srcImg = SwingFXUtils.fromFXImage(image.getImage(), null);
+ BufferedImage img = new BufferedImage(resizeWidth, resizeHeight, srcImg.getType());
+ if (true){
+ MultiStepRescaleOp resampleOp = new MultiStepRescaleOp(resizeWidth, resizeHeight, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
+ resampleOp.doFilter(srcImg, img, resizeWidth, resizeHeight);
+ } else {
+ ResampleOp resampleOp = new ResampleOp(resizeWidth, resizeHeight);
+ resampleOp.setFilter(ResampleFilters.getBiCubicFilter());
+ resampleOp.doFilter(srcImg, img, resizeWidth, resizeHeight);
+ }
+ Log.debug("Raw resized img: "+img.getHeight()+"x"+img.getWidth());
+
+ //
+
+ Image resizedImage = SwingFXUtils.toFXImage(img, null);
+ image.setImage(resizedImage);
+ if (viewport != null){
+ image.setViewport(viewport);
+ }
+ image.setFitWidth(NumberUtils.double2int(this.getInnerWidth()));
+ image.setFitHeight(NumberUtils.double2int(this.getInnerHeight()));
+ Log.debug("Result: "+image.getFitHeight()+"x"+image.getFitWidth()+" -img-> "+image.getImage().getHeight()+"x"+image.getImage().getWidth());
+
+ contentPane.getChildren().clear();
+
+ displayedImageView = image;
+
+ imageWrapPane = new Pane(image);
+
+
+ contentPane.getChildren().clear();
+ contentPane.getChildren().add(GuiUtils.center(imageWrapPane));
+
+
+ /* //image.setSmooth(true);
+ double offsetX = 0, offsetY =0 , height, width;
+ image.setPreserveRatio(true);
+ if (keepRatio){
+
+ Log.debug("KEEEPRATIIOOO");
+ height = deviceImage.getInnerHeight();
+ width = displayedImage.getWidth();
+
+ offsetX = 0;
+ offsetY = -1*(deviceImage.getInnerHeight()-displayedImage.getHeight())/2;
+ image.setViewport(new Rectangle2D(offsetX,offsetY,width,height));
+ } else {
+ Log.debug("DONTT KEEEPRATIIOOO");
height = displayedImage.getHeight();
+ Log.debug("Height: "+displayedImage.getHeight());
width = displayedImage.getWidth();
}
+ Log.debug("Width: "+width+", height: "+height);
double setHeight = height-offsetY;
double setWidth = width-offsetX;
double innerRatio = deviceImage.getInnerHeight()/deviceImage.getInnerWidth();
double imgRatio = setHeight/setWidth;
+ double wantedH = -1, wantedW = -1;
if (innerRatio < imgRatio){
Log.debug("Image is taller than frame: height -> "+setHeight);
- double h = Double.min(setHeight, deviceImage.getInnerHeight()*scaleRatio);
+ wantedH = Double.min(setHeight, deviceImage.getInnerHeight()*scaleRatio);
//h = keepRatio ? Double.min(h, displayedImage.getHeight()) : h;
- image.setFitHeight(h);
+ Log.debug("Wanted height: "+wantedH);
+
} else {
- double w = Double.min(setWidth, deviceImage.getInnerWidth()*scaleRatio);
+ wantedW = Double.min(setWidth, deviceImage.getInnerWidth()*scaleRatio);
//w = keepRatio ? Double.min(w, displayedImage.getWidth()) : w;
Log.debug("Image is wider than frame: width -> "+(deviceImage.getInnerWidth()*scaleRatio));
- image.setFitWidth(w);
+ Log.debug("Wanted width: "+wantedW);
}
+ int dstH = new Double(wantedH).intValue(), dstW = new Double(wantedW).intValue();
+ if (dstH < 0){
+ Log.debug(keepRatio);
+ Log.debug("DstH: "+dstH+", DstW: "+dstW);
+ Log.debug(displayedImage.impl_getUrl());
+ Log.debug("Dst ration: "+(displayedImage.getHeight()/displayedImage.getWidth()));
+ dstH = new Double(keepRatio ? (dstW*displayedImage.getHeight()/displayedImage.getWidth()) : dstW*getInnerAspectRatio()).intValue();
+ } else if (dstW <0){
+ Log.debug("DstH: "+dstH+", DstW: "+dstW);
+ Log.debug(displayedImage.impl_getUrl());
+ Log.debug("Dst ration: "+(displayedImage.getWidth()/displayedImage.getHeight()));
+ dstW = new Double(keepRatio ? (dstH*displayedImage.getWidth()/displayedImage.getHeight()) : dstH/getInnerAspectRatio()).intValue();
+ }
+ Log.debug("DstH: "+dstH+", DstW: "+dstW);
+
+ BufferedImage srcImg = SwingFXUtils.fromFXImage(image.getImage(), null);
+ BufferedImage img = new BufferedImage(dstW, dstH, srcImg.getType());
+ new ResampleOp(dstW, dstH).doFilter(srcImg, img, dstW, dstH);
+ Image dstImg = SwingFXUtils.toFXImage(img, null);
+ image.setSmooth(false);
+ image.setImage(dstImg);
+
+
+ if (wantedW >= 0){
+ image.setFitWidth(wantedW);
+ }
+ if (wantedH >= 0){
+ image.setFitHeight(wantedH);
+ }
//image.setFitHeight(wantedHeight * deviceImage.getInnerHeight() / deviceImage.getOuterHeight());
contentPane.getChildren().clear();
displayedImageView = image;
imageWrapPane = new Pane(image);
- contentPane.getChildren().add(GuiUtils.center(imageWrapPane));
+ contentPane.getChildren().add(GuiUtils.center(imageWrapPane));*/
}
@@ -255,7 +367,7 @@ public class DeviceView extends StackPane {
double centerY = (pos.top + pos.height / 2) ;
rectangle.setFill(Color.RED);
containerPane.getChildren().add(rectangle);
- Transition transition = buildCircleTransition(centerX,centerY,times,false);
+ Transition transition = buildCircleTransition(centerX,centerY,times,false,false);
transition.statusProperty().addListener((observable, oldValue, newValue) -> {
Log.debug(oldValue.toString()+" -> "+newValue.toString());
if (Animation.Status.STOPPED.equals(newValue)){
@@ -272,15 +384,52 @@ public class DeviceView extends StackPane {
}
public Transition buildCircleTransition(double x, double y, int times){
- return buildCircleTransition(x,y,times,true);
+ return buildCircleTransition(x,y,times,true, true);
}
- public Transition buildCircleTransition(double x, double y, int times, boolean addBorder){
- Circle circle = new Circle(x*scaleRatio+(addBorder ? deviceImage.getLeftOffset()*scaleRatio : 0), y*scaleRatio+(addBorder ? deviceImage.getTopOffset() * scaleRatio : 0), wantedHeight / 12);
+ private final ConcurrentLinkedQueue circlesAnimation = new ConcurrentLinkedQueue<>();
+ public void removeCircleAnimation(){
+ Log.debug("Clearing anims");
+ synchronized (circlesAnimation) {
+ for (Transition transition : circlesAnimation) {
+ Log.debug("Clearing trans: "+transition.toString());
+ transition.stop();
+ }
+ circlesAnimation.clear();
+ }
+ }
+
+ public Transition buildCircleTransition(double x, double y, int times, boolean addBorder, boolean unique){
+ if (!Platform.isFxApplicationThread()){
+ CompletableFuture future = new CompletableFuture<>();
+ Platform.runLater(new Runnable() {
+ @Override
+ public void run() {
+
+
+ future.complete(buildCircleTransition(x,y,times,addBorder, unique));
+ }
+ });
+ try {
+ return future.get();
+ } catch (InterruptedException e) {
+ removeCircleAnimation();
+ return null;
+ } catch (ExecutionException e) {
+ removeCircleAnimation();
+ return null;
+ }
+ }
+ if(unique){
+ removeCircleAnimation();
+ }
+ Circle circle = new Circle(x*scaleRatio+(addBorder ? deviceImage.getLeftOffset()*scaleRatio+imageOffsetX : 0), y*scaleRatio+(addBorder ? imageOffsetY+deviceImage.getTopOffset() * scaleRatio : 0), wantedHeight / 12);
circle.setStroke(Color.RED);
+ circle.setStrokeWidth(3);
circle.setFill(Color.TRANSPARENT);
circle.setVisible(false);
circle.setOpacity(0);
+ circle.setMouseTransparent(true);
Transition transition = getCircleTransition(circle, times);
containerPane.getChildren().add(circle);
@@ -290,13 +439,16 @@ public class DeviceView extends StackPane {
Log.debug(oldValue.toString()+" -> "+newValue.toString());
if (Animation.Status.STOPPED.equals(newValue)){
circle.setVisible(false);
- containerPane.getChildren().removeAll(circle);
+ containerPane.getChildren().remove(circle);
} else if (Animation.Status.RUNNING.equals(newValue)){
circle.setVisible(true);
}
}
});
transition.play();
+ synchronized (circlesAnimation){
+ this.circlesAnimation.add(transition);
+ }
return transition;
}
diff --git a/src/com/xiaomitool/v2/gui/drawable/device_auth.png b/src/com/xiaomitool/v2/gui/drawable/device_auth.png
index 9a4f6074e6ce50af715fee30ed4fd845927f366c..e6375c27f4347763902c23d29a92d3e57787a3b6 100644
GIT binary patch
literal 2158153
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