提交代码修改

YolandaQingniu · Oct 22, 2020 · da595dd · da595dd
1 parent a774979
commit da595dd
Show file tree

Hide file tree

Showing 12 changed files with 1,182 additions and 24 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -64,8 +64,8 @@ dependencies {
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
     testCompile 'junit:junit:4.12'
     compile 'cn.bingoogolapple:bga-qrcode-zxing:1.3.6'
-    //compile project(':qnscalesdk')
-     compile("com.github.YolandaQingniu:qnscalesdk:2.3.0-beta10") {
+    compile project(':qnscalesdk')
+   /*  compile("com.github.YolandaQingniu:qnscalesdk:2.3.0-beta10") {
          exclude module: "support-v4"//防止和module引用的v4资源版本不同
-     }
+     }*/
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,10 @@
         <activity
             android:name=".view.HeightScaleActivity"
             android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".view.SelfMultiDeviceConnectActivity"
+            android:screenOrientation="portrait" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/qingniu/qnble/demo/view/CustomSettingActivity.java b/app/src/main/java/com/qingniu/qnble/demo/view/CustomSettingActivity.java
@@ -73,6 +73,8 @@ public class CustomSettingActivity extends AppCompatActivity implements RadioGro
 
     @BindView(R.id.user_clothes_edt)
     EditText user_clothes_edt;
+    @BindView(R.id.btn_double_sure)
+    Button btnDoubleSure;
 
     private Config mBleConfig; //蓝牙配置对象
     private String mGender = "male";//用户性别
@@ -113,6 +115,7 @@ private void initListener() {
         mUserUnitGrp.setOnCheckedChangeListener(this);
         mUserHeightTv.setOnClickListener(this);
         mUserBirthdayTv.setOnClickListener(this);
+        btnDoubleSure.setOnClickListener(this);
         mSure.setOnClickListener(this);
 
 
@@ -220,6 +223,12 @@ public void onChoose(Date date) {
                 startActivity(SelfManagementActivity.getCallIntent(this, mUser, mBleConfig));
                 finish();
                 break;
+
+            case R.id.btn_double_sure:
+                if (checkInfo()) return;
+                startActivity(SelfMultiDeviceConnectActivity.getCallIntent(this,mUser,mBleConfig));
+                finish();
+                break;
         }
     }
 
@@ -243,16 +252,16 @@ private boolean checkInfo() {
             ToastMaker.show(this, getResources().getString(R.string.user_id_empty));
             return true;
         } else if (mUserGenderGrp.getCheckedRadioButtonId() == -1) {
-            ToastMaker.show(this,getResources().getString(R.string.select_grander));
+            ToastMaker.show(this, getResources().getString(R.string.select_grander));
             return true;
         } else if (mHeight == 0) {
             ToastMaker.show(this, getResources().getString(R.string.input_height));
             return true;
         } else if (mBirthday == null) {
-            ToastMaker.show(this,getString(R.string.input_birthday));
+            ToastMaker.show(this, getString(R.string.input_birthday));
             return true;
         } else if (mUserUnitGrp.getCheckedRadioButtonId() == -1) {
-            ToastMaker.show(this,getResources().getString(R.string.select_weight));
+            ToastMaker.show(this, getResources().getString(R.string.select_weight));
             return true;
         }
 

diff --git a/app/src/main/java/com/qingniu/qnble/demo/view/SelfConnectActivity.java b/app/src/main/java/com/qingniu/qnble/demo/view/SelfConnectActivity.java
@@ -58,7 +58,7 @@
 
 /**
  * author: yolanda-zhao
- * description:自主普通秤连接测量界面
+ * description:自主普通秤连接测量界面(单设备连接)
  * date: 2019/9/6
  */
 
@@ -150,6 +150,7 @@ public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState
                     mBluetoothGatt = null;
                 }
                 setBleStatus(QNScaleStatus.STATE_DISCONNECTED);
+                mIsConnected = false;
                 Log.e(TAG, err);
                 return;
             }
@@ -319,13 +320,13 @@ private void initData() {
     private void buildHandler() {
         mProtocolhandler = mQNBleApi.buildProtocolHandler(mBleDevice, createQNUser(), new QNBleProtocolDelegate() {
             @Override
-            public void writeCharacteristicValue(String service_uuid, String characteristic_uuid, byte[] data) {
-                writeCharacteristicData(service_uuid, characteristic_uuid, data);
+            public void writeCharacteristicValue(String service_uuid, String characteristic_uuid, byte[] data, QNBleDevice qnBleDevice) {
+                writeCharacteristicData(service_uuid, characteristic_uuid, data, qnBleDevice.getMac());
             }
 
             @Override
-            public void readCharacteristic(String service_uuid, String characteristic_uuid) {
-                readCharacteristicData(service_uuid, characteristic_uuid);
+            public void readCharacteristic(String service_uuid, String characteristic_uuid, QNBleDevice qnBleDevice) {
+                readCharacteristicData(service_uuid, characteristic_uuid, qnBleDevice.getMac());
 
             }
         }, new QNResultCallback() {
@@ -336,7 +337,7 @@ public void onResult(int code, String msg) {
         });
     }
 
-    private void readCharacteristicData(String service_uuid, String characteristic_uuid) {
+    private void readCharacteristicData(String service_uuid, String characteristic_uuid, String mac) {
 
         switch (characteristic_uuid) {
             case QNBleConst.UUID_IBT_READ:
@@ -365,7 +366,7 @@ private void readCharacteristicData(String service_uuid, String characteristic_u
 
     }
 
-    private void writeCharacteristicData(String service_uuid, String characteristic_uuid, byte[] data) {
+    private void writeCharacteristicData(String service_uuid, String characteristic_uuid, byte[] data, String mac) {
         switch (characteristic_uuid) {
             case QNBleConst.UUID_IBT_WRITE: