harald/iconsole-android
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

iiii

Browse source
This commit is contained in:
Harald Hoyer 2017-04-24 16:35:13 +02:00 committed by Harald Hoyer
parent 103e51e4d0
commit b1a55ffae8
7 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.idea/misc.xml
View file

@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

2
.idea/modules.xml
View file

@ -4,7 +4,7 @@
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/android_antlib_4-14-0/android_antlib_4-14-0.iml" filepath="$PROJECT_DIR$/android_antlib_4-14-0/android_antlib_4-14-0.iml" /> <module fileurl="file://$PROJECT_DIR$/android_antlib_4-14-0/android_antlib_4-14-0.iml" filepath="$PROJECT_DIR$/android_antlib_4-14-0/android_antlib_4-14-0.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/iconsole.iml" filepath="$PROJECT_DIR$/iconsole.iml" /> <module fileurl="file://$PROJECT_DIR$/iconsole-android.iml" filepath="$PROJECT_DIR$/iconsole-android.iml" />
</modules> </modules>
</component> </component>
</project> </project>

BIN
android_antlib_4-14-0/android_antlib_4-14-0.jar
View file

Binary file not shown.

2
android_antlib_4-14-0/build.gradle
View file

@ -1,2 +0,0 @@
configurations.maybeCreate("default")
artifacts.add("default", file('android_antlib_4-14-0.jar'))

2
app/build.gradle
View file

@ -28,5 +28,5 @@ dependencies {
compile 'com.android.support:support-v4:24.2.1' compile 'com.android.support:support-v4:24.2.1'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
compile 'com.android.support.constraint:constraint-layout:1.0.2' compile 'com.android.support.constraint:constraint-layout:1.0.2'
provided project(':android_antlib_4-14-0') compile project(':android_antlib_4-14-0')
} }

2
app/src/main/java/com/dsi/ant/channel/PredefinedNetwork.java
View file

@ -7,7 +7,7 @@ package com.dsi.ant.channel;
public enum PredefinedNetwork { public enum PredefinedNetwork {
INVALID(-1), INVALID(-1),
PUBLIC(0), PUBLIC(0),
ANT_PLUS1(1), // ANT_PLUS_1(1),
ANT_FS(2); ANT_FS(2);
private final int mRawValue; private final int mRawValue;

2
app/src/main/java/xyz/hoyer/iconsole/ChannelService.java
View file

@ -218,7 +218,7 @@ public class ChannelService extends Service
* acquireChannel(context, PredefinedNetwork, * acquireChannel(context, PredefinedNetwork,
* requiredCapabilities, desiredCapabilities). * requiredCapabilities, desiredCapabilities).
*/ */
mAntChannel = mAntChannelProvider.acquireChannel(this, PredefinedNetwork.ANT_PLUS1); mAntChannel = mAntChannelProvider.acquireChannel(this, PredefinedNetwork.ANT_PLUS_1);
/* /*
NetworkKey mNK = new NetworkKey(new byte[] { (byte)0xb9, (byte)0xa5, (byte)0x21, (byte)0xfb, NetworkKey mNK = new NetworkKey(new byte[] { (byte)0xb9, (byte)0xa5, (byte)0x21, (byte)0xfb,
(byte)0xbd, (byte)0x72, (byte)0xc3, (byte)0x45 }); (byte)0xbd, (byte)0x72, (byte)0xc3, (byte)0x45 });