Merge remote-tracking branch 'origin/developer' into developer

MPAndroidChart/src/main/java/com/github/mikephil/charting/buffer/BarBuffer.java

@@ -1,6 +1,8 @@
 
 package com.github.mikephil.charting.buffer;
 
+import android.util.Log;
+
 import com.github.mikephil.charting.data.BarEntry;
 
 import java.util.List;
@@ -34,11 +36,15 @@ public class BarBuffer extends AbstractBuffer<BarEntry> {
     }
 
     protected void addBar(float left, float top, float right, float bottom) {
-
-        buffer[index++] = left;
-        buffer[index++] = top;
-        buffer[index++] = right;
-        buffer[index++] = bottom;
+        try {
+            buffer[index++] = left;
+            buffer[index++] = top;
+            buffer[index++] = right;
+            buffer[index++] = bottom;
+        } catch (Exception e) {
+            e.printStackTrace();
+            Log.i("MPAndroidChart", "addBar:");
+        }
     }
 
     @Override

WeiChat/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 android {
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('C:/CompanyProject/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="45"
-    android:versionName="4.5">
+    android:versionCode="47"
+    android:versionName="4.7">
 
     <uses-sdk
         android:minSdkVersion="11"

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

@@ -164,6 +164,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
     @ViewInject(R.id.ll_customer_lost)
     private LinearLayout  ll_customer_lost;
     private BarData data;
+    private BarData data1;
     private ArrayList<BarDataSet> dataSets;
     private ArrayList<BarDataSet> dataSets1;
     private MyMarkerView mv;
@@ -185,7 +186,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
     }
 
     private void initView() {
-        getSupportActionBar().setTitle("CRM");
+        getSupportActionBar().setTitle("客户管理");
         initBarChart();
         initSaleBarChart();
         initListener();
@@ -408,9 +409,13 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 
         ArrayList<BarEntry> yVals1 = new ArrayList<BarEntry>();
 
-        for (int i = 0; i < count; i++) {
-            float val = ydata[i];
-            yVals1.add(new BarEntry(val, i));
+        try {
+            for (int i = 0; i < count; i++) {
+                float val = ydata[i];
+                yVals1.add(new BarEntry(val, i));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
         BarDataSet set1 = new BarDataSet(yVals1, "数量(单位:个)");
         set1.setColors(ColorTemplate.JOYFUL_COLORS);
@@ -419,10 +424,10 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         dataSets1.clear();
         dataSets1.add(set1);
 
-        data = new BarData(xVals, dataSets1);
+        data1 = new BarData(xVals, dataSets1);
     
 
-        sChart.setData(data);
+        sChart.setData(data1);
         sChart.invalidate();
     }
     
@@ -608,7 +613,9 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                         ydata1[6] = root.getJSONArray("visit").getIntValue(1);
                         tv_chuhuo.setText("出货" + root.getIntValue("saleamount") + "元");
                         tv_huikuan.setText("回款" + root.getIntValue("backamount") + "元");
-                        Log.i(TAG, "handleMessage:" + ydata1.toString() );
+                       for (int i=0;i<ydata1.length;i++){
+                           Log.i(TAG, "handleMessage:ydata1["+i+"]=" + ydata1[i] );
+                       }
                         setData1(7, ydata1);
                     }else{
                         setData1(7, ydata1);

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

@@ -32,9 +32,13 @@ import com.xzjmyk.pm.activity.bean.crm.Business;
 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.db.DBManager;
+import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 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.ListUtils;
+import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 
 import java.util.ArrayList;
@@ -73,6 +77,8 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
     private int type = 0;
     private int falg = 0;//是否启用预录入客户
 
+    private EmptyLayout mEmptyLayout;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -91,6 +97,11 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
 
         mAdapter = new BussinessDetailAdapter(ct, jsonArray);
         mlist.setAdapter(mAdapter);
+
+        mEmptyLayout = new EmptyLayout(this,mlist.getRefreshableView());
+        mEmptyLayout.setShowLoadingButton(false);
+        mEmptyLayout.setShowEmptyButton(false);
+        mEmptyLayout.setShowErrorButton(false);
     }
 
     private void initListener() {
@@ -133,6 +144,19 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
     private void initData() {
         em_code = CommonUtil.getSharedPreferences(ct, "erp_username");
         sendHttpResquest(Constants.HTTP_SUCCESS_INIT, kind, page, 0, "");
+        DBManager dbManager=new DBManager(ct);
+        List<EmployeesEntity> db=  dbManager.select_getEmployee(
+                new String[]{CommonUtil.getSharedPreferences(ct, "erp_master"),
+                CommonUtil.getSharedPreferences(ct, "erp_username")}
+                , "whichsys=? and em_code=? ");
+        if (!ListUtils.isEmpty(db)){
+            for (EmployeesEntity model:db) {
+                Log.i(TAG, "initData:" + model.getEM_DEPART());
+                Log.i(TAG, "initData:" + model.getEM_POSITION());
+            }
+            tv_position.setText(db.get(0).getEM_POSITION());
+            tv_department.setText(db.get(0).getEM_DEFAULTORNAME()+"—>");
+        }
     }
 
     @Override
@@ -388,10 +412,12 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
 
                             break;
                     }
-                    if (json != null) {
+                    if (json != null && json.size() != 0) {
                         if (page == 1) jsonArray.clear();
                         jsonArray.addAll(json);
                         mAdapter.notifyDataSetChanged();
+                    }else {
+                        mEmptyLayout.showEmpty();
                     }
                     mlist.onRefreshComplete();
                     progressDialog.dismiss();

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

@@ -95,6 +95,12 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
             iv_remain.setVisibility(View.VISIBLE);
         else
             iv_remain.setVisibility(View.GONE);
+        
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
         //判断是否启用功能模块
         isStartNewApp(Constants.HTTP_SUCCESS_INIT);
     }
@@ -149,7 +155,7 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params,mhandler, headers, Constants.HTTP_SUCCESS_INIT, null, null, "post");
     }
-    private  String falg;
+    private  String falg="0";
     private Handler mhandler=new Handler(){
         @Override
         public void handleMessage(Message msg) {
@@ -169,6 +175,7 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     tv_crm.setText("客户管理");
                     tv_oa.setText("办公自动化");
+                    falg="0";
                     break;
             }
         }

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

@@ -124,7 +124,7 @@ public class ViewUtil {
         Log.i("result", "url：" + url);
         Log.i("result", "parm：" + params.toString());
         Log.i("result", "statusCode：" + result.getStatusCode());
-        Log.i("result", "text：" + result.getResponseText());
+        LogUtil.prinlnLongMsg("result",result.getResponseText());
         Log.i("result", "http 响应-----------------------------------------");
     }
 

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

@@ -826,7 +826,7 @@
                     android:src="@drawable/ic_forget_customer"/>
 
                 <TextView
-                    android:layout_toRightOf="@+id/tv_leave_title"
+                   
                     style="@style/crm_tv_card_topLeftTitle"
                     android:text="@string/crm_customer_forget_num"
                     android:visibility="gone"

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

@@ -45,7 +45,7 @@
 
                 <TextView
                     android:text="总经理"
-                    android:layout_marginLeft="15dp"
+                    android:layout_marginLeft="1dp"
                     android:textColor="#4f4848"
                     style="@style/TextView_Basic"
                     android:id="@+id/tv_position" />