冲突之后的提交 8-22

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

@@ -105,7 +105,8 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         switch (item.getItemId()) {
             case R.id.btn_save:
                 if (tv_name.testValidity()&&tv_executive.testValidity()&&tv_date.testValidity()
-                        &&tv_priority.testValidity()) {
+                        &&tv_priority.testValidity()
+                        &&tv_date_start.testValidity()) {
                     sendHttpResquest(Constants.HTTP_SUCCESS_INIT);
                 }
                 break;
@@ -147,6 +148,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
 
     private void sendHttpResquest(int what) {
         progressDialog.show();
+       
         String formStore = "{\n" +
                 "\"taskcode\":\"" + tv_code + "\",\n" +//编号
                 "\"name\":\"" + tv_name.getText().toString() + "\",\n" +//名称
@@ -156,6 +158,9 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                 "\"enddate\":\"" +//结束时间
                 tv_date.getText().toString() +
                 "\",\n" +
+                "\"startdate\":\"" +//结束时间
+                tv_date_start.getText().toString() +
+                "\",\n" +
                 "\"tasklevel\":\"" +
                 tv_priority.getText().toString() +//任务优先级
                 "\",\n" +

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

@@ -42,14 +42,11 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     private EditText tv_linksman_login;
     @ViewInject(R.id.tv_visit_login)
     private EditText tv_visit_login;
-//    @ViewInject(R.id.tv_depart_login)
-//    private EditText tv_depart_login;
-//    @ViewInject(R.id.tv_startTim_login)
-//    private EditText tv_startTim_login;
-//    @ViewInject(R.id.tv_endTime_login)
-//    private EditText tv_endTime_login;
-//    @ViewInject(R.id.tv_businessState_login)
-//    private EditText tv_businessState_login;
+    @ViewInject(R.id.tv_date_start)
+    private EditText ttv_date_start;
+    @ViewInject(R.id.tv_date_end)
+    private EditText tv_date_end;
+
     @ViewInject(R.id.tv_notes_login)
     private EditText tv_notes_login;
 

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

@@ -31,7 +31,7 @@
 
         <com.andreabaccega.widget.FormEditText
             xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/tv_date_select"
+            android:id="@+id/tv_date_start"
             style="@style/form_relative_right_text"
             android:drawableRight="@drawable/nav_icon_search_default"
             editTextFormExample:testType="nocheck"
@@ -62,7 +62,7 @@
             android:text="*"
             android:textColor="@color/red" />
         <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/tv_visit_login"
+            android:id="@+id/tv_date_end"
             style="@style/form_relative_right_text"
             android:drawableRight="@drawable/nav_icon_search_default"
             editTextFormExample:testType="nocheck"

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.1.0'
 
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip