Some Bugs fixed again
This commit is contained in:
parent
183f1e0b13
commit
370a9410ef
6
.idea/encodings.xml
generated
Normal file
6
.idea/encodings.xml
generated
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="Encoding">
|
||||||
|
<file url="PROJECT" charset="UTF-8" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
226
.idea/findbugs-idea.xml
generated
Normal file
226
.idea/findbugs-idea.xml
generated
Normal file
@ -0,0 +1,226 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="org.twodividedbyzero.idea.findbugs">
|
||||||
|
<option name="annotationTypeSettings">
|
||||||
|
<map>
|
||||||
|
<entry key="ExpPriority" value="-16777216;-1;-8355712;WAVE_UNDERSCORE;0;" />
|
||||||
|
<entry key="HighPriority" value="-65536;-1;-65536;WAVE_UNDERSCORE;1;" />
|
||||||
|
<entry key="IgnorePriority" value="-16777216;-1;-8650628;WAVE_UNDERSCORE;0;" />
|
||||||
|
<entry key="LowPriority" value="-16777216;-1;-16711936;BOXED;0;" />
|
||||||
|
<entry key="NormalPriority" value="-16777216;-1;-5066240;WAVE_UNDERSCORE;2;" />
|
||||||
|
</map>
|
||||||
|
</option>
|
||||||
|
<option name="_basePreferences">
|
||||||
|
<map>
|
||||||
|
<entry key="property.analysisEffortLevel" value="default" />
|
||||||
|
<entry key="property.analyzeAfterAutoMake" value="false" />
|
||||||
|
<entry key="property.analyzeAfterCompile" value="false" />
|
||||||
|
<entry key="property.annotationGutterIconEnabled" value="true" />
|
||||||
|
<entry key="property.annotationSuppressWarningsClass" value="edu.umd.cs.findbugs.annotations.SuppressFBWarnings" />
|
||||||
|
<entry key="property.annotationTextRangeMarkupEnabled" value="true" />
|
||||||
|
<entry key="property.exportAsHtml" value="true" />
|
||||||
|
<entry key="property.exportAsXml" value="true" />
|
||||||
|
<entry key="property.exportBaseDir" value="" />
|
||||||
|
<entry key="property.exportCreateArchiveDir" value="false" />
|
||||||
|
<entry key="property.exportOpenBrowser" value="true" />
|
||||||
|
<entry key="property.minPriorityToReport" value="Medium" />
|
||||||
|
<entry key="property.runAnalysisInBackground" value="false" />
|
||||||
|
<entry key="property.showHiddenDetectors" value="false" />
|
||||||
|
<entry key="property.toolWindowToFront" value="true" />
|
||||||
|
</map>
|
||||||
|
</option>
|
||||||
|
<option name="_detectors">
|
||||||
|
<map>
|
||||||
|
<entry key="AppendingToAnObjectOutputStream" value="true" />
|
||||||
|
<entry key="AtomicityProblem" value="true" />
|
||||||
|
<entry key="BadAppletConstructor" value="false" />
|
||||||
|
<entry key="BadResultSetAccess" value="true" />
|
||||||
|
<entry key="BadSyntaxForRegularExpression" value="true" />
|
||||||
|
<entry key="BadUseOfReturnValue" value="true" />
|
||||||
|
<entry key="BadlyOverriddenAdapter" value="true" />
|
||||||
|
<entry key="BooleanReturnNull" value="true" />
|
||||||
|
<entry key="BuildInterproceduralCallGraph" value="false" />
|
||||||
|
<entry key="BuildObligationPolicyDatabase" value="true" />
|
||||||
|
<entry key="BuildStringPassthruGraph" value="true" />
|
||||||
|
<entry key="CallToUnsupportedMethod" value="false" />
|
||||||
|
<entry key="CalledMethods" value="true" />
|
||||||
|
<entry key="CheckCalls" value="false" />
|
||||||
|
<entry key="CheckExpectedWarnings" value="false" />
|
||||||
|
<entry key="CheckImmutableAnnotation" value="true" />
|
||||||
|
<entry key="CheckRelaxingNullnessAnnotation" value="true" />
|
||||||
|
<entry key="CheckTypeQualifiers" value="true" />
|
||||||
|
<entry key="CloneIdiom" value="true" />
|
||||||
|
<entry key="ComparatorIdiom" value="true" />
|
||||||
|
<entry key="ConfusedInheritance" value="true" />
|
||||||
|
<entry key="ConfusionBetweenInheritedAndOuterMethod" value="true" />
|
||||||
|
<entry key="CovariantArrayAssignment" value="false" />
|
||||||
|
<entry key="CrossSiteScripting" value="true" />
|
||||||
|
<entry key="DefaultEncodingDetector" value="true" />
|
||||||
|
<entry key="DoInsideDoPrivileged" value="true" />
|
||||||
|
<entry key="DontCatchIllegalMonitorStateException" value="true" />
|
||||||
|
<entry key="DontIgnoreResultOfPutIfAbsent" value="true" />
|
||||||
|
<entry key="DontUseEnum" value="true" />
|
||||||
|
<entry key="DroppedException" value="true" />
|
||||||
|
<entry key="DumbMethodInvocations" value="true" />
|
||||||
|
<entry key="DumbMethods" value="true" />
|
||||||
|
<entry key="DuplicateBranches" value="true" />
|
||||||
|
<entry key="EmptyZipFileEntry" value="false" />
|
||||||
|
<entry key="EqualsOperandShouldHaveClassCompatibleWithThis" value="true" />
|
||||||
|
<entry key="ExplicitSerialization" value="true" />
|
||||||
|
<entry key="FieldItemSummary" value="true" />
|
||||||
|
<entry key="FinalizerNullsFields" value="true" />
|
||||||
|
<entry key="FindBadCast2" value="true" />
|
||||||
|
<entry key="FindBadForLoop" value="true" />
|
||||||
|
<entry key="FindBugsSummaryStats" value="true" />
|
||||||
|
<entry key="FindCircularDependencies" value="false" />
|
||||||
|
<entry key="FindComparatorProblems" value="true" />
|
||||||
|
<entry key="FindDeadLocalStores" value="true" />
|
||||||
|
<entry key="FindDoubleCheck" value="true" />
|
||||||
|
<entry key="FindEmptySynchronizedBlock" value="true" />
|
||||||
|
<entry key="FindFieldSelfAssignment" value="true" />
|
||||||
|
<entry key="FindFinalizeInvocations" value="true" />
|
||||||
|
<entry key="FindFloatEquality" value="true" />
|
||||||
|
<entry key="FindFloatMath" value="false" />
|
||||||
|
<entry key="FindHEmismatch" value="true" />
|
||||||
|
<entry key="FindInconsistentSync2" value="true" />
|
||||||
|
<entry key="FindJSR166LockMonitorenter" value="true" />
|
||||||
|
<entry key="FindLocalSelfAssignment2" value="true" />
|
||||||
|
<entry key="FindMaskedFields" value="true" />
|
||||||
|
<entry key="FindMismatchedWaitOrNotify" value="true" />
|
||||||
|
<entry key="FindNakedNotify" value="true" />
|
||||||
|
<entry key="FindNoSideEffectMethods" value="true" />
|
||||||
|
<entry key="FindNonSerializableStoreIntoSession" value="false" />
|
||||||
|
<entry key="FindNonSerializableValuePassedToWriteObject" value="false" />
|
||||||
|
<entry key="FindNonShortCircuit" value="true" />
|
||||||
|
<entry key="FindNullDeref" value="true" />
|
||||||
|
<entry key="FindNullDerefsInvolvingNonShortCircuitEvaluation" value="true" />
|
||||||
|
<entry key="FindOpenStream" value="true" />
|
||||||
|
<entry key="FindPuzzlers" value="true" />
|
||||||
|
<entry key="FindRefComparison" value="true" />
|
||||||
|
<entry key="FindReturnRef" value="true" />
|
||||||
|
<entry key="FindRoughConstants" value="true" />
|
||||||
|
<entry key="FindRunInvocations" value="true" />
|
||||||
|
<entry key="FindSelfComparison" value="true" />
|
||||||
|
<entry key="FindSelfComparison2" value="true" />
|
||||||
|
<entry key="FindSleepWithLockHeld" value="true" />
|
||||||
|
<entry key="FindSpinLoop" value="true" />
|
||||||
|
<entry key="FindSqlInjection" value="true" />
|
||||||
|
<entry key="FindTwoLockWait" value="true" />
|
||||||
|
<entry key="FindUncalledPrivateMethods" value="true" />
|
||||||
|
<entry key="FindUnconditionalWait" value="true" />
|
||||||
|
<entry key="FindUninitializedGet" value="true" />
|
||||||
|
<entry key="FindUnrelatedTypesInGenericContainer" value="true" />
|
||||||
|
<entry key="FindUnreleasedLock" value="true" />
|
||||||
|
<entry key="FindUnsatisfiedObligation" value="true" />
|
||||||
|
<entry key="FindUnsyncGet" value="true" />
|
||||||
|
<entry key="FindUseOfNonSerializableValue" value="true" />
|
||||||
|
<entry key="FindUselessControlFlow" value="true" />
|
||||||
|
<entry key="FindUselessObjects" value="true" />
|
||||||
|
<entry key="FormatStringChecker" value="true" />
|
||||||
|
<entry key="FunctionsThatMightBeMistakenForProcedures" value="true" />
|
||||||
|
<entry key="HugeSharedStringConstants" value="true" />
|
||||||
|
<entry key="IDivResultCastToDouble" value="true" />
|
||||||
|
<entry key="IncompatMask" value="true" />
|
||||||
|
<entry key="InconsistentAnnotations" value="true" />
|
||||||
|
<entry key="InefficientIndexOf" value="false" />
|
||||||
|
<entry key="InefficientInitializationInsideLoop" value="false" />
|
||||||
|
<entry key="InefficientMemberAccess" value="false" />
|
||||||
|
<entry key="InefficientToArray" value="false" />
|
||||||
|
<entry key="InfiniteLoop" value="true" />
|
||||||
|
<entry key="InfiniteRecursiveLoop" value="true" />
|
||||||
|
<entry key="InheritanceUnsafeGetResource" value="true" />
|
||||||
|
<entry key="InitializationChain" value="true" />
|
||||||
|
<entry key="InitializeNonnullFieldsInConstructor" value="true" />
|
||||||
|
<entry key="InstantiateStaticClass" value="true" />
|
||||||
|
<entry key="IntCast2LongAsInstant" value="true" />
|
||||||
|
<entry key="InvalidJUnitTest" value="true" />
|
||||||
|
<entry key="IteratorIdioms" value="true" />
|
||||||
|
<entry key="LazyInit" value="true" />
|
||||||
|
<entry key="LoadOfKnownNullValue" value="true" />
|
||||||
|
<entry key="LostLoggerDueToWeakReference" value="true" />
|
||||||
|
<entry key="MethodReturnCheck" value="true" />
|
||||||
|
<entry key="Methods" value="true" />
|
||||||
|
<entry key="MultithreadedInstanceAccess" value="true" />
|
||||||
|
<entry key="MutableEnum" value="true" />
|
||||||
|
<entry key="MutableLock" value="true" />
|
||||||
|
<entry key="MutableStaticFields" value="true" />
|
||||||
|
<entry key="Naming" value="true" />
|
||||||
|
<entry key="Noise" value="false" />
|
||||||
|
<entry key="NoiseNullDeref" value="false" />
|
||||||
|
<entry key="NoteAnnotationRetention" value="true" />
|
||||||
|
<entry key="NoteCheckReturnValueAnnotations" value="true" />
|
||||||
|
<entry key="NoteDirectlyRelevantTypeQualifiers" value="true" />
|
||||||
|
<entry key="NoteJCIPAnnotation" value="true" />
|
||||||
|
<entry key="NoteNonNullAnnotations" value="false" />
|
||||||
|
<entry key="NoteNonnullReturnValues" value="false" />
|
||||||
|
<entry key="NoteSuppressedWarnings" value="true" />
|
||||||
|
<entry key="NoteUnconditionalParamDerefs" value="true" />
|
||||||
|
<entry key="NumberConstructor" value="true" />
|
||||||
|
<entry key="OptionalReturnNull" value="true" />
|
||||||
|
<entry key="OverridingEqualsNotSymmetrical" value="true" />
|
||||||
|
<entry key="PreferZeroLengthArrays" value="true" />
|
||||||
|
<entry key="PublicSemaphores" value="false" />
|
||||||
|
<entry key="QuestionableBooleanAssignment" value="true" />
|
||||||
|
<entry key="ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass" value="true" />
|
||||||
|
<entry key="ReadReturnShouldBeChecked" value="true" />
|
||||||
|
<entry key="RedundantConditions" value="true" />
|
||||||
|
<entry key="RedundantInterfaces" value="true" />
|
||||||
|
<entry key="ReflectiveClasses" value="true" />
|
||||||
|
<entry key="RepeatedConditionals" value="true" />
|
||||||
|
<entry key="ResolveAllReferences" value="false" />
|
||||||
|
<entry key="RuntimeExceptionCapture" value="true" />
|
||||||
|
<entry key="SerializableIdiom" value="true" />
|
||||||
|
<entry key="StartInConstructor" value="true" />
|
||||||
|
<entry key="StaticCalendarDetector" value="true" />
|
||||||
|
<entry key="StringConcatenation" value="true" />
|
||||||
|
<entry key="SuperfluousInstanceOf" value="true" />
|
||||||
|
<entry key="SuspiciousThreadInterrupted" value="true" />
|
||||||
|
<entry key="SwitchFallthrough" value="true" />
|
||||||
|
<entry key="SynchronizationOnSharedBuiltinConstant" value="true" />
|
||||||
|
<entry key="SynchronizeAndNullCheckField" value="true" />
|
||||||
|
<entry key="SynchronizeOnClassLiteralNotGetClass" value="true" />
|
||||||
|
<entry key="SynchronizingOnContentsOfFieldToProtectField" value="true" />
|
||||||
|
<entry key="TestASM" value="false" />
|
||||||
|
<entry key="TestDataflowAnalysis" value="false" />
|
||||||
|
<entry key="TestingGround" value="false" />
|
||||||
|
<entry key="TestingGround2" value="false" />
|
||||||
|
<entry key="TrainFieldStoreTypes" value="true" />
|
||||||
|
<entry key="TrainLongInstantfParams" value="true" />
|
||||||
|
<entry key="TrainNonNullAnnotations" value="true" />
|
||||||
|
<entry key="TrainUnconditionalDerefParams" value="true" />
|
||||||
|
<entry key="URLProblems" value="true" />
|
||||||
|
<entry key="UncallableMethodOfAnonymousClass" value="true" />
|
||||||
|
<entry key="UnnecessaryMath" value="true" />
|
||||||
|
<entry key="UnreadFields" value="true" />
|
||||||
|
<entry key="UselessSubclassMethod" value="false" />
|
||||||
|
<entry key="VarArgsProblems" value="true" />
|
||||||
|
<entry key="VolatileUsage" value="true" />
|
||||||
|
<entry key="WaitInLoop" value="true" />
|
||||||
|
<entry key="WrongMapIterator" value="true" />
|
||||||
|
<entry key="XMLFactoryBypass" value="true" />
|
||||||
|
</map>
|
||||||
|
</option>
|
||||||
|
<option name="_reportCategories">
|
||||||
|
<map>
|
||||||
|
<entry key="BAD_PRACTICE" value="true" />
|
||||||
|
<entry key="CORRECTNESS" value="true" />
|
||||||
|
<entry key="EXPERIMENTAL" value="true" />
|
||||||
|
<entry key="I18N" value="true" />
|
||||||
|
<entry key="MALICIOUS_CODE" value="true" />
|
||||||
|
<entry key="MT_CORRECTNESS" value="true" />
|
||||||
|
<entry key="PERFORMANCE" value="true" />
|
||||||
|
<entry key="SECURITY" value="true" />
|
||||||
|
<entry key="STYLE" value="true" />
|
||||||
|
</map>
|
||||||
|
</option>
|
||||||
|
<option name="_annotationTypeSettings">
|
||||||
|
<map>
|
||||||
|
<entry key="ExpPriority" value="-16777216;-1;-8355712;WAVE_UNDERSCORE;0;" />
|
||||||
|
<entry key="HighPriority" value="-65536;-1;-65536;WAVE_UNDERSCORE;1;" />
|
||||||
|
<entry key="IgnorePriority" value="-16777216;-1;-8650628;WAVE_UNDERSCORE;0;" />
|
||||||
|
<entry key="LowPriority" value="-16777216;-1;-16711936;BOXED;0;" />
|
||||||
|
<entry key="NormalPriority" value="-16777216;-1;-5066240;WAVE_UNDERSCORE;2;" />
|
||||||
|
</map>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@ -36,4 +36,6 @@ dependencies {
|
|||||||
compile('org.eclipse.paho:org.eclipse.paho.android.service:1.0.2') {
|
compile('org.eclipse.paho:org.eclipse.paho.android.service:1.0.2') {
|
||||||
exclude module: 'support-v4'
|
exclude module: 'support-v4'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//apply plugin: 'checkstyle'
|
||||||
|
|||||||
@ -34,9 +34,9 @@ public class DimmMainActivity extends AppCompatActivity {
|
|||||||
private Button buttonSet, buttonReconnect;
|
private Button buttonSet, buttonReconnect;
|
||||||
private Integer color;
|
private Integer color;
|
||||||
private MqttAndroidClient client;
|
private MqttAndroidClient client;
|
||||||
private String device = "receiver";
|
private String device = "sender";
|
||||||
private String publisher_topic;
|
private String publisher_topic;
|
||||||
private String broker = "tcp://raspi2:1883";
|
private String broker = "tcp://172.23.4.17:1883";
|
||||||
private Spinner spinnerlights;
|
private Spinner spinnerlights;
|
||||||
private CheckBox checkBoxInstantSet;
|
private CheckBox checkBoxInstantSet;
|
||||||
private String[] adapter;
|
private String[] adapter;
|
||||||
@ -58,7 +58,7 @@ public class DimmMainActivity extends AppCompatActivity {
|
|||||||
spinnerlights = (Spinner) findViewById(R.id.spinnerLights);
|
spinnerlights = (Spinner) findViewById(R.id.spinnerLights);
|
||||||
spinnerlights.setAdapter(new ArrayAdapter<String>(this, R.layout.support_simple_spinner_dropdown_item, adapter));
|
spinnerlights.setAdapter(new ArrayAdapter<String>(this, R.layout.support_simple_spinner_dropdown_item, adapter));
|
||||||
|
|
||||||
publisher_topic = "kitchen/switch/android/" + device == "sender"?getWifiMacAddress():"#";
|
publisher_topic = "kitchen/switch/android/" + getWifiMacAddress();
|
||||||
|
|
||||||
red.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
|
red.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
|
||||||
@Override
|
@Override
|
||||||
@ -146,7 +146,7 @@ public class DimmMainActivity extends AppCompatActivity {
|
|||||||
//String topic = publisher_topic;sf
|
//String topic = publisher_topic;sf
|
||||||
//String payload = Integer.toHexString(color);
|
//String payload = Integer.toHexString(color);
|
||||||
|
|
||||||
if(sendCommand) SendCommand(spinnerlights.getSelectedItem().toString() + "; " + Integer.toHexString(color).substring(2), publisher_topic);
|
if(sendCommand) SendCommand(spinnerlights.getSelectedItem().toString() + ";" +Integer.toHexString(color).substring(2), publisher_topic);
|
||||||
}
|
}
|
||||||
else if(!client.isConnected() && device == "sender")
|
else if(!client.isConnected() && device == "sender")
|
||||||
{
|
{
|
||||||
|
|||||||
@ -5,7 +5,7 @@ buildscript {
|
|||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:1.5.0'
|
classpath 'com.android.tools.build:gradle:2.1.0'
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
|
|||||||
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
|||||||
#Wed Oct 21 11:34:03 PDT 2015
|
#Mon May 02 19:23:46 CEST 2016
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user