[ *] 修复重新设置数据,最大最小值没有重置的bug

yangsanning · Jun 4, 2019 · 7853750 · 7853750
1 parent 508ad69
commit 7853750
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -28,8 +28,8 @@ allprojects {
         //未经测试，不要随意升级支持库的版本
         SUPPORT_LIBRARY_VERSION = '27.1.1'
 
-        VERSION_CODE = 10004
-        VERSION_NAME = "1.0.4"
+        VERSION_CODE = 10005
+        VERSION_NAME = "1.0.5"
     }
 }
 

diff --git a/stock/src/main/java/ysn/com/stock/view/MiniFenShiView.java b/stock/src/main/java/ysn/com/stock/view/MiniFenShiView.java
@@ -214,9 +214,16 @@ private void initCurrentColor() {
         }
     }
 
+    private void initData() {
+        stockPriceList.clear();
+        lastClose = 0.0f;
+        maxStockPrice = Float.MIN_VALUE;
+        minStockPrice = Float.MAX_VALUE;
+    }
+
     public void setNewData(FenShi fenShi) {
+        initData();
         if (fenShi != null) {
-            stockPriceList.clear();
             for (FenShiData fenShiData : fenShi.getData()) {
                 float trade = fenShiData.getTrade();
                 stockPriceList.add(trade);
@@ -228,25 +235,57 @@ public void setNewData(FenShi fenShi) {
             }
             lastClose = fenShi.getLastClose();
         }
-
         initCurrentColor();
         invalidate();
     }
 
     public void setNewData(ArrayList<Float> stockPriceList, Float lastClose) {
+        initData();
         this.stockPriceList = stockPriceList;
+        for (Float trade : stockPriceList) {
+            if (maxStockPrice < trade) {
+                maxStockPrice = trade;
+            } else if (minStockPrice > trade) {
+                minStockPrice = trade;
+            }
+        }
         this.lastClose = lastClose;
         initCurrentColor();
         invalidate();
     }
 
-    public void setPathEffect(PathEffect pathEffect) {
-        this.pathEffect = pathEffect;
-        dottedLinePaint.setPathEffect(pathEffect);
+    public void setNewData(ArrayList<Float> stockPriceList, Float lastClose, Float maxStockPrice, Float minStockPrice) {
+        this.stockPriceList = stockPriceList;
+        this.lastClose = lastClose;
+        this.maxStockPrice = maxStockPrice;
+        this.minStockPrice = minStockPrice;
+        initCurrentColor();
         invalidate();
     }
 
+    public List<Float> getStockPriceList() {
+        return stockPriceList;
+    }
+
+    public float getLastClose() {
+        return lastClose;
+    }
+
+    public float getMaxStockPrice() {
+        return maxStockPrice;
+    }
+
+    public float getMinStockPrice() {
+        return minStockPrice;
+    }
+
     public int getCurrentColor() {
         return currentColor;
     }
-}
+
+    public void setPathEffect(PathEffect pathEffect) {
+        this.pathEffect = pathEffect;
+        dottedLinePaint.setPathEffect(pathEffect);
+        invalidate();
+    }
+}