java17
This commit is contained in:
parent
a8dc0a192f
commit
f0fb142fea
|
|
@ -4,10 +4,9 @@
|
|||
<component name="GradleSettings">
|
||||
<option name="linkedExternalProjectsSettings">
|
||||
<GradleProjectSettings>
|
||||
<option name="testRunner" value="GRADLE" />
|
||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||
<option name="testRunner" value="CHOOSE_PER_TEST" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="gradleJvm" value="jbr-17" />
|
||||
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
|
||||
<option name="modules">
|
||||
<set>
|
||||
<option value="$PROJECT_DIR$" />
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="EntryPointsManager">
|
||||
<list size="1">
|
||||
|
|
@ -5,7 +6,7 @@
|
|||
</list>
|
||||
</component>
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="zulu-17" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
|
|
|
|||
|
|
@ -11,14 +11,96 @@ android {
|
|||
minSdk 21
|
||||
targetSdk 34
|
||||
versionCode 1
|
||||
versionName "2.2.16-N"
|
||||
versionName "2.2.1-N"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
// buildTypes {
|
||||
// release {
|
||||
// minifyEnabled false
|
||||
// proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||
// }
|
||||
// }
|
||||
signingConfigs {
|
||||
config { //常用 通用
|
||||
keyAlias 'xy'
|
||||
keyPassword '111111'
|
||||
storeFile file('D:/zp/Android/GitConn/xy_keystore')
|
||||
//storeFile file('/home/yzd/work/sign/xy_keystore')
|
||||
storePassword '111111'
|
||||
}
|
||||
|
||||
|
||||
M {//美格 //A7
|
||||
keyAlias 'xixun'
|
||||
keyPassword '123456'
|
||||
storeFile file('D:/XixunSoftware/ZP/conn/xixun-m.keystore')
|
||||
storePassword '123456'
|
||||
}
|
||||
|
||||
Y5a { //A9
|
||||
keyAlias 'xixun'
|
||||
keyPassword '123456'
|
||||
storeFile file('D:/zp/Android/GitConn/xixun-c.keystore')
|
||||
storePassword '123456'
|
||||
}
|
||||
|
||||
D { //A11 系统签名 卓策
|
||||
keyAlias 'xixun'
|
||||
keyPassword '123456'
|
||||
storeFile file('D:/zp/Android/GitConn/xixun-d.keystore')
|
||||
storePassword '123456'
|
||||
}
|
||||
|
||||
D_3566 { //A11 系统签名-新
|
||||
keyAlias 'platform'
|
||||
keyPassword 'youngfeel'
|
||||
storeFile file('D:/XixunSoftware/ZP/conn/yf356x_android11_system.jks')
|
||||
storePassword 'youngfeel'
|
||||
}
|
||||
|
||||
Y33 { // 系统签名
|
||||
keyAlias 'xixun'
|
||||
keyPassword '123456'
|
||||
storeFile file('D:/XixunSoftware/ZP/conn/xixun-x.keystore')
|
||||
storePassword '123456'
|
||||
}
|
||||
|
||||
D_3568 {//3568 //恩泰世3568
|
||||
keyAlias 'systemkey'
|
||||
keyPassword '123456'
|
||||
storeFile file('D:/zp/Android/GitConn/platform.jks')
|
||||
storePassword '123456'
|
||||
}
|
||||
D_gt {//3568 //高通
|
||||
keyAlias 'androiddebugkey'
|
||||
keyPassword 'android'
|
||||
storeFile file('D:/zp/Android/GitConn/platform.keystore')
|
||||
storePassword 'android'
|
||||
}
|
||||
|
||||
a133 {//全志 a133
|
||||
keyAlias 'platform'
|
||||
keyPassword 'youngfeel'
|
||||
storeFile file('D:/zp/Android/GitConn/android11_system.jks')
|
||||
storePassword 'youngfeel'
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
|
||||
signingConfig signingConfigs.D_3568
|
||||
}
|
||||
debug {
|
||||
signingConfig signingConfigs.D_3568
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -36,9 +118,9 @@ dependencies {
|
|||
implementation 'androidx.appcompat:appcompat:1.6.1'
|
||||
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.25'
|
||||
implementation 'com.aliyun:imageaudit20191230:2.0.6'
|
||||
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-core:1.0.19'
|
||||
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-armeabi-v7a:1.0.19'
|
||||
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-arm64-v8a:1.0.19'
|
||||
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-core:1.0.19'
|
||||
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-armeabi-v7a:1.0.19'
|
||||
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-arm64-v8a:1.0.19'
|
||||
implementation files('libs/gnph.jar')
|
||||
implementation files('libs/zip4j-2.10.0.jar')
|
||||
implementation files('libs/xixun_card_settings_1.2.4.jar')
|
||||
|
|
@ -61,3 +143,8 @@ android.applicationVariants.configureEach { variant ->
|
|||
outputFileName = fileName
|
||||
}
|
||||
}
|
||||
|
||||
//修改内容:
|
||||
//D:\zp\Android\XixunPlayer_zp\XixunPlayer\app\build.gradle
|
||||
//D:\zp\Android\XixunPlayer_zp\XixunPlayer\gradle\wrapper\gradle-wrapper.properties
|
||||
//配置使用java17
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools" >
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:sharedUserId="android.uid.system">
|
||||
<!-- android:sharedUserId="android.uid.system"-->
|
||||
<!-- android:sharedUserMaxSdkVersion="32">-->
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package com.xixun.xixunplayer;
|
|||
import static android.view.View.VISIBLE;
|
||||
|
||||
import android.app.ActivityManager;
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.graphics.BitmapFactory;
|
||||
|
|
@ -152,10 +153,11 @@ public class TCPThread extends Thread {
|
|||
MainService.ins.startActivity(intent);
|
||||
}
|
||||
}
|
||||
if(MainService.ins!=null) {
|
||||
if(MainService.ins!=null) { //周鹏注释
|
||||
var intent = new Intent("com.xixun.AccessibilityService");
|
||||
intent.putExtra("newProgram", "TCP");
|
||||
MainService.ins.sendBroadcast(intent);
|
||||
|
||||
}
|
||||
}
|
||||
} else if("playZipTask".equals(_type)) {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#Wed Oct 11 11:55:49 CST 2023
|
||||
#Fri Aug 22 14:42:52 CST 2025
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user