This commit is contained in:
Harald Hoyer 2021-06-24 09:23:03 +02:00
parent 449c7e34f4
commit d2ab7de012
4 changed files with 4 additions and 4 deletions

View file

@ -45,8 +45,9 @@
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1" level="project" /> <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1" level="project" />
<orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1" level="project" /> <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3" level="project" /> <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:2.0.4" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:gridlayout-v7:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:gridlayout-v7:28.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout:2.0.4@aar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:28.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-v13:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-v13:28.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-v4:28.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-v4:28.0.0@aar" level="project" />
@ -77,7 +78,6 @@
<orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar" level="project" /> <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" level="project" /> <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" /> <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout:1.1.3@aar" level="project" />
<orderEntry type="module" module-name="iconsole-android.android_antlib_4-14" /> <orderEntry type="module" module-name="iconsole-android.android_antlib_4-14" />
</component> </component>
</module> </module>

View file

@ -29,7 +29,7 @@ dependencies {
implementation "com.android.support:cardview-v7:28.0.0" implementation "com.android.support:cardview-v7:28.0.0"
implementation "com.android.support:appcompat-v7:28.0.0" implementation "com.android.support:appcompat-v7:28.0.0"
implementation 'com.android.support:support-v13:28.0.0' implementation 'com.android.support:support-v13:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'com.android.support.constraint:constraint-layout:2.0.4'
implementation project(':android_antlib_4-14') implementation project(':android_antlib_4-14')
} }

View file

@ -99,7 +99,7 @@ public class BluetoothChatFragment extends Fragment {
return; return;
IConsole.Data data = (IConsole.Data) msg.obj; IConsole.Data data = (IConsole.Data) msg.obj;
theFrag.mChannelService.setSpeed(data.mSpeed10 / 10.0); theFrag.mChannelService.setSpeed(data.mSpeed10 / 10.0);
theFrag.mChannelService.setPower(data.mPower10 * 9 / 100); theFrag.mChannelService.setPower(data.mPower10 / 10);
theFrag.mChannelService.setCadence(data.mRPM); theFrag.mChannelService.setCadence(data.mRPM);
theFrag.mSpeedText.setText(String.format("% 3.1f", data.mSpeed10 / 10.0)); theFrag.mSpeedText.setText(String.format("% 3.1f", data.mSpeed10 / 10.0));