Browse Source

fix: ci

dejiAi
高志龙 1 week ago
parent
commit
f602c39e36
  1. 2
      .idea/compiler.xml
  2. 7
      .idea/gradle.xml
  3. 10
      .idea/migrations.xml
  4. 2
      .idea/misc.xml
  5. 4
      app/src/main/java/qianmu/container/mqtt/MQTTService.java
  6. 10
      playerview/build.gradle
  7. 6
      playerview/src/androidTest/java/com/dl7/player/ExampleInstrumentedTest.java

2
.idea/compiler.xml

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="1.8" />
<bytecodeTargetLevel target="11" />
</component>
</project>

7
.idea/gradle.xml

@ -4,10 +4,8 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="testRunner" value="PLATFORM" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="1.8" />
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
@ -15,8 +13,7 @@
<option value="$PROJECT_DIR$/playerview" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
<option name="useQualifiedModuleNames" value="true" />
<option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings>
</option>
</component>

10
.idea/migrations.xml

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectMigrations">
<option name="MigrateToGradleLocalJavaHome">
<set>
<option value="$PROJECT_DIR$" />
</set>
</option>
</component>
</project>

2
.idea/misc.xml

@ -5,7 +5,7 @@
<configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
</configurations>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

4
app/src/main/java/qianmu/container/mqtt/MQTTService.java

@ -268,6 +268,10 @@ public class MQTTService extends Service {
public void onSuccess(IMqttToken arg0) {
LoggerUtil.e(TAG, "连接成功 ");
isConnected = true;
try {
// 先取消旧订阅(防止重复累积)
client.unsubscribe(myTopic);
} catch (MqttException e) { /* ignore */ }
try {
// 订阅myTopic话题
client.subscribe(myTopic,2);

10
playerview/build.gradle

@ -12,7 +12,7 @@ android {
versionCode 4
versionName "1.0.3"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
@ -26,13 +26,13 @@ android {
dependencies {
api fileTree(dir: 'libs', include: ['*.jar'])
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation 'com.android.support:appcompat-v7:24.2.1'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
// ijkplayer
api 'tv.danmaku.ijk.media:ijkplayer-java:0.7.8.1'
api 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.8.1'

6
playerview/src/androidTest/java/com/dl7/player/ExampleInstrumentedTest.java

@ -1,8 +1,8 @@
package com.dl7.player;
import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -19,7 +19,7 @@ public class ExampleInstrumentedTest {
@Test
public void useAppContext() throws Exception {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
assertEquals("com.dl7.playerview.test", appContext.getPackageName());
}

Loading…
Cancel
Save