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

WeiChat/build.gradle

@@ -64,11 +64,10 @@ android {
     productFlavors {  // Gradle 多渠道打包
         baidu {}
         wandoujia {}
-
+//        _360 {}
         xiaomi {}
         tencent {}
         taobao {}
-
     }
 
     productFlavors.all {

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

@@ -183,6 +183,11 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
             @Override
             public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
                 String time = year + "-" + month + "-" + day + " " + hour + ":" + minute + ":00";
+                String curtime = TimeUtils.f_long_2_str(System.currentTimeMillis());
+                if (curtime.compareTo(time) > 0){
+                    Crouton.makeText(ct, "不能选择过去时间");
+                    return;
+                }
                 if (b) {
                     tv_date_start.setText(time);
                 } else {

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

@@ -23,6 +23,7 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.PopupWindow;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -46,6 +47,7 @@ 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.JsonValidator;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
@@ -79,6 +81,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     private static final int RES_SUBMIT_VISITRECORD = 0x213;
     private static final int UPDATE_VISITRECORD = 0x214;
     private static final int DELETE_VISITRECORD = 0x215;
+    private static final int CURRENT_DUR = 0x216;
     @ViewInject(R.id.tv_address_login)
     private FormEditText tv_address_login;
     @ViewInject(R.id.tv_customer_login)
@@ -239,6 +242,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             tv_address_login.setFocusable(false);
             tv_linksman_login.setFocusable(false);
             tv_visit_type.setFocusable(false);
+            tv_visit_steps.setOnClickListener(this);
             if (status != 2) {
                 save_btn.setFocusable(false);
                 delete_btn.setFocusable(false);
@@ -248,7 +252,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             }
         } else {
             phone_tv.setFocusableInTouchMode(true);
-            tv_visit_steps.setFocusableInTouchMode(true);
+            tv_visit_steps.setFocusable(false);
             tv_visit_content.setFocusableInTouchMode(true);
             tv_address_login.setFocusableInTouchMode(true);
             tv_linksman_login.setFocusableInTouchMode(true);
@@ -262,6 +266,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             tv_visit_theme.setFocusable(false);
             save_btn.setOnClickListener(this);
             delete_btn.setOnClickListener(this);
+            tv_visit_steps.setOnClickListener(this);
             if (isOutplan) {
                 setFocusable(tv_date_start, isMe && TextUtils.isEmpty(tv_date_start.getText()));
                 setFocusable(tv_date_end, isMe && TextUtils.isEmpty(tv_date_end.getText()));
@@ -409,10 +414,46 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                     ToastUtil.showToast(ct, R.string.delete_succeed_notice1);
                     endActivity();
                     break;
+                case CURRENT_DUR:
+                    if (!StringUtils.isEmpty(msg.getData().toString())){
+                        String result = msg.getData().getString("result");
+                        LogUtil.prinlnLongMsg("CURRENT_DUR",result+"");
+
+                        doSelectCurDur(result);
+                    }
+                    break;
             }
         }
     };
 
+    //当前阶段请求后的数据处理并跳转传值
+    private void doSelectCurDur(String result) {
+
+        JSONObject object = JSON.parseObject(result);
+        if (object == null) return;
+        JSONArray array = object.getJSONArray("stages");
+        if (ListUtils.isEmpty(array)) return;
+
+        ArrayList<SelectBean> formBeaan = new ArrayList<>();
+        SelectBean selectBean;
+        for (int i = 0; i < array.size(); i++) {
+            selectBean = new SelectBean();
+            if (!StringUtils.isEmpty(array.getJSONObject(i).getString("BS_NAME"))){
+                selectBean.setName(array.getJSONObject(i).getString("BS_NAME"));
+                formBeaan.add(selectBean);
+            }
+
+            if (i == array.size()-1 && !ListUtils.isEmpty(formBeaan)){
+                Intent intent = new Intent();
+                intent.setClass(this, SelectActivity.class);
+                intent.putExtra("type", 2);
+                intent.putExtra("title", getString(R.string.current_stage));
+                intent.putParcelableArrayListExtra("data", formBeaan);
+                startActivityForResult(intent, 0x828);
+            }
+        }
+    }
+
     private void endActivity() {
         if (isOutplan && isB2b)
             CommonInterface.getInstance().endMission(vp_id, true);
@@ -495,7 +536,12 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                 startActivityForResult(intent, 0x22);
                 break;
             case R.id.tv_visit_steps:
-
+//                Toast.makeText(this,"当前阶段",Toast.LENGTH_SHORT).show();
+                String url = Constants.getAppBaseUrl(getApplicationContext()) + "mobile/crm/getBusinessChanceStage.action";
+                Map<String, Object> params = new HashMap<>();
+                LinkedHashMap headers = new LinkedHashMap();
+                headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));
+                ViewUtil.httpSendRequest(getApplicationContext(), url, params, mHandler, headers, CURRENT_DUR, null, null, "post");
                 break;
             case R.id.tv_relate_business:
                 param = new HashMap<>();
@@ -646,6 +692,11 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         } else if (requestCode == 0x29) {
             String message = data.getStringExtra("data");
             tv_visit_theme.setText(StringUtils.isEmpty(message) ? getString(R.string.maintain_customers) : message);
+        }else if (requestCode == 0x828 && resultCode == 0x20){
+            SelectBean b = data.getParcelableExtra("data");
+            if (b != null && !StringUtils.isEmpty(b.getName())){
+                tv_visit_steps.setText(b.getName());
+            }
         }
     }
 

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

@@ -317,7 +317,7 @@
                 android:id="@+id/tv_visit_steps"
                 style="@style/form_relative_right_text"
                 android:drawableRight="@drawable/nav_icon_search_default"
-                android:hint=""
+                android:hint="@string/common_select1"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 

WeiChat/src/main/res/raw/versionconfiguration.properties

@@ -1,3 +1,3 @@
 #发布版本状态改为true,测试版本状态为false
-release_version=false
-#release_version=true
+#release_version=false
+release_version=true