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

# Conflicts:
#	WeiChat/build.gradle
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportPlanActivity.java

WeiChat/build.gradle

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

WeiChat/src/main/AndroidManifest.xml

@@ -2,13 +2,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="49"
-    android:versionName="4.9">
-
+    android:versionCode="46"
+    android:versionName="4.6">
     <uses-sdk
         android:minSdkVersion="11"
         android:targetSdkVersion="23" />
-
     <!-- 拨打电话 -->
     <uses-permission android:name="android.permission.CALL_PHONE" />
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -484,7 +484,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         BDAutoUpdateSDK.uiUpdateAction(this, new UICheckUpdateCallback() {
             @Override
             public void onCheckComplete() {
-
+              
             }
         });
     }

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

@@ -76,6 +76,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
 
 
     private List<String> lists = new ArrayList<String>();
+    private int et_business_enterCode;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -295,11 +296,17 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
         String bc_remark = getEditText(et_business_remark);//备注
         String bc_position = getEditText(et_company_position); //职位
         String bc_type = getEditText(et_business_type);  //商机类型
+        String enterCode=null;
+        if (et_business_enterCode==0){
+            enterCode="";
+        }else{
+            enterCode=CommonUtil.getSharedPreferences(ct,"erp_username");
+        }
         String formStore =
                 "{\n" +
                         "\"bc_code\":\"" + et_business_no.getText().toString() + "\",\n" +   //商机名称
                         "\"bc_status\":\"" + "在录入" + "\",\n" +
-                        "\"bc_domancode\":\"" + CommonUtil.getSharedPreferences(ct, "erp_username") + "\",\n" +
+                        "\"bc_domancode\":\"" + enterCode+ "\",\n" +
                         "\"bc_statuscode\":\"" + "ENTERING" + "\",\n" +
                         "\"bc_description\":\"" + name + "\",\n" +   //商机名称
                         "\"bc_from\":\"" + from + "\",\n" +          //商机来源
@@ -419,8 +426,10 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
                                     et_business_enterMan.setClickable(false);
                                     et_business_enterMan.setEnabled(false);
                                     et_business_enterMan.setText("");
+                                    et_business_enterCode=0;
                                 }else{
                                     //跟进人可编辑
+                                    et_business_enterCode=1;
                                     et_business_enterMan.setEnabled(true);
                                     et_business_enterMan.setClickable(true);
                                     et_business_enterMan.setText(MyApplication.getInstance().mLoginUser.getNickName());

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

@@ -468,7 +468,7 @@ public class BusinessDetailActivty extends BaseActivity {
         Map<String, Object> params = new HashMap<>();
         params.put("bc_code", bc_code);
         params.put("bc_doman", bc_doman);
-        params.put("bc_domancode", bc_code);//CommonUtil.getSharedPreferences(ct, "erp_username")
+        params.put("bc_domancode", CommonUtil.getSharedPreferences(ct, "erp_username"));//
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");

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

@@ -21,6 +21,7 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.view.steps.StepsView;
 
 import java.util.HashMap;
@@ -117,10 +118,10 @@ public class CustomerDetailActivity extends BaseActivity {
         String code = getIntent().getStringExtra("code");
         sendHttpResquest(Constants.HTTP_SUCCESS_INIT, code);
         // sendAdd(Constants.HTTP_SUCCESS_INIT);
-        mStepsView.setCompletedPosition(5 % labels.length)
+        mStepsView.setCompletedPosition(0 % labels.length)
                 .setLabels(labels)
                 .setBarColorIndicator(
-                        ct.getResources().getColor(R.color.material_blue_grey_800))
+                        ct.getResources().getColor(R.color.light_gray))
                 .setProgressColorIndicator(ct.getResources().getColor(R.color.orange))
                 .setLabelColorIndicator(ct.getResources().getColor(R.color.orange))
                 .drawView();
@@ -169,7 +170,20 @@ public class CustomerDetailActivity extends BaseActivity {
                         tv_mobile.setText(jsonArray.getString("cu_mobile"));
                         tv_position.setText(jsonArray.getString("cu_degree"));
                         tv_name.setText(jsonArray.getString("cu_name"));
-                        
+                        String steps= jsonArray.getString("cu_nichestep");
+                        for (int i=0;i<labels.length;i++){
+                            if (!StringUtils.isEmpty(steps)){
+                                if (labels[i].equals(steps)){
+                                    mStepsView.setCompletedPosition(i% labels.length)
+                                            .setLabels(labels)
+                                            .setBarColorIndicator(
+                                                    ct.getResources().getColor(R.color.light_gray))
+                                            .setProgressColorIndicator(ct.getResources().getColor(R.color.orange))
+                                            .setLabelColorIndicator(ct.getResources().getColor(R.color.orange))
+                                            .drawView();
+                                }
+                            }
+                        }
                         tv_visitTimes.setText(jsonArray.getString("bfcount"));
                         tv_modifyRecord.setText(jsonArray.getString("cu_remark"));
                         tv_feilv.setText(jsonArray.getString("cu_taxrate"));

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

@@ -260,7 +260,7 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
             holder.tv_step.setText(mdata.getJSONObject(position).getString("cu_nichestep"));
             holder.tv_date.setText(mdata.getJSONObject(position).getString("cu_lastdate"));
             holder.tv_datetv.setText("最后跟进时间:");
-            holder.tv_leader.setText(mdata.getJSONObject(position).getString("cu_contact"));
+            holder.tv_leader.setText(mdata.getJSONObject(position).getString("cu_sellername"));//cu_contact
             holder.tv_code.setText(mdata.getJSONObject(position).getString("cu_code"));
             if (type == 0) {
                 holder.tv_state.setText("未成交");

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

@@ -73,8 +73,8 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
     private void initView() {
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("拜访计划");
-//        tv_date_select.setText(TimeUtils.s_long_2_str(System.currentTimeMillis()));
-//        tv_address_login.setText(MyApplication.getInstance().getBdLocationHelper().getAddress());
+        tv_date_select.setText(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
+        tv_address_login.setText(MyApplication.getInstance().getBdLocationHelper().getAddress());
         tv_date_select.setKeyListener(null);
         tv_date_select.setFocusable(false);
         tv_date_select.setOnClickListener(this);
@@ -154,10 +154,10 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
         String formStore = "";
         if (tv_date_select.testValidity() && tv_date_end.testValidity()
                 && tv_customer_login.testValidity() && tv_linksman_login.testValidity()
-                && tv_address_login.testValidity() && tv_visit_theme.testValidity()){
+                && tv_address_login.testValidity() && tv_visit_theme.testValidity()) {
             formStore = "\n" +
                     "{\n" +
-                    "\"vp_date\":\"" +DateFormatUtil.getStrDate4Date(new Date(),"yyyy-MM-dd")  +
+                    "\"vp_date\":\"" + DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd") +
                     "\",\n" +
                     "\"vp_code\":\"" + tv_code +
                     "\",\n" +
@@ -198,7 +198,7 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
                     DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd") +
                     "\"\n" +
                     "}";
-        }else {
+        } else {
             return;
         }
         progressDialog.show();
@@ -218,11 +218,12 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
         setResult(0x20, intent);
         finish();
     }
+
     private void showDateDialog(final FormEditText tv) {
         DateTimePicker picker = new DateTimePicker(this, DateTimePicker.HOUR_OF_DAY);
         picker.setRange(2000, 2030);
-        picker.setSelectedItem( Calendar.getInstance().get(Calendar.YEAR),
-                Calendar.getInstance().get(Calendar.MONTH)+1,
+        picker.setSelectedItem(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH) + 1,
                 Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
                 Calendar.getInstance().get(Calendar.HOUR_OF_DAY),
                 Calendar.getInstance().get(Calendar.MINUTE));
@@ -310,6 +311,8 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
                         for (int i = 0; i < array.size(); i++) {
                             if (value.equals(array.getJSONObject(i).getString("CU_NAME"))) {
                                 vp_code = array.getJSONObject(i).getString("CU_CODE");
+                                tv_linksman_login.setText(array.getJSONObject(i).getString("CU_CONTACT"));
+                                tv_address_login.setText(array.getJSONObject(i).getString("CU_ADD1"));
                             }
                         }
                     }

libbdupdatesdk/src/main/res/drawable/bdp_update_bg_dialog_btn.xml

@@ -4,9 +4,9 @@
     <item>
         <shape>
             <corners android:radius="5dip" />
-
-            <solid android:color="#ff44d7b3" />
-
+            <solid android:color="#EE3B3B" />
+          <!--  <solid android:color="#ff44d7b3" />-->
+           
             <padding android:bottom="0dip" android:left="0dip" android:right="0dip" android:top="0dip" />
         </shape>
     </item>

libbdupdatesdk/src/main/res/layout/bdp_update_activity_confirm_dialog.xml

@@ -84,14 +84,17 @@
                 android:text="@string/bdp_update_not_now"
                 />
             
-            <TextView 
+           <TextView 
                 android:id="@+id/txt_action_3"
                 android:layout_width="0dip"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:layout_weight="0"
                 android:textColor="#ffabbed9"
                 android:textSize="13sp"
                 android:gravity="center"
+                android:enabled="false"
+                android:clickable="false"
+               android:visibility="gone"
                 android:text="@string/bdp_update_ignore"
                 />
         </LinearLayout>

libbdupdatesdk/src/main/res/values/bdp_update_strings.xml

@@ -11,7 +11,7 @@
     <string name="bdp_update_action_download">立即升级</string>
     <string name="bdp_update_action_install">立即安装</string>
     <string name="bdp_update_not_now">暂不升级</string>
-    <string name="bdp_update_ignore">忽略此版本</string>
+    <string name="bdp_update_ignore"></string>
     
     <string name="bdp_update_new_download">发现新版本，点击更新</string>
     <string name="bdp_update_download_complete">新版本下载完成，点击安装</string>