添加阴影效果，stepView自定义view

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/LeaveActivity.java

@@ -640,7 +640,7 @@ public class LeaveActivity extends BaseActivity implements OnClickListener {
         params.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        ViewUtil.httpSendRequest(ct, url, params, handler, headers, SUCCESS_SAVE, null, null, "get");
+        ViewUtil.httpSendRequest(ct, url, params, handler, headers, SUCCESS_SAVE, null, null, "post");
     }
 
     private LeaveEntity getSaveJsonData() {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/NewsTwoActivity.java

@@ -132,7 +132,7 @@ public class NewsTwoActivity extends BaseActivity {
                     String result = msg.getData().getString("result");
                     NewsEntity newsEntity = JSON.parseObject(result, NewsEntity.class);
                     for (int i = 0; i < newsEntity.getData().size(); i++) {
-                        Log.i("gongpengming", newsEntity.getData().get(i).getNE_TYPE());
+                   //     Log.i("gongpengming", newsEntity.getData().get(i).getNE_TYPE());
                     }
                     if (adapter == null) {
                         adapter = new CardItemAdapter(ct, newsEntity);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessDetailInfoActivity.java

@@ -28,6 +28,7 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
+import com.xzjmyk.pm.activity.view.steps.StepsView;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -54,8 +55,6 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
     @ViewInject(R.id.crm_ll_manage)
     private LinearLayout crm_ll_manage;
 
-
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -158,7 +157,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                 }
             });
 
-            popupWindow = new PopupWindow(view, parent.getWidth(), ViewUtil.setListViewHeightBasedOnChildren1(plist));
+            popupWindow = new PopupWindow(view, parent.getWidth(), ViewUtil.setListViewHeightBasedOnChildren1(plist)+DisplayUtil.dip2px(this,10));
         }
         // 使其聚集
         popupWindow.setFocusable(true);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/ClientActivity.java

@@ -281,7 +281,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                 DisplayUtil.backgroundAlpha(ClientActivity.this, 1f);
             }
         });
-        DisplayUtil.backgroundAlpha(this, 0.5f);
+        DisplayUtil.backgroundAlpha(this, 1f);
         // 这个是为了点击“返回Back”也能使其消失，并且并不会影响你的背景
         popupWindow.setBackgroundDrawable(new BitmapDrawable());
         popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerDetailActivity.java

@@ -1,13 +1,16 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 
 import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.view.steps.StepsView;
 
 /**
  * @功能:客户详情
@@ -16,7 +19,11 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
  * @return:
  */
 public class CustomerDetailActivity extends BaseActivity {
-
+    @ViewInject(R.id.stepsView)
+    private StepsView mStepsView;
+    private Context ct;
+    private final String[] labels = {"Step 1", "Step 2", "Step 3", "Step 4", "Step 5"
+            ,"进度6" ,"进度7" ,"进度8" ,"进度9" };
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -28,6 +35,7 @@ public class CustomerDetailActivity extends BaseActivity {
 
     private void initView() {
         ViewUtils.inject(this);
+        ct=this;
         getSupportActionBar().setTitle("客户详情");
     }
 
@@ -36,7 +44,13 @@ public class CustomerDetailActivity extends BaseActivity {
     }
 
     private void initData() {
-
+        mStepsView.setCompletedPosition(5 % labels.length)
+                .setLabels(labels)
+                .setBarColorIndicator(
+                       ct.getResources().getColor(R.color.material_blue_grey_800))
+                .setProgressColorIndicator(ct.getResources().getColor(R.color.orange))
+                .setLabelColorIndicator(ct.getResources().getColor(R.color.orange))
+                .drawView();
     }
 
     @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/HListViewOneAdapter.java

@@ -3,6 +3,7 @@ package com.xzjmyk.pm.activity.ui.erp.adapter;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Color;
+import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -15,6 +16,7 @@ import android.widget.TextView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.util.DisplayUtil;
 
 import java.util.ArrayList;
 
@@ -77,6 +79,7 @@ public class HListViewOneAdapter extends BaseAdapter {
                       //  holder.tv_item[i].setMinWidth(CommonUtil.dip2px(ct, 105));
                     }else{
                         holder.tv_item[i].setTextColor(ct.getResources().getColor(R.color.black));
+                      //  holder.tv_item[i].setBackgroundColor(ct.getResources().getColor(R.color.yellow_home));
                     }
                 }
             }
@@ -100,9 +103,10 @@ public class HListViewOneAdapter extends BaseAdapter {
         //tp.setMargins(CommonUtil.dip2px(ct, 2), CommonUtil.dip2px(ct, 0), CommonUtil.dip2px(ct, 10), CommonUtil.dip2px(ct, 0));
         tView.setLayoutParams(tp);
         tView.setGravity(Gravity.CENTER);
-        tView.setBackground(ct.getResources().getDrawable(R.drawable.shape_btn_bussine));
+        tView.setBackground(ct.getResources().getDrawable(R.drawable.shape_btn_nomargin));
         tView.setTextColor(ct.getResources().getColor(R.color.black));
-        tView.setTextSize(CommonUtil.px2dip(ct,34f));
+        //DisplayUtil.sp2px(ct,6f)
+        tView.setTextSize(TypedValue.COMPLEX_UNIT_SP,10);
         return tView;
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java

@@ -95,8 +95,8 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                 ViewUtil.WebLinks(ct, url, "我的商务");
                 break;
             case R.id.rl_uas_sys:
-                ct.startActivity(new Intent(ct, ErpMenActivity.class));
- //                       ct.startActivity(new Intent(ct, OAActivity.class));
+               // ct.startActivity(new Intent(ct, ErpMenActivity.class));
+                        ct.startActivity(new Intent(ct, OAActivity.class));
                 break;
             case R.id.my_client_rl:
                 ct.startActivity(new Intent(ct, ClientActivity.class));

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/HttpUtil.java

@@ -14,6 +14,7 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.params.CoreProtocolPNames;
+import org.apache.http.protocol.HTTP;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -27,6 +28,7 @@ import java.net.ProtocolException;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.net.URL;
+import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -66,7 +68,11 @@ public class HttpUtil {
                 for (Map.Entry<String, Object> entry : entrys) {
                     buf.append(entry.getKey())
                             .append("=")
-                            .append(URLEncoder.encode(entry.getValue().toString(), "UTF-8"))
+                            .append(
+                                    URLEncoder.encode(
+                                            entry.getValue().toString()
+                                            , "UTF-8")
+                            )
                             .append("&");
                 }
             }
@@ -77,13 +83,15 @@ public class HttpUtil {
             } else
                 buf.deleteCharAt(buf.length() - 1);
             HttpGet httpGet = new HttpGet(buf.toString());
+//            httpGet.setHeader(key, headers.get(key).toString());
+            httpGet.setHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
             if (headers != null) {
                 for (String key : headers.keySet()) {
                     System.out.println("add header:" + key + " value:" + headers.get(key).toString());
                     httpGet.setHeader(key, headers.get(key).toString());
                 }
             }
-            httpClient.getParams().setParameter(CoreProtocolPNames.HTTP_CONTENT_CHARSET, "UTF-8");
+          //  httpClient.getParams().setParameter(CoreProtocolPNames.HTTP_CONTENT_CHARSET, "UTF-8");
             response = httpClient.execute(httpGet);
             return Response.getResponse(response);
         } finally {
@@ -114,17 +122,21 @@ public class HttpUtil {
             if (params != null && !params.isEmpty()) {
                 Set<Entry<String, Object>> entrys = params.entrySet();
                 for (Map.Entry<String, Object> entry : entrys) {
-                    nvps.add(new BasicNameValuePair(entry.getKey(), URLEncoder
-                            .encode(entry.getValue().toString(), "utf-8")));
+                    nvps.add(new BasicNameValuePair(entry.getKey(),
+                            URLDecoder.decode(
+                                    entry.getValue().toString()
+                                    , "utf-8")
+                    ));
                 }
             }
-            httpPost.setEntity(new UrlEncodedFormEntity(nvps));
+            httpPost.setEntity(new UrlEncodedFormEntity(nvps, HTTP.UTF_8));
             if (headers != null) {
                 for (String key : headers.keySet()) {
                     System.out.println("add header:" + key + " value:" + headers.get(key).toString());
                     httpPost.setHeader(key, headers.get(key).toString());
                 }
             }
+            httpPost.addHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
             response = httpClient.execute(httpPost);
             return Response.getResponse(response);
         } finally {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/ViewUtil.java

@@ -143,23 +143,6 @@ public class ViewUtil {
                 .show();
     }
 
-/*	public static void ShowBasicNoTitle(Context ct) {
-        new MaterialDialog.Builder(ct).title(""
-				+ "信息提示").content("您还未登录，请登录！")
-				.positiveText("确定").negativeText("取消").autoDismiss(false)
-				.callback(new ButtonCallback() {
-					@Override
-					public void onPositive(MaterialDialog dialog) {
-						ShowLoginDialog(dialog.getContext());
-						dialog.dismiss();
-					}
-
-					@Override
-					public void onNegative(MaterialDialog dialog) {
-						dialog.dismiss();
-					}
-				}).show();
-	}*/
 
     public static void ShowMessageTitle(Context ct, String msg) {
         final MaterialDialog messageDialog = new MaterialDialog.Builder(ct).title("系統提示").content(msg)
@@ -530,7 +513,7 @@ public class ViewUtil {
             for (int i = 0; i < logMsg.size(); i++) {
                 LoginEntity map = logMsg.get(i);
                 if (map.getPlatform().equals("ERP")) {
-                    erpEntities.add(map);//ERP账户累加到数组
+                    erpEntities.add(map);
                 } else if (map.getPlatform().equals("B2B")) {
                     b2b_uu = map.getAccount();
                     erp_phone = phone;
@@ -720,7 +703,7 @@ public class ViewUtil {
                 response = HttpUtil.sendGetRequest(url, params, headers, false);
             }
             if (method.equals("post")) {
-                response = HttpUtil.sendGetRequest(url, params, headers, false);
+                response = HttpUtil.sendPostRequest(url, params, headers, false);
             }
         } catch (Exception e) {
             e.printStackTrace();

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/DisplayUtil.java

@@ -40,6 +40,19 @@ public class DisplayUtil {
 		return (int) (pxValue / fontScale + 0.5f);
 	}
 
+	/**
+	 * 将sp值转换为px值，保证文字大小不变
+	 *
+	 * @param spValue
+	 * @param fontScale
+	 *            （DisplayMetrics类中属性scaledDensity）
+	 * @return
+	 */
+	public static int sp2px(Context context, float spValue) {
+		final float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
+		return (int) (spValue * fontScale + 0.5f);
+	}
+
 	/**
 	 * 设置添加屏幕的背景透明度
 	 *

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/steps/StepsView.java

@@ -12,6 +12,8 @@ import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.xzjmyk.pm.activity.R;
+
 import java.util.List;
 
 
@@ -33,6 +35,7 @@ public class StepsView extends LinearLayout implements StepsViewIndicator.OnDraw
         this(context, attrs, 0);
     }
 
+
     public StepsView(Context context, AttributeSet attrs,
             int defStyleAttr) {
         super(context, attrs, defStyleAttr);

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/steps/StepsViewIndicator.java

@@ -8,6 +8,8 @@ import android.graphics.Paint;
 import android.util.AttributeSet;
 import android.view.View;
 
+import com.xzjmyk.pm.activity.R;
+
 import java.util.ArrayList;
 import java.util.List;
 

WeiChat/src/main/res/layout/activity_client.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/crm_basic_bg"
@@ -106,7 +107,18 @@
             </LinearLayout>
         </LinearLayout>
         <!--我的排名-->
-        <LinearLayout style="@style/crm_ll_card">
+        <com.xzjmyk.pm.activity.view.shadow.ShadowLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_margin="5dp"
+            app:sl_shadowRadius="8dp"
+            app:sl_shadowColor="@color/shadow"
+            app:sl_dx="0dp"
+            app:sl_dy="2dp"
+            app:sl_cornerRadius="12dp">
+        <LinearLayout
+            android:layout_margin="0dp"
+            style="@style/crm_ll_card">
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -195,7 +207,7 @@
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-
+        </com.xzjmyk.pm.activity.view.shadow.ShadowLayout>
         <LinearLayout style="@style/crm_ll_card">
 
             <RelativeLayout

WeiChat/src/main/res/layout/activity_customer_detail.xml

@@ -220,6 +220,12 @@
                     android:textColor="#FF8E57"
                     android:text="商机阶段" />
             </LinearLayout>
+            <com.xzjmyk.pm.activity.view.steps.StepsView
+                android:id="@+id/stepsView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
+                android:layout_marginTop="0dp" />
         </LinearLayout>
 
         <LinearLayout

WeiChat/src/main/res/layout/activity_main.xml

@@ -1,5 +1,6 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
    >

WeiChat/src/main/res/layout/inculde_grid_view.xml

@@ -28,7 +28,8 @@
                     android:scrollbars="none"
                     android:layout_gravity="center"
                     android:cacheColorHint="#00000000"
-                    android:divider="@drawable/scanframeline" />
+                    android:dividerHeight="0.5dp"
+                    android:divider="#e3e3e3" />
           <!--      <View style="@style/horizontal_layout" />
             </LinearLayout>
             <View style="@style/vertical_layout" />

WeiChat/src/main/res/layout/item_pop_list.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 

WeiChat/src/main/res/layout/layout_main_tab_radio_group.xml

@@ -1,4 +1,5 @@
-<com.xzjmyk.pm.activity.view.DivideRadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
+<com.xzjmyk.pm.activity.view.DivideRadioGroup
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="60dp"
     android:background="@drawable/bg_bar"
@@ -7,7 +8,6 @@
     android:orientation="horizontal"
     android:paddingBottom="4dp"
     android:paddingTop="4dp">
-
     <FrameLayout
         android:layout_width="0dip"
         android:layout_height="match_parent"
@@ -145,4 +145,4 @@
             android:visibility="invisible" />
     </FrameLayout>
 
-</com.xzjmyk.pm.activity.view.DivideRadioGroup>
+</com.xzjmyk.pm.activity.view.DivideRadioGroup>

WeiChat/src/main/res/layout/pop_crm_list.xml

@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.xzjmyk.pm.activity.view.shadow.ShadowLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:sl_shadowRadius="3dp"
+    app:sl_shadowColor="@color/shadow"
+    app:sl_dx="-1dp"
+    app:sl_dy="3dp"
+    app:sl_cornerRadius="0dp">
+<LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/shape_pop_ll"
     android:padding="0.5dp"
     android:orientation="vertical">
-
     <ListView
         android:layout_height="wrap_content"
         android:dividerHeight="0dp"
         android:id="@+id/mList"
         style="@style/ListViewBasic"></ListView>
 </LinearLayout>
+</com.xzjmyk.pm.activity.view.shadow.ShadowLayout>

WeiChat/src/main/res/layout/widget_steps_view.xml

@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp" />
 
-    <com.anton46.stepsview.StepsViewIndicator
+    <com.xzjmyk.pm.activity.view.steps.StepsViewIndicator
         android:id="@+id/steps_indicator_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

WeiChat/src/main/res/values/attrs.xml

@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!--shadow Arison-->
+    <declare-styleable name="ShadowLayout">
+        <attr name="sl_cornerRadius" format="dimension"/>
+        <attr name="sl_shadowRadius" format="dimension"/>
+        <attr name="sl_shadowColor" format="color"/>
+        <attr name="sl_dx" format="dimension"/>
+        <attr name="sl_dy" format="dimension"/>
+    </declare-styleable>
+    <!--steps Airsono-->
+    <declare-styleable name="StepsViewIndicator">
+        <attr name="numOfSteps" format="integer" />
+    </declare-styleable>
     <!-- Defines the custom XML attributes supported for a ChatFaceView(表情布局) -->
     <declare-styleable name="ChatFaceView">
         <attr name="hasGif" format="boolean" />

WeiChat/src/main/res/values/colors.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="crm_basic_bg">#4B4B57</color>
+
     <!--by gongpengming-->
     <color name="subscrip_text">#60a0a0a0</color>
     <color name="item_color1">#30a0a0a0</color>
@@ -22,8 +22,10 @@
     <color name="btn_login_press">#B9D2E3</color>
 
     <!--end gongpengming-->
-
-
+    <color name="shadow">#AA000000</color>
+    <color name="default_shadow_color">#88757575</color>
+    <color name="default_fill_color">#ffffff</color>
+    <color name="crm_basic_bg">#4B4B57</color>
     <color name="indexnormal">#98FB98</color>
     <color name="indexpress">#3ACF6C</color>
     <color name="blend_item_theme_color">#ff005092</color>

WeiChat/src/main/res/values/dimens.xml

@@ -1,11 +1,12 @@
 <resources>
+    <!--view show-->
+    <dimen name="default_corner_radius">4dp</dimen>
+    <dimen name="default_shadow_radius">4dp</dimen>
     <!-- oa 考勤统计页面-->
     <dimen name="oa_statistics_line">15dp</dimen>
     <dimen name="oa_statistics_date_minWidth">100dp</dimen>
     <dimen name="oa_statistics_date_minheight">30dp</dimen>
     <!-- end oa 考勤统计页面-->
-
-
     <dimen name="next_width">5.0dip</dimen>
     <dimen name="line">1px</dimen>
     <dimen name="line_big">7.0dip</dimen>