UnknownObject/MainCarRemoteControl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocr fix

Browse Source
This commit is contained in:
UnknownObject
2022-11-09 19:07:35 +08:00
parent 7d5369cf8d
commit 5eb9a94184
9 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/uns/maincar/constants/Commands.java
+5 -5
View File
@@ -42,11 +42,11 @@ public class Commands
public static byte TFT_PAGE_DOWN = (byte) 0xA8;
public static byte ORC_TEXT_SUCCESS = (byte) 0xA9;
public static byte ORC_TEXT_FAILED = (byte) 0xB9;
public static byte ORC_TEXT_LENGTH = (byte) 0xC9;
public static byte ORC_TEXT_DATA = (byte) 0xD9;
public static byte ORC_TEXT_FINISH = (byte) 0xE9;
public static byte OCR_TEXT_SUCCESS = (byte) 0xA9;
public static byte OCR_TEXT_FAILED = (byte) 0xB9;
public static byte OCR_TEXT_LENGTH = (byte) 0xC9;
public static byte OCR_TEXT_DATA = (byte) 0xD9;
public static byte OCR_TEXT_FINISH = (byte) 0xE9;
public static final byte RECEIVE_FULL_AUTO = (byte) 0xA0;
app/src/main/java/com/uns/maincar/gui/MainActivity.java
+11 -3
View File
@@ -29,7 +29,6 @@ import androidx.appcompat.app.AppCompatActivity;
import com.bkrcl.control_car_video.camerautil.CameraCommandUtil;
import com.bkrcl.control_car_video.camerautil.SearchCameraUtil;
import com.uns.maincar.R;
import com.uns.maincar.communication.Client;
import com.uns.maincar.communication.CommandDecoder;
import com.uns.maincar.communication.CommandEncoder;
import com.uns.maincar.communication.DataTransferCore;
@@ -42,12 +41,12 @@ import com.uns.maincar.constants.GlobalSignType;
import com.uns.maincar.cpp_interface.CarLicense;
import com.uns.maincar.cpp_interface.EnvTest;
import com.uns.maincar.cpp_interface.MainCarAES;
import com.uns.maincar.cpp_interface.OCR;
import com.uns.maincar.cpp_interface.QRDecoder;
import com.uns.maincar.cpp_interface.ShapeColor;
import com.uns.maincar.cpp_interface.TrafficLight;
import com.uns.maincar.cpp_interface.TrafficSign;
import com.uns.maincar.tools.ImageReleaser;
import com.uns.maincar.cpp_interface.OCR;
import com.uns.maincar.tools.OCRDataReleaser;
import java.nio.charset.StandardCharsets;
@@ -311,7 +310,16 @@ public class MainActivity extends AppCompatActivity
// String str = OCR.DecodeImage(currImage);
String str = OCR.SelfTest(this);
byte[] bstr = str.getBytes(StandardCharsets.UTF_8);
CommandEncoder encoder = new CommandEncoder();
dtc_client.Send(encoder.GenerateCommand(Commands.OCR_TEXT_LENGTH, (byte) bstr.length, (byte) 0x00, (byte) bstr.length));
for (int i = 0; i < bstr.length; i += 2)
{
Sleep(500);
byte data_2 = ((i + 1) >= bstr.length ? 0x00 : bstr[i + 1]);
byte checksum = (byte) ((bstr[i] + data_2) % 0xFF);
byte main = ((i + 1) < bstr.length ? Commands.OCR_TEXT_DATA : Commands.OCR_TEXT_FINISH);
dtc_client.Send(encoder.GenerateCommand(main, bstr[i], data_2, checksum));
}
}
private String ByteArray2String(byte[] arr)