diff --git a/Paint_UDPV2_03/.project b/Paint_UDPV2_03/.project index 1bb9d31..f881570 100644 --- a/Paint_UDPV2_03/.project +++ b/Paint_UDPV2_03/.project @@ -1,6 +1,6 @@ - Paint_UDPV2_03 + Paint_UDPV2_04 diff --git a/Paint_UDPV2_03/Core/FSM/Src/fsm_state_control.c b/Paint_UDPV2_03/Core/FSM/Src/fsm_state_control.c index 3083244..3c560f0 100644 --- a/Paint_UDPV2_03/Core/FSM/Src/fsm_state_control.c +++ b/Paint_UDPV2_03/Core/FSM/Src/fsm_state_control.c @@ -428,7 +428,7 @@ void IV_control() IV.Left_Motor_Err = GV.LeftMotor.Motor_Fault; IV.Right_Motor_Err = GV.RightMotor.Motor_Fault; IV.TimeStamp = SystemTimeMiliCount; - IV.STM_Version = 203; + IV.STM_Version = 204; } /* 测试喷枪控制* */ void PaintGunControl() diff --git a/Paint_UDPV2_03/Paint_UDPV2_03.ioc b/Paint_UDPV2_03/Paint_UDPV2_04.ioc similarity index 100% rename from Paint_UDPV2_03/Paint_UDPV2_03.ioc rename to Paint_UDPV2_03/Paint_UDPV2_04.ioc diff --git a/PaintingappV2.03/.gradle/8.2/executionHistory/executionHistory.bin b/PaintingappV2.03/.gradle/8.2/executionHistory/executionHistory.bin index dac87b1..0883e86 100644 Binary files a/PaintingappV2.03/.gradle/8.2/executionHistory/executionHistory.bin and b/PaintingappV2.03/.gradle/8.2/executionHistory/executionHistory.bin differ diff --git a/PaintingappV2.03/.gradle/8.2/executionHistory/executionHistory.lock b/PaintingappV2.03/.gradle/8.2/executionHistory/executionHistory.lock index 74b2b0b..7431a75 100644 Binary files a/PaintingappV2.03/.gradle/8.2/executionHistory/executionHistory.lock and b/PaintingappV2.03/.gradle/8.2/executionHistory/executionHistory.lock differ diff --git a/PaintingappV2.03/.gradle/8.2/fileHashes/fileHashes.bin b/PaintingappV2.03/.gradle/8.2/fileHashes/fileHashes.bin index 75d053c..5556a75 100644 Binary files a/PaintingappV2.03/.gradle/8.2/fileHashes/fileHashes.bin and b/PaintingappV2.03/.gradle/8.2/fileHashes/fileHashes.bin differ diff --git a/PaintingappV2.03/.gradle/8.2/fileHashes/fileHashes.lock b/PaintingappV2.03/.gradle/8.2/fileHashes/fileHashes.lock index 5b95b21..4155f93 100644 Binary files a/PaintingappV2.03/.gradle/8.2/fileHashes/fileHashes.lock and b/PaintingappV2.03/.gradle/8.2/fileHashes/fileHashes.lock differ diff --git a/PaintingappV2.03/.gradle/8.2/fileHashes/resourceHashesCache.bin b/PaintingappV2.03/.gradle/8.2/fileHashes/resourceHashesCache.bin index 079238b..6bc5280 100644 Binary files a/PaintingappV2.03/.gradle/8.2/fileHashes/resourceHashesCache.bin and b/PaintingappV2.03/.gradle/8.2/fileHashes/resourceHashesCache.bin differ diff --git a/PaintingappV2.03/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/PaintingappV2.03/.gradle/buildOutputCleanup/buildOutputCleanup.lock index f1688cc..c87201c 100644 Binary files a/PaintingappV2.03/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/PaintingappV2.03/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/PaintingappV2.03/.gradle/buildOutputCleanup/outputFiles.bin b/PaintingappV2.03/.gradle/buildOutputCleanup/outputFiles.bin index 5a92dc7..11ec258 100644 Binary files a/PaintingappV2.03/.gradle/buildOutputCleanup/outputFiles.bin and b/PaintingappV2.03/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/PaintingappV2.03/.gradle/file-system.probe b/PaintingappV2.03/.gradle/file-system.probe index 1d298d2..8d03943 100644 Binary files a/PaintingappV2.03/.gradle/file-system.probe and b/PaintingappV2.03/.gradle/file-system.probe differ diff --git a/PaintingappV2.03/.idea/.name b/PaintingappV2.03/.idea/.name index 6c09b41..a8b911f 100644 --- a/PaintingappV2.03/.idea/.name +++ b/PaintingappV2.03/.idea/.name @@ -1 +1 @@ -PaintingappV2.03 \ No newline at end of file +PaintingappV2.04 \ No newline at end of file diff --git a/PaintingappV2.03/app/build.gradle b/PaintingappV2.03/app/build.gradle index e479d04..0919019 100644 --- a/PaintingappV2.03/app/build.gradle +++ b/PaintingappV2.03/app/build.gradle @@ -3,7 +3,7 @@ plugins { } android { - namespace 'com.example.paintingappv2_03' + namespace 'com.example.paintingappv2_04' compileSdk 34 viewBinding { @@ -15,7 +15,7 @@ android { enabled true } defaultConfig { - applicationId "com.example.paintingappv2_03" + applicationId "com.example.paintingappv2_04" minSdk 24 targetSdk 34 versionCode 1 @@ -25,7 +25,7 @@ android { } android.applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "Painting203.apk" + outputFileName = "Painting204.apk" } } buildTypes { diff --git a/PaintingappV2.03/app/src/androidTest/java/com/example/paintingappv2_03/ExampleInstrumentedTest.java b/PaintingappV2.03/app/src/androidTest/java/com/example/paintingappv2_04/ExampleInstrumentedTest.java similarity index 100% rename from PaintingappV2.03/app/src/androidTest/java/com/example/paintingappv2_03/ExampleInstrumentedTest.java rename to PaintingappV2.03/app/src/androidTest/java/com/example/paintingappv2_04/ExampleInstrumentedTest.java diff --git a/PaintingappV2.03/app/src/main/java/bsp_Error.proto b/PaintingappV2.03/app/src/main/java/bsp_Error.proto index f4dcb71..5718fa0 100644 --- a/PaintingappV2.03/app/src/main/java/bsp_Error.proto +++ b/PaintingappV2.03/app/src/main/java/bsp_Error.proto @@ -1,6 +1,6 @@ syntax = "proto3"; option java_multiple_files = false; -option java_package = "com.example.paintingappv2_03.models"; +option java_package = "com.example.paintingappv2_04.models"; message ErrorData { int32 Com_Error_Code=1; diff --git a/PaintingappV2.03/app/src/main/java/bsp_IV.proto b/PaintingappV2.03/app/src/main/java/bsp_IV.proto index 157d360..fb16309 100644 --- a/PaintingappV2.03/app/src/main/java/bsp_IV.proto +++ b/PaintingappV2.03/app/src/main/java/bsp_IV.proto @@ -1,7 +1,7 @@ syntax = "proto3"; option java_multiple_files = false; -option java_package = "com.example.paintingappv2_03.models"; +option java_package = "com.example.paintingappv2_04.models"; message IV_struct_define { diff --git a/PaintingappV2.03/app/src/main/java/bsp_PV.proto b/PaintingappV2.03/app/src/main/java/bsp_PV.proto index 1451122..072c09e 100644 --- a/PaintingappV2.03/app/src/main/java/bsp_PV.proto +++ b/PaintingappV2.03/app/src/main/java/bsp_PV.proto @@ -1,6 +1,6 @@ syntax = "proto3"; option java_multiple_files = false; -option java_package = "com.example.paintingappv2_03.models"; +option java_package = "com.example.paintingappv2_04.models"; message PV_struct_define{ diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/MainActivity.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/MainActivity.java similarity index 95% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/MainActivity.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/MainActivity.java index b6436d6..723b722 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/MainActivity.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/MainActivity.java @@ -1,8 +1,8 @@ -package com.example.paintingappv2_03; +package com.example.paintingappv2_04; -import static com.example.paintingappv2_03.services.ReceiivedIVHandler.TIME_OUT; -import static com.example.paintingappv2_03.services.ReceiivedIVHandler.isAlarmDialogShowed; -import static com.example.paintingappv2_03.services.ReceiivedIVHandler.lastReceiveTime; +import static com.example.paintingappv2_04.services.ReceiivedIVHandler.TIME_OUT; +import static com.example.paintingappv2_04.services.ReceiivedIVHandler.isAlarmDialogShowed; +import static com.example.paintingappv2_04.services.ReceiivedIVHandler.lastReceiveTime; import static java.lang.Integer.parseInt; import android.os.Bundle; @@ -21,16 +21,16 @@ import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; import androidx.databinding.DataBindingUtil; -import com.example.paintingappv2_03.databinding.ActivityMainBinding; -import com.example.paintingappv2_03.models.BspPV; -import com.example.paintingappv2_03.models.DisplayPV; -import com.example.paintingappv2_03.services.DecimalDigitsInputFilter; -import com.example.paintingappv2_03.services.ModbusCRC; -import com.example.paintingappv2_03.services.MyDataHelper; -import com.example.paintingappv2_03.services.PopupHelper; -import com.example.paintingappv2_03.services.ReceiivedIVHandler; -import com.example.paintingappv2_03.services.UDPHelper; -import com.example.paintingappv2_03.services.USBSerialPortHelper; +import com.example.paintingappv2_04.databinding.ActivityMainBinding; +import com.example.paintingappv2_04.models.BspPV; +import com.example.paintingappv2_04.models.DisplayPV; +import com.example.paintingappv2_04.services.DecimalDigitsInputFilter; +import com.example.paintingappv2_04.services.ModbusCRC; +import com.example.paintingappv2_04.services.MyDataHelper; +import com.example.paintingappv2_04.services.PopupHelper; +import com.example.paintingappv2_04.services.ReceiivedIVHandler; +import com.example.paintingappv2_04.services.UDPHelper; +import com.example.paintingappv2_04.services.USBSerialPortHelper; import java.util.List; import java.util.Timer; diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/models/BspError.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/models/BspError.java similarity index 89% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/models/BspError.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/models/BspError.java index 46a5c86..c35d759 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/models/BspError.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/models/BspError.java @@ -3,7 +3,7 @@ // source: bsp_Error.proto // Protobuf Java Version: 4.27.2 -package com.example.paintingappv2_03.models; +package com.example.paintingappv2_04.models; public final class BspError { private BspError() {} @@ -161,7 +161,7 @@ public final class BspError { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.example.paintingappv2_03.models.BspError.getDescriptor().getEnumTypes().get(0); + return com.example.paintingappv2_04.models.BspError.getDescriptor().getEnumTypes().get(0); } private static final ComError[] VALUES = values(); @@ -235,15 +235,15 @@ public final class BspError { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.example.paintingappv2_03.models.BspError.internal_static_ErrorData_descriptor; + return com.example.paintingappv2_04.models.BspError.internal_static_ErrorData_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.example.paintingappv2_03.models.BspError.internal_static_ErrorData_fieldAccessorTable + return com.example.paintingappv2_04.models.BspError.internal_static_ErrorData_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.example.paintingappv2_03.models.BspError.ErrorData.class, com.example.paintingappv2_03.models.BspError.ErrorData.Builder.class); + com.example.paintingappv2_04.models.BspError.ErrorData.class, com.example.paintingappv2_04.models.BspError.ErrorData.Builder.class); } public static final int COM_ERROR_CODE_FIELD_NUMBER = 1; @@ -333,10 +333,10 @@ public final class BspError { if (obj == this) { return true; } - if (!(obj instanceof com.example.paintingappv2_03.models.BspError.ErrorData)) { + if (!(obj instanceof com.example.paintingappv2_04.models.BspError.ErrorData)) { return super.equals(obj); } - com.example.paintingappv2_03.models.BspError.ErrorData other = (com.example.paintingappv2_03.models.BspError.ErrorData) obj; + com.example.paintingappv2_04.models.BspError.ErrorData other = (com.example.paintingappv2_04.models.BspError.ErrorData) obj; if (getComErrorCode() != other.getComErrorCode()) return false; @@ -366,44 +366,44 @@ public final class BspError { return hash; } - public static com.example.paintingappv2_03.models.BspError.ErrorData parseFrom( + public static com.example.paintingappv2_04.models.BspError.ErrorData parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.example.paintingappv2_03.models.BspError.ErrorData parseFrom( + public static com.example.paintingappv2_04.models.BspError.ErrorData parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.example.paintingappv2_03.models.BspError.ErrorData parseFrom( + public static com.example.paintingappv2_04.models.BspError.ErrorData parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.example.paintingappv2_03.models.BspError.ErrorData parseFrom( + public static com.example.paintingappv2_04.models.BspError.ErrorData parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.example.paintingappv2_03.models.BspError.ErrorData parseFrom(byte[] data) + public static com.example.paintingappv2_04.models.BspError.ErrorData parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.example.paintingappv2_03.models.BspError.ErrorData parseFrom( + public static com.example.paintingappv2_04.models.BspError.ErrorData parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.example.paintingappv2_03.models.BspError.ErrorData parseFrom(java.io.InputStream input) + public static com.example.paintingappv2_04.models.BspError.ErrorData parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input); } - public static com.example.paintingappv2_03.models.BspError.ErrorData parseFrom( + public static com.example.paintingappv2_04.models.BspError.ErrorData parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -411,26 +411,26 @@ public final class BspError { .parseWithIOException(PARSER, input, extensionRegistry); } - public static com.example.paintingappv2_03.models.BspError.ErrorData parseDelimitedFrom(java.io.InputStream input) + public static com.example.paintingappv2_04.models.BspError.ErrorData parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessage .parseDelimitedWithIOException(PARSER, input); } - public static com.example.paintingappv2_03.models.BspError.ErrorData parseDelimitedFrom( + public static com.example.paintingappv2_04.models.BspError.ErrorData parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessage .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static com.example.paintingappv2_03.models.BspError.ErrorData parseFrom( + public static com.example.paintingappv2_04.models.BspError.ErrorData parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input); } - public static com.example.paintingappv2_03.models.BspError.ErrorData parseFrom( + public static com.example.paintingappv2_04.models.BspError.ErrorData parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -443,7 +443,7 @@ public final class BspError { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.example.paintingappv2_03.models.BspError.ErrorData prototype) { + public static Builder newBuilder(com.example.paintingappv2_04.models.BspError.ErrorData prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -464,18 +464,18 @@ public final class BspError { public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:ErrorData) - com.example.paintingappv2_03.models.BspError.ErrorDataOrBuilder { + com.example.paintingappv2_04.models.BspError.ErrorDataOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.example.paintingappv2_03.models.BspError.internal_static_ErrorData_descriptor; + return com.example.paintingappv2_04.models.BspError.internal_static_ErrorData_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.example.paintingappv2_03.models.BspError.internal_static_ErrorData_fieldAccessorTable + return com.example.paintingappv2_04.models.BspError.internal_static_ErrorData_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.example.paintingappv2_03.models.BspError.ErrorData.class, com.example.paintingappv2_03.models.BspError.ErrorData.Builder.class); + com.example.paintingappv2_04.models.BspError.ErrorData.class, com.example.paintingappv2_04.models.BspError.ErrorData.Builder.class); } // Construct using com.example.paintingappv2_01.models.BspError.ErrorData.newBuilder() @@ -501,17 +501,17 @@ public final class BspError { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.example.paintingappv2_03.models.BspError.internal_static_ErrorData_descriptor; + return com.example.paintingappv2_04.models.BspError.internal_static_ErrorData_descriptor; } @java.lang.Override - public com.example.paintingappv2_03.models.BspError.ErrorData getDefaultInstanceForType() { - return com.example.paintingappv2_03.models.BspError.ErrorData.getDefaultInstance(); + public com.example.paintingappv2_04.models.BspError.ErrorData getDefaultInstanceForType() { + return com.example.paintingappv2_04.models.BspError.ErrorData.getDefaultInstance(); } @java.lang.Override - public com.example.paintingappv2_03.models.BspError.ErrorData build() { - com.example.paintingappv2_03.models.BspError.ErrorData result = buildPartial(); + public com.example.paintingappv2_04.models.BspError.ErrorData build() { + com.example.paintingappv2_04.models.BspError.ErrorData result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -519,14 +519,14 @@ public final class BspError { } @java.lang.Override - public com.example.paintingappv2_03.models.BspError.ErrorData buildPartial() { - com.example.paintingappv2_03.models.BspError.ErrorData result = new com.example.paintingappv2_03.models.BspError.ErrorData(this); + public com.example.paintingappv2_04.models.BspError.ErrorData buildPartial() { + com.example.paintingappv2_04.models.BspError.ErrorData result = new com.example.paintingappv2_04.models.BspError.ErrorData(this); if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - private void buildPartial0(com.example.paintingappv2_03.models.BspError.ErrorData result) { + private void buildPartial0(com.example.paintingappv2_04.models.BspError.ErrorData result) { int from_bitField0_ = bitField0_; if (((from_bitField0_ & 0x00000001) != 0)) { result.comErrorCode_ = comErrorCode_; @@ -541,16 +541,16 @@ public final class BspError { @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.example.paintingappv2_03.models.BspError.ErrorData) { - return mergeFrom((com.example.paintingappv2_03.models.BspError.ErrorData)other); + if (other instanceof com.example.paintingappv2_04.models.BspError.ErrorData) { + return mergeFrom((com.example.paintingappv2_04.models.BspError.ErrorData)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.example.paintingappv2_03.models.BspError.ErrorData other) { - if (other == com.example.paintingappv2_03.models.BspError.ErrorData.getDefaultInstance()) return this; + public Builder mergeFrom(com.example.paintingappv2_04.models.BspError.ErrorData other) { + if (other == com.example.paintingappv2_04.models.BspError.ErrorData.getDefaultInstance()) return this; if (other.getComErrorCode() != 0) { setComErrorCode(other.getComErrorCode()); } @@ -718,12 +718,12 @@ public final class BspError { } // @@protoc_insertion_point(class_scope:ErrorData) - private static final com.example.paintingappv2_03.models.BspError.ErrorData DEFAULT_INSTANCE; + private static final com.example.paintingappv2_04.models.BspError.ErrorData DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.example.paintingappv2_03.models.BspError.ErrorData(); + DEFAULT_INSTANCE = new com.example.paintingappv2_04.models.BspError.ErrorData(); } - public static com.example.paintingappv2_03.models.BspError.ErrorData getDefaultInstance() { + public static com.example.paintingappv2_04.models.BspError.ErrorData getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -759,7 +759,7 @@ public final class BspError { } @java.lang.Override - public com.example.paintingappv2_03.models.BspError.ErrorData getDefaultInstanceForType() { + public com.example.paintingappv2_04.models.BspError.ErrorData getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/models/BspIV.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/models/BspIV.java similarity index 93% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/models/BspIV.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/models/BspIV.java index 2adbfd8..8c3d656 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/models/BspIV.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/models/BspIV.java @@ -3,7 +3,7 @@ // source: bsp_IV.proto // Protobuf Java Version: 4.27.2 -package com.example.paintingappv2_03.models; +package com.example.paintingappv2_04.models; public final class BspIV { private BspIV() {} @@ -165,15 +165,15 @@ public final class BspIV { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.example.paintingappv2_03.models.BspIV.internal_static_IV_struct_define_descriptor; + return com.example.paintingappv2_04.models.BspIV.internal_static_IV_struct_define_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.example.paintingappv2_03.models.BspIV.internal_static_IV_struct_define_fieldAccessorTable + return com.example.paintingappv2_04.models.BspIV.internal_static_IV_struct_define_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.example.paintingappv2_03.models.BspIV.IV_struct_define.class, com.example.paintingappv2_03.models.BspIV.IV_struct_define.Builder.class); + com.example.paintingappv2_04.models.BspIV.IV_struct_define.class, com.example.paintingappv2_04.models.BspIV.IV_struct_define.Builder.class); } public static final int CURRENTANGLE_FIELD_NUMBER = 1; @@ -451,10 +451,10 @@ public final class BspIV { if (obj == this) { return true; } - if (!(obj instanceof com.example.paintingappv2_03.models.BspIV.IV_struct_define)) { + if (!(obj instanceof com.example.paintingappv2_04.models.BspIV.IV_struct_define)) { return super.equals(obj); } - com.example.paintingappv2_03.models.BspIV.IV_struct_define other = (com.example.paintingappv2_03.models.BspIV.IV_struct_define) obj; + com.example.paintingappv2_04.models.BspIV.IV_struct_define other = (com.example.paintingappv2_04.models.BspIV.IV_struct_define) obj; if (getCurrentAngle() != other.getCurrentAngle()) return false; @@ -517,44 +517,44 @@ public final class BspIV { return hash; } - public static com.example.paintingappv2_03.models.BspIV.IV_struct_define parseFrom( + public static com.example.paintingappv2_04.models.BspIV.IV_struct_define parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.example.paintingappv2_03.models.BspIV.IV_struct_define parseFrom( + public static com.example.paintingappv2_04.models.BspIV.IV_struct_define parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.example.paintingappv2_03.models.BspIV.IV_struct_define parseFrom( + public static com.example.paintingappv2_04.models.BspIV.IV_struct_define parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.example.paintingappv2_03.models.BspIV.IV_struct_define parseFrom( + public static com.example.paintingappv2_04.models.BspIV.IV_struct_define parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.example.paintingappv2_03.models.BspIV.IV_struct_define parseFrom(byte[] data) + public static com.example.paintingappv2_04.models.BspIV.IV_struct_define parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.example.paintingappv2_03.models.BspIV.IV_struct_define parseFrom( + public static com.example.paintingappv2_04.models.BspIV.IV_struct_define parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.example.paintingappv2_03.models.BspIV.IV_struct_define parseFrom(java.io.InputStream input) + public static com.example.paintingappv2_04.models.BspIV.IV_struct_define parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input); } - public static com.example.paintingappv2_03.models.BspIV.IV_struct_define parseFrom( + public static com.example.paintingappv2_04.models.BspIV.IV_struct_define parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -562,26 +562,26 @@ public final class BspIV { .parseWithIOException(PARSER, input, extensionRegistry); } - public static com.example.paintingappv2_03.models.BspIV.IV_struct_define parseDelimitedFrom(java.io.InputStream input) + public static com.example.paintingappv2_04.models.BspIV.IV_struct_define parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessage .parseDelimitedWithIOException(PARSER, input); } - public static com.example.paintingappv2_03.models.BspIV.IV_struct_define parseDelimitedFrom( + public static com.example.paintingappv2_04.models.BspIV.IV_struct_define parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessage .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static com.example.paintingappv2_03.models.BspIV.IV_struct_define parseFrom( + public static com.example.paintingappv2_04.models.BspIV.IV_struct_define parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input); } - public static com.example.paintingappv2_03.models.BspIV.IV_struct_define parseFrom( + public static com.example.paintingappv2_04.models.BspIV.IV_struct_define parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -594,7 +594,7 @@ public final class BspIV { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.example.paintingappv2_03.models.BspIV.IV_struct_define prototype) { + public static Builder newBuilder(com.example.paintingappv2_04.models.BspIV.IV_struct_define prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -615,18 +615,18 @@ public final class BspIV { public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:IV_struct_define) - com.example.paintingappv2_03.models.BspIV.IV_struct_defineOrBuilder { + com.example.paintingappv2_04.models.BspIV.IV_struct_defineOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.example.paintingappv2_03.models.BspIV.internal_static_IV_struct_define_descriptor; + return com.example.paintingappv2_04.models.BspIV.internal_static_IV_struct_define_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.example.paintingappv2_03.models.BspIV.internal_static_IV_struct_define_fieldAccessorTable + return com.example.paintingappv2_04.models.BspIV.internal_static_IV_struct_define_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.example.paintingappv2_03.models.BspIV.IV_struct_define.class, com.example.paintingappv2_03.models.BspIV.IV_struct_define.Builder.class); + com.example.paintingappv2_04.models.BspIV.IV_struct_define.class, com.example.paintingappv2_04.models.BspIV.IV_struct_define.Builder.class); } // Construct using com.example.paintingappv2_01.models.BspIV.IV_struct_define.newBuilder() @@ -660,17 +660,17 @@ public final class BspIV { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.example.paintingappv2_03.models.BspIV.internal_static_IV_struct_define_descriptor; + return com.example.paintingappv2_04.models.BspIV.internal_static_IV_struct_define_descriptor; } @java.lang.Override - public com.example.paintingappv2_03.models.BspIV.IV_struct_define getDefaultInstanceForType() { - return com.example.paintingappv2_03.models.BspIV.IV_struct_define.getDefaultInstance(); + public com.example.paintingappv2_04.models.BspIV.IV_struct_define getDefaultInstanceForType() { + return com.example.paintingappv2_04.models.BspIV.IV_struct_define.getDefaultInstance(); } @java.lang.Override - public com.example.paintingappv2_03.models.BspIV.IV_struct_define build() { - com.example.paintingappv2_03.models.BspIV.IV_struct_define result = buildPartial(); + public com.example.paintingappv2_04.models.BspIV.IV_struct_define build() { + com.example.paintingappv2_04.models.BspIV.IV_struct_define result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -678,14 +678,14 @@ public final class BspIV { } @java.lang.Override - public com.example.paintingappv2_03.models.BspIV.IV_struct_define buildPartial() { - com.example.paintingappv2_03.models.BspIV.IV_struct_define result = new com.example.paintingappv2_03.models.BspIV.IV_struct_define(this); + public com.example.paintingappv2_04.models.BspIV.IV_struct_define buildPartial() { + com.example.paintingappv2_04.models.BspIV.IV_struct_define result = new com.example.paintingappv2_04.models.BspIV.IV_struct_define(this); if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - private void buildPartial0(com.example.paintingappv2_03.models.BspIV.IV_struct_define result) { + private void buildPartial0(com.example.paintingappv2_04.models.BspIV.IV_struct_define result) { int from_bitField0_ = bitField0_; if (((from_bitField0_ & 0x00000001) != 0)) { result.currentAngle_ = currentAngle_; @@ -724,16 +724,16 @@ public final class BspIV { @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.example.paintingappv2_03.models.BspIV.IV_struct_define) { - return mergeFrom((com.example.paintingappv2_03.models.BspIV.IV_struct_define)other); + if (other instanceof com.example.paintingappv2_04.models.BspIV.IV_struct_define) { + return mergeFrom((com.example.paintingappv2_04.models.BspIV.IV_struct_define)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.example.paintingappv2_03.models.BspIV.IV_struct_define other) { - if (other == com.example.paintingappv2_03.models.BspIV.IV_struct_define.getDefaultInstance()) return this; + public Builder mergeFrom(com.example.paintingappv2_04.models.BspIV.IV_struct_define other) { + if (other == com.example.paintingappv2_04.models.BspIV.IV_struct_define.getDefaultInstance()) return this; if (other.getCurrentAngle() != 0) { setCurrentAngle(other.getCurrentAngle()); } @@ -1353,12 +1353,12 @@ public final class BspIV { } // @@protoc_insertion_point(class_scope:IV_struct_define) - private static final com.example.paintingappv2_03.models.BspIV.IV_struct_define DEFAULT_INSTANCE; + private static final com.example.paintingappv2_04.models.BspIV.IV_struct_define DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.example.paintingappv2_03.models.BspIV.IV_struct_define(); + DEFAULT_INSTANCE = new com.example.paintingappv2_04.models.BspIV.IV_struct_define(); } - public static com.example.paintingappv2_03.models.BspIV.IV_struct_define getDefaultInstance() { + public static com.example.paintingappv2_04.models.BspIV.IV_struct_define getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -1394,7 +1394,7 @@ public final class BspIV { } @java.lang.Override - public com.example.paintingappv2_03.models.BspIV.IV_struct_define getDefaultInstanceForType() { + public com.example.paintingappv2_04.models.BspIV.IV_struct_define getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/models/BspPV.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/models/BspPV.java similarity index 91% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/models/BspPV.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/models/BspPV.java index 6bfdc5f..c9fb57b 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/models/BspPV.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/models/BspPV.java @@ -3,7 +3,7 @@ // source: bsp_PV.proto // Protobuf Java Version: 4.27.2 -package com.example.paintingappv2_03.models; +package com.example.paintingappv2_04.models; public final class BspPV { private BspPV() {} @@ -124,15 +124,15 @@ public final class BspPV { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.example.paintingappv2_03.models.BspPV.internal_static_PV_struct_define_descriptor; + return com.example.paintingappv2_04.models.BspPV.internal_static_PV_struct_define_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.example.paintingappv2_03.models.BspPV.internal_static_PV_struct_define_fieldAccessorTable + return com.example.paintingappv2_04.models.BspPV.internal_static_PV_struct_define_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.example.paintingappv2_03.models.BspPV.PV_struct_define.class, com.example.paintingappv2_03.models.BspPV.PV_struct_define.Builder.class); + com.example.paintingappv2_04.models.BspPV.PV_struct_define.class, com.example.paintingappv2_04.models.BspPV.PV_struct_define.Builder.class); } public static final int RUNMODE_FIELD_NUMBER = 1; @@ -321,10 +321,10 @@ public final class BspPV { if (obj == this) { return true; } - if (!(obj instanceof com.example.paintingappv2_03.models.BspPV.PV_struct_define)) { + if (!(obj instanceof com.example.paintingappv2_04.models.BspPV.PV_struct_define)) { return super.equals(obj); } - com.example.paintingappv2_03.models.BspPV.PV_struct_define other = (com.example.paintingappv2_03.models.BspPV.PV_struct_define) obj; + com.example.paintingappv2_04.models.BspPV.PV_struct_define other = (com.example.paintingappv2_04.models.BspPV.PV_struct_define) obj; if (getRunMode() != other.getRunMode()) return false; @@ -373,44 +373,44 @@ public final class BspPV { return hash; } - public static com.example.paintingappv2_03.models.BspPV.PV_struct_define parseFrom( + public static com.example.paintingappv2_04.models.BspPV.PV_struct_define parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.example.paintingappv2_03.models.BspPV.PV_struct_define parseFrom( + public static com.example.paintingappv2_04.models.BspPV.PV_struct_define parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.example.paintingappv2_03.models.BspPV.PV_struct_define parseFrom( + public static com.example.paintingappv2_04.models.BspPV.PV_struct_define parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.example.paintingappv2_03.models.BspPV.PV_struct_define parseFrom( + public static com.example.paintingappv2_04.models.BspPV.PV_struct_define parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.example.paintingappv2_03.models.BspPV.PV_struct_define parseFrom(byte[] data) + public static com.example.paintingappv2_04.models.BspPV.PV_struct_define parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.example.paintingappv2_03.models.BspPV.PV_struct_define parseFrom( + public static com.example.paintingappv2_04.models.BspPV.PV_struct_define parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.example.paintingappv2_03.models.BspPV.PV_struct_define parseFrom(java.io.InputStream input) + public static com.example.paintingappv2_04.models.BspPV.PV_struct_define parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input); } - public static com.example.paintingappv2_03.models.BspPV.PV_struct_define parseFrom( + public static com.example.paintingappv2_04.models.BspPV.PV_struct_define parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -418,26 +418,26 @@ public final class BspPV { .parseWithIOException(PARSER, input, extensionRegistry); } - public static com.example.paintingappv2_03.models.BspPV.PV_struct_define parseDelimitedFrom(java.io.InputStream input) + public static com.example.paintingappv2_04.models.BspPV.PV_struct_define parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessage .parseDelimitedWithIOException(PARSER, input); } - public static com.example.paintingappv2_03.models.BspPV.PV_struct_define parseDelimitedFrom( + public static com.example.paintingappv2_04.models.BspPV.PV_struct_define parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessage .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static com.example.paintingappv2_03.models.BspPV.PV_struct_define parseFrom( + public static com.example.paintingappv2_04.models.BspPV.PV_struct_define parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessage .parseWithIOException(PARSER, input); } - public static com.example.paintingappv2_03.models.BspPV.PV_struct_define parseFrom( + public static com.example.paintingappv2_04.models.BspPV.PV_struct_define parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -450,7 +450,7 @@ public final class BspPV { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.example.paintingappv2_03.models.BspPV.PV_struct_define prototype) { + public static Builder newBuilder(com.example.paintingappv2_04.models.BspPV.PV_struct_define prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -471,18 +471,18 @@ public final class BspPV { public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:PV_struct_define) - com.example.paintingappv2_03.models.BspPV.PV_struct_defineOrBuilder { + com.example.paintingappv2_04.models.BspPV.PV_struct_defineOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.example.paintingappv2_03.models.BspPV.internal_static_PV_struct_define_descriptor; + return com.example.paintingappv2_04.models.BspPV.internal_static_PV_struct_define_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.example.paintingappv2_03.models.BspPV.internal_static_PV_struct_define_fieldAccessorTable + return com.example.paintingappv2_04.models.BspPV.internal_static_PV_struct_define_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.example.paintingappv2_03.models.BspPV.PV_struct_define.class, com.example.paintingappv2_03.models.BspPV.PV_struct_define.Builder.class); + com.example.paintingappv2_04.models.BspPV.PV_struct_define.class, com.example.paintingappv2_04.models.BspPV.PV_struct_define.Builder.class); } // Construct using com.example.paintingappv2_01.models.BspPV.PV_struct_define.newBuilder() @@ -512,17 +512,17 @@ public final class BspPV { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.example.paintingappv2_03.models.BspPV.internal_static_PV_struct_define_descriptor; + return com.example.paintingappv2_04.models.BspPV.internal_static_PV_struct_define_descriptor; } @java.lang.Override - public com.example.paintingappv2_03.models.BspPV.PV_struct_define getDefaultInstanceForType() { - return com.example.paintingappv2_03.models.BspPV.PV_struct_define.getDefaultInstance(); + public com.example.paintingappv2_04.models.BspPV.PV_struct_define getDefaultInstanceForType() { + return com.example.paintingappv2_04.models.BspPV.PV_struct_define.getDefaultInstance(); } @java.lang.Override - public com.example.paintingappv2_03.models.BspPV.PV_struct_define build() { - com.example.paintingappv2_03.models.BspPV.PV_struct_define result = buildPartial(); + public com.example.paintingappv2_04.models.BspPV.PV_struct_define build() { + com.example.paintingappv2_04.models.BspPV.PV_struct_define result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -530,14 +530,14 @@ public final class BspPV { } @java.lang.Override - public com.example.paintingappv2_03.models.BspPV.PV_struct_define buildPartial() { - com.example.paintingappv2_03.models.BspPV.PV_struct_define result = new com.example.paintingappv2_03.models.BspPV.PV_struct_define(this); + public com.example.paintingappv2_04.models.BspPV.PV_struct_define buildPartial() { + com.example.paintingappv2_04.models.BspPV.PV_struct_define result = new com.example.paintingappv2_04.models.BspPV.PV_struct_define(this); if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - private void buildPartial0(com.example.paintingappv2_03.models.BspPV.PV_struct_define result) { + private void buildPartial0(com.example.paintingappv2_04.models.BspPV.PV_struct_define result) { int from_bitField0_ = bitField0_; if (((from_bitField0_ & 0x00000001) != 0)) { result.runMode_ = runMode_; @@ -564,16 +564,16 @@ public final class BspPV { @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof com.example.paintingappv2_03.models.BspPV.PV_struct_define) { - return mergeFrom((com.example.paintingappv2_03.models.BspPV.PV_struct_define)other); + if (other instanceof com.example.paintingappv2_04.models.BspPV.PV_struct_define) { + return mergeFrom((com.example.paintingappv2_04.models.BspPV.PV_struct_define)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(com.example.paintingappv2_03.models.BspPV.PV_struct_define other) { - if (other == com.example.paintingappv2_03.models.BspPV.PV_struct_define.getDefaultInstance()) return this; + public Builder mergeFrom(com.example.paintingappv2_04.models.BspPV.PV_struct_define other) { + if (other == com.example.paintingappv2_04.models.BspPV.PV_struct_define.getDefaultInstance()) return this; if (other.getRunMode() != 0) { setRunMode(other.getRunMode()); } @@ -982,12 +982,12 @@ public final class BspPV { } // @@protoc_insertion_point(class_scope:PV_struct_define) - private static final com.example.paintingappv2_03.models.BspPV.PV_struct_define DEFAULT_INSTANCE; + private static final com.example.paintingappv2_04.models.BspPV.PV_struct_define DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new com.example.paintingappv2_03.models.BspPV.PV_struct_define(); + DEFAULT_INSTANCE = new com.example.paintingappv2_04.models.BspPV.PV_struct_define(); } - public static com.example.paintingappv2_03.models.BspPV.PV_struct_define getDefaultInstance() { + public static com.example.paintingappv2_04.models.BspPV.PV_struct_define getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -1023,7 +1023,7 @@ public final class BspPV { } @java.lang.Override - public com.example.paintingappv2_03.models.BspPV.PV_struct_define getDefaultInstanceForType() { + public com.example.paintingappv2_04.models.BspPV.PV_struct_define getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/models/DisplayIV.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/models/DisplayIV.java similarity index 96% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/models/DisplayIV.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/models/DisplayIV.java index 15ee2e1..3d60539 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/models/DisplayIV.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/models/DisplayIV.java @@ -1,4 +1,4 @@ -package com.example.paintingappv2_03.models; +package com.example.paintingappv2_04.models; import androidx.databinding.BaseObservable; diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/models/DisplayPV.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/models/DisplayPV.java similarity index 95% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/models/DisplayPV.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/models/DisplayPV.java index 8fd333b..c6f9cd0 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/models/DisplayPV.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/models/DisplayPV.java @@ -1,4 +1,4 @@ -package com.example.paintingappv2_03.models; +package com.example.paintingappv2_04.models; import androidx.databinding.BaseObservable; diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/models/ErrorModel.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/models/ErrorModel.java similarity index 94% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/models/ErrorModel.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/models/ErrorModel.java index 3342acf..2fdb20b 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/models/ErrorModel.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/models/ErrorModel.java @@ -1,4 +1,4 @@ -package com.example.paintingappv2_03.models; +package com.example.paintingappv2_04.models; public class ErrorModel { diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/models/ScrollBottomScrollView.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/models/ScrollBottomScrollView.java similarity index 95% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/models/ScrollBottomScrollView.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/models/ScrollBottomScrollView.java index 8fe2984..d0fae80 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/models/ScrollBottomScrollView.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/models/ScrollBottomScrollView.java @@ -1,4 +1,4 @@ -package com.example.paintingappv2_03.models; +package com.example.paintingappv2_04.models; import android.content.Context; import android.util.AttributeSet; diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/ConvertHelper.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/ConvertHelper.java similarity index 93% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/ConvertHelper.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/ConvertHelper.java index 8602efb..8c8fecb 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/ConvertHelper.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/ConvertHelper.java @@ -1,4 +1,4 @@ -package com.example.paintingappv2_03.services; +package com.example.paintingappv2_04.services; import android.widget.EditText; import android.widget.TextView; diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/CustomProber.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/CustomProber.java similarity index 94% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/CustomProber.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/CustomProber.java index f8109ef..dc99bdb 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/CustomProber.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/CustomProber.java @@ -1,4 +1,4 @@ -package com.example.paintingappv2_03.services; +package com.example.paintingappv2_04.services; import com.hoho.android.usbserial.driver.FtdiSerialDriver; import com.hoho.android.usbserial.driver.ProbeTable; diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/DecimalDigitsInputFilter.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/DecimalDigitsInputFilter.java similarity index 97% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/DecimalDigitsInputFilter.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/DecimalDigitsInputFilter.java index 63878a8..484d32a 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/DecimalDigitsInputFilter.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/DecimalDigitsInputFilter.java @@ -1,4 +1,4 @@ -package com.example.paintingappv2_03.services; +package com.example.paintingappv2_04.services; import android.text.InputFilter; import android.text.Spanned; diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/ErrorDeocdeHelper.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/ErrorDeocdeHelper.java similarity index 94% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/ErrorDeocdeHelper.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/ErrorDeocdeHelper.java index 6d6b59a..384fe6e 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/ErrorDeocdeHelper.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/ErrorDeocdeHelper.java @@ -1,5 +1,5 @@ -package com.example.paintingappv2_03.services; -import com.example.paintingappv2_03.models.BspError; +package com.example.paintingappv2_04.services; +import com.example.paintingappv2_04.models.BspError; public class ErrorDeocdeHelper { diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/LogUtil.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/LogUtil.java similarity index 94% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/LogUtil.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/LogUtil.java index 3294978..d0c118f 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/LogUtil.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/LogUtil.java @@ -1,4 +1,4 @@ -package com.example.paintingappv2_03.services; +package com.example.paintingappv2_04.services; import android.util.Log; diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/ModbusCRC.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/ModbusCRC.java similarity index 97% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/ModbusCRC.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/ModbusCRC.java index 1293923..e747ee8 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/ModbusCRC.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/ModbusCRC.java @@ -1,4 +1,4 @@ -package com.example.paintingappv2_03.services; +package com.example.paintingappv2_04.services; public class ModbusCRC { diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/MyDataHelper.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/MyDataHelper.java similarity index 92% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/MyDataHelper.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/MyDataHelper.java index cad9f7a..c74dea7 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/MyDataHelper.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/MyDataHelper.java @@ -1,4 +1,4 @@ -package com.example.paintingappv2_03.services; +package com.example.paintingappv2_04.services; import android.annotation.SuppressLint; import android.content.ContentValues; @@ -10,8 +10,8 @@ import android.util.Log; import androidx.annotation.Nullable; -import com.example.paintingappv2_03.models.DisplayPV; -import com.example.paintingappv2_03.models.ErrorModel; +import com.example.paintingappv2_04.models.DisplayPV; +import com.example.paintingappv2_04.models.ErrorModel; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -49,7 +49,7 @@ public class MyDataHelper extends SQLiteOpenHelper { db.execSQL(sql); - sql = "CREATE TABLE " + Error_TABLE_NAME + "(" + Error_COLUMN_Iime_ID + " INTEGER PRIMARY KEY ," + + sql = "CREATE TABLE " + Error_TABLE_NAME + "(" + Error_COLUMN_Iime_ID + " INTEGER UNIQUE ," + Error_COLUMN_ERROR_INFO + " STRING " + ")"; db.execSQL(sql); @@ -153,15 +153,16 @@ public class MyDataHelper extends SQLiteOpenHelper { //数据超过 500 条，就删除最早的 200 条 if (count > 50) { sqliteDatabase.beginTransaction(); + // 用 rowid 排序，保证严格按插入顺序删除，与 Time_ID 无关 String deleteQuery = "DELETE FROM " + Error_TABLE_NAME - + " WHERE " + Error_COLUMN_Iime_ID - + " IN (SELECT " + Error_COLUMN_Iime_ID - + " FROM " + Error_TABLE_NAME - + " ORDER BY " + Error_COLUMN_Iime_ID + " ASC LIMIT 25)"; + + " WHERE rowid IN (" + + " SELECT rowid FROM " + Error_TABLE_NAME + + " ORDER BY rowid ASC LIMIT 25" + + ")"; //****在这改大于多少条删除x条,此处为2***** sqliteDatabase.execSQL(deleteQuery); sqliteDatabase.setTransactionSuccessful(); sqliteDatabase.endTransaction(); - Log.d("数据库", "数据太多，已删除最早50条"); + Log.d("数据库", "数据太多，已删除最早25条"); } } catch (Exception e) { e.printStackTrace(); diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/PopupHelper.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/PopupHelper.java similarity index 97% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/PopupHelper.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/PopupHelper.java index 0d3da5d..254502e 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/PopupHelper.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/PopupHelper.java @@ -1,4 +1,4 @@ -package com.example.paintingappv2_03.services; +package com.example.paintingappv2_04.services; import android.annotation.SuppressLint; import android.app.Dialog; @@ -12,11 +12,11 @@ import android.widget.ScrollView; import android.widget.TextView; import android.widget.Toast; -import com.example.paintingappv2_03.MainActivity; -import com.example.paintingappv2_03.R; -import com.example.paintingappv2_03.models.DisplayPV; -import com.example.paintingappv2_03.models.ErrorModel; -import com.example.paintingappv2_03.models.ScrollBottomScrollView; +import com.example.paintingappv2_04.MainActivity; +import com.example.paintingappv2_04.R; +import com.example.paintingappv2_04.models.DisplayPV; +import com.example.paintingappv2_04.models.ErrorModel; +import com.example.paintingappv2_04.models.ScrollBottomScrollView; import java.util.List; import java.util.Objects; diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/ReceiivedIVHandler.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/ReceiivedIVHandler.java similarity index 95% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/ReceiivedIVHandler.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/ReceiivedIVHandler.java index 7cd733a..4a9dc50 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/ReceiivedIVHandler.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/ReceiivedIVHandler.java @@ -1,18 +1,18 @@ -package com.example.paintingappv2_03.services; +package com.example.paintingappv2_04.services; -import static com.example.paintingappv2_03.services.ErrorDeocdeHelper.ErrorDeocde; -import static com.example.paintingappv2_03.services.USBSerialPortHelper.errorLast; -import static com.example.paintingappv2_03.services.USBSerialPortHelper.toHex4Digits; -import static com.example.paintingappv2_03.services.USBSerialPortHelper.unsignedIntToBinaryWithSeparator; +import static com.example.paintingappv2_04.services.ErrorDeocdeHelper.ErrorDeocde; +import static com.example.paintingappv2_04.services.USBSerialPortHelper.errorLast; +import static com.example.paintingappv2_04.services.USBSerialPortHelper.toHex4Digits; +import static com.example.paintingappv2_04.services.USBSerialPortHelper.unsignedIntToBinaryWithSeparator; import android.graphics.Color; import android.view.Gravity; import android.widget.TextView; import android.widget.Toast; -import com.example.paintingappv2_03.R; -import com.example.paintingappv2_03.models.BspIV; -import com.example.paintingappv2_03.models.ErrorModel; +import com.example.paintingappv2_04.R; +import com.example.paintingappv2_04.models.BspIV; +import com.example.paintingappv2_04.models.ErrorModel; import com.google.protobuf.InvalidProtocolBufferException; import java.util.Objects; @@ -24,7 +24,7 @@ public class ReceiivedIVHandler { public static final long TIME_OUT = 5000; // 超时时间：2秒没收到数据就算离线 public static boolean isAlarmDialogShowed =false; - public static void midToast(String str, int showTime, com.example.paintingappv2_03.MainActivity MainActivity) { + public static void midToast(String str, int showTime, com.example.paintingappv2_04.MainActivity MainActivity) { Toast toast = Toast.makeText(MainActivity, str, showTime); toast.setGravity(Gravity.CENTER_VERTICAL | Gravity.CENTER_HORIZONTAL, 0, 0); //设置显示位置 TextView v = (TextView) toast.getView().findViewById(android.R.id.message); @@ -35,7 +35,7 @@ public class ReceiivedIVHandler { public static BspIV.IV_struct_define _toReceiveIV = BspIV.IV_struct_define.newBuilder().build();//上一次有效数据 public static BspIV.IV_struct_define _toReceiveIV_Variable = BspIV.IV_struct_define.newBuilder().build();//最新数据 - public static void HandleData(com.example.paintingappv2_03.MainActivity MainActivity, byte[] data) { + public static void HandleData(com.example.paintingappv2_04.MainActivity MainActivity, byte[] data) { try { byte[] crcbytes = new byte[data.length - 2]; diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/RobotDataHanlder.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/RobotDataHanlder.java similarity index 91% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/RobotDataHanlder.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/RobotDataHanlder.java index ef1c1fd..99b54b3 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/RobotDataHanlder.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/RobotDataHanlder.java @@ -1,8 +1,8 @@ -package com.example.paintingappv2_03.services; +package com.example.paintingappv2_04.services; -import com.example.paintingappv2_03.models.BspIV; -import com.example.paintingappv2_03.models.BspPV; +import com.example.paintingappv2_04.models.BspIV; +import com.example.paintingappv2_04.models.BspPV; import com.google.protobuf.InvalidProtocolBufferException; public class RobotDataHanlder { diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/ToggleRadioButton.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/ToggleRadioButton.java similarity index 94% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/ToggleRadioButton.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/ToggleRadioButton.java index 8f517f8..25a6385 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/ToggleRadioButton.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/ToggleRadioButton.java @@ -1,4 +1,4 @@ -package com.example.paintingappv2_03.services; +package com.example.paintingappv2_04.services; import android.content.Context; import android.util.AttributeSet; @@ -7,7 +7,7 @@ import android.widget.RadioGroup; import androidx.appcompat.widget.AppCompatRadioButton; -import com.example.paintingappv2_03.R; +import com.example.paintingappv2_04.R; /**********自己的raidobutton按钮类*************/ public class ToggleRadioButton extends AppCompatRadioButton { diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/UDPHelper.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/UDPHelper.java similarity index 93% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/UDPHelper.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/UDPHelper.java index 1de981d..9f26b15 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/UDPHelper.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/UDPHelper.java @@ -1,4 +1,4 @@ -package com.example.paintingappv2_03.services; +package com.example.paintingappv2_04.services; import java.io.IOException; import java.net.DatagramPacket; @@ -9,7 +9,7 @@ import java.util.logging.Handler; public class UDPHelper { - private static com.example.paintingappv2_03.MainActivity MainActivity; + private static com.example.paintingappv2_04.MainActivity MainActivity; private static Thread receiveThread; private static boolean running = false; private static DatagramSocket sendSocket; @@ -19,7 +19,7 @@ public class UDPHelper { private static int target_port; private static int listening_port; - public static void Intialize(com.example.paintingappv2_03.MainActivity mainActivity, String targetip, int targetPort, int listentingPort) { + public static void Intialize(com.example.paintingappv2_04.MainActivity mainActivity, String targetip, int targetPort, int listentingPort) { try { MainActivity = mainActivity; target_ip = targetip; diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/USBSerialPortHelper.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/USBSerialPortHelper.java similarity index 98% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/USBSerialPortHelper.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/USBSerialPortHelper.java index 8e4fe53..9d97701 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/USBSerialPortHelper.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/USBSerialPortHelper.java @@ -1,4 +1,4 @@ -package com.example.paintingappv2_03.services; +package com.example.paintingappv2_04.services; import android.annotation.SuppressLint; @@ -18,9 +18,9 @@ import android.os.Looper; import androidx.core.content.ContextCompat; -import com.example.paintingappv2_03.BuildConfig; -import com.example.paintingappv2_03.MainActivity; -import com.example.paintingappv2_03.R; +import com.example.paintingappv2_04.BuildConfig; +import com.example.paintingappv2_04.MainActivity; +import com.example.paintingappv2_04.R; import com.hoho.android.usbserial.driver.UsbSerialDriver; import com.hoho.android.usbserial.driver.UsbSerialPort; import com.hoho.android.usbserial.driver.UsbSerialProber; diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/VideoPlayerHelper.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/VideoPlayerHelper.java similarity index 95% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/VideoPlayerHelper.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/VideoPlayerHelper.java index 8ce0c08..cbc39ec 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/services/VideoPlayerHelper.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/services/VideoPlayerHelper.java @@ -1,4 +1,4 @@ -package com.example.paintingappv2_03.services; +package com.example.paintingappv2_04.services; import cn.nodemedia.NodePlayer; diff --git a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/viewmodels/MainViewModel.java b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/viewmodels/MainViewModel.java similarity index 71% rename from PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/viewmodels/MainViewModel.java rename to PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/viewmodels/MainViewModel.java index ca3da40..822d37e 100644 --- a/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_03/viewmodels/MainViewModel.java +++ b/PaintingappV2.03/app/src/main/java/com/example/paintingappv2_04/viewmodels/MainViewModel.java @@ -1,4 +1,4 @@ -package com.example.paintingappv2_03.viewmodels; +package com.example.paintingappv2_04.viewmodels; import androidx.lifecycle.ViewModel; diff --git a/PaintingappV2.03/app/src/main/res/layout/log_item.xml b/PaintingappV2.03/app/src/main/res/layout/log_item.xml index be784dd..a14d740 100644 --- a/PaintingappV2.03/app/src/main/res/layout/log_item.xml +++ b/PaintingappV2.03/app/src/main/res/layout/log_item.xml @@ -15,7 +15,7 @@ - - + diff --git a/PaintingappV2.03/app/src/main/res/layout/parameters_call.xml b/PaintingappV2.03/app/src/main/res/layout/parameters_call.xml index c3a7edd..b8e9b49 100644 --- a/PaintingappV2.03/app/src/main/res/layout/parameters_call.xml +++ b/PaintingappV2.03/app/src/main/res/layout/parameters_call.xml @@ -35,7 +35,7 @@ android:gravity="center" android:orientation="horizontal" > - - - - - - 喷漆v2.03 - 2.03 + 喷漆v2.04 + 2.04 当前状态 软件版本 stm版本 diff --git a/PaintingappV2.03/app/src/test/java/com/example/paintingappv2_03/ExampleUnitTest.java b/PaintingappV2.03/app/src/test/java/com/example/paintingappv2_04/ExampleUnitTest.java similarity index 100% rename from PaintingappV2.03/app/src/test/java/com/example/paintingappv2_03/ExampleUnitTest.java rename to PaintingappV2.03/app/src/test/java/com/example/paintingappv2_04/ExampleUnitTest.java diff --git a/PaintingappV2.03/settings.gradle b/PaintingappV2.03/settings.gradle index 2d89221..e845339 100644 --- a/PaintingappV2.03/settings.gradle +++ b/PaintingappV2.03/settings.gradle @@ -14,5 +14,5 @@ dependencyResolutionManagement { } } -rootProject.name = "PaintingappV2.03" +rootProject.name = "PaintingappV2.04" include ':app' diff --git a/~$版本记录.docx b/~$版本记录.docx new file mode 100644 index 0000000..4de69ce Binary files /dev/null and b/~$版本记录.docx differ