发布2.3.8版本

Author: ch

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.7") {
+    compile project(':qnscalesdk')
+    /* compile("com.github.YolandaQingniu:qnscalesdk:2.3.7") {
          exclude module: "support-v4"//防止和module引用的v4资源版本不同
-     }
+     }*/
 }

app/src/main/java/com/qingniu/qnble/demo/view/SettingActivity.java

@@ -108,6 +108,8 @@ public class SettingActivity extends AppCompatActivity implements RadioGroup.OnC
     Spinner scaleShowHeartRate;
     @BindView(R.id.scale_show_weather)
     Spinner scaleShowWeather;
+    @BindView(R.id.scale_show_weightExtend)
+    Spinner scaleShowweightExtend;
 
     private Config mBleConfig; //蓝牙配置对象
     private String mGender = "male";//用户性别
@@ -319,6 +321,23 @@ public void onNothingSelected(AdapterView<?> parent) {
             }
         });
 
+        scaleShowweightExtend.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                if (position == 0) {
+                    qnIndicateConfig.setWeightExtend(true);
+                } else {
+                    qnIndicateConfig.setWeightExtend(false);
+                }
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+                qnIndicateConfig.setWeightExtend(true);
+            }
+        });
+
     }
 
     @Override

app/src/main/res/layout/activity_setting.xml

@@ -456,6 +456,21 @@
                     android:layout_height="wrap_content"
                     android:entries="@array/choiceArray"/>
             </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+                <TextView
+                    style="@style/user_small_text"
+                    android:text="@string/wsp_show_weight_extend" />
+
+                <Spinner
+                    android:id="@+id/scale_show_weightExtend"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:entries="@array/choiceArray"/>
+            </LinearLayout>
         </LinearLayout>
 
         <TextView

app/src/main/res/values-zh/strings.xml

@@ -195,6 +195,7 @@
     <string name="wsp_show_water">显示体水分</string>
     <string name="wsp_show_heartrate">显示心率</string>
     <string name="wsp_show_weather">显示天气</string>
+    <string name="wsp_show_weight_extend">显示体重变化趋势</string>
     <string name="wsp_location_info">位置信息</string>
     <string name="longitude">经度</string>
     <string name="latitude">纬度</string>

app/src/main/res/values/strings.xml

@@ -195,6 +195,7 @@
     <string name="wsp_show_water">Show body water</string>
     <string name="wsp_show_heartrate">Show heart rate</string>
     <string name="wsp_show_weather">Show weather</string>
+    <string name="wsp_show_weight_extend">Show weight change trend</string>
     <string name="wsp_location_info">location information</string>
     <string name="longitude">longitude</string>
     <string name="latitude">latitude</string>

build.gradle

@@ -2,8 +2,11 @@
 
 buildscript {
     repositories {
-        maven { url 'https://maven.google.com' }
+        maven { url 'https://maven.aliyun.com/repository/jcenter' }
+        maven { url 'https://maven.aliyun.com/repository/google' }
+        maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
         maven { url 'https://jitpack.io' }
+        maven { url 'https://maven.google.com' }
         jcenter()
     }
     dependencies {
@@ -16,6 +19,9 @@ buildscript {
 
 allprojects {
     repositories {
+        maven { url 'https://maven.aliyun.com/repository/jcenter' }
+        maven { url 'https://maven.aliyun.com/repository/google' }
+        maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
         maven { url 'https://maven.google.com' }
         maven { url 'https://jitpack.io' }
         jcenter()

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.7"
+        versionName "qnsdk-2.3.8"
 
         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.7.jar')
+    compile files('libs/qnsdk-2.3.8.jar')
 
 }