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

WeiChat/build.gradle

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

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

@@ -428,6 +428,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             vp_code = getIntent().getStringExtra("code");
         String url = CommonUtil.getSharedPreferences(this, "erp_baseurl") + "mobile/crm/updateVistPlan.action";
         final Map<String, Object> param = new HashMap<>();
+        param.put("vr_id",mVrId);
         param.put("vp_id", vp_id);
         //cu_nichestep商机阶段
         //cu_code客户编号

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/CalendarView.java

@@ -49,7 +49,7 @@ public class CalendarView extends View implements View.OnTouchListener {
         downDate = curDate = today = new Date();
         calendar = Calendar.getInstance();
         calendar.setTime(curDate);
-        downIndex = calendar.get(Calendar.DAY_OF_MONTH);
+        downIndex = calendar.get(Calendar.DAY_OF_MONTH)+3;
         surface = new Surface();
         surface.density = getResources().getDisplayMetrics().density;
         setBackgroundColor(surface.bgColor);

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

@@ -284,7 +284,8 @@
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@+id/tv_id9"
                 android:text="*"
-                android:textColor="@color/red" />
+                android:textColor="@color/red"
+                android:visibility="gone"/>
 
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_relate_business"