diff --git a/app/build.gradle b/app/build.gradle index 0d57446..a57c2f1 100644 --- 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.2") { + compile project(':qnscalesdk') + /* compile("com.github.YolandaQingniu:qnscalesdk:2.3.2") { exclude module: "support-v4"//防止和module引用的v4资源版本不同 - } + }*/ } diff --git a/app/src/main/java/com/qingniu/qnble/demo/BaseApplication.java b/app/src/main/java/com/qingniu/qnble/demo/BaseApplication.java index 911bff6..4d80aa7 100644 --- a/app/src/main/java/com/qingniu/qnble/demo/BaseApplication.java +++ b/app/src/main/java/com/qingniu/qnble/demo/BaseApplication.java @@ -4,8 +4,8 @@ import android.util.Log; import com.qingniu.qnble.utils.QNLogUtils; -import com.yolanda.health.qnblesdk.listener.QNResultCallback; -import com.yolanda.health.qnblesdk.out.QNBleApi; +import com.qn.device.listener.QNResultCallback; +import com.qn.device.out.QNBleApi; /** * @author: hekang diff --git a/app/src/main/java/com/qingniu/qnble/demo/adapter/ListAdapter.java b/app/src/main/java/com/qingniu/qnble/demo/adapter/ListAdapter.java index 97ca1a1..cf61e88 100644 --- a/app/src/main/java/com/qingniu/qnble/demo/adapter/ListAdapter.java +++ b/app/src/main/java/com/qingniu/qnble/demo/adapter/ListAdapter.java @@ -10,10 +10,10 @@ import com.qingniu.qnble.demo.bean.IndicateBean; import com.qingniu.qnble.demo.util.IndicateUtils; import com.qingniu.qnble.utils.QNLogUtils; -import com.yolanda.health.qnblesdk.constant.QNIndicator; -import com.yolanda.health.qnblesdk.out.QNBleApi; -import com.yolanda.health.qnblesdk.out.QNScaleItemData; -import com.yolanda.health.qnblesdk.out.QNUser; +import com.qn.device.constant.QNIndicator; +import com.qn.device.out.QNBleApi; +import com.qn.device.out.QNScaleItemData; +import com.qn.device.out.QNUser; import java.util.Calendar; import java.util.Date; diff --git a/app/src/main/java/com/qingniu/qnble/demo/bean/User.java b/app/src/main/java/com/qingniu/qnble/demo/bean/User.java index cc75f47..f832160 100644 --- a/app/src/main/java/com/qingniu/qnble/demo/bean/User.java +++ b/app/src/main/java/com/qingniu/qnble/demo/bean/User.java @@ -3,7 +3,8 @@ import android.os.Parcel; import android.os.Parcelable; -import com.yolanda.health.qnblesdk.out.QNIndicateConfig; + +import com.qn.device.out.QNIndicateConfig; import java.util.Date; diff --git a/app/src/main/java/com/qingniu/qnble/demo/util/IndicateUtils.java b/app/src/main/java/com/qingniu/qnble/demo/util/IndicateUtils.java index 0229d4a..2c08e2d 100644 --- a/app/src/main/java/com/qingniu/qnble/demo/util/IndicateUtils.java +++ b/app/src/main/java/com/qingniu/qnble/demo/util/IndicateUtils.java @@ -4,8 +4,8 @@ import com.qingniu.qnble.demo.R; import com.qingniu.qnble.demo.bean.IndicateBean; -import com.yolanda.health.qnblesdk.constant.QNIndicator; -import com.yolanda.health.qnblesdk.constant.QNInfoConst; +import com.qn.device.constant.QNIndicator; +import com.qn.device.constant.QNInfoConst; import java.util.ArrayList; import java.util.Arrays; diff --git a/app/src/main/java/com/qingniu/qnble/demo/view/BroadcastScaleActivity.java b/app/src/main/java/com/qingniu/qnble/demo/view/BroadcastScaleActivity.java index 1cacfff..f0deeff 100644 --- a/app/src/main/java/com/qingniu/qnble/demo/view/BroadcastScaleActivity.java +++ b/app/src/main/java/com/qingniu/qnble/demo/view/BroadcastScaleActivity.java @@ -16,18 +16,18 @@ import com.qingniu.qnble.demo.bean.User; import com.qingniu.qnble.demo.util.ToastMaker; import com.qingniu.qnble.demo.util.UserConst; -import com.yolanda.health.qnblesdk.constant.UserGoal; -import com.yolanda.health.qnblesdk.constant.UserShape; -import com.yolanda.health.qnblesdk.listener.QNBleDeviceDiscoveryListener; -import com.yolanda.health.qnblesdk.listener.QNResultCallback; -import com.yolanda.health.qnblesdk.out.QNBleApi; -import com.yolanda.health.qnblesdk.out.QNBleBroadcastDevice; -import com.yolanda.health.qnblesdk.out.QNBleDevice; -import com.yolanda.health.qnblesdk.out.QNBleKitchenDevice; -import com.yolanda.health.qnblesdk.out.QNConfig; -import com.yolanda.health.qnblesdk.out.QNScaleData; -import com.yolanda.health.qnblesdk.out.QNScaleItemData; -import com.yolanda.health.qnblesdk.out.QNUser; +import com.qn.device.constant.UserGoal; +import com.qn.device.constant.UserShape; +import com.qn.device.listener.QNBleDeviceDiscoveryListener; +import com.qn.device.listener.QNResultCallback; +import com.qn.device.out.QNBleApi; +import com.qn.device.out.QNBleBroadcastDevice; +import com.qn.device.out.QNBleDevice; +import com.qn.device.out.QNBleKitchenDevice; +import com.qn.device.out.QNConfig; +import com.qn.device.out.QNScaleData; +import com.qn.device.out.QNScaleItemData; +import com.qn.device.out.QNUser; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/qingniu/qnble/demo/view/ConnectActivity.java b/app/src/main/java/com/qingniu/qnble/demo/view/ConnectActivity.java index 85ba9ed..4055066 100644 --- a/app/src/main/java/com/qingniu/qnble/demo/view/ConnectActivity.java +++ b/app/src/main/java/com/qingniu/qnble/demo/view/ConnectActivity.java @@ -25,22 +25,22 @@ import com.qingniu.qnble.demo.util.UserConst; import com.qingniu.qnble.utils.QNLogUtils; import com.qingniu.scale.constant.DecoderConst; -import com.yolanda.health.qnblesdk.constant.CheckStatus; -import com.yolanda.health.qnblesdk.constant.QNIndicator; -import com.yolanda.health.qnblesdk.constant.QNScaleStatus; -import com.yolanda.health.qnblesdk.constant.UserGoal; -import com.yolanda.health.qnblesdk.constant.UserShape; -import com.yolanda.health.qnblesdk.listener.QNBleConnectionChangeListener; -import com.yolanda.health.qnblesdk.listener.QNLogListener; -import com.yolanda.health.qnblesdk.listener.QNResultCallback; -import com.yolanda.health.qnblesdk.listener.QNScaleDataListener; -import com.yolanda.health.qnblesdk.out.QNBleApi; -import com.yolanda.health.qnblesdk.out.QNBleDevice; -import com.yolanda.health.qnblesdk.out.QNScaleData; -import com.yolanda.health.qnblesdk.out.QNScaleItemData; -import com.yolanda.health.qnblesdk.out.QNScaleStoreData; -import com.yolanda.health.qnblesdk.out.QNUser; -import com.yolanda.health.qnblesdk.out.QNWiFiConfig; +import com.qn.device.constant.CheckStatus; +import com.qn.device.constant.QNIndicator; +import com.qn.device.constant.QNScaleStatus; +import com.qn.device.constant.UserGoal; +import com.qn.device.constant.UserShape; +import com.qn.device.listener.QNBleConnectionChangeListener; +import com.qn.device.listener.QNLogListener; +import com.qn.device.listener.QNResultCallback; +import com.qn.device.listener.QNScaleDataListener; +import com.qn.device.out.QNBleApi; +import com.qn.device.out.QNBleDevice; +import com.qn.device.out.QNScaleData; +import com.qn.device.out.QNScaleItemData; +import com.qn.device.out.QNScaleStoreData; +import com.qn.device.out.QNUser; +import com.qn.device.out.QNWiFiConfig; import java.text.ParseException; import java.text.SimpleDateFormat; 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 index 8092d5a..8f44f5a 100644 --- a/app/src/main/java/com/qingniu/qnble/demo/view/CustomSettingActivity.java +++ b/app/src/main/java/com/qingniu/qnble/demo/view/CustomSettingActivity.java @@ -21,10 +21,10 @@ import com.qingniu.qnble.demo.picker.HeightPickerDialog; import com.qingniu.qnble.demo.util.DateUtils; import com.qingniu.qnble.demo.util.ToastMaker; -import com.yolanda.health.qnblesdk.constant.QNInfoConst; -import com.yolanda.health.qnblesdk.constant.QNUnit; -import com.yolanda.health.qnblesdk.constant.UserGoal; -import com.yolanda.health.qnblesdk.constant.UserShape; +import com.qn.device.constant.QNInfoConst; +import com.qn.device.constant.QNUnit; +import com.qn.device.constant.UserGoal; +import com.qn.device.constant.UserShape; import java.util.Date; diff --git a/app/src/main/java/com/qingniu/qnble/demo/view/HeightScaleActivity.java b/app/src/main/java/com/qingniu/qnble/demo/view/HeightScaleActivity.java index 508fe3c..420dd9b 100644 --- a/app/src/main/java/com/qingniu/qnble/demo/view/HeightScaleActivity.java +++ b/app/src/main/java/com/qingniu/qnble/demo/view/HeightScaleActivity.java @@ -17,20 +17,20 @@ import com.qingniu.qnble.demo.bean.User; import com.qingniu.qnble.demo.util.UserConst; import com.qingniu.scale.constant.DecoderConst; -import com.yolanda.health.qnblesdk.constant.QNIndicator; -import com.yolanda.health.qnblesdk.constant.QNScaleStatus; -import com.yolanda.health.qnblesdk.constant.UserGoal; -import com.yolanda.health.qnblesdk.constant.UserShape; -import com.yolanda.health.qnblesdk.listener.QNBleConnectionChangeListener; -import com.yolanda.health.qnblesdk.listener.QNLogListener; -import com.yolanda.health.qnblesdk.listener.QNResultCallback; -import com.yolanda.health.qnblesdk.listener.QNScaleDataListener; -import com.yolanda.health.qnblesdk.out.QNBleApi; -import com.yolanda.health.qnblesdk.out.QNBleDevice; -import com.yolanda.health.qnblesdk.out.QNScaleData; -import com.yolanda.health.qnblesdk.out.QNScaleItemData; -import com.yolanda.health.qnblesdk.out.QNScaleStoreData; -import com.yolanda.health.qnblesdk.out.QNUser; +import com.qn.device.constant.QNIndicator; +import com.qn.device.constant.QNScaleStatus; +import com.qn.device.constant.UserGoal; +import com.qn.device.constant.UserShape; +import com.qn.device.listener.QNBleConnectionChangeListener; +import com.qn.device.listener.QNLogListener; +import com.qn.device.listener.QNResultCallback; +import com.qn.device.listener.QNScaleDataListener; +import com.qn.device.out.QNBleApi; +import com.qn.device.out.QNBleDevice; +import com.qn.device.out.QNScaleData; +import com.qn.device.out.QNScaleItemData; +import com.qn.device.out.QNScaleStoreData; +import com.qn.device.out.QNUser; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/qingniu/qnble/demo/view/ScanActivity.java b/app/src/main/java/com/qingniu/qnble/demo/view/ScanActivity.java index 1750224..2e98162 100644 --- a/app/src/main/java/com/qingniu/qnble/demo/view/ScanActivity.java +++ b/app/src/main/java/com/qingniu/qnble/demo/view/ScanActivity.java @@ -31,22 +31,22 @@ import com.qingniu.qnble.demo.util.ToastMaker; import com.qingniu.qnble.demo.util.UserConst; import com.qingniu.qnble.utils.QNLogUtils; -import com.yolanda.health.qnblesdk.constant.CheckStatus; -import com.yolanda.health.qnblesdk.constant.QNDeviceType; -import com.yolanda.health.qnblesdk.constant.QNIndicator; -import com.yolanda.health.qnblesdk.constant.UserGoal; -import com.yolanda.health.qnblesdk.constant.UserShape; -import com.yolanda.health.qnblesdk.listener.QNBleDeviceDiscoveryListener; -import com.yolanda.health.qnblesdk.listener.QNResultCallback; -import com.yolanda.health.qnblesdk.out.QNBleApi; -import com.yolanda.health.qnblesdk.out.QNBleBroadcastDevice; -import com.yolanda.health.qnblesdk.out.QNBleDevice; -import com.yolanda.health.qnblesdk.out.QNBleKitchenDevice; -import com.yolanda.health.qnblesdk.out.QNConfig; -import com.yolanda.health.qnblesdk.out.QNShareData; -import com.yolanda.health.qnblesdk.out.QNUser; -import com.yolanda.health.qnblesdk.out.QNUtils; -import com.yolanda.health.qnblesdk.out.QNWiFiConfig; +import com.qn.device.constant.CheckStatus; +import com.qn.device.constant.QNDeviceType; +import com.qn.device.constant.QNIndicator; +import com.qn.device.constant.UserGoal; +import com.qn.device.constant.UserShape; +import com.qn.device.listener.QNBleDeviceDiscoveryListener; +import com.qn.device.listener.QNResultCallback; +import com.qn.device.out.QNBleApi; +import com.qn.device.out.QNBleBroadcastDevice; +import com.qn.device.out.QNBleDevice; +import com.qn.device.out.QNBleKitchenDevice; +import com.qn.device.out.QNConfig; +import com.qn.device.out.QNShareData; +import com.qn.device.out.QNUser; +import com.qn.device.out.QNUtils; +import com.qn.device.out.QNWiFiConfig; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/qingniu/qnble/demo/view/SelfBroadcastScaleActivity.java b/app/src/main/java/com/qingniu/qnble/demo/view/SelfBroadcastScaleActivity.java index ec29546..ee06ad1 100644 --- a/app/src/main/java/com/qingniu/qnble/demo/view/SelfBroadcastScaleActivity.java +++ b/app/src/main/java/com/qingniu/qnble/demo/view/SelfBroadcastScaleActivity.java @@ -24,17 +24,17 @@ import com.qingniu.qnble.demo.util.ToastMaker; import com.qingniu.qnble.demo.util.UserConst; import com.qingniu.qnble.utils.QNLogUtils; -import com.yolanda.health.qnblesdk.constant.CheckStatus; -import com.yolanda.health.qnblesdk.constant.QNDeviceType; -import com.yolanda.health.qnblesdk.constant.UserGoal; -import com.yolanda.health.qnblesdk.constant.UserShape; -import com.yolanda.health.qnblesdk.listener.QNResultCallback; -import com.yolanda.health.qnblesdk.out.QNBleApi; -import com.yolanda.health.qnblesdk.out.QNBleBroadcastDevice; -import com.yolanda.health.qnblesdk.out.QNBleDevice; -import com.yolanda.health.qnblesdk.out.QNScaleData; -import com.yolanda.health.qnblesdk.out.QNScaleItemData; -import com.yolanda.health.qnblesdk.out.QNUser; +import com.qn.device.constant.CheckStatus; +import com.qn.device.constant.QNDeviceType; +import com.qn.device.constant.UserGoal; +import com.qn.device.constant.UserShape; +import com.qn.device.listener.QNResultCallback; +import com.qn.device.out.QNBleApi; +import com.qn.device.out.QNBleBroadcastDevice; +import com.qn.device.out.QNBleDevice; +import com.qn.device.out.QNScaleData; +import com.qn.device.out.QNScaleItemData; +import com.qn.device.out.QNUser; import java.util.ArrayList; import java.util.List; 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 index ef123d1..06508f4 100644 --- a/app/src/main/java/com/qingniu/qnble/demo/view/SelfConnectActivity.java +++ b/app/src/main/java/com/qingniu/qnble/demo/view/SelfConnectActivity.java @@ -31,23 +31,23 @@ import com.qingniu.scale.config.DecoderAdapterManager; import com.qingniu.scale.config.DoubleDecoderAdapter; import com.qingniu.scale.constant.DecoderConst; -import com.yolanda.health.qnblesdk.constant.QNBleConst; -import com.yolanda.health.qnblesdk.constant.QNIndicator; -import com.yolanda.health.qnblesdk.constant.QNScaleStatus; -import com.yolanda.health.qnblesdk.constant.UserGoal; -import com.yolanda.health.qnblesdk.constant.UserShape; -import com.yolanda.health.qnblesdk.listener.QNBleProtocolDelegate; -import com.yolanda.health.qnblesdk.listener.QNLogListener; -import com.yolanda.health.qnblesdk.listener.QNResultCallback; -import com.yolanda.health.qnblesdk.listener.QNScaleDataListener; -import com.yolanda.health.qnblesdk.out.QNBleApi; -import com.yolanda.health.qnblesdk.out.QNBleDevice; -import com.yolanda.health.qnblesdk.out.QNBleProtocolHandler; -import com.yolanda.health.qnblesdk.out.QNScaleData; -import com.yolanda.health.qnblesdk.out.QNScaleItemData; -import com.yolanda.health.qnblesdk.out.QNScaleStoreData; -import com.yolanda.health.qnblesdk.out.QNUser; -import com.yolanda.health.qnblesdk.out.QNWiFiConfig; +import com.qn.device.constant.QNBleConst; +import com.qn.device.constant.QNIndicator; +import com.qn.device.constant.QNScaleStatus; +import com.qn.device.constant.UserGoal; +import com.qn.device.constant.UserShape; +import com.qn.device.listener.QNBleProtocolDelegate; +import com.qn.device.listener.QNLogListener; +import com.qn.device.listener.QNResultCallback; +import com.qn.device.listener.QNScaleDataListener; +import com.qn.device.out.QNBleApi; +import com.qn.device.out.QNBleDevice; +import com.qn.device.out.QNBleProtocolHandler; +import com.qn.device.out.QNScaleData; +import com.qn.device.out.QNScaleItemData; +import com.qn.device.out.QNScaleStoreData; +import com.qn.device.out.QNUser; +import com.qn.device.out.QNWiFiConfig; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/qingniu/qnble/demo/view/SelfKitchenScaleActivity.java b/app/src/main/java/com/qingniu/qnble/demo/view/SelfKitchenScaleActivity.java index 7d00a15..18b77cf 100644 --- a/app/src/main/java/com/qingniu/qnble/demo/view/SelfKitchenScaleActivity.java +++ b/app/src/main/java/com/qingniu/qnble/demo/view/SelfKitchenScaleActivity.java @@ -17,12 +17,12 @@ import com.qingniu.qnble.demo.R; import com.qingniu.qnble.demo.util.UserConst; import com.qingniu.qnble.utils.QNLogUtils; -import com.yolanda.health.qnblesdk.constant.CheckStatus; -import com.yolanda.health.qnblesdk.constant.QNDeviceType; -import com.yolanda.health.qnblesdk.listener.QNResultCallback; -import com.yolanda.health.qnblesdk.out.QNBleApi; -import com.yolanda.health.qnblesdk.out.QNBleDevice; -import com.yolanda.health.qnblesdk.out.QNBleKitchenDevice; +import com.qn.device.constant.CheckStatus; +import com.qn.device.constant.QNDeviceType; +import com.qn.device.listener.QNResultCallback; +import com.qn.device.out.QNBleApi; +import com.qn.device.out.QNBleDevice; +import com.qn.device.out.QNBleKitchenDevice; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/qingniu/qnble/demo/view/SelfManagementActivity.java b/app/src/main/java/com/qingniu/qnble/demo/view/SelfManagementActivity.java index a78963a..5a041f9 100644 --- a/app/src/main/java/com/qingniu/qnble/demo/view/SelfManagementActivity.java +++ b/app/src/main/java/com/qingniu/qnble/demo/view/SelfManagementActivity.java @@ -30,13 +30,13 @@ import com.qingniu.qnble.demo.util.ToastMaker; import com.qingniu.qnble.demo.util.UserConst; import com.qingniu.qnble.utils.QNLogUtils; -import com.yolanda.health.qnblesdk.constant.CheckStatus; -import com.yolanda.health.qnblesdk.constant.QNDeviceType; -import com.yolanda.health.qnblesdk.listener.QNResultCallback; -import com.yolanda.health.qnblesdk.out.QNBleApi; -import com.yolanda.health.qnblesdk.out.QNBleDevice; -import com.yolanda.health.qnblesdk.out.QNConfig; -import com.yolanda.health.qnblesdk.out.QNWiFiConfig; +import com.qn.device.constant.CheckStatus; +import com.qn.device.constant.QNDeviceType; +import com.qn.device.listener.QNResultCallback; +import com.qn.device.out.QNBleApi; +import com.qn.device.out.QNBleDevice; +import com.qn.device.out.QNConfig; +import com.qn.device.out.QNWiFiConfig; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/qingniu/qnble/demo/view/SelfMultiDeviceConnectActivity.java b/app/src/main/java/com/qingniu/qnble/demo/view/SelfMultiDeviceConnectActivity.java index 1a2815e..d84589a 100644 --- a/app/src/main/java/com/qingniu/qnble/demo/view/SelfMultiDeviceConnectActivity.java +++ b/app/src/main/java/com/qingniu/qnble/demo/view/SelfMultiDeviceConnectActivity.java @@ -38,23 +38,23 @@ import com.qingniu.qnble.demo.util.UserConst; import com.qingniu.qnble.utils.QNLogUtils; import com.qingniu.scale.constant.DecoderConst; -import com.yolanda.health.qnblesdk.constant.CheckStatus; -import com.yolanda.health.qnblesdk.constant.QNBleConst; -import com.yolanda.health.qnblesdk.constant.QNDeviceType; -import com.yolanda.health.qnblesdk.constant.QNScaleStatus; -import com.yolanda.health.qnblesdk.constant.UserGoal; -import com.yolanda.health.qnblesdk.constant.UserShape; -import com.yolanda.health.qnblesdk.listener.QNBleProtocolDelegate; -import com.yolanda.health.qnblesdk.listener.QNResultCallback; -import com.yolanda.health.qnblesdk.listener.QNScaleDataListener; -import com.yolanda.health.qnblesdk.out.QNBleApi; -import com.yolanda.health.qnblesdk.out.QNBleDevice; -import com.yolanda.health.qnblesdk.out.QNBleProtocolHandler; -import com.yolanda.health.qnblesdk.out.QNConfig; -import com.yolanda.health.qnblesdk.out.QNScaleData; -import com.yolanda.health.qnblesdk.out.QNScaleItemData; -import com.yolanda.health.qnblesdk.out.QNScaleStoreData; -import com.yolanda.health.qnblesdk.out.QNUser; +import com.qn.device.constant.CheckStatus; +import com.qn.device.constant.QNBleConst; +import com.qn.device.constant.QNDeviceType; +import com.qn.device.constant.QNScaleStatus; +import com.qn.device.constant.UserGoal; +import com.qn.device.constant.UserShape; +import com.qn.device.listener.QNBleProtocolDelegate; +import com.qn.device.listener.QNResultCallback; +import com.qn.device.listener.QNScaleDataListener; +import com.qn.device.out.QNBleApi; +import com.qn.device.out.QNBleDevice; +import com.qn.device.out.QNBleProtocolHandler; +import com.qn.device.out.QNConfig; +import com.qn.device.out.QNScaleData; +import com.qn.device.out.QNScaleItemData; +import com.qn.device.out.QNScaleStoreData; +import com.qn.device.out.QNUser; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/qingniu/qnble/demo/view/SettingActivity.java b/app/src/main/java/com/qingniu/qnble/demo/view/SettingActivity.java index 1cb0944..d7545f6 100644 --- a/app/src/main/java/com/qingniu/qnble/demo/view/SettingActivity.java +++ b/app/src/main/java/com/qingniu/qnble/demo/view/SettingActivity.java @@ -23,11 +23,11 @@ import com.qingniu.qnble.demo.picker.HeightPickerDialog; import com.qingniu.qnble.demo.util.DateUtils; import com.qingniu.qnble.demo.util.ToastMaker; -import com.yolanda.health.qnblesdk.constant.QNInfoConst; -import com.yolanda.health.qnblesdk.constant.QNUnit; -import com.yolanda.health.qnblesdk.constant.UserGoal; -import com.yolanda.health.qnblesdk.constant.UserShape; -import com.yolanda.health.qnblesdk.out.QNIndicateConfig; +import com.qn.device.constant.QNInfoConst; +import com.qn.device.constant.QNUnit; +import com.qn.device.constant.UserGoal; +import com.qn.device.constant.UserShape; +import com.qn.device.out.QNIndicateConfig; import java.util.Date; diff --git a/app/src/main/java/com/qingniu/qnble/demo/view/SystemScanActivity.java b/app/src/main/java/com/qingniu/qnble/demo/view/SystemScanActivity.java index 1d1ffe1..ac6474e 100644 --- a/app/src/main/java/com/qingniu/qnble/demo/view/SystemScanActivity.java +++ b/app/src/main/java/com/qingniu/qnble/demo/view/SystemScanActivity.java @@ -30,12 +30,12 @@ import com.qingniu.qnble.utils.BleUtils; import com.qingniu.qnble.utils.QNLogUtils; import com.qingniu.scale.constant.ScaleType; -import com.yolanda.health.qnblesdk.constant.CheckStatus; -import com.yolanda.health.qnblesdk.listener.QNResultCallback; -import com.yolanda.health.qnblesdk.out.QNBleApi; -import com.yolanda.health.qnblesdk.out.QNBleDevice; -import com.yolanda.health.qnblesdk.out.QNConfig; -import com.yolanda.health.qnblesdk.out.QNWiFiConfig; +import com.qn.device.constant.CheckStatus; +import com.qn.device.listener.QNResultCallback; +import com.qn.device.out.QNBleApi; +import com.qn.device.out.QNBleDevice; +import com.qn.device.out.QNConfig; +import com.qn.device.out.QNWiFiConfig; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/qingniu/qnble/demo/view/WspConfigActivity.java b/app/src/main/java/com/qingniu/qnble/demo/view/WspConfigActivity.java index cc317cd..e1ec803 100644 --- a/app/src/main/java/com/qingniu/qnble/demo/view/WspConfigActivity.java +++ b/app/src/main/java/com/qingniu/qnble/demo/view/WspConfigActivity.java @@ -19,14 +19,14 @@ import com.qingniu.qnble.demo.bean.User; import com.qingniu.qnble.demo.util.ToastMaker; import com.qingniu.qnble.demo.util.UserConst; -import com.yolanda.health.qnblesdk.constant.UserGoal; -import com.yolanda.health.qnblesdk.constant.UserShape; -import com.yolanda.health.qnblesdk.listener.QNResultCallback; -import com.yolanda.health.qnblesdk.out.QNBleApi; -import com.yolanda.health.qnblesdk.out.QNBleDevice; -import com.yolanda.health.qnblesdk.out.QNUser; -import com.yolanda.health.qnblesdk.out.QNWiFiConfig; -import com.yolanda.health.qnblesdk.out.QNWspConfig; +import com.qn.device.constant.UserGoal; +import com.qn.device.constant.UserShape; +import com.qn.device.listener.QNResultCallback; +import com.qn.device.out.QNBleApi; +import com.qn.device.out.QNBleDevice; +import com.qn.device.out.QNUser; +import com.qn.device.out.QNWiFiConfig; +import com.qn.device.out.QNWspConfig; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/qingniu/qnble/demo/view/WspScaleActivity.java b/app/src/main/java/com/qingniu/qnble/demo/view/WspScaleActivity.java index 5307f07..3f9e620 100644 --- a/app/src/main/java/com/qingniu/qnble/demo/view/WspScaleActivity.java +++ b/app/src/main/java/com/qingniu/qnble/demo/view/WspScaleActivity.java @@ -17,19 +17,19 @@ import com.qingniu.qnble.demo.util.UserConst; import com.qingniu.qnble.utils.QNLogUtils; import com.qingniu.scale.constant.DecoderConst; -import com.yolanda.health.qnblesdk.constant.QNIndicator; -import com.yolanda.health.qnblesdk.constant.QNScaleStatus; -import com.yolanda.health.qnblesdk.listener.QNBleConnectionChangeListener; -import com.yolanda.health.qnblesdk.listener.QNLogListener; -import com.yolanda.health.qnblesdk.listener.QNResultCallback; -import com.yolanda.health.qnblesdk.listener.QNWspScaleDataListener; -import com.yolanda.health.qnblesdk.out.QNBleApi; -import com.yolanda.health.qnblesdk.out.QNBleDevice; -import com.yolanda.health.qnblesdk.out.QNScaleData; -import com.yolanda.health.qnblesdk.out.QNScaleItemData; -import com.yolanda.health.qnblesdk.out.QNScaleStoreData; -import com.yolanda.health.qnblesdk.out.QNUser; -import com.yolanda.health.qnblesdk.out.QNWspConfig; +import com.qn.device.constant.QNIndicator; +import com.qn.device.constant.QNScaleStatus; +import com.qn.device.listener.QNBleConnectionChangeListener; +import com.qn.device.listener.QNLogListener; +import com.qn.device.listener.QNResultCallback; +import com.qn.device.listener.QNWspScaleDataListener; +import com.qn.device.out.QNBleApi; +import com.qn.device.out.QNBleDevice; +import com.qn.device.out.QNScaleData; +import com.qn.device.out.QNScaleItemData; +import com.qn.device.out.QNScaleStoreData; +import com.qn.device.out.QNUser; +import com.qn.device.out.QNWspConfig; import java.util.ArrayList; import java.util.Date; diff --git a/app/src/main/java/com/qingniu/qnble/demo/view/kitchenScaleActivity.java b/app/src/main/java/com/qingniu/qnble/demo/view/kitchenScaleActivity.java index 9b874f9..9fdd9f5 100644 --- a/app/src/main/java/com/qingniu/qnble/demo/view/kitchenScaleActivity.java +++ b/app/src/main/java/com/qingniu/qnble/demo/view/kitchenScaleActivity.java @@ -9,13 +9,13 @@ import android.widget.TextView; import com.qingniu.qnble.demo.R; -import com.yolanda.health.qnblesdk.listener.QNBleDeviceDiscoveryListener; -import com.yolanda.health.qnblesdk.listener.QNResultCallback; -import com.yolanda.health.qnblesdk.out.QNBleApi; -import com.yolanda.health.qnblesdk.out.QNBleBroadcastDevice; -import com.yolanda.health.qnblesdk.out.QNBleDevice; -import com.yolanda.health.qnblesdk.out.QNBleKitchenDevice; -import com.yolanda.health.qnblesdk.out.QNConfig; +import com.qn.device.listener.QNBleDeviceDiscoveryListener; +import com.qn.device.listener.QNResultCallback; +import com.qn.device.out.QNBleApi; +import com.qn.device.out.QNBleBroadcastDevice; +import com.qn.device.out.QNBleDevice; +import com.qn.device.out.QNBleKitchenDevice; +import com.qn.device.out.QNConfig; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/qnscalesdk/build.gradle b/qnscalesdk/build.gradle index 79e943b..3df73fd 100644 --- a/qnscalesdk/build.gradle +++ b/qnscalesdk/build.gradle @@ -7,7 +7,7 @@ android { minSdkVersion 15//MIN_SDK_VERSION as int targetSdkVersion TARGET_SDK_VERSION as int versionCode 1 - versionName "qnsdk-2.3.2" + versionName "qnsdk-2.3.6" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } @@ -30,6 +30,6 @@ dependencies { }) testCompile 'junit:junit:4.12' compile "com.android.support:support-v4:$ANDROID_SUPPORT_VERSION" - compile files('libs/qnsdk-2.3.2.jar') + compile files('libs/qnsdk-2.3.6.jar') } diff --git a/qnscalesdk/libs/qnsdk-2.3.2.jar b/qnscalesdk/libs/qnsdk-2.3.6.jar similarity index 61% rename from qnscalesdk/libs/qnsdk-2.3.2.jar rename to qnscalesdk/libs/qnsdk-2.3.6.jar index e3671cd..87af8ec 100644 Binary files a/qnscalesdk/libs/qnsdk-2.3.2.jar and b/qnscalesdk/libs/qnsdk-2.3.6.jar differ