bug修改

app/build.gradle

@@ -49,6 +49,43 @@ android {
             proguardFiles 'proguard-rules.pro'
         }
     }
+    productFlavors {
+        yingyongbao {
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "1001"]
+            buildConfigField 'String','CHANNLE','"1001"'
+        }
+
+        vivo {
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "1002"]
+            buildConfigField 'String','CHANNLE','"1002"'
+        }
+
+        oppo {
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "1003"]
+            buildConfigField 'String','CHANNLE','"1003"'
+        }
+
+        xiaomi {
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "1005"]
+            buildConfigField 'String','CHANNLE','"1005"'
+        }
+
+        huawei {
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "1004"]
+            buildConfigField 'String','CHANNLE','"1004"'
+        }
+
+        baidu {
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "1006"]
+            buildConfigField 'String','CHANNLE','"1006"'
+        }
+
+        c360 {
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "1000"]
+            buildConfigField 'String','CHANNLE','"1000"'
+        }
+
+    }
 }
 
 def releaseTime() {

app/src/main/java/com/kuxuan/moneynote/common/Constant.java

@@ -9,8 +9,8 @@ public class Constant {
     //手机号正则，11位手机号
     public static final String REGEX_MOBILE = "[1][3,4,5,7,8][0-9]{9}$";
     //测试接口
-    public static final String BASE_URL = "http://bill.quyaqu.com/api/";
-//    public static final String BASE_URL = "http://api.money.quyaqu.com/api/";
+//    public static final String BASE_URL = "http://bill.quyaqu.com/api/";
+    public static final String BASE_URL = "http://api.money.quyaqu.com/api/";
     public static final String MD5 = "b4b80c2676828f1df375684100f56d48";
 
     public static class UserInfo{

app/src/main/java/com/kuxuan/moneynote/ui/activitys/account/AccountActivity.java

@@ -171,6 +171,8 @@ public class AccountActivity extends MVPFragmentActivity<AccountPresenter, Accou
         }
         if (numNumber != null) {
             num.setText(numNumber);
+
+
         }
         //编辑页跳转过来用到
         isEdit = intent.getBooleanExtra(ISEDIT, false);

app/src/main/java/com/kuxuan/moneynote/ui/weight/CaculatorLayout.java

@@ -129,11 +129,15 @@ public class CaculatorLayout extends LinearLayout implements View.OnClickListene
         this.sum =sum;
     }
 
+
+    public static void setNumText(String numText) {
+        CaculatorLayout.numText = numText;
+    }
+
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.calculator_btn7:
-
                 if (canRecord(numText)) {
                     numText = numText + INPUT_7;
                     mNumText.setText(numText);
@@ -295,14 +299,19 @@ public class CaculatorLayout extends LinearLayout implements View.OnClickListene
                     mResultBtn.setText(COMPLETES);
                     return;
                 }
-                if(numText.substring(numText.length()-1,numText.length()).equals("+")||numText.substring(numText.length()-1,numText.length()).equals("-")){
-                    numText = numText.substring(0,numText.length()-1);
-                    mNumText.setText(numText);
-                    return;
+                try {
+                    if(numText.substring(numText.length()-1,numText.length()).equals("+")||numText.substring(numText.length()-1,numText.length()).equals("-")){
+                        numText = numText.substring(0,numText.length()-1);
+                        mNumText.setText(numText);
+                        return;
+                    }
+                }catch (Exception e){
+
                 }
                 numText = "";
                 sum.complete();
 
+
                 //计算结果
                 break;
             case R.id.calculator_add_btn:

app/src/main/java/com/kuxuan/moneynote/ui/weight/LineChartView.java

@@ -241,25 +241,25 @@ public class LineChartView extends View {
         }
 
         //画平均线
-        axisPaint.setColor(Color.parseColor("#b4b4b4"));
-        axisPaint.setStrokeWidth(DisplayUtil.dip2px(1));
-        int count = (mXAxis.size() - 1) * mxInterval / mXuxianInterval;
-        for (int i = 0; i < count; i++) {
-            int lineWidth = mXuxianInterval;
-            int start = mLeftInterval + (lineWidth * 2) * i;
-            int end = start + lineWidth;
-            boolean isBreak = false;
-            if (end > (mXAxis.size() - 1) * mxInterval + mLeftInterval) {
-                end = (mXAxis.size() - 1) * mxInterval + mLeftInterval;
-                isBreak = true;
-            }
-            float h = (mHeight-mBottomInterval)-((mHeight - mBottomInterval) * average/maxYValue);
-            canvas.drawLine(start, h, end,
-                    h, axisPaint);
-            if (isBreak) {
-                break;
-            }
-        }
+//        axisPaint.setColor(Color.parseColor("#b4b4b4"));
+//        axisPaint.setStrokeWidth(DisplayUtil.dip2px(1));
+//        int count = (mXAxis.size() - 1) * mxInterval / mXuxianInterval;
+//        for (int i = 0; i < count; i++) {
+//            int lineWidth = mXuxianInterval;
+//            int start = mLeftInterval + (lineWidth * 2) * i;
+//            int end = start + lineWidth;
+//            boolean isBreak = false;
+//            if (end > (mXAxis.size() - 1) * mxInterval + mLeftInterval) {
+//                end = (mXAxis.size() - 1) * mxInterval + mLeftInterval;
+//                isBreak = true;
+//            }
+//            float h = (mHeight-mBottomInterval)-((mHeight - mBottomInterval) * average/maxYValue);
+//            canvas.drawLine(start, h, end,
+//                    h, axisPaint);
+//            if (isBreak) {
+//                break;
+//            }
+//        }
         // x轴的刻度集合
         int[] xPoints = new int[mXAxis.size()];
         for (int i = 0; i < mXAxis.size(); i++) {

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

@@ -7,9 +7,9 @@
 
     <ImageView
         android:id="@+id/item_find_imageView"
-        android:layout_width="40px"
+        android:layout_width="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:layout_height="40px"
+        android:layout_height="wrap_content"
         />