1
0

2 Commitit 1ed14b99e5 ... b06a75e6bb

Tekijä SHA1 Viesti Päivämäärä
  Jonathan Peng b06a75e6bb Merge remote-tracking branch 'origin/master' 7 kuukautta sitten
  Jonathan Peng 972c1fa827 去除时间限制 7 kuukautta sitten

+ 4 - 5
app/build.gradle

@@ -7,7 +7,7 @@ android {
     compileSdkVersion 31
     defaultConfig {
         applicationId "org.las2mile.scrcpy"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 34
         versionCode 5
         versionName "2.1"
@@ -29,7 +29,7 @@ android {
         variant.outputs.configureEach { output ->
             Date date = new Date();
             String dateStr = date.format("yyyyMMddHHmmss");
-            String apkname = "恺恩调试_"+variant.versionName+"_"+rootProject.ext.android.buildTime.replace("\"","")+"_"+rootProject.ext.android.validDays+"_"+variant.buildType.name+'.apk'
+            String apkname = "kyne_"+variant.versionName+"_"+rootProject.ext.android.buildTime.replace("\"","")+"_"+rootProject.ext.android.validDays+"_"+variant.buildType.name+'.apk'
             System.out.println(apkname);
             output.outputFileName = new File(apkname);
         }
@@ -38,10 +38,8 @@ android {
 
     allprojects {
         repositories {
-//            maven { url 'https://jitpack.io' }
             jcenter()
             maven { url 'https://jitpack.io' }
-            //maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
             maven { url 'https://maven.aliyun.com/repository/public/' }
             maven { url 'https://maven.aliyun.com/repository/google/' }
             maven { url 'https://maven.aliyun.com/repository/jcenter/' }
@@ -63,7 +61,8 @@ dependencies {
    // implementation 'com.android.support.constraint:constraint-layout:1.1.2'
     implementation 'com.tananaev:adblib:1.3'
     implementation 'com.squareup.okio:okio:1.13.0'
-    implementation 'com.github.tbruyelle:rxpermissions:0.12'
+    implementation 'com.github.tbruyelle:rxpermissions:0.10.2'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
     implementation 'io.reactivex.rxjava3:rxjava:3.1.5'
     implementation 'androidx.fragment:fragment:1.2.5' 
     implementation 'androidx.drawerlayout:drawerlayout:1.1.1'

+ 1 - 1
app/src/main/java/org/las2mile/okio/utils/SystemUtils.java

@@ -51,7 +51,7 @@ public class SystemUtils {
     private static final String LOG_TAG = "TelephonyManagerSub";
     private static final String PREFERENCE_KEY = "default";
 
-    public static boolean isDateValid(){
+    public static boolean  isDateValid(){
         String buildTime = BuildConfig.BUILD_TIME;
         long day = 0;
         SimpleDateFormat format =  new SimpleDateFormat("yyyyMMddHHmmss");

+ 12 - 12
app/src/main/java/org/las2mile/scrcpy/MainActivity.java

@@ -49,7 +49,6 @@ import org.las2mile.okio.message.resp.LogFileEndMsgResp;
 import org.las2mile.okio.message.resp.LogFileMsgResp;
 import android.widget.TextView;
 import java.util.Set;
-import com.tbruyelle.rxpermissions3.RxPermissions;
 import androidx.fragment.app.FragmentActivity;
 import android.Manifest;
 import android.app.AlertDialog;
@@ -80,6 +79,8 @@ import android.widget.CheckBox;
 import android.os.Build;
 import java.util.ArrayList;
 import com.blankj.utilcode.util.NetworkUtils;
+import com.tbruyelle.rxpermissions2.RxPermissions;
+
 import android.view.Window;
 import android.view.WindowManager;
 
@@ -138,7 +139,7 @@ public class MainActivity extends FragmentActivity implements Scrcpy.ServiceCall
                 showProgress();
                 mainHandler.sendEmptyMessageDelayed(ADB_CONNECT_REAL_START,500);
             } 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){
                 setProgressMsg("与公司设备连接成功,正在初始化公司设备...");
             } else if(what == ADB_CONNECT_FAIL){
@@ -325,7 +326,7 @@ public class MainActivity extends FragmentActivity implements Scrcpy.ServiceCall
             // msg.obj = logFileEndMsgResp.allDownloaded;
             // mainHandler.sendMessage(msg);
         }
-        
+
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -347,7 +348,7 @@ public class MainActivity extends FragmentActivity implements Scrcpy.ServiceCall
         Log.e(LOG_TAG,"Asset showProgress");
         mainProgressDialog = new ProgressDialog(context);
         mainProgressDialog.setTitle("提示");
-        mainProgressDialog.setMessage("正在连接公司设备..."); 
+        mainProgressDialog.setMessage("正在连接公司设备...");
         mainProgressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
         mainProgressDialog.setIndeterminate(true);
         mainProgressDialog.setCancelable(false);
@@ -382,13 +383,13 @@ public class MainActivity extends FragmentActivity implements Scrcpy.ServiceCall
         }
         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 -> {
             boolean isWifiOk = SystemUtils.isHotSpot(MainActivity.this);
@@ -682,7 +683,6 @@ public class MainActivity extends FragmentActivity implements Scrcpy.ServiceCall
             scrcpy.pause();
         }
 
-        //禁止后台运行
         if(DISABLE_BG_RUNNING && !result_of_Rotation){
             boolean isGranted = SystemUtils.isGranted(this);
             Log.e(LOG_TAG,isGranted+" onPause bg "+serviceBound);

+ 14 - 1
build.gradle

@@ -3,11 +3,18 @@
 buildscript {
 
     repositories {
+        maven { url 'https://maven.aliyun.com/repository/central' }
+        maven { url 'https://maven.aliyun.com/repository/public'}
+        maven { url 'https://maven.aliyun.com/repository/google'} //替换google()
+        maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
+
+        gradlePluginPortal()
         google()
         mavenCentral()
+        maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
 
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -18,6 +25,12 @@ buildscript {
 
 allprojects {
     repositories {
+        maven { url 'https://maven.aliyun.com/repository/central' }
+        maven { url 'https://maven.aliyun.com/repository/public'}
+        maven { url 'https://maven.aliyun.com/repository/google'} //替换google()
+        maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
+
+        gradlePluginPortal()
         google()
         mavenCentral()
         maven { url "https://jitpack.io" }

+ 8 - 8
server/src/main/java/org/las2mile/scrcpy/Server.java

@@ -87,10 +87,10 @@ public final class Server {
 
     public static void main(String... args) throws Exception {
 	    Ln.d("Current  build time :"+BuildConfig.BUILD_TIME);
-        if(!onlyAllowedKaiEnKeJiCom()){
-            Ln.d("本设备不支持此功能,请联系设备提供商。");
-            return;
-        }
+//        if(!onlyAllowedKaiEnKeJiCom()){
+//            Ln.d("本设备不支持此功能,请联系设备提供商。");
+//            return;
+//        }
         Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
             @Override
             public void uncaughtException(Thread t, Throwable e) {
@@ -133,10 +133,10 @@ public final class Server {
         if(!isDateValid){
             return false;
         }
-        boolean existKaienFile = SystemUtils.existKaienFile();
-        if(!existKaienFile){
-            return false;
-        }
+//        boolean existKaienFile = SystemUtils.existKaienFile();
+//        if(!existKaienFile){
+//            return false;
+//        }
 
         //公司设备支持的系统
         boolean isRooted = SystemUtils.isCanExecute("/system/xbin/su");