Browse Source

1.更新gradle版本到28;
2.完善接收数据逻辑。

Yumin 6 years ago
parent
commit
28b36a6f9d

+ 7 - 7
app/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
         applicationId "cn.minbb.producttester"
         minSdkVersion 18
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -44,15 +44,15 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.android.support:support-vector-drawable:27.1.1'
-    implementation 'com.android.support:support-v4:27.1.1'
+    implementation 'com.android.support:support-vector-drawable:28.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'com.android.support:cardview-v7:28.0.0'
 
     implementation 'com.jakewharton:butterknife:8.8.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'

+ 13 - 7
app/src/main/java/cn/minbb/producttester/views/BasicDeviceActivity.java

@@ -51,7 +51,7 @@ public class BasicDeviceActivity extends AppCompatActivity {
     private BasicDeviceAdapter basicDeviceAdapter;
     private List<BasicDeviceAdapter.ItemBean> itemBeanList = new ArrayList<>();
     // 输出流缓冲区
-    private StringBuffer outStringBuffer;
+    private StringBuffer outStringBuffer = new StringBuffer("");
 
     static {
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
@@ -156,6 +156,7 @@ public class BasicDeviceActivity extends AppCompatActivity {
                     String address = data.getExtras().getString(BluetoothChatService.EXTRA_DEVICE_ADDRESS);
                     // 尝试连接到设备
                     chatService.connect(bluetoothAdapter.getRemoteDevice(address));
+                    // 初始化文本
                 }
         }
     }
@@ -167,19 +168,24 @@ public class BasicDeviceActivity extends AppCompatActivity {
                 startActivityForResult(new Intent(BasicDeviceActivity.this, ScanDeviceActivity.class), 0);
                 break;
             case R.id.opUp:
-                sendDataToDevice("UD\r\nUU\r\n", false);
+                sendDataToDevice("UD\r\n", false);
+                sendDataToDevice("UU\r\n", false);
                 break;
             case R.id.opLeft:
-                sendDataToDevice("LD\r\nLU\r\n", false);
+                sendDataToDevice("LD\r\n", false);
+                sendDataToDevice("LU\r\n", false);
                 break;
             case R.id.opCenter:
-                sendDataToDevice("SD\r\nSU\r\n", false);
+                sendDataToDevice("SD\r\n", false);
+                sendDataToDevice("SU\r\n", false);
                 break;
             case R.id.opRight:
-                sendDataToDevice("RD\r\nRU\r\n", false);
+                sendDataToDevice("RD\r\n", false);
+                sendDataToDevice("RU\r\n", false);
                 break;
             case R.id.opDown:
-                sendDataToDevice("DD\r\nDU\n", false);
+                sendDataToDevice("DD\r\n", false);
+                sendDataToDevice("DU\r\n", false);
                 break;
         }
     }
@@ -255,7 +261,7 @@ public class BasicDeviceActivity extends AppCompatActivity {
                         e.printStackTrace();
                     }
                     if (null != readMessage) {
-                        System.err.println("/" + readMessage);
+                        System.err.println("===" + readMessage);
                         Pattern p = Pattern.compile("\\{.*?\\}");
                         Matcher m = p.matcher(readMessage);
                         // 判断正则表达式是否匹配到