|
@@ -49,7 +49,6 @@ import org.las2mile.okio.message.resp.LogFileEndMsgResp;
|
|
|
import org.las2mile.okio.message.resp.LogFileMsgResp;
|
|
import org.las2mile.okio.message.resp.LogFileMsgResp;
|
|
|
import android.widget.TextView;
|
|
import android.widget.TextView;
|
|
|
import java.util.Set;
|
|
import java.util.Set;
|
|
|
-import com.tbruyelle.rxpermissions3.RxPermissions;
|
|
|
|
|
import androidx.fragment.app.FragmentActivity;
|
|
import androidx.fragment.app.FragmentActivity;
|
|
|
import android.Manifest;
|
|
import android.Manifest;
|
|
|
import android.app.AlertDialog;
|
|
import android.app.AlertDialog;
|
|
@@ -80,6 +79,8 @@ import android.widget.CheckBox;
|
|
|
import android.os.Build;
|
|
import android.os.Build;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import com.blankj.utilcode.util.NetworkUtils;
|
|
import com.blankj.utilcode.util.NetworkUtils;
|
|
|
|
|
+import com.tbruyelle.rxpermissions2.RxPermissions;
|
|
|
|
|
+
|
|
|
import android.view.Window;
|
|
import android.view.Window;
|
|
|
import android.view.WindowManager;
|
|
import android.view.WindowManager;
|
|
|
|
|
|
|
@@ -138,7 +139,7 @@ public class MainActivity extends FragmentActivity implements Scrcpy.ServiceCall
|
|
|
showProgress();
|
|
showProgress();
|
|
|
mainHandler.sendEmptyMessageDelayed(ADB_CONNECT_REAL_START,500);
|
|
mainHandler.sendEmptyMessageDelayed(ADB_CONNECT_REAL_START,500);
|
|
|
} else if(what == ADB_CONNECT_REAL_START){
|
|
} else if(what == ADB_CONNECT_REAL_START){
|
|
|
- sendCommands.SendAdbCommands(context, fileBase64, serverAdr, Integer.parseInt(serverPort), local_ip, videoBitrate, Math.max(screenHeight, screenWidth));
|
|
|
|
|
|
|
+ sendCommands.SendAdbCommands(context, fileBase64, serverAdr, Integer.parseInt(serverPort), local_ip, videoBitrate, Math.max(screenHeight, screenWidth));
|
|
|
} else if(what == ADB_CONNECT_SUC){
|
|
} else if(what == ADB_CONNECT_SUC){
|
|
|
setProgressMsg("与公司设备连接成功,正在初始化公司设备...");
|
|
setProgressMsg("与公司设备连接成功,正在初始化公司设备...");
|
|
|
} else if(what == ADB_CONNECT_FAIL){
|
|
} else if(what == ADB_CONNECT_FAIL){
|
|
@@ -325,7 +326,7 @@ public class MainActivity extends FragmentActivity implements Scrcpy.ServiceCall
|
|
|
// msg.obj = logFileEndMsgResp.allDownloaded;
|
|
// msg.obj = logFileEndMsgResp.allDownloaded;
|
|
|
// mainHandler.sendMessage(msg);
|
|
// mainHandler.sendMessage(msg);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Subscribe(threadMode = ThreadMode.MAIN)
|
|
@Subscribe(threadMode = ThreadMode.MAIN)
|
|
@@ -347,7 +348,7 @@ public class MainActivity extends FragmentActivity implements Scrcpy.ServiceCall
|
|
|
Log.e(LOG_TAG,"Asset showProgress");
|
|
Log.e(LOG_TAG,"Asset showProgress");
|
|
|
mainProgressDialog = new ProgressDialog(context);
|
|
mainProgressDialog = new ProgressDialog(context);
|
|
|
mainProgressDialog.setTitle("提示");
|
|
mainProgressDialog.setTitle("提示");
|
|
|
- mainProgressDialog.setMessage("正在连接公司设备...");
|
|
|
|
|
|
|
+ mainProgressDialog.setMessage("正在连接公司设备...");
|
|
|
mainProgressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
|
|
mainProgressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
|
|
|
mainProgressDialog.setIndeterminate(true);
|
|
mainProgressDialog.setIndeterminate(true);
|
|
|
mainProgressDialog.setCancelable(false);
|
|
mainProgressDialog.setCancelable(false);
|
|
@@ -382,13 +383,13 @@ public class MainActivity extends FragmentActivity implements Scrcpy.ServiceCall
|
|
|
}
|
|
}
|
|
|
sendCommands = new SendCommands(mainHandler);
|
|
sendCommands = new SendCommands(mainHandler);
|
|
|
|
|
|
|
|
- if(!SystemUtils.isDateValid()){
|
|
|
|
|
- startButton.setEnabled(false);
|
|
|
|
|
- ((TextView)findViewById(R.id.tv_tip_info)).setText("软件需升级。");
|
|
|
|
|
- toast("软件需升级。");
|
|
|
|
|
- } else {
|
|
|
|
|
- SystemUtils.enableStartLegalNotice(MainActivity.this,startButton);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+// if(!SystemUtils.isDateValid()){
|
|
|
|
|
+// startButton.setEnabled(false);
|
|
|
|
|
+// ((TextView)findViewById(R.id.tv_tip_info)).setText("软件需升级。");
|
|
|
|
|
+// toast("软件需升级。");
|
|
|
|
|
+// } else {
|
|
|
|
|
+// SystemUtils.enableStartLegalNotice(MainActivity.this,startButton);
|
|
|
|
|
+// }
|
|
|
|
|
|
|
|
startButton.setOnClickListener(v -> {
|
|
startButton.setOnClickListener(v -> {
|
|
|
boolean isWifiOk = SystemUtils.isHotSpot(MainActivity.this);
|
|
boolean isWifiOk = SystemUtils.isHotSpot(MainActivity.this);
|
|
@@ -682,7 +683,6 @@ public class MainActivity extends FragmentActivity implements Scrcpy.ServiceCall
|
|
|
scrcpy.pause();
|
|
scrcpy.pause();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- //禁止后台运行
|
|
|
|
|
if(DISABLE_BG_RUNNING && !result_of_Rotation){
|
|
if(DISABLE_BG_RUNNING && !result_of_Rotation){
|
|
|
boolean isGranted = SystemUtils.isGranted(this);
|
|
boolean isGranted = SystemUtils.isGranted(this);
|
|
|
Log.e(LOG_TAG,isGranted+" onPause bg "+serviceBound);
|
|
Log.e(LOG_TAG,isGranted+" onPause bg "+serviceBound);
|