Просмотр исходного кода

MPAndroidChart优化;日期控件优化;

Arison 9 лет назад
Родитель
Сommit
d1f3c123d4

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessActivity.java

@@ -347,7 +347,7 @@ public class BusinessActivity extends BaseActivity implements View.OnClickListen
         if (position != 0){
         if (position != 0){
 //            HListViewOneAdapter.ViewHolder holder= (HListViewOneAdapter.ViewHolder) view.getTag();
 //            HListViewOneAdapter.ViewHolder holder= (HListViewOneAdapter.ViewHolder) view.getTag();
             ArrayList<String> items=   gridlists.get(position);
             ArrayList<String> items=   gridlists.get(position);
-            startActivity(new Intent(ct, BusinessDetailActivty.class).putExtra("bt_type",3).putExtra("steps",items.get(2)));
+            startActivity(new Intent(ct, BusinessDetailActivty.class).putExtra("bt_type",3).putExtra("steps",items.get(1)));
            // Crouton.makeText(this,"item "+items.get(2)+" is clicked",0xff99cc00,1000).show();
            // Crouton.makeText(this,"item "+items.get(2)+" is clicked",0xff99cc00,1000).show();
         }
         }
     }
     }

+ 7 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/view/FunnelView.java

@@ -12,9 +12,11 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.util.Log;
 import android.util.TypedValue;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.View;
+import android.view.WindowManager;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.AccelerateDecelerateInterpolator;
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
+import com.xzjmyk.pm.activity.util.DisplayUtil;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
@@ -48,7 +50,9 @@ public class FunnelView extends View implements ValueAnimator.AnimatorUpdateList
     private float mTotalHeight = 
     private float mTotalHeight = 
             TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 250, getResources().getDisplayMetrics());
             TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 250, getResources().getDisplayMetrics());
     private float maxWidth = 
     private float maxWidth = 
-            TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 330, getResources().getDisplayMetrics());
+            TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
+                   355,
+                    getResources().getDisplayMetrics());
     private float maxLineH = 
     private float maxLineH = 
             TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 120, getResources().getDisplayMetrics());
             TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 120, getResources().getDisplayMetrics());
     private float minLineH = 
     private float minLineH = 
@@ -81,6 +85,8 @@ public class FunnelView extends View implements ValueAnimator.AnimatorUpdateList
         this.mMoneys = moneys;
         this.mMoneys = moneys;
         this.maxMoney = maxMoney;
         this.maxMoney = maxMoney;
         this.colors=colors;
         this.colors=colors;
+        Log.i("FunnelMain", "setData:px:" + ((WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getWidth() );
+        Log.i("FunnelMain", "setData:dp:" + DisplayUtil.px2dip(getContext(),((WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getWidth()));
         stopAnimator();
         stopAnimator();
         init();
         init();
         calculate();
         calculate();