Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

# Conflicts:
#	WeiChat/build.gradle

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

@@ -33,10 +33,6 @@ import com.github.mikephil.charting.components.YAxis;
 import com.github.mikephil.charting.data.BarData;
 import com.github.mikephil.charting.data.BarDataSet;
 import com.github.mikephil.charting.data.BarEntry;
-import com.github.mikephil.charting.data.Entry;
-import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
-import com.github.mikephil.charting.utils.ColorTemplate;
-import com.github.mikephil.charting.utils.Highlight;
 import com.github.mikephil.charting.utils.LargeValueFormatter;
 import com.github.mikephil.charting.utils.ValueFormatter;
 import com.lidroid.xutils.ViewUtils;
@@ -120,12 +116,12 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
     @ViewInject(R.id.tv_em_c)
     private TextView tv_em_c;
 
-    @ViewInject(R.id. tv_em_plana)
-    private TextView  tv_em_plana;
-    @ViewInject(R.id. tv_em_planb)
-    private TextView  tv_em_planb;
-    @ViewInject(R.id. tv_em_planc)
-    private TextView  tv_em_planc;
+    @ViewInject(R.id.tv_em_plana)
+    private TextView tv_em_plana;
+    @ViewInject(R.id.tv_em_planb)
+    private TextView tv_em_planb;
+    @ViewInject(R.id.tv_em_planc)
+    private TextView tv_em_planc;
 
     @ViewInject(R.id.tv_em_salea)
     private TextView tv_em_salea;
@@ -133,38 +129,38 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
     private TextView tv_em_saleb;
     @ViewInject(R.id.tv_em_salec)
     private TextView tv_em_salec;
-    
+
     @ViewInject(R.id.tv_cu_count)
     private TextView tv_cu_count;
-    
+
     @ViewInject(R.id.ib_ranking_condition)
-    private TextView  ib_ranking_condition;
- 
+    private TextView ib_ranking_condition;
+
     @ViewInject(R.id.ib_index_condition)
     private TextView ib_index_condition;
 
     @ViewInject(R.id.ll_subordinate)
     private LinearLayout ll_subordinate;
-    
+
     @ViewInject(R.id.crm_chart_bar)
     private BarChart mChart;
     @ViewInject(R.id.crm_chart_sale)
     private BarChart sChart;
-    
+
     @ViewInject(R.id.ll_data_empty)
     private LinearLayout ll_data_empty;
     @ViewInject(R.id.ll_data_empty1)
     private LinearLayout ll_data_empty1;
-    
+
     @ViewInject(R.id.ll_data_one)
-    private LinearLayout  ll_data_one;
+    private LinearLayout ll_data_one;
     @ViewInject(R.id.ll_data_two)
     private LinearLayout ll_data_two;
     @ViewInject(R.id.ll_data_three)
     private LinearLayout ll_data_three;
 
     @ViewInject(R.id.ll_customer_lost)
-    private LinearLayout  ll_customer_lost;
+    private LinearLayout ll_customer_lost;
     private BarData data;
     private BarData data1;
     private ArrayList<BarDataSet> dataSets;
@@ -176,7 +172,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
     private TextView tv_huikuan;
     @ViewInject(R.id.tv_chuhuo)
     private TextView tv_chuhuo;
-    
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -198,12 +194,9 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         ib_business.setOnClickListener(this);
         ib_customer.setOnClickListener(this);
         ib_waller.setOnClickListener(this);
-        
         ib_customer_vistor.setOnClickListener(this);
-       
         ib_ranking_condition.setOnClickListener(this);
         ib_index_condition.setOnClickListener(this);
-       
     }
 
     private void initData() {
@@ -219,10 +212,8 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, param, mHandler, headers, 100, null, null, "get");
     }*/
-    
+
     private void initBarChart() {
-        mv = new MyMarkerView(this, R.layout.custom_marker_view);
-       // mChart.setMarkerView(mv);
         mChart.setDescription("");
         mChart.setMaxVisibleValueCount(60);
         mChart.setPinchZoom(false);
@@ -231,14 +222,13 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 
         XAxis xAxis = mChart.getXAxis();
         xAxis.setPosition(XAxis.XAxisPosition.BOTTOM);
-        // xAxis.setSpaceBetweenLabels(30);
         xAxis.setLabelsToSkip(0);
-        xAxis.setAxisLineColor(getResources().getColor(R.color.red));
-        xAxis.setSpaceBetweenLabels(8);
+        xAxis.setAxisLineColor(getResources().getColor(R.color.light_gray));
+        xAxis.setSpaceBetweenLabels(30);
         xAxis.setAxisLineWidth(0f);
         xAxis.setDrawGridLines(false);
         mChart.getAxisLeft().setDrawGridLines(false);
-     
+
         mChart.animateY(2500);
         tf = Typeface.createFromAsset(getAssets(),
                 "OpenSans-Regular.ttf");
@@ -247,28 +237,29 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         l.setTypeface(tf);
 
 
-        YAxis leftAxis = mChart.getAxisLeft();
+        final YAxis leftAxis = mChart.getAxisLeft();
+       /* leftAxis.setValueFormatter(new ValueFormatter() {
+            @Override
+            public String getFormattedValue(float value) {
+                if (value != 0) {
+                    return String.valueOf(value);
+
+                } else {
+
+                    return "";
+                }
+            }
+        });*/
         leftAxis.setTypeface(tf);
         leftAxis.setValueFormatter(new LargeValueFormatter());
         leftAxis.setDrawGridLines(false);
         leftAxis.setSpaceTop(25f);
-        leftAxis.setAxisMinValue(0f);
-//        leftAxis.setAxisMaxValue(100f);
-        leftAxis.setAxisLineColor(getResources().getColor(R.color.red));
+        leftAxis.setAxisMinValue(1f);
+        leftAxis.setAxisMaxValue(100f);
+        leftAxis.setAxisLineColor(getResources().getColor(R.color.light_gray));
         mChart.getAxisRight().setEnabled(false);
         mChart.getAxisLeft().setEnabled(true);
         mChart.setMaxVisibleValueCount(10);
-        mChart.setOnChartValueSelectedListener(new OnChartValueSelectedListener() {
-
-            @Override
-            public void onValueSelected(Entry e, int dataSetIndex, Highlight h) {
-            }
-
-            @Override
-            public void onNothingSelected() {
-
-            }
-        });
         
         ArrayList<BarEntry> yVals1 = new ArrayList<BarEntry>();
         ArrayList<String> xVals = new ArrayList<String>();
@@ -282,10 +273,8 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         mChart.invalidate();
     }
 
-  
-    private void initSaleBarChart(){
-        mv = new MyMarkerView(this, R.layout.custom_marker_view);
-       // sChart.setMarkerView(mv);
+
+    private void initSaleBarChart() {
         sChart.setDescription("");
         sChart.setMaxVisibleValueCount(60);
         sChart.setPinchZoom(false);
@@ -294,13 +283,11 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 
         XAxis xAxis = sChart.getXAxis();
         xAxis.setPosition(XAxis.XAxisPosition.BOTTOM);
-        // xAxis.setSpaceBetweenLabels(30);
+        xAxis.setSpaceBetweenLabels(30);
         xAxis.setLabelsToSkip(0);
-        
-        xAxis.setAxisLineColor(getResources().getColor(R.color.red));
-        xAxis.setSpaceBetweenLabels(8);
-        xAxis.setAxisLineWidth(0f);
 
+        xAxis.setAxisLineColor(getResources().getColor(R.color.light_gray));
+        xAxis.setAxisLineWidth(0f);
         xAxis.setDrawGridLines(false);
         sChart.getAxisLeft().setDrawGridLines(false);
         sChart.animateY(2500);
@@ -313,31 +300,32 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         XAxis xl = sChart.getXAxis();
         xl.setTypeface(tf);
 
-        YAxis leftAxis = sChart.getAxisLeft();
+
+        final YAxis leftAxis = sChart.getAxisLeft();
+     /*   leftAxis.setValueFormatter(new ValueFormatter() {
+            @Override
+            public String getFormattedValue(float value) {
+                if (value != 0) {
+                    return String.valueOf(value);
+
+                } else {
+
+                    return "";
+                }
+            }
+        });*/
         leftAxis.setTypeface(tf);
         leftAxis.setValueFormatter(new LargeValueFormatter());
         leftAxis.setDrawGridLines(false);
         leftAxis.setSpaceTop(25f);
-        leftAxis.setAxisMinValue(0f);
-//        leftAxis.setAxisMaxValue(100f);
-        leftAxis.setAxisLineColor(getResources().getColor(R.color.red));
+        leftAxis.setAxisMinValue(1f);
+        leftAxis.setAxisMaxValue(100f);
+        leftAxis.setAxisLineColor(getResources().getColor(R.color.light_gray));
         sChart.getAxisRight().setEnabled(false);
         sChart.getAxisLeft().setEnabled(true);
         sChart.setMaxVisibleValueCount(10);
-        sChart.setOnChartValueSelectedListener(new OnChartValueSelectedListener() {
-
-            @Override
-            public void onValueSelected(Entry e, int dataSetIndex, Highlight h) {
-            }
-
-            @Override
-            public void onNothingSelected() {
-
-            }
-        });
         ArrayList<BarEntry> yVals1 = new ArrayList<BarEntry>();
         ArrayList<String> xVals = new ArrayList<String>();
-
         BarDataSet set1 = new BarDataSet(yVals1, "日销售额");
         set1.setColor(Color.rgb(164, 228, 251));
         dataSets = new ArrayList<BarDataSet>();
@@ -347,10 +335,8 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         sChart.setData(data);
         sChart.setNoDataText("暂时没有数据");
         sChart.invalidate();
-        
     }
-
-
+    
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_crm, menu);
@@ -384,8 +370,8 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
     protected String[] sales = new String[]{
             "客户", "联系人", "商机数", "商机变更", "销售订单", "拜访客户数", "拜访次数", "Aug", "Sep", "Okt", "Nov", "Dec"
     };
-    
-    private void setData(int count, float [] ydata) {
+
+    private void setData(int count, float[] ydata) {
         ArrayList<String> xVals = new ArrayList<String>();
         for (int i = 0; i < count; i++) {
             xVals.add(mMonths[i % 12]);
@@ -396,7 +382,10 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
             yVals1.add(new BarEntry(val, i));
         }
         BarDataSet set1 = new BarDataSet(yVals1, "月销售额(单位:人民币 万元)");
-        set1.setColors(ColorTemplate.JOYFUL_COLORS);
+        int [] JOYFUL_COLORS= {
+                Color.rgb(121,191,174), Color.rgb(91,161,209)
+        };
+        set1.setColors(JOYFUL_COLORS);
         //set1.setVisible(false);
         //set1.setDrawValues(false);
         set1.setValueFormatter(new ValueFormatter() {
@@ -420,7 +409,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                     if (value == 0) {
                         return "";
                     } else {
-                        return String.valueOf(value);
+                        return new DecimalFormat("###,###,##0").format(value);
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -436,12 +425,12 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         mChart.setData(data);
         /**@注释：清空任何缩放  */
         mChart.zoom(0, 0, 0, 0);
-        mChart.zoom(ydata.length/4.2f,0,0,0);
+        mChart.zoom(ydata.length / 4.2f, 0, 0, 0);
         mChart.invalidate();
     }
 
 
-    private void setData1(int count, float [] ydata) {
+    private void setData1(int count, float[] ydata) {
         ArrayList<String> xVals = new ArrayList<String>();
         for (int i = 0; i < count; i++) {
             xVals.add(sales[i % 12]);
@@ -458,11 +447,15 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
             e.printStackTrace();
         }
         BarDataSet set1 = new BarDataSet(yVals1, "数量(单位:个)");
-        set1.setColors(ColorTemplate.JOYFUL_COLORS);
+        int [] JOYFUL_COLORS= {
+                Color.rgb(121,191,174), Color.rgb(91,161,209)
+        };
+        set1.setColors(JOYFUL_COLORS);
         //set1.setVisible(false);
         //set1.setDrawValues(false);
         set1.setValueFormatter(new ValueFormatter() {
             private DecimalFormat mFormat;
+
             public void DefaultValueFormatter(int digits) {
 
                 StringBuffer b = new StringBuffer();
@@ -474,13 +467,14 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 
                 mFormat = new DecimalFormat("###,###,###,##0" + b.toString());
             }
+
             @Override
             public String getFormattedValue(float value) {
                 try {
-                    if (value==0){
+                    if (value == 0) {
                         return "";
-                    }else {
-                        return String.valueOf(value);
+                    } else {
+                        return new DecimalFormat("###,###,##0").format(value);
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -497,8 +491,8 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         sChart.setData(data1);
         sChart.invalidate();
     }
-    
-    
+
+
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
@@ -508,9 +502,9 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
             case R.id.ib_customer:
                 startActivity(new Intent(this, CustomerListActivity.class));
                 break;
-            
+
             case R.id.ib_customer_vistor:
-                startActivity(new Intent(this, OAActivity.class).putExtra("type",1));
+                startActivity(new Intent(this, OAActivity.class).putExtra("type", 1));
                 break;
             case R.id.ib_waller:
                 startActivity(new Intent(this, SalesRankingActivity.class));
@@ -521,7 +515,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
             case R.id.ib_index_condition:
                 showDateDialog(R.id.ib_index_condition);
                 break;
-            case  R.id.ib_ranking_condition:
+            case R.id.ib_ranking_condition:
                 showDateDialog(R.id.ib_ranking_condition);
                 break;
          /*   case R.id.ib_em_condition:
@@ -548,11 +542,11 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                     JSONArray receivables = root.getJSONArray("receivables");
                     JSONArray profits = root.getJSONArray("profits");
                     if (sales != null) {
-                        if (!sales.isEmpty()){
+                        if (!sales.isEmpty()) {
                             if (sales.size() != 2) {
-                                if (sales.getJSONArray(0).getString(2).equals(CommonUtil.getSharedPreferences(ct,"erp_usernme"))) {
+                                if (sales.getJSONArray(0).getString(2).equals(CommonUtil.getSharedPreferences(ct, "erp_usernme"))) {
                                     CommonUtil.textAarrySpanForStyle(tv_rank_sale_left,
-                                            "第"+sales.getJSONArray(0).get(3) + "名"
+                                            "第" + sales.getJSONArray(0).get(3) + "名"
                                             , new String[]{
                                                     String.valueOf(sales.getJSONArray(0).get(3))},
                                             ct.getResources().getColor(R.color.red));
@@ -562,14 +556,14 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                             , new String[]{
                                                     String.valueOf(sales.getJSONArray(0).get(0))},
                                             ct.getResources().getColor(R.color.gray));
-                                }else{
+                                } else {
                                     CommonUtil.textAarrySpanForStyle(tv_rank_sale_left,
-                                            "第"+"__"+"名",
-                                            new String[]{"__"},ct.getResources().getColor(R.color.gray)
+                                            "第" + "__" + "名",
+                                            new String[]{"__"}, ct.getResources().getColor(R.color.gray)
                                     );
                                     CommonUtil.textAarrySpanForStyle(tv_rank_sale_right,
-                                            "__"+ "万元"
-                                            , new String[]{ "__"},
+                                            "__" + "万元"
+                                            , new String[]{"__"},
                                             ct.getResources().getColor(R.color.gray));
                                 }
                             } else {
@@ -585,34 +579,33 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                                 String.valueOf(sales.getJSONArray(1).get(0))},
                                         ct.getResources().getColor(R.color.gray));
                             }
-                        }else{
+                        } else {
                             CommonUtil.textAarrySpanForStyle(tv_rank_sale_left,
-                                    "第"+"__"+"名",
-                                    new String[]{"__"},ct.getResources().getColor(R.color.gray)
+                                    "第" + "__" + "名",
+                                    new String[]{"__"}, ct.getResources().getColor(R.color.gray)
                             );
                             CommonUtil.textAarrySpanForStyle(tv_rank_sale_right,
-                                    "__"+ "万元"
-                                    , new String[]{ "__"},
+                                    "__" + "万元"
+                                    , new String[]{"__"},
                                     ct.getResources().getColor(R.color.gray));
                         }
-                   
+
                     }
 
-                    if (visits != null&&!visits.isEmpty()) {
+                    if (visits != null && !visits.isEmpty()) {
                         if (visits.size() != 2) {
-                            if (visits.getJSONArray(0).getString(1).equals(CommonUtil.getSharedPreferences(ct,"erp_username")))
-                            {
+                            if (visits.getJSONArray(0).getString(1).equals(CommonUtil.getSharedPreferences(ct, "erp_username"))) {
                                 CommonUtil.textAarrySpanForStyle(tv_rank_visit_left,
                                         "第" + visits.getJSONArray(0).get(3).toString()
                                                 + "名"
                                         , new String[]{visits.getJSONArray(0).get(3).toString()},
                                         ct.getResources().getColor(R.color.red));
 
-                                CommonUtil.textAarrySpanForStyle(tv_rank_visit_right,visits.getJSONArray(0).getIntValue(2)
+                                CommonUtil.textAarrySpanForStyle(tv_rank_visit_right, visits.getJSONArray(0).getIntValue(2)
                                                 + "个"
-                                        , new String[]{ String.valueOf(visits.getJSONArray(0).getIntValue(2))},
+                                        , new String[]{String.valueOf(visits.getJSONArray(0).getIntValue(2))},
                                         ct.getResources().getColor(R.color.gray));
-                            }else{
+                            } else {
                                 //名称 拜访次数，拜访个数，排名
                                 CommonUtil.textAarrySpanForStyle(tv_rank_visit_left,
                                         "第__名",
@@ -620,7 +613,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                         , ct.getResources().getColor(R.color.gray));
                                 CommonUtil.textAarrySpanForStyle(tv_rank_visit_right,
                                         "__个"
-                                        , new String[]{ "__"},
+                                        , new String[]{"__"},
                                         ct.getResources().getColor(R.color.gray));
                             }
 
@@ -631,110 +624,108 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                                     ct.getResources().getColor(R.color.red));
 //                            tv_rank_visit_left.setText("第" + visits.getJSONArray(1).getIntValue(3)+"名");
                             tv_rank_visit_right.setText(visits.getJSONArray(1).getIntValue(2) + "个");
-                           
+
                         }
-                    }else{
+                    } else {
                         CommonUtil.textAarrySpanForStyle(tv_rank_visit_left,
                                 "第__名",
                                 new String[]{"__"}
                                 , ct.getResources().getColor(R.color.gray));
                         CommonUtil.textAarrySpanForStyle(tv_rank_visit_right,
                                 "__个"
-                                , new String[]{ "__"},
+                                , new String[]{"__"},
                                 ct.getResources().getColor(R.color.gray));
                     }
 
-                    if (profits != null&&!profits.isEmpty()) {
+                    if (profits != null && !profits.isEmpty()) {
                         if (profits.size() == 2) {
                             CommonUtil.textAarrySpanForStyle(tv_rank_rirun_left,
                                     "第" + profits.getJSONArray(1).get(3).toString() + "名"
                                     , new String[]{
                                             String.valueOf(profits.getJSONArray(1).get(3).toString())
                                     }, ct.getResources().getColor(R.color.red));
-                            CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right,profits.getJSONArray(1).get(0) + "万元"
+                            CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right, profits.getJSONArray(1).get(0) + "万元"
                                     , new String[]{
-                                            String.valueOf(profits.getJSONArray(0).get(0))
-                                    }, ct.getResources().getColor(R.color.gray));
+                                    String.valueOf(profits.getJSONArray(0).get(0))
+                            }, ct.getResources().getColor(R.color.gray));
                         } else {
-                            if (profits.getJSONArray(0).getString(2).equals(CommonUtil.getSharedPreferences(ct,"erp_username")))
-                            {
+                            if (profits.getJSONArray(0).getString(2).equals(CommonUtil.getSharedPreferences(ct, "erp_username"))) {
                                 CommonUtil.textAarrySpanForStyle(tv_rank_rirun_left,
-                                        "第" + profits.getJSONArray(0).get(3).toString()+ "名"
+                                        "第" + profits.getJSONArray(0).get(3).toString() + "名"
                                         , new String[]{
                                                 String.valueOf(profits.getJSONArray(0).get(3).toString())
                                         }, ct.getResources().getColor(R.color.red));
 
-                                CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right,profits.getJSONArray(0).get(0) + "万元"
+                                CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right, profits.getJSONArray(0).get(0) + "万元"
                                         , new String[]{
                                         String.valueOf(profits.getJSONArray(0).get(0))
                                 }, ct.getResources().getColor(R.color.gray));
 
-                            }else{
+                            } else {
                                 CommonUtil.textAarrySpanForStyle(tv_rank_rirun_left,
-                                        "第"+"__"+"名",
-                                        new String[]{"__"},ct.getResources().getColor(R.color.gray)
+                                        "第" + "__" + "名",
+                                        new String[]{"__"}, ct.getResources().getColor(R.color.gray)
                                 );
                                 CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right,
-                                        "__"+ "万元"
-                                        , new String[]{ "__"},
+                                        "__" + "万元"
+                                        , new String[]{"__"},
                                         ct.getResources().getColor(R.color.gray));
                             }
                         }
-                    }else{
+                    } else {
                         CommonUtil.textAarrySpanForStyle(tv_rank_rirun_left,
-                                "第"+"__"+"名",
-                                new String[]{"__"},ct.getResources().getColor(R.color.gray)
+                                "第" + "__" + "名",
+                                new String[]{"__"}, ct.getResources().getColor(R.color.gray)
                         );
                         CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right,
-                                "__"+ "万元"
-                                , new String[]{ "__"},
+                                "__" + "万元"
+                                , new String[]{"__"},
                                 ct.getResources().getColor(R.color.gray));
                     }
 
 
-                    if (receivables != null&&!receivables.isEmpty()) {
+                    if (receivables != null && !receivables.isEmpty()) {
                         if (receivables.size() == 2) {
                             CommonUtil.textAarrySpanForStyle(tv_rank_income_left,
-                                    "第"+ receivables.getJSONArray(1).get(3).toString() +"名"
+                                    "第" + receivables.getJSONArray(1).get(3).toString() + "名"
                                     , new String[]{
-                                            String.valueOf( receivables.getJSONArray(1).get(3).toString())},
+                                            String.valueOf(receivables.getJSONArray(1).get(3).toString())},
                                     ct.getResources().getColor(R.color.red));
-                            CommonUtil.textAarrySpanForStyle(tv_rank_income_right,receivables.getJSONArray(1).get(0) + "万元"
+                            CommonUtil.textAarrySpanForStyle(tv_rank_income_right, receivables.getJSONArray(1).get(0) + "万元"
                                     , new String[]{String.valueOf(receivables.getJSONArray(1).get(0))},
                                     ct.getResources().getColor(R.color.gray));
                         } else {
-                            if (receivables.getJSONArray(0).getString(2).equals(CommonUtil.getSharedPreferences(ct,"erp_username")))
-                            {
+                            if (receivables.getJSONArray(0).getString(2).equals(CommonUtil.getSharedPreferences(ct, "erp_username"))) {
                                 CommonUtil.textAarrySpanForStyle(tv_rank_income_left,
-                                        "第" + receivables.getJSONArray(0).getString(1)+ "名"
+                                        "第" + receivables.getJSONArray(0).getString(1) + "名"
                                         , new String[]{receivables.getJSONArray(0).getString(1)},
                                         ct.getResources().getColor(R.color.red));
 
-                                CommonUtil.textAarrySpanForStyle(tv_rank_income_right,receivables.getJSONArray(0).get(0) + "万元"
+                                CommonUtil.textAarrySpanForStyle(tv_rank_income_right, receivables.getJSONArray(0).get(0) + "万元"
                                         , new String[]{
                                                 String.valueOf(receivables.getJSONArray(0).get(0))},
                                         ct.getResources().getColor(R.color.gray));
-                            }else{
+                            } else {
 
                                 CommonUtil.textAarrySpanForStyle(tv_rank_income_left,
-                                        "第"+"__"+"名",
-                                        new String[]{"__"},ct.getResources().getColor(R.color.gray)
+                                        "第" + "__" + "名",
+                                        new String[]{"__"}, ct.getResources().getColor(R.color.gray)
                                 );
                                 CommonUtil.textAarrySpanForStyle(tv_rank_income_right,
-                                        "__"+"万元"
-                                        , new String[]{ "__"},
+                                        "__" + "万元"
+                                        , new String[]{"__"},
                                         ct.getResources().getColor(R.color.gray));
                             }
 
                         }
-                    }else{
+                    } else {
                         CommonUtil.textAarrySpanForStyle(tv_rank_income_left,
-                                "第"+"__"+"名",
-                                new String[]{"__"},ct.getResources().getColor(R.color.gray)
+                                "第" + "__" + "名",
+                                new String[]{"__"}, ct.getResources().getColor(R.color.gray)
                         );
                         CommonUtil.textAarrySpanForStyle(tv_rank_income_right,
-                                "__"+"万元"
-                                , new String[]{ "__"},
+                                "__" + "万元"
+                                , new String[]{"__"},
                                 ct.getResources().getColor(R.color.gray));
                     }
                     break;
@@ -742,8 +733,8 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage SalesKit:" + msg.getData().getString("result"));
                     root = JSON.parseObject(msg.getData().getString("result")).getJSONObject("datas");
-                    float [] ydata1={0,0,0,0,0,0,0};
-                    if (root!=null) {
+                    float[] ydata1 = {0, 0, 0, 0, 0, 0, 0};
+                    if (root != null) {
                         ydata1[0] = root.getIntValue("customercount");
                         ydata1[1] = root.getIntValue("contactcount");
                         ydata1[2] = root.getIntValue("salecount");
@@ -753,13 +744,13 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                         ydata1[6] = root.getJSONArray("visit").getIntValue(1);
                         tv_chuhuo.setText("出货" + root.getFloatValue("saleamount") + "万元");
                         tv_huikuan.setText("回款" + root.getFloatValue("backamount") + "万元");
-                       for (int i=0;i<ydata1.length;i++){
-                           Log.i(TAG, "handleMessage:ydata1["+i+"]=" + ydata1[i] );
-                       }
+                        for (int i = 0; i < ydata1.length; i++) {
+                            Log.i(TAG, "handleMessage:ydata1[" + i + "]=" + ydata1[i]);
+                        }
                         setData1(7, ydata1);
-                    }else{
+                    } else {
                         setData1(7, ydata1);
-                        tv_chuhuo.setText("出货" + root.getIntValue("saleamount") + "万元"); 
+                        tv_chuhuo.setText("出货" + root.getIntValue("saleamount") + "万元");
                         tv_huikuan.setText("回款" + root.getIntValue("backamount") + "万元");
                     }
                     break;
@@ -768,101 +759,101 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                     Log.i(TAG, "handleMessage Targets:" + msg.getData().getString("result"));
                     root = JSON.parseObject(msg.getData().getString("result")).getJSONObject("datas");
                     //解析指标和下属
-                    if(!root.getJSONArray("target").isEmpty()){
+                    if (!root.getJSONArray("target").isEmpty()) {
                         JSONObject target = root.getJSONArray("target").getJSONObject(0);
                         tv_em_a.setText(target.getString("CUSTOMERCOUNT"));
-                        float [] ydata={0,0,0,0,0,0,0};
-                        ydata[0]=target.getIntValue("RANK");
-                        ydata[1]=target.getFloatValue("FIRSTBFCOUNT/10000");
-                        ydata[2]=target.getIntValue("TOPCOUNT");
-                        ydata[3]=target.getFloatValue("ACTUALPROFIT/10000");
-                       setData(7,ydata);
-                    }else{
-                        float [] ydata={0,0,0,0,0,0,0};
-                        setData(7,ydata);
+                        float[] ydata = {0, 0, 0, 0, 0, 0, 0};
+                        ydata[0] = target.getIntValue("RANK");
+                        ydata[1] = target.getFloatValue("FIRSTBFCOUNT/10000");
+                        ydata[2] = target.getIntValue("TOPCOUNT");
+                        ydata[3] = target.getFloatValue("ACTUALPROFIT/10000");
+                        setData(7, ydata);
+                    } else {
+                        float[] ydata = {0, 0, 0, 0, 0, 0, 0};
+                        setData(7, ydata);
+                    }
+                    if (!root.getJSONArray("subs").isEmpty()) {
+                        int size = root.getJSONArray("subs").size();
+                        switch (size) {
+                            case 1:
+                                ll_data_one.setVisibility(View.VISIBLE);
+                                ll_data_two.setVisibility(View.GONE);
+                                ll_data_three.setVisibility(View.GONE);
+                                tv_em_a.setText(root.getJSONArray("subs").getJSONObject(0).getString("CUSTOMERCOUNT"));
+
+                                tv_em_plana.setText(root.getJSONArray("subs").getJSONObject(0).getFloatValue("FIRSTBFCOUNT/10000")
+                                        + "/" + root.getJSONArray("subs").getJSONObject(0).getFloatValue("ACTUALPROFIT/10000"));
+                                tv_em_salea.setText(root.getJSONArray("subs").getJSONObject(0).getIntValue("RANK")
+                                        + "/" + root.getJSONArray("subs").getJSONObject(0).getIntValue("TOPCOUNT"));
+                                break;
+                            case 2:
+                                ll_data_one.setVisibility(View.GONE);
+                                ll_data_two.setVisibility(View.VISIBLE);
+                                ll_data_three.setVisibility(View.GONE);
+                                tv_em_a.setText(root.getJSONArray("subs").getJSONObject(0).getString("CUSTOMERCOUNT"));
+                                tv_em_b.setText(root.getJSONArray("subs").getJSONObject(1).getString("CUSTOMERCOUNT"));
+
+                                tv_em_plana.setText(root.getJSONArray("subs").getJSONObject(0).getFloatValue("FIRSTBFCOUNT/10000")
+                                        + "/" + root.getJSONArray("subs").getJSONObject(0).getFloatValue("ACTUALPROFIT/10000"));
+                                tv_em_salea.setText(root.getJSONArray("subs").getJSONObject(0).getIntValue("RANK")
+                                        + "/" + root.getJSONArray("subs").getJSONObject(0).getIntValue("TOPCOUNT"));
+
+                                tv_em_planb.setText(root.getJSONArray("subs").getJSONObject(1).getFloatValue("FIRSTBFCOUNT/10000")
+                                        + "/" + root.getJSONArray("subs").getJSONObject(1).getFloatValue("ACTUALPROFIT/10000"));
+                                tv_em_saleb.setText(root.getJSONArray("subs").getJSONObject(1).getIntValue("RANK")
+                                        + "/" + root.getJSONArray("subs").getJSONObject(1).getIntValue("TOPCOUNT"));
+
+                                break;
+                            case 3:
+                                ll_data_one.setVisibility(View.GONE);
+                                ll_data_two.setVisibility(View.GONE);
+                                ll_data_three.setVisibility(View.VISIBLE);
+                                tv_em_a.setText(root.getJSONArray("subs").getJSONObject(0).getString("CUSTOMERCOUNT"));
+                                tv_em_b.setText(root.getJSONArray("subs").getJSONObject(1).getString("CUSTOMERCOUNT"));
+                                tv_em_c.setText(root.getJSONArray("subs").getJSONObject(2).getString("CUSTOMERCOUNT"));
+
+
+                                tv_em_plana.setText(root.getJSONArray("subs").getJSONObject(0).getFloatValue("FIRSTBFCOUNT/10000")
+                                        + "/" + root.getJSONArray("subs").getJSONObject(0).getFloatValue("ACTUALPROFIT/10000"));
+                                tv_em_salea.setText(root.getJSONArray("subs").getJSONObject(0).getIntValue("RANK")
+                                        + "/" + root.getJSONArray("subs").getJSONObject(0).getIntValue("TOPCOUNT"));
+
+                                tv_em_planb.setText(root.getJSONArray("subs").getJSONObject(1).getFloatValue("FIRSTBFCOUNT/10000")
+                                        + "/" + root.getJSONArray("subs").getJSONObject(1).getFloatValue("ACTUALPROFIT/10000"));
+                                tv_em_saleb.setText(root.getJSONArray("subs").getJSONObject(1).getIntValue("RANK")
+                                        + "/" + root.getJSONArray("subs").getJSONObject(1).getIntValue("TOPCOUNT"));
+
+                                tv_em_planc.setText(root.getJSONArray("subs").getJSONObject(2).getFloatValue("FIRSTBFCOUNT/10000")
+                                        + "/" + root.getJSONArray("subs").getJSONObject(2).getFloatValue("ACTUALPROFIT/10000"));
+                                tv_em_salec.setText(root.getJSONArray("subs").getJSONObject(2).getIntValue("RANK")
+                                        + "/" + root.getJSONArray("subs").getJSONObject(2).getIntValue("TOPCOUNT"));
+                                break;
+                        }
+
+                        ll_data_empty.setVisibility(View.GONE);
+                    } else {
+                        ll_data_empty.setVisibility(View.VISIBLE);
+                        ll_data_one.setVisibility(View.GONE);
+                        ll_data_two.setVisibility(View.GONE);
+                        ll_data_three.setVisibility(View.GONE);
                     }
-                   if(!root.getJSONArray("subs").isEmpty()){
-                     int size=  root.getJSONArray("subs").size();
-                       switch (size){
-                           case 1:
-                               ll_data_one.setVisibility(View.VISIBLE);
-                               ll_data_two.setVisibility(View.GONE);
-                               ll_data_three.setVisibility(View.GONE);
-                               tv_em_a.setText(root.getJSONArray("subs").getJSONObject(0).getString("CUSTOMERCOUNT"));
-
-                               tv_em_plana.setText(root.getJSONArray("subs").getJSONObject(0).getFloatValue("FIRSTBFCOUNT/10000")
-                               +"/"+root.getJSONArray("subs").getJSONObject(0).getFloatValue("ACTUALPROFIT/10000"));
-                               tv_em_salea.setText(root.getJSONArray("subs").getJSONObject(0).getIntValue("RANK")
-                               +"/"+ root.getJSONArray("subs").getJSONObject(0).getIntValue("TOPCOUNT"));
-                               break;
-                           case 2:
-                               ll_data_one.setVisibility(View.GONE);
-                               ll_data_two.setVisibility(View.VISIBLE);
-                               ll_data_three.setVisibility(View.GONE);
-                               tv_em_a.setText(root.getJSONArray("subs").getJSONObject(0).getString("CUSTOMERCOUNT"));
-                               tv_em_b.setText(root.getJSONArray("subs").getJSONObject(1).getString("CUSTOMERCOUNT"));
-
-                               tv_em_plana.setText(root.getJSONArray("subs").getJSONObject(0).getFloatValue("FIRSTBFCOUNT/10000")
-                                       + "/" + root.getJSONArray("subs").getJSONObject(0).getFloatValue("ACTUALPROFIT/10000"));
-                               tv_em_salea.setText(root.getJSONArray("subs").getJSONObject(0).getIntValue("RANK")
-                                       + "/" + root.getJSONArray("subs").getJSONObject(0).getIntValue("TOPCOUNT"));
-
-                               tv_em_planb.setText(root.getJSONArray("subs").getJSONObject(1).getFloatValue("FIRSTBFCOUNT/10000")
-                                       + "/" + root.getJSONArray("subs").getJSONObject(1).getFloatValue("ACTUALPROFIT/10000"));
-                               tv_em_saleb.setText(root.getJSONArray("subs").getJSONObject(1).getIntValue("RANK")
-                                       + "/" + root.getJSONArray("subs").getJSONObject(1).getIntValue("TOPCOUNT"));
-
-                               break;
-                           case 3:
-                               ll_data_one.setVisibility(View.GONE);
-                               ll_data_two.setVisibility(View.GONE);
-                               ll_data_three.setVisibility(View.VISIBLE);
-                               tv_em_a.setText(root.getJSONArray("subs").getJSONObject(0).getString("CUSTOMERCOUNT"));
-                               tv_em_b.setText(root.getJSONArray("subs").getJSONObject(1).getString("CUSTOMERCOUNT"));
-                               tv_em_c.setText(root.getJSONArray("subs").getJSONObject(2).getString("CUSTOMERCOUNT"));
-
-
-                               tv_em_plana.setText(root.getJSONArray("subs").getJSONObject(0).getFloatValue("FIRSTBFCOUNT/10000")
-                                       + "/" + root.getJSONArray("subs").getJSONObject(0).getFloatValue("ACTUALPROFIT/10000"));
-                               tv_em_salea.setText(root.getJSONArray("subs").getJSONObject(0).getIntValue("RANK")
-                                       + "/" + root.getJSONArray("subs").getJSONObject(0).getIntValue("TOPCOUNT"));
-
-                               tv_em_planb.setText(root.getJSONArray("subs").getJSONObject(1).getFloatValue("FIRSTBFCOUNT/10000")
-                                       + "/" + root.getJSONArray("subs").getJSONObject(1).getFloatValue("ACTUALPROFIT/10000"));
-                               tv_em_saleb.setText(root.getJSONArray("subs").getJSONObject(1).getIntValue("RANK")
-                                       + "/" + root.getJSONArray("subs").getJSONObject(1).getIntValue("TOPCOUNT"));
-
-                               tv_em_planc.setText(root.getJSONArray("subs").getJSONObject(2).getFloatValue("FIRSTBFCOUNT/10000")
-                                       +"/"+root.getJSONArray("subs").getJSONObject(2).getFloatValue("ACTUALPROFIT/10000"));
-                               tv_em_salec.setText(root.getJSONArray("subs").getJSONObject(2).getIntValue("RANK")
-                                       +"/"+ root.getJSONArray("subs").getJSONObject(2).getIntValue("TOPCOUNT"));
-                               break;
-                       }
-                       
-                       ll_data_empty.setVisibility(View.GONE);
-                   }else{
-                       ll_data_empty.setVisibility(View.VISIBLE);
-                       ll_data_one.setVisibility(View.GONE);
-                       ll_data_two.setVisibility(View.GONE);
-                       ll_data_three.setVisibility(View.GONE);
-                   }
                     break;
                 case INIT_InactionCusts:
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage InactionCusts:" + msg.getData().getString("result"));
-                  if(JSON.parseObject(msg.getData().getString("result")).get("data") instanceof JSONObject){
-                      root = JSON.parseObject(msg.getData().getString("result")).getJSONObject("datas");
-                      CommonUtil.textAarrySpanForStyle(tv_cu_count,
-                              root.getIntValue("customernum") + " 个"
-                              , new String[]{String.valueOf(root.getIntValue("customernum"))},
-                              ct.getResources().getColor(R.color.yellow_home));
-                      ll_data_empty1.setVisibility(View.GONE);
-                      ll_customer_lost.setVisibility(View.VISIBLE);
-                  }else{
-                      //无数据处理
-                      ll_customer_lost.setVisibility(View.GONE);
-                      ll_data_empty1.setVisibility(View.VISIBLE);
-                  }
+                    if (JSON.parseObject(msg.getData().getString("result")).get("data") instanceof JSONObject) {
+                        root = JSON.parseObject(msg.getData().getString("result")).getJSONObject("datas");
+                        CommonUtil.textAarrySpanForStyle(tv_cu_count,
+                                root.getIntValue("customernum") + " 个"
+                                , new String[]{String.valueOf(root.getIntValue("customernum"))},
+                                ct.getResources().getColor(R.color.yellow_home));
+                        ll_data_empty1.setVisibility(View.GONE);
+                        ll_customer_lost.setVisibility(View.VISIBLE);
+                    } else {
+                        //无数据处理
+                        ll_customer_lost.setVisibility(View.GONE);
+                        ll_data_empty1.setVisibility(View.VISIBLE);
+                    }
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
@@ -870,19 +861,19 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                     break;
                 case 6:
                     JSONArray array = JSON.parseObject(msg.getData().getString("result")).getJSONArray("datas");
-                    if (array!=null){
-                        if (array.size()>0){
+                    if (array != null) {
+                        if (array.size() > 0) {
                             //显示下属面板
-                            Log.i("raomeng",msg.getData().getString("result"));
+                            Log.i("raomeng", msg.getData().getString("result"));
                             ll_subordinate.setVisibility(View.VISIBLE);
-                        }else{
+                        } else {
                             //隐藏下属面板
-                            Log.i("raomeng",msg.getData().getString("result"));
+                            Log.i("raomeng", msg.getData().getString("result"));
                             ll_subordinate.setVisibility(View.GONE);
                         }
                     }
                     break;
-                
+
             }
         }
     };
@@ -942,7 +933,8 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 
     private void sendPersonalRank(String date) {
         progressDialog.show();
-        LinkedHashMap<String, Object> headers =  new LinkedHashMap<>();;
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        ;
         String url;
         Map<String, Object> params;
         url = Constants.getAppBaseUrl(ct) + "mobile/crm/getPersonalRank.action";
@@ -1024,14 +1016,13 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         popupWindow.showAsDropDown(parent, windowManager.getDefaultDisplay().getWidth(), 0);
     }
 
-    private void closePoppupWindow(){
-        if (popupWindow != null && popupWindow.isShowing()){
+    private void closePoppupWindow() {
+        if (popupWindow != null && popupWindow.isShowing()) {
             popupWindow.dismiss();
             popupWindow = null;
         }
     }
 
-  
 
     private List<Map<String, Object>> getPopData() {
         List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
@@ -1075,7 +1066,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 
 
     private void showDateDialog(final int resId) {
-        DatePicker picker = new DatePicker(this,DatePicker.YEAR_MONTH);
+        DatePicker picker = new DatePicker(this, DatePicker.YEAR_MONTH);
         picker.setRange(1950, 2030);
         //Calendar.getInstance().get(Calendar.DAY_OF_MONTH)
         picker.setSelectedItem(
@@ -1087,12 +1078,12 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 //                        ToastUtil.showToast(ct, year + "-" + month + "-" + day);
                 switch (resId) {
                     case R.id.ib_ranking_condition://排名
-                        ToastUtil.showToast(ct, year + "-" + month );
-                        sendPersonalRank(year+month);
+                        ToastUtil.showToast(ct, year + "-" + month);
+                        sendPersonalRank(year + month);
                         break;
                     case R.id.ib_index_condition://图表
-                        ToastUtil.showToast(ct, year + "-" + month );
-                        sendTargets(year+month);
+                        ToastUtil.showToast(ct, year + "-" + month);
+                        sendTargets(year + month);
                         break;
                   /*  case R.id.ib_sale_condition://销售
                         ToastUtil.showToast(ct, year + "-" + month );
@@ -1118,6 +1109,6 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, param, mHandler, headers, what, null, null, "get");
     }
-    
+
 }
 

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

@@ -15,6 +15,7 @@ import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
+import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.PopupWindow;
 import android.widget.SimpleAdapter;
@@ -56,6 +57,10 @@ import java.util.Map;
  */
 public class CustomerListActivity extends BaseActivity implements View.OnClickListener {
     private BussinessDetailAdapter mAdapter;
+
+    @ViewInject(R.id.iv_head)
+    private ImageView iv_head;
+
     @ViewInject(R.id.tv_change)
     private TextView tv_change;
     @ViewInject(R.id.tv_count_unend)
@@ -155,9 +160,12 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
                 Log.i(TAG, "initData:" + model.getEM_DEPART());
                 Log.i(TAG, "initData:" + model.getEM_POSITION());
                 Log.i(TAG, "initData:" + model.getCOMPANY());
+                Log.i(TAG, "initData:" +model.getEm_IMID()  );
+
             }
             tv_position.setText(db.get(0).getEM_POSITION());
-            tv_department.setText(db.get(0).getEM_DEFAULTORNAME() + "—>");
+            tv_department.setText(db.get(0).getEM_DEFAULTORNAME() + "->");
+            AvatarHelper.getInstance().displayAvatar(String.valueOf(db.get(0).getEm_IMID()), iv_head, false);
         }
     }
 
@@ -398,9 +406,9 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
                             if (json1.size()>0){
                                 endSize = json1.getJSONObject(0).getIntValue("count");
                             }
-                          
-                          
-                           
+
+
+
 
                             CommonUtil.textSpanForStyle(tv_count_unend, unEndSize + "\n未成交", String.valueOf(unEndSize),
                                     ct.getResources().getColor(R.color.yellow_home));
@@ -469,15 +477,15 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
         if (requestCode == 0x11 && 0x11 == resultCode) {
-            MeetUserEntity entity = data.getParcelableExtra("data");
-            if (entity == null || entity.getEmCode() == null) return;
+            Employees entity = data.getParcelableExtra("data");
+            if (entity == null || entity.getEm_code() == null) return;
             isSelected = 1;
             page = 1;
             kind = 0;
-            em_code = entity.getEmCode();
-            tv_name.setText(entity.getName());
-            tv_department.setText(entity.getImId());
-            tv_position.setText("");
+            em_code = entity.getEm_code();
+            tv_name.setText(entity.getEm_name());
+            tv_department.setText(entity.getEm_depart());
+            tv_position.setText(entity.getEm_position());
             sendHttpResquest(Constants.HTTP_SUCCESS_INIT, kind, page, isSelected, em_code);
         }
     }

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

@@ -16,9 +16,9 @@ import com.andreabaccega.widget.FormEditText;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.oa.MeetUserEntity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.UserSelectActivity;
+import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
@@ -203,9 +203,9 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                                 setCodeByNet(code);
                             else
                                 endActivity();
-                          
+
                         }
-                    },3000);
+                    }, 3000);
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
@@ -272,9 +272,9 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                     + "\",\n" +
                     "\"custname\":\"" +
                     tv_customer.getText().toString() +//联系人
-                     "\",\n" +
+                    "\",\n" +
                     "\"SOURCECODE\":\"" +
-                      code +//联系人
+                    code +//联系人
                     "\",\n" +
                     "\"timealert\":\"" +
                     tv_notice.getText().toString() +//提醒
@@ -425,9 +425,9 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
         if (requestCode == 0x11 && resultCode == 0x11) {
-            MeetUserEntity entity = data.getParcelableExtra("data");
-            if (entity == null || entity.getName() == null) return;
-            tv_executive.setText(entity.getName());
+            Employees entity = data.getParcelableExtra("data");
+            if (entity == null || entity.getEm_name() == null) return;
+            tv_executive.setText(entity.getEm_name());
         }
     }
 }

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

@@ -140,4 +140,17 @@ public class AddLogActivity extends BaseActivity {
         }
         ViewUtil.httpSendRequest(this, mConfig.MSG_ADD_URL, params, handler, null, ADD_WHAT, null, null, "get");
     }
+
+
+    /** 添加一条评论的操作 */
+    /**
+     * 新一条回复
+     */
+    private void  addWorkLog(String text) {
+
+
+
+
+    }
+
 }

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

@@ -18,8 +18,8 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.oa.MeetUserEntity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CodeUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -61,7 +61,7 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
     private final int whatAdd = 0x11;
     private String baseUrl;
     private int request = 0x13;
-    ArrayList<MeetUserEntity> entities = null;//成员
+    ArrayList<Employees> entities = null;//成员
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -257,11 +257,11 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
         StringBuilder builderId = new StringBuilder();
         for (int i = 0; i < entities.size(); i++) {
             if (i == 0) {
-                builder.append(entities.get(i).getName());
-                builderId.append("employee#" + entities.get(i).getEmId());
+                builder.append(entities.get(i).getEm_name());
+                builderId.append("employee#" + entities.get(i).getEm_id());
             } else {
-                builder.append(";" + entities.get(i).getName());
-                builderId.append(";employee#" + entities.get(i).getEmId());
+                builder.append(";" + entities.get(i).getEm_name());
+                builderId.append(";employee#" + entities.get(i).getEm_id());
             }
         }
         doSignin(builder.toString(), builderId.toString(), id);
@@ -357,8 +357,8 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
         progressDialog.show();
         StringBuilder resourcename = new StringBuilder();
         if (entities != null && entities.size() > 0) {
-            for (MeetUserEntity e : entities) {
-                resourcename.append("," + e.getName());
+            for (Employees e : entities) {
+                resourcename.append("," + e.getEm_name());
             }
             resourcename.delete(0, 1);
         }

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

@@ -6,7 +6,6 @@ import android.os.Handler;
 import android.os.Message;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -316,7 +315,6 @@ public class MeetingActivity extends BaseActivity {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
-        Log.i("gongpengming", "onActivityResult");
         if (requestCode == this.requestCode) {
             if (resultCode == 0x14) {
                 if ("data".equals(data.getStringExtra("data"))) {
@@ -324,13 +322,17 @@ public class MeetingActivity extends BaseActivity {
                     loadNetData(1);
                 }
             } else if (resultCode == 0x15) {
-                Log.i("gongpengming", "resultCode == 0x15");
-                int i = data.getIntExtra("item", -1);
-                if (i >= 0 && data.getBooleanExtra("data", false)) {//是否结束会议
-                    entities = adapter.getData();
-                    entities.get(i).setStatus("已结束");
-                }
-                adapter.setData(entities);
+                loadNetData(1);
+//                Log.i("gongpengming", "resultCode == 0x15");
+//                int i = data.getIntExtra("item", -1);
+//                Log.i("gongpengming", "i == " + i);
+//                if (i >= 0 && data.getBooleanExtra("data", false)) {//是否结束会议
+//                    Log.i("gongpengming", "进来了" + i);
+//                    entities = adapter.getData();
+//                    entities.get(i).setStatus("已结束");
+//                    Log.i("gongpengming", "进来了222" + entities.get(i).getStatus());
+//                }
+//                adapter.setData(entities);
             }
         }
     }

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

@@ -28,7 +28,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.oa.MeetUserEntity;
 import com.xzjmyk.pm.activity.bean.oa.OABean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.DetailTaskActivity;
@@ -36,6 +35,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.ErpMenActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.TaskAddActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.VisitReportAddActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.VisitReportPlanActivity;
+import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
@@ -231,17 +231,16 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
         if (requestCode == 0x11 && 0x11 == resultCode) {
-            MeetUserEntity entity = data.getParcelableExtra("data");
-            if (entity == null || entity.getName() == null) return;
-            my_client_log.setText(entity.getName());
+            Employees entity = data.getParcelableExtra("data");
+            if (entity == null || entity.getEm_name() == null) return;
+            my_client_log.setText(entity.getEm_name());
             //下属选项
             if (otherBeans == null) {
                 adapter.setBeans(new ArrayList<OABean>());
                 return;
             }
             List<OABean> chche = new ArrayList<>();
-            String name = "," + entity.getName().trim() + ",";
-            Log.i("gongpengming", name);
+            String name = "," + entity.getEm_name().trim() + ",";
             if (name == null) return;
             String nameStr;
             for (OABean e : otherBeans) {

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

@@ -83,18 +83,16 @@ public class OutSigninOKActivity extends BaseActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.push) {
-            CodeUtil.getInstance().getCode(ct, "mobile_outsign", new CodeUtil.OnCodeLinstener() {
-                @Override
-                public void callBack(String code) {
-                    doSignin(code, 0);
-                }
-            });
+            if (!StringUtils.isEmpty(path) && new File(path).isFile())
+                uploadFile(path);
+            else
+                CodeUtil.getInstance().getCode(ct, "mobile_outsign", new CodeUtil.OnCodeLinstener() {
+                    @Override
+                    public void callBack(String code) {
+                        doSignin(code, 0);
+                    }
+                });
         }
-//            if (!StringUtils.isEmpty(path) && new File(path).isFile())
-//                uploadFile(path);
-//            else
-//
-//        }
         return super.onOptionsItemSelected(item);
     }
 
@@ -141,7 +139,7 @@ public class OutSigninOKActivity extends BaseActivity {
                     mNewPhotoUri = CameraUtil.getOutputMediaFileUri(OutSigninOKActivity.this, CameraUtil.MEDIA_TYPE_IMAGE);
                     CameraUtil.captureImage(OutSigninOKActivity.this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
                 } else if (i == 1) {
-                    if (!CommonUtil.setSharedPreferences(ct, "isImage", false)) {
+                    if (!getIntent().getBooleanExtra("isImage", false)) {
                         Crouton.makeText(ct, "您没有被允许使用系统相册，请使用拍照");
                     } else {
                         //调用系统相册
@@ -222,7 +220,7 @@ public class OutSigninOKActivity extends BaseActivity {
             if (resultCode == Activity.RESULT_OK) {
                 if (mNewPhotoUri != null) {
                     path = mNewPhotoUri.getPath();
-                    path = CameraUtil.getImagePathFromUri(ct, mNewPhotoUri);
+//                    path = CameraUtil.getImagePathFromUri(ct, mNewPhotoUri);
                     if (StringUtils.isEmpty(path)) return;
                     ImageLoader.getInstance().displayImage(Uri.fromFile(new File(path)).toString(), image);
                 } else {

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

@@ -1,23 +1,36 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.support.v7.app.AlertDialog;
 import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 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.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
+import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
-public class OutofficeSetActivity extends BaseActivity {
-    public static final String OA_LOCATION_DISTANCE = "OA_LOCATION_DISTANCE";
-    public static final String OA_LOCATION_IS = "OA_LOCATION_IS";
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
+/**
+ */
+public class OutofficeSetActivity extends BaseActivity {
     @ViewInject(R.id.location_tv)
     private TextView location_tv;
     @ViewInject(R.id.location_tag)
@@ -28,6 +41,23 @@ public class OutofficeSetActivity extends BaseActivity {
     private SwitchView allow_chance_location;
     @ViewInject(R.id.isImage)
     private SwitchView isImage;
+    private Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            String message = msg.getData().getString("result");
+            JSONObject object = null;
+            switch (msg.what) {
+                case 0x11:
+                    object = JSON.parseObject(message);
+                    if (object.containsKey("success") && object.getBoolean("success"))
+                        Crouton.makeText(ct, "保存成功");
+                    else
+                        Crouton.makeText(ct, "保存失败");
+                    break;
+
+            }
+        }
+    };
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -37,20 +67,72 @@ public class OutofficeSetActivity extends BaseActivity {
         initview();
     }
 
+    //form 3：isImage  2：isAddress  1：distance
+    private void saveSet(String... form) {
+        StringBuilder formStore = new StringBuilder();
+        formStore.append("[");
+        switch (form.length) {
+            case 3:
+                formStore.append("{\"isImage\":\"" + form[2] + "\"},");
+            case 2:
+                formStore.append("{\"isAddress\":\"" + form[1] + "\"},");
+            case 1:
+                formStore.append("{\"distance\":\"" + form[0] + "\"},");
+                break;
+        }
+        formStore.append("]");
+        Map<String, Object> param = new HashMap<>();
+        param.put("formStore", formStore.toString());
+        net("mobile/saveconfigs.action", param, 0x11);
+    }
+
+    private void updataSet(String key, String value) {
+        String formStore = "{\"code\":\"" + key + "\",\"data\":\"" + value + "\"}";
+        Map<String, Object> param = new HashMap<>();
+        param.put("formStore", formStore);
+        net("mobile/updateconfigs.action", param, 0x11);
+    }
+
+    String baseUrl;
+    String emcode;
+
+    private void net(String action, Map<String, Object> param, int what) {
+        progressDialog.show();
+        if (baseUrl == null)
+            baseUrl = CommonUtil.getSharedPreferences(ct, "erp_baseurl");
+        if (emcode == null)
+            emcode = CommonUtil.getSharedPreferences(ct, "erp_username");
+        String url = baseUrl + action;
+        param.put("caller", "AppConfigs");
+        param.put("emcode", emcode);
+        param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, param, handler, headers, what, null, null, "get");
+    }
+
+
     private void initview() {
-        isImage.setChecked(CommonUtil.setSharedPreferences(ct, "isImage", false));
+        Intent intent = getIntent();
+        if (intent != null) {
+            saveSet(intent.getBooleanExtra("isImage", false) ? "1" : "0", intent.getBooleanExtra("isAddress", false) ? "1" : "0", intent.getIntExtra("distance", 0) + "");
+            isImage.setChecked(intent.getBooleanExtra("isImage", false));
+            allow_chance_location.setChecked(intent.getBooleanExtra("isAddress", false));
+            setClickAble(intent.getBooleanExtra("isAddress", false));
+            location_tv.setText(intent.getIntExtra("distance", 0));
+        }
         isImage.setOnCheckedChangeListener(new SwitchView.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(View view, boolean isChecked) {
                 CommonUtil.setSharedPreferences(ct, "isImage", isChecked);
+                updataSet("isImage", "" + (isChecked ? 1 : 0));
             }
         });
         allow_chance_location.setOnCheckedChangeListener(new SwitchView.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(View view, boolean isChecked) {
                 setClickAble(isChecked);
-                CommonUtil.setSharedPreferences(ct, OA_LOCATION_DISTANCE, location_tv.getText().toString().trim());
-                CommonUtil.setSharedPreferences(ct, OA_LOCATION_IS, isChecked);
+                updataSet("isAddress ", "" + (isChecked ? 1 : 0));
             }
         });
         location_rl.setOnClickListener(new View.OnClickListener() {
@@ -59,12 +141,6 @@ public class OutofficeSetActivity extends BaseActivity {
                 ShowDalogs();
             }
         });
-        //获取保存信息
-        String location = CommonUtil.getSharedPreferences(ct, OA_LOCATION_DISTANCE);
-        if (location == null || location.length() <= 0)
-            location = "100米";
-        location_tv.setText(location);
-        allow_chance_location.setChecked(CommonUtil.getSharedPreferencesBoolean(ct, OA_LOCATION_IS, false));
     }
 
     private void ShowDalogs() {
@@ -77,12 +153,21 @@ public class OutofficeSetActivity extends BaseActivity {
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 location_tv.setText(cities[which]);
-                CommonUtil.setSharedPreferences(ct, OA_LOCATION_DISTANCE, cities[which]);
+                updataSet("distance", "" + getMin(cities[which]));
             }
         });
         builder.show();
     }
 
+    private int getMin(String chche) {
+        if (StringUtils.isEmpty(chche)) return 0;
+        Pattern p = Pattern.compile("(\\d+)");
+        Matcher m = p.matcher(chche);
+        if (m.find()) {
+            return Integer.parseInt(m.group(0));
+        }
+        return 0;
+    }
 
     public void setClickAble(boolean clickAble) {
         location_rl.setClickable(clickAble);

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

@@ -26,13 +26,13 @@ import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.oa.MeetUserEntity;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 
@@ -53,49 +53,62 @@ public class UserSelectActivity extends BaseActivity {
     private ClearEditText search_edit;
     private boolean isSingle = false;
     private boolean isNet = false;
-    private DBManager manager;
     private MeetSelectAdapter adapter;
-    private ArrayList<MeetUserEntity> entities = new ArrayList<>();
+    private List<Employees> list = new ArrayList<>();
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             String message = msg.getData().getString("result");
-            progressDialog.dismiss();
+            if (progressDialog.isShowing())
+                progressDialog.dismiss();
             switch (msg.what) {
                 case WHAT_LOAD:
                     JSONArray array = JSON.parseObject(message).getJSONArray("datas");//获取到数据
                     if (array == null || array.size() <= 0) return;
-                    MeetUserEntity entity = null;
+                    Employees entity = null;
                     String code = null;//em_code
                     String name = null;//em_name
                     String company = null;//em_name
+                    String position = null;//em_name
                     String imId = null;//em_department->em_post
                     JSONObject object = null;
                     for (int i = 0; i < array.size(); i++) {
                         object = array.getJSONObject(i);
-                        entity = new MeetUserEntity();
+                        entity = new Employees();
                         entity.setClick(false);
                         code = object.containsKey("em_code") ? object.getString("em_code") : "";
                         name = object.containsKey("em_name") ? object.getString("em_name") : "";
                         imId = object.containsKey("em_imid") ? object.getString("em_imid") : "";
-                        company = (array.getJSONObject(i).getString("em_department") == null ? "" : (array.getJSONObject(i).getString("em_department") + "->")) +
-                                (array.getJSONObject(i).getString("em_post") == null ? "" : array.getJSONObject(i).getString("em_post"));
-                        entity.setEmCode(code);
-                        entity.setName(name);
-                        entity.setImId(imId);
-                        entity.setCompany(company);
-                        entities.add(entity);
+                        company = array.getJSONObject(i).getString("em_department") == null ? "" : array.getJSONObject(i).getString("em_department");
+                        position = (array.getJSONObject(i).getString("em_post") == null ? "" : array.getJSONObject(i).getString("em_post"));
+                        entity.setEm_code(code);
+                        entity.setEm_name(name);
+                        entity.setEm_id(Integer.parseInt(imId));
+                        entity.setEm_depart(company);
+                        entity.setEm_position(position);
+                        list.add(entity);
                     }
-                    if (entities.size() > 0) {
+                    if (list.size() > 0) {
                         if (adapter == null) {
-                            adapter = new MeetSelectAdapter(entities);
+                            adapter = new MeetSelectAdapter(list);
                             listview.setAdapter(adapter);
                         } else
-                            adapter.setUsers(entities);
+                            adapter.setUsers(list);
+                    }
+                    break;
+                case 0x12:
+                    Map<Object, Object> kMap = FlexJsonUtil.fromJson(msg.getData().getString("result"));
+                    list = FlexJsonUtil.fromJsonArray(kMap.get("data").toString(), Employees.class);
+                    if (ListUtils.isEmpty(list)) return;
+                    if (list.size() > 0) {
+                        if (adapter == null) {
+                            adapter = new MeetSelectAdapter(list);
+                            listview.setAdapter(adapter);
+                        } else
+                            adapter.setUsers(list);
                     }
                     break;
             }
-
         }
     };
 
@@ -113,10 +126,6 @@ public class UserSelectActivity extends BaseActivity {
 
     private void initView() {
         View view = LayoutInflater.from(this).inflate(R.layout.view_empty, null);
-        TextView tvMessage = (TextView) view.findViewById(R.id.textViewMessage);
-        if (!isNet) {
-            tvMessage.setText("当前数据库没有找到数据，请点击通讯录页面的企业架构刷新数据");
-        }
         listview.setEmptyView(view);
         adapter = new MeetSelectAdapter();
         listview.setAdapter(adapter);
@@ -133,10 +142,10 @@ public class UserSelectActivity extends BaseActivity {
             @Override
             public void afterTextChanged(Editable editable) {
                 String strChche = editable.toString();
-                if (entities == null || entities.size() <= 0) return;
-                ArrayList<MeetUserEntity> chche = new ArrayList<>();
-                for (MeetUserEntity e : entities) {
-                    if (getResult(e.getName() + e.getImId(), strChche)) {
+                if (list == null || list.size() <= 0) return;
+                ArrayList<Employees> chche = new ArrayList<>();
+                for (Employees e : list) {
+                    if (getResult(e.getEm_name() + e.getEm_depart() + e.getEm_position(), strChche)) {
                         chche.add(e);
                     }
                 }
@@ -152,10 +161,10 @@ public class UserSelectActivity extends BaseActivity {
         listview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-                MeetUserEntity select = adapter.getUsers().get(i - 1 < 0 ? 0 : (i - 1));
+                Employees select = adapter.getUsers().get(i - 1 < 0 ? 0 : (i - 1));
                 if (isSingle) {//单选
                     if (adapter.getUsers() == null) return;
-                    MeetUserEntity entity = select;
+                    Employees entity = select;
                     Intent intent = new Intent();
                     intent.putExtra("data", entity);
                     setResult(0x11, intent);
@@ -178,14 +187,14 @@ public class UserSelectActivity extends BaseActivity {
 
     private void selectOK() {
         //选择人员成功操作
-        ArrayList<MeetUserEntity> list = new ArrayList<>();
+        ArrayList<Employees> list = new ArrayList<>();
         if (adapter == null || adapter.getUsers() == null || adapter.getUsers().size() <= 0) {
             finish();
             return;
         }
         String name = CommonUtil.getSharedPreferences(ct, "erp_username");
         for (int i = 0; i < adapter.getUsers().size(); i++) {
-            if (!StringUtils.isEmpty(name) && name.equals(adapter.getUsers().get(i).getEmCode())) {
+            if (!StringUtils.isEmpty(name) && name.equals(adapter.getUsers().get(i).getEm_code())) {
                 list.add(adapter.getUsers().get(i));
                 continue;
             }
@@ -218,26 +227,25 @@ public class UserSelectActivity extends BaseActivity {
         if (isNet) {
             getDataByNet();
         } else {
-            getDataByDB();
+            getEmployeeByNet();
         }
     }
 
-    private void getDataByDB() {  //企业通讯录好友
-        manager = new DBManager(ct);
-        String master = CommonUtil.getSharedPreferences(ct, "erp_master"); //待优化   每次都 读取文件耗性能
-        if (StringUtils.isEmpty(master)) return;
-        List<EmployeesEntity> emList = manager.select_getEmployee(
-                new String[]{master},
-                "whichsys=?");
-        manager.closeDB();
-        for (int i = 0; i < emList.size(); i++) {//企业通讯人员
-
-            entities.add(EnterChatAction(emList.get(i)));
-        }
+    private void getEmployeeByNet() {
+        progressDialog.show();
+        String url = Constants.getAppBaseUrl(ct) + "common/dbfind.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("caller", "Ask4leave");
+        params.put("which", "form");
+        params.put("field", "va_emcode");
+        params.put("condition", "1=1");
+        params.put("page", "1");
+        params.put("pageSize", "100");
+        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, 0x12, null, null, "get");
 
-        //获取完数据以后
-        if (adapter != null)
-            adapter.setUsers(entities);
     }
 
     private void getDataByNet() {
@@ -252,29 +260,20 @@ public class UserSelectActivity extends BaseActivity {
         ViewUtil.httpSendRequest(ct, url, param, handler, headers, WHAT_LOAD, null, null, "get");
     }
 
-    private MeetUserEntity EnterChatAction(EmployeesEntity employee) {
-        MeetUserEntity entity = new MeetUserEntity();
-        entity.setCompany(employee.getCOMPANY() == null ? "" : employee.getCOMPANY());
-        entity.setImId(String.valueOf(employee.getEm_IMID()));
-        entity.setName(employee.getEM_NAME());
-        entity.setEmCode(employee.getEM_CODE());
-        entity.setEmId(employee.getEM_ID());
-        return entity;
-    }
 
     class MeetSelectAdapter extends BaseAdapter {
-        private ArrayList<MeetUserEntity> users;
+        private List<Employees> users;
 
-        public ArrayList<MeetUserEntity> getUsers() {
+        public List<Employees> getUsers() {
             return users;
         }
 
-        public void setUsers(ArrayList<MeetUserEntity> users) {
+        public void setUsers(List<Employees> users) {
             this.users = users;
             notifyDataSetChanged();
         }
 
-        public MeetSelectAdapter(ArrayList<MeetUserEntity> users) {
+        public MeetSelectAdapter(List<Employees> users) {
             this.users = users;
         }
 
@@ -313,13 +312,8 @@ public class UserSelectActivity extends BaseActivity {
             holder.select_scb.setChecked(users.get(i).isClick());
             holder.select_scb.setFocusable(false);
             holder.select_scb.setClickable(false);
-            if (isNet) {
-                holder.id_tv.setText(users.get(i).getCompany());
-            } else {
-                holder.id_tv.setText(users.get(i).getCompany().length() <= 0 ? "" : "公司:" + users.get(i).getCompany());
-            }
-            AvatarHelper.getInstance().displayAvatar(users.get(i).getImId(), holder.head_img, true);//不会删除缓存
-            holder.name_tv.setText("姓名:" + users.get(i).getName());
+            holder.id_tv.setText(users.get(i).getEm_depart() + "->" + users.get(i).getEm_position());
+            holder.name_tv.setText("姓名:" + users.get(i).getEm_name());
             return view;
         }
 

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

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -81,6 +82,7 @@ public class WorkLogsActivity extends BaseActivity {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == this.requestCode) {
             if (resultCode == this.resultCode) {
+                Log.i("gongpengming", "进来了");
                 requestMyBusiness(true);
             }
         }
@@ -197,7 +199,7 @@ public class WorkLogsActivity extends BaseActivity {
             params.put("messageId", messageId);
         }
         params.put("access_token", MyApplication.getInstance().mAccessToken);
-        params.put("pageSize", "" + 10);
+        params.put("pageSize", "10");
         params.put("type", "0");
         params.put("flag", "1");
         StringJsonArrayRequest<PublicMessage> request = new StringJsonArrayRequest<PublicMessage>(
@@ -224,6 +226,8 @@ public class WorkLogsActivity extends BaseActivity {
                     if (context_rv.isRefreshing()) {
                         context_rv.onRefreshComplete();
                     }
+                    Log.i("gongpengming","mMessages="+mMessages.size());
+                    Log.i("gongpengming","messages="+messages.size());
                     mMessages.addAll(result.getData());
                     messages.addAll(result.getData());
                     upDataUi();

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

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.text.Html;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -15,6 +16,7 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baidu.mapapi.map.MapView;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.search.core.PoiInfo;
@@ -29,24 +31,25 @@ import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAListActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OutSigninOKActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OutofficeActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OutofficeSetActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
-import com.xzjmyk.pm.activity.util.ToastUtil;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
+ * 1.0x11 获取打卡记录列表
+ * 2.0x12 获取判断用户是否是管理员接口
+ * 3.0x13 获取考勤设置接口
+ * 4.0x21 requestCode
  * Created by gongpm on 2016/7/14.
  */
 public class OutofficeFragment extends EasyFragment implements View.OnClickListener {
-    private static final int WHAT_LOAD = 0x11;
     private LatLng point;//位置
-    private static int requestCode = 0x11;
     private int sigNum;//签到次数
     @ViewInject(R.id.name_img)
     private ImageView name_img;//头像
@@ -70,19 +73,42 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
     private TextView do_trim;
     private OutofficeActivity ct;
     private JSONArray json = null;
+    private String baseAddr;
+    private boolean isAdmin = false;
+    private boolean isAddress = false;
+    private boolean isImage = false;
+    private int distance = 0;
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             ct.progressDialog.dismiss();
             String message = msg.getData().getString("result");
-            if (msg.what == WHAT_LOAD) {
-                if (JSON.parseObject(message).containsKey("listdata")) {
-                    json = JSON.parseObject(message).getJSONArray("listdata");
-                    sigNum = json.size();
-                    num_tv.setText(Html.fromHtml("<u>" + sigNum + "</u>"));
-                }
+            JSONObject object = null;
+            switch (msg.what) {
+                case 0x11:
+                    object = JSON.parseObject(message);
+                    if (object.containsKey("listdata")) {
+                        json = object.getJSONArray("listdata");
+                        sigNum = json.size();
+                        num_tv.setText(Html.fromHtml("<u>" + sigNum + "</u>"));
+                    }
+                    break;
+                case 0x12:
+                    object = JSON.parseObject(message);
+                    if (object.containsKey("success") && object.getBoolean("success")) {
+                        Log.i("gongpengming", "进来" + object.getString("isAdmin"));
+                        isAdmin = object.containsKey("isAdmin") ? ("1".equals(object.getString("isAdmin")) ? true : false ): false;
+                    }
+                    break;
+                case 0x13:
+                    object = JSON.parseObject(message);
+                    if (object.containsKey("success") && object.getBoolean("success")) {
+                        isAddress = object.containsKey("isAddress") ? ("1".equals(object.getString("isAddress")) ? true : false ): false;
+                        isImage = object.containsKey("isImage") ? ("1".equals(object.getString("isImage")) ? true : false ): false;
+                        distance = object.containsKey("distance") ? Integer.parseInt(object.getString("distance")) : 0;
+                    }
+                    break;
             }
-
         }
     };
 
@@ -91,80 +117,6 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
         return R.layout.fragment_outoffice;
     }
 
-    @Override
-    protected void onCreateView(Bundle savedInstanceState, boolean createView) {
-        setHasOptionsMenu(true);
-        ViewUtils.inject(getmRootView());
-        ct = (OutofficeActivity) getActivity();
-        initview();
-    }
-
-    private void signinAble(boolean b) {
-        click_btn.setFocusable(b);
-        click_btn.setClickable(b);
-        if (b) {
-            click_btn.setBackgroundResource(R.drawable.button_round_shape);
-        } else {
-            click_btn.setBackgroundResource(R.drawable.button_signin);
-        }
-    }
-
-    private void initview() {
-        loadLog();
-        num_tv.setOnClickListener(this);
-        date_tv.setText(TimeUtils.day_long_2_str(System.currentTimeMillis()) + " " + TimeUtils.getWeek(System.currentTimeMillis()) + " " + TimeUtils.long2str(System.currentTimeMillis(), "HH:mm"));
-        num_tv.setText("" + sigNum);
-        String loginUserId = MyApplication.getInstance().mLoginUser.getUserId();
-        AvatarHelper.getInstance().displayAvatar(loginUserId, name_img, true);
-        name_tv.setText(MyApplication.getInstance().mLoginUser.getNickName());
-        com_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_commpany"));
-        String name = MyApplication.getInstance().getBdLocationHelper().getName();
-        String addr = MyApplication.getInstance().getBdLocationHelper().getAddress();
-        out_add_name_tv.setText(name);
-        out_add_t_tv.setText(addr);
-        double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
-        double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
-        point = new LatLng(latitude, longitude);
-        baseAddr = StringUtils.isEmail(name) ? addr : name;
-        BaiduMapUtil.getInstence().setMapViewPoint(mapView, point);
-//        BaiduMapUtil.getInstence().getPoiInfo(ct, new BaiduMapUtil.OnLocationListener() {
-//            @Override
-//            public void result(Map<String, Object> map) {
-//                out_add_name_tv.setText(map.get("poi") + "");
-////                out_add_t_tv.setText(map.get("name") + "");
-//                out_add_t_tv.setText(MyApplication.getInstance().getBdLocationHelper().getAddress());
-//                double latitude = (double) map.get("latitude");
-//                double longitude = (double) map.get("lontitude");
-//                point = new LatLng(latitude, longitude);
-//                baseAddr = map.get("poi") + "";
-//                BaiduMapUtil.getInstence().setMapViewPoint(mapView, point);
-//            }
-//        });
-        do_trim.setOnClickListener(this);
-        click_btn.setOnClickListener(this);
-    }
-
-    //获取打卡记录 date:yyyy-MM-dd
-    private void loadLog() {
-        ct.progressDialog.show();
-        //获取网络数据
-        String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "mobile/common/list.action";
-        String emcode = CommonUtil.getSharedPreferences(ct, "erp_username");
-        final Map<String, Object> param = new HashMap<>();
-        param.put("currentMaster", CommonUtil.getSharedPreferences(ct, "erp_master"));
-        param.put("page", 1);
-        param.put("pageSize", 1000);
-        param.put("emcode", emcode);
-        param.put("condition", "mo_mancode='" + emcode + "' and to_char(mo_signtime,'yyyy-MM-dd')='" + TimeUtils.s_long_2_str(System.currentTimeMillis()) + "'");
-        param.put("caller", "Mobile_outsign");
-        param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
-        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        ViewUtil.httpSendRequest(ct, url, param, handler, headers, WHAT_LOAD, null, null, "get");
-    }
-
-    String baseAddr;
-
     @Override
     public void onDestroy() {
         super.onDestroy();
@@ -179,31 +131,19 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
                 startActivity(list);
                 break;
             case R.id.do_trim:
-                boolean isClick = CommonUtil.getSharedPreferencesBoolean(ct, OutofficeSetActivity.OA_LOCATION_IS);
-                if (isClick) {
-                    Intent i = new Intent(getActivity(), LocationMapActivity.class);
-                    i.putExtra("addr", baseAddr == null ? "" : baseAddr);
-                    String location = CommonUtil.getSharedPreferences(ct, OutofficeSetActivity.OA_LOCATION_DISTANCE);
-                    if (location == null) location = "600米";
-                    StringBuilder builder = new StringBuilder(location);
-                    location = builder.deleteCharAt(builder.length() - 1).toString();
-                    try {
-                        i.putExtra("data", Integer.parseInt(location));
-                    } catch (NumberFormatException e) {
-                        e.printStackTrace();
-                    }
-                    startActivityForResult(i, requestCode);
-                } else {
-                    ToastUtil.showToast(ct, "您已关闭地点微调功能，请在设置里面修改设置");
-                }
+                Intent i = new Intent(getActivity(), LocationMapActivity.class);
+                i.putExtra("addr", baseAddr == null ? "" : baseAddr);
+                i.putExtra("data", distance);
+                startActivityForResult(i, 0x21);
                 break;
             case R.id.click_btn:
                 Intent intent = new Intent(getActivity(), OutSigninOKActivity.class);
                 intent.putExtra("addr", out_add_t_tv.getText().toString());
                 intent.putExtra("com", out_add_name_tv.getText().toString());
+                intent.putExtra("isImage", isImage);
                 if (json != null)
                     intent.putExtra("list", json);
-                startActivityForResult(intent, requestCode);
+                startActivityForResult(intent, 0x21);
                 break;
         }
     }
@@ -211,22 +151,26 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.title) {
-            startActivity(new Intent(getActivity(), OutofficeSetActivity.class));
+            Intent intent = new Intent(ct, OutofficeSetActivity.class);
+            intent.putExtra("isAddress", isAddress);
+            intent.putExtra("isImage", isImage);
+            intent.putExtra("distance", distance);
+            startActivity(intent);
         }
         return super.onOptionsItemSelected(item);
     }
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.menu_outoffice, menu);
-        menu.getItem(0).setTitle("设置");
+        if (isAdmin)
+            inflater.inflate(R.menu.menu_outoffice, menu);
         super.onCreateOptionsMenu(menu, inflater);
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
-        if (this.requestCode == requestCode) {
+        if (0x21 == requestCode) {
             if (resultCode == LocationMapActivity.REQUCODE) {
                 PoiInfo info = data.getParcelableExtra(LocationMapActivity.REQUESTNAME);
                 if (info != null) {
@@ -244,4 +188,89 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
             }
         }
     }
+
+    @Override
+    protected void onCreateView(Bundle savedInstanceState, boolean createView) {
+        setHasOptionsMenu(true);
+        ViewUtils.inject(getmRootView());
+        ct = (OutofficeActivity) getActivity();
+        initview();
+        initData();
+    }
+
+    private void initview() {
+        num_tv.setOnClickListener(this);
+        date_tv.setText(TimeUtils.day_long_2_str(System.currentTimeMillis()) + " " + TimeUtils.getWeek(System.currentTimeMillis()) + " " + TimeUtils.long2str(System.currentTimeMillis(), "HH:mm"));
+        num_tv.setText("" + sigNum);
+        String loginUserId = MyApplication.getInstance().mLoginUser.getUserId();
+        AvatarHelper.getInstance().displayAvatar(loginUserId, name_img, true);
+        name_tv.setText(MyApplication.getInstance().mLoginUser.getNickName());
+        com_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_commpany"));
+        String name = MyApplication.getInstance().getBdLocationHelper().getName();
+        String addr = MyApplication.getInstance().getBdLocationHelper().getAddress();
+        out_add_name_tv.setText(name);
+        out_add_t_tv.setText(addr);
+        double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
+        double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
+        point = new LatLng(latitude, longitude);
+        baseAddr = StringUtils.isEmail(name) ? addr : name;
+        BaiduMapUtil.getInstence().setMapViewPoint(mapView, point);
+        do_trim.setOnClickListener(this);
+        click_btn.setOnClickListener(this);
+        if (isAddress)
+            do_trim.setVisibility(View.VISIBLE);
+        else
+            do_trim.setVisibility(View.GONE);
+    }
+
+    private void initData() {
+        loadLog();
+        judgeManager();
+        getSet();
+    }
+
+    private void getSet() {
+        Map<String, Object> param = new HashMap<>();
+        param.put("code", "isImage,isAddress,distance");
+        net("mobile/getconfigs.action", param, 0x13);
+    }
+
+    //判断是否管理员
+    private void judgeManager() {
+        Map<String, Object> param = new HashMap<>();
+        net("mobile/ifadmin.action", param, 0x12);
+    }
+
+    //获取打卡记录 date:yyyy-MM-dd
+    private void loadLog() {
+        if (emcode == null)
+            emcode = CommonUtil.getSharedPreferences(ct, "erp_username");
+        final Map<String, Object> param = new HashMap<>();
+        param.put("currentMaster", CommonUtil.getSharedPreferences(ct, "erp_master"));
+        param.put("page", 1);
+        param.put("pageSize", 1000);
+        param.put("condition", "mo_mancode='" + emcode + "' and to_char(mo_signtime,'yyyy-MM-dd')='" + TimeUtils.s_long_2_str(System.currentTimeMillis()) + "'");
+        param.put("caller", "Mobile_outsign");
+        net("mobile/common/list.action", param, 0x11);
+    }
+
+    String baseUrl = null;
+    String emcode = null;
+
+    private void net(String action, Map<String, Object> param, int what) {
+        ct.progressDialog.show();
+        if (baseUrl == null)
+            baseUrl = CommonUtil.getSharedPreferences(ct, "erp_baseurl");
+        if (emcode == null)
+            emcode = CommonUtil.getSharedPreferences(ct, "erp_username");
+        String url = baseUrl + action;
+
+        param.put("emcode", emcode);
+        param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, param, handler, headers, what, null, null, "get");
+    }
+
+
 }

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

@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
@@ -80,7 +79,6 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
     @ViewInject(R.id.unoffice_mm)
     private TextView unoffice_mm;//地点微调
 
-
     //变量
     private BaseActivity ct;
     private double companyX;//当前公司位置经度
@@ -94,11 +92,8 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
     private SigninAdapter adapter;
     private long selectTime;//当前选择的日期的时间
     private String code;//账号员工编号
-    private AlertDialog.Builder builder;
-    private String[] timeList = new String[5];
     private boolean isToday = true;
     private long time = System.currentTimeMillis();
-
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {

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

@@ -1,15 +1,17 @@
 package com.xzjmyk.pm.activity.ui.erp.model;
 
+import android.os.Parcel;
 import android.os.Parcelable;
 
-public class Employees {
+public class Employees implements Parcelable {
     private int em_id;
     private String em_code;
     private String em_name;
     private String em_depart;
     private String em_position;
-    //private int em_defaultorid;
     private String em_defaultorname;
+    private boolean isClick=false;
+    public Employees(){}
 
     public int getEm_id() {
         return em_id;
@@ -51,12 +53,6 @@ public class Employees {
         this.em_position = em_position;
     }
 
-    //	public int getEm_defaultorid() {
-//		return em_defaultorid;
-//	}
-//	public void setEm_defaultorid(int em_defaultorid) {
-//		this.em_defaultorid = em_defaultorid;
-//	}
     public String getEm_defaultorname() {
         return em_defaultorname;
     }
@@ -65,5 +61,49 @@ public class Employees {
         this.em_defaultorname = em_defaultorname;
     }
 
+    public boolean isClick() {
+        return isClick;
+    }
+
+    public void setClick(boolean click) {
+        isClick = click;
+    }
+
+    protected Employees(Parcel in) {
+        em_id = in.readInt();
+        em_code = in.readString();
+        em_name = in.readString();
+        em_depart = in.readString();
+        em_position = in.readString();
+        em_defaultorname = in.readString();
+        isClick = in.readByte() != 0;
+    }
+
+    public static final Creator<Employees> CREATOR = new Creator<Employees>() {
+        @Override
+        public Employees createFromParcel(Parcel in) {
+            return new Employees(in);
+        }
+
+        @Override
+        public Employees[] newArray(int size) {
+            return new Employees[size];
+        }
+    };
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
 
+    @Override
+    public void writeToParcel(Parcel parcel, int i) {
+        parcel.writeInt(em_id);
+        parcel.writeString(em_code);
+        parcel.writeString(em_name);
+        parcel.writeString(em_depart);
+        parcel.writeString(em_position);
+        parcel.writeString(em_defaultorname);
+        parcel.writeByte((byte) (isClick ? 1 : 0));
+    }
 }

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/bg_main"

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

@@ -11,8 +11,8 @@
         android:id="@+id/top"
         android:layout_width="match_parent"
         android:layout_height="70dp"
-        android:gravity="center_vertical"
         android:background="@color/oa_background_orange"
+        android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <LinearLayout
@@ -32,9 +32,9 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/white"
                 android:layout_marginTop="2dp"
-                android:text="会议纪要" />
+                android:text="会议纪要"
+                android:textColor="@color/white" />
         </LinearLayout>
 
         <LinearLayout
@@ -56,8 +56,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
-                android:textColor="@color/white"
-                android:text="分配任务" />
+                android:text="分配任务"
+                android:textColor="@color/white" />
         </LinearLayout>
     </LinearLayout>
 
@@ -228,32 +228,29 @@
         android:textSize="@dimen/text_main" />
 
 
-    <LinearLayout
+    <RelativeLayout
         android:id="@+id/baidu_ll"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/click_btn"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="10dp"
-        android:orientation="horizontal">
+        android:layout_marginTop="10dp">
 
         <TextView
             android:id="@+id/location_tv"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <View
-            android:layout_width="6dp"
-            android:layout_height="1dp" />
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true" />
 
         <TextView
             android:id="@+id/location_tag"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_toRightOf="@id/location_tv"
             android:clickable="true"
             android:text="@string/agare"
             android:textColor="@color/blue" />
-    </LinearLayout>
+    </RelativeLayout>
 
     <LinearLayout
         android:id="@+id/click_ll"
@@ -287,18 +284,18 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:background="@drawable/endmeeting"/>
+        android:background="@drawable/endmeeting" />
 
     <!--<TextView-->
-        <!--android:id="@+id/end_meet_tv"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:layout_alignParentBottom="true"-->
-        <!--android:layout_below="@+id/meet_about"-->
-        <!--android:background="@color/white"-->
-        <!--android:clickable="true"-->
-        <!--android:gravity="center"-->
-        <!--android:padding="20dp"-->
-        <!--android:text="结束会议"-->
-        <!--android:textColor="@color/text_main" />-->
+    <!--android:id="@+id/end_meet_tv"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:layout_alignParentBottom="true"-->
+    <!--android:layout_below="@+id/meet_about"-->
+    <!--android:background="@color/white"-->
+    <!--android:clickable="true"-->
+    <!--android:gravity="center"-->
+    <!--android:padding="20dp"-->
+    <!--android:text="结束会议"-->
+    <!--android:textColor="@color/text_main" />-->
 </RelativeLayout>

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

@@ -113,7 +113,7 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:visibility="gone">
+            >
 
                 <ImageView
                     android:id="@+id/image"

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

@@ -20,7 +20,8 @@
         android:layout_height="38dp"
         android:layout_centerVertical="true"
         android:layout_toRightOf="@id/select_scb"
-        android:src="@drawable/friend_u" />
+        android:src="@drawable/friend_u"
+        android:visibility="gone" />
 
     <TextView
         android:id="@+id/name_tv"