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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/OAListAdapter.java

WeiChat/build.gradle

@@ -13,7 +13,7 @@ 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

@@ -589,6 +589,7 @@
             android:label="选择人员" />
         <activity
             android:name=".ui.erp.activity.crm.BusinessStateActivity"
+            android:launchMode="singleTask"
             android:theme="@style/CrmThemeBlue" />
         <activity
             android:name=".ui.erp.activity.oa.AddMeetTaskActivity"

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

@@ -230,7 +230,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                 String url = Constants.getAppBaseUrl(ct) + "mobile/crm/ifoverrecv.action";
                 Map<String, Object> stringMap = new HashMap<String, Object>();
                 stringMap.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
-                stringMap.put("type","0");
+                stringMap.put("type", "0");
                 LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
                 headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
                 ViewUtil.httpSendRequest(ct, url, stringMap, mHandler, headers, CAN_QIANG_NOT, null, null, "post");
@@ -320,6 +320,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                                             .putExtra("code", bt_code)
 //                                   
                             );
+                            finish();
                             break;
                     }
                 }
@@ -428,7 +429,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                     break;
                 case BUSINESS_FENPEI:
                     progressDialog.dismiss();
-                    Crouton.makeText(BusinessDetailInfoActivity.this, "分配商机成功！", Style.holoGreenLight ,3000).show();
+                    Crouton.makeText(BusinessDetailInfoActivity.this, "分配商机成功！", Style.holoGreenLight, 3000).show();
                     crm_ll_followup.setVisibility(View.GONE);
                     crm_ll_qiang.setVisibility(View.GONE);
                     crm_ll_manage.setVisibility(View.GONE);
@@ -444,8 +445,8 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                         public void run() {
                             finish();
                         }
-                    },2000);
-                   // jumpToStateActivity();
+                    }, 2000);
+                    // jumpToStateActivity();
                     break;
                 case CAN_QIANG_NOT:
                     JSONObject result = JSON.parseObject(msg.getData().getString("result"));
@@ -479,7 +480,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
                     Crouton.cancelAllCroutons();
-                    final String m= msg.getData().getString("result");
+                    final String m = msg.getData().getString("result");
                     LogUtil.d(TAG, "handleMessage:" + msg.getData().getString("result"));
                     mHandler.postDelayed(new Runnable() {
                         @Override
@@ -557,19 +558,19 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                     break;
                 case 0x10:
                     progressDialog.dismiss();
-                  boolean success=  JSON.parseObject(msg.getData().getString("result")).getBoolean("success");
-                   if (success){
-                       startActivity(new Intent(BusinessDetailInfoActivity.this, CustomerAddActivity.class)
-                               .putExtra("companyname", bc_custname.getText().toString().trim())
-                               .putExtra("companyaddress", bc_address.getText().toString().trim())
-                               .putExtra("contact", bc_contact.getText().toString().trim())
-                               .putExtra("position", bc_position.getText().toString().trim())
-                               .putExtra("bc_code", bt_code)
-                               .putExtra("telephone", bt_tel.getText().toString().trim()));
-                   }else{
+                    boolean success = JSON.parseObject(msg.getData().getString("result")).getBoolean("success");
+                    if (success) {
+                        startActivity(new Intent(BusinessDetailInfoActivity.this, CustomerAddActivity.class)
+                                .putExtra("companyname", bc_custname.getText().toString().trim())
+                                .putExtra("companyaddress", bc_address.getText().toString().trim())
+                                .putExtra("contact", bc_contact.getText().toString().trim())
+                                .putExtra("position", bc_position.getText().toString().trim())
+                                .putExtra("bc_code", bt_code)
+                                .putExtra("telephone", bt_tel.getText().toString().trim()));
+                    } else {
 //                      ToastMessage("该商机已转过客户！"); 
-                       ViewUtil.ToastMessage(mContext,"该商机已转过客户！",Style.holoRedLight,2000);
-                   }
+                        ViewUtil.ToastMessage(mContext, "该商机已转过客户！", Style.holoRedLight, 2000);
+                    }
                     break;
             }
         }
@@ -603,7 +604,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
         if (StringUtils.isEmpty(emname)) {
             emname = MyApplication.getInstance().mLoginUser.getNickName().trim();
         }
-        params.put("type","0");
+        params.put("type", "0");
         params.put("bc_doman", emname);
         params.put("bc_domancode", CommonUtil.getSharedPreferences(ct, "erp_username"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
@@ -678,7 +679,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
         if (StringUtils.isEmpty(emname)) {
             emname = MyApplication.getInstance().mLoginUser.getNickName().trim();
         }
-        params.put("type","1");
+        params.put("type", "1");
         params.put("bc_doman", bt_doman);
         params.put("bc_domancode", en_code);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();

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

@@ -510,7 +510,7 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
         public View getView(final int position, View convertView, ViewGroup parent) {
             ViewModel model = null;
             if (true) {
-                convertView = inflater.inflate(R.layout.listitem_businessless_edit, parent, false);
+                convertView = inflater.inflate(R.layout.item_businessless_edit, parent, false);
                 model = new ViewModel();
                 model.text = (TextView) convertView.findViewById(R.id.tv_less_key);
                 model.editText = (EditText) convertView.findViewById(R.id.tv_less_value);

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

@@ -348,6 +348,7 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
                         @Override
                         public void run() {
                             jumpToStateActivity();
+                            finish();
                         }
                     },3000);
                   

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

@@ -8,6 +8,7 @@ import android.os.Message;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -539,4 +540,22 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
         }
         super.onActivityResult(requestCode, resultCode, data);
     }
+
+//    /**
+//     * 监听Back键按下事件,方法2: 
+//     * 注意: 
+//     * 返回值表示:是否能完全处理该事件 
+//     * 在此处返回false,所以会继续传播该事件. 
+//     * 在具体项目中此处的返回值视情况而定. 
+//     */
+//    @Override
+//    public boolean onKeyDown(int keyCode, KeyEvent event) {
+//        if ((keyCode == KeyEvent.KEYCODE_BACK)) {
+//            System.out.println("按下了back键   onKeyDown()");
+//            return false;
+//        }else {
+//            return super.onKeyDown(keyCode, event);
+//        }
+//
+//    }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/DataFormDetailActivity.java

@@ -517,32 +517,33 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
         //给该layout设置监听，监听其布局发生变化事件
         findViewById(R.id.sv_top).getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
             int heightDiff;
+
             @Override
             public void onGlobalLayout() {
                 //比较Activity根布局与当前布局的大小
-                if (heightDiff!=0){
-                    int updatehight=findViewById(R.id.sv_top).getRootView().getHeight()-findViewById(R.id.sv_top).getHeight();
-                   
-                    if (updatehight!=heightDiff) {
+                if (heightDiff != 0) {
+                    int updatehight = findViewById(R.id.sv_top).getRootView().getHeight() - findViewById(R.id.sv_top).getHeight();
+
+                    if (updatehight != heightDiff) {
                         if (updatehight > heightDiff) {
                             //弹起键盘
-                            LogUtil.d("updatehight:"+updatehight+" heightDiff:"+heightDiff+"isLeave:"+isLeave);
+                            LogUtil.d("updatehight:" + updatehight + " heightDiff:" + heightDiff + "isLeave:" + isLeave);
                             LogUtil.d("弹起键盘");
                         } else {
                             //隐藏键盘
-                            LogUtil.d("updatehight:"+updatehight+" heightDiff:"+heightDiff+"isLeave:"+isLeave);
+                            LogUtil.d("updatehight:" + updatehight + " heightDiff:" + heightDiff + "isLeave:" + isLeave);
                             LogUtil.d("----隐藏键盘");
-                            isLeave=true;
+                            isLeave = true;
                             if (mAdapter != null)
                                 mAdapter.notifyDataSetChanged();
-                            isload=true;
+                            isload = true;
                         }
                     }
-                    heightDiff=updatehight;
-                }else{
-                    heightDiff = findViewById(R.id.sv_top).getRootView().getHeight()-findViewById(R.id.sv_top).getHeight();
+                    heightDiff = updatehight;
+                } else {
+                    heightDiff = findViewById(R.id.sv_top).getRootView().getHeight() - findViewById(R.id.sv_top).getHeight();
                 }
-               
+
                 //其实这个heightDiff换成dp更靠谱一些 
 //                LogUtil.d("heightdiff---+:"+findViewById(R.id.sv_top).getRootView().getHeight());
 //                LogUtil.d("heightdiff--->:"+findViewById(R.id.sv_top).getHeight());
@@ -918,8 +919,9 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                 intent.putExtra("reid", R.style.OAThemeMeet);
                                 intent.putExtras(bundle);
                                 intent.putExtra("key", "combdatas");
-                                intent.putExtra("showKey", data.getField());
-                                intent.putExtra("action", "mobile/common/getCombo.action");
+                                intent.putExtra("showKey", "DISPLAY");
+                                //mobile/common/getCombo.action
+                                intent.putExtra("action", "mobile/common/getComboValue.action");//
                                 intent.putExtra("title", data.getName());
                                 intent.putExtra("id", categoryIndex);//需要把zum
                                 intent.putExtra("object", data);
@@ -1045,12 +1047,24 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         // Toast.makeText(ct, "下拉项：" + datas.get(b.getId() - 1).getName() + "返回值：" + b.getName(), Toast.LENGTH_LONG).show();
 //                        mEditText.put(b.getId() - 1, b.getName());
                         // mAdapter.getmListData().get(0).getDatas().get(0).setValue("");
+                        String value=null;
+                        if ("C".equals(vaules.getType())){
+                            value= JSON.parseObject(b.getJson()).getString("VALUE");
+                        }
                         LogUtil.d("id=" + b.getId());
                         LogUtil.d("groupId=" + vaules.getGroupId());
                         if (ListUtils.isEmpty(grids)) {
+                            //主
                             mAdapter.getmListData().get(vaules.getGroupId()).getDatas().get(b.getId() - 1).setValue(b.getName());
+                            if(value!=null){
+                                mAdapter.getmListData().get(vaules.getGroupId()).getDatas().get(b.getId() - 1).setDisplayValue(value);
+                            }
                         } else {
+                            //明细
                             mAdapter.getmListData().get(vaules.getGroupId()).getDatas().get(b.getId() - 1).setValue(b.getName());
+                           if(value!=null){
+                               mAdapter.getmListData().get(vaules.getGroupId()).getDatas().get(b.getId() - 1).setDisplayValue(value);  
+                           }
                         }
 
                         mAdapter.notifyDataSetChanged();
@@ -1245,6 +1259,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                     Data item = items.get(i);
                     String key = item.getField();
                     String value = item.getValue();
+                    String disValue=item.getDisplayValue();
+                    if(!StringUtils.isEmpty(disValue))value=disValue;//下拉字段
                     if (StringUtils.isEmpty(value)) value = "";
                     if (("F".equals(item.getReadonly()) && StringUtils.isEmpty(value))
                             ||( "necessaryField".equals(item.getReadonly())&&StringUtils.isEmpty(value))) {
@@ -1300,6 +1316,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         Data item = items.get(j);
                         String key = item.getField();
                         String value = item.getValue();
+                        String disValue=item.getDisplayValue();
+                        if(!StringUtils.isEmpty(disValue))value=disValue;//下拉字段
                         if (StringUtils.isEmpty(value)) value = "";
                         if (("F".equals(item.getReadonly()) && StringUtils.isEmpty(value))
                                 ||( "necessaryField".equals(item.getReadonly())&&StringUtils.isEmpty(value))) {
@@ -1355,6 +1373,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                     Data item = items.get(i);
                     String key = item.getField();
                     String value = item.getValue();
+                    String disValue=item.getDisplayValue();
+                    if(!StringUtils.isEmpty(disValue))value=disValue;//下拉字段
                     if (StringUtils.isEmpty(value)) value = "";
                     if (("F".equals(item.getReadonly()) && StringUtils.isEmpty(value))
                             ||( "necessaryField".equals(item.getReadonly())&&StringUtils.isEmpty(value))) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/form/Data.java

@@ -12,40 +12,29 @@ public class Data implements Parcelable {
     private int groupId;//组ID---控件需要用到
     private String group;//组名----多组的情况
     private boolean isSelected;
-
     private int detno;//编号
     private String readonly;//必填
     private int isDefault;//是否展示和隐藏
     private String type;//字段类型
     private String name;//文本字段名
     private int isNeed;//必填
-    private String value;//编辑框的内容
+    private String value;//编辑框的内容-界面显示
+    private String displayValue;//下拉字段隐藏的值
     private String field;//字段名
     private String formStoreKey;//formstore key 
     private int fdid;
-    
     private boolean isEditing;//是否正在编辑
-    
     private String maxlength;//最大长度
-    
     private String detailId;//关联主表id
     private String detailDid;//明细表id
 
 
-    public String getDetailId() {
-        return detailId;
-    }
-
-    public void setDetailId(String detailId) {
-        this.detailId = detailId;
-    }
-
-    public String getDetailDid() {
-        return detailDid;
+    public String getGroup() {
+        return group;
     }
 
-    public void setDetailDid(String detailDid) {
-        this.detailDid = detailDid;
+    public void setGroup(String group) {
+        this.group = group;
     }
 
     public int getGroupId() {
@@ -56,12 +45,12 @@ public class Data implements Parcelable {
         this.groupId = groupId;
     }
 
-    public String getGroup() {
-        return group;
+    public int getDetno() {
+        return detno;
     }
 
-    public void setGroup(String group) {
-        this.group = group;
+    public void setDetno(int detno) {
+        this.detno = detno;
     }
 
     public boolean isSelected() {
@@ -72,20 +61,12 @@ public class Data implements Parcelable {
         this.isSelected = isSelected;
     }
 
-    public int getDetno() {
-        return detno;
-    }
-
-    public void setDetno(int detno) {
-        this.detno = detno;
-    }
-
-    public String getReadonly() {
-        return readonly;
+    public String getType() {
+        return type;
     }
 
-    public void setReadonly(String readonly) {
-        this.readonly = readonly;
+    public void setType(String type) {
+        this.type = type;
     }
 
     public int getIsDefault() {
@@ -96,12 +77,20 @@ public class Data implements Parcelable {
         this.isDefault = isDefault;
     }
 
-    public String getType() {
-        return type;
+    public String getReadonly() {
+        return readonly;
     }
 
-    public void setType(String type) {
-        this.type = type;
+    public void setReadonly(String readonly) {
+        this.readonly = readonly;
+    }
+
+    public int getIsNeed() {
+        return isNeed;
+    }
+
+    public void setIsNeed(int isNeed) {
+        this.isNeed = isNeed;
     }
 
     public String getName() {
@@ -112,12 +101,12 @@ public class Data implements Parcelable {
         this.name = name;
     }
 
-    public int getIsNeed() {
-        return isNeed;
+    public String getField() {
+        return field;
     }
 
-    public void setIsNeed(int isNeed) {
-        this.isNeed = isNeed;
+    public void setField(String field) {
+        this.field = field;
     }
 
     public String getValue() {
@@ -128,12 +117,12 @@ public class Data implements Parcelable {
         this.value = value;
     }
 
-    public String getField() {
-        return field;
+    public String getDisplayValue() {
+        return displayValue;
     }
 
-    public void setField(String field) {
-        this.field = field;
+    public void setDisplayValue(String displayValue) {
+        this.displayValue = displayValue;
     }
 
     public String getFormStoreKey() {
@@ -152,6 +141,14 @@ public class Data implements Parcelable {
         this.fdid = fdid;
     }
 
+    public boolean isEditing() {
+        return isEditing;
+    }
+
+    public void setIsEditing(boolean isEditing) {
+        this.isEditing = isEditing;
+    }
+
     public String getMaxlength() {
         return maxlength;
     }
@@ -160,14 +157,23 @@ public class Data implements Parcelable {
         this.maxlength = maxlength;
     }
 
-    public boolean isEditing() {
-        return isEditing;
+    public String getDetailId() {
+        return detailId;
     }
 
-    public void setIsEditing(boolean isEditing) {
-        this.isEditing = isEditing;
+    public void setDetailId(String detailId) {
+        this.detailId = detailId;
+    }
+
+    public String getDetailDid() {
+        return detailDid;
+    }
+
+    public void setDetailDid(String detailDid) {
+        this.detailDid = detailDid;
     }
 
+
     @Override
     public int describeContents() {
         return 0;
@@ -185,6 +191,7 @@ public class Data implements Parcelable {
         dest.writeString(this.name);
         dest.writeInt(this.isNeed);
         dest.writeString(this.value);
+        dest.writeString(this.displayValue);
         dest.writeString(this.field);
         dest.writeString(this.formStoreKey);
         dest.writeInt(this.fdid);
@@ -208,6 +215,7 @@ public class Data implements Parcelable {
         this.name = in.readString();
         this.isNeed = in.readInt();
         this.value = in.readString();
+        this.displayValue = in.readString();
         this.field = in.readString();
         this.formStoreKey = in.readString();
         this.fdid = in.readInt();

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/steps/StepsView.java

@@ -124,7 +124,7 @@ public class StepsView extends LinearLayout implements StepsViewIndicator.OnDraw
                 textView.setText(mLabels[i]);
                 textView.setTextColor(mLabelColorIndicator);
                 textView.setX(indicatorPosition.get(i)- 0.25f*CommonUtil.dip2px(this.getContext(), 40));
-                textView.setTextSize(TypedValue.COMPLEX_UNIT_SP,10);
+                textView.setTextSize(TypedValue.COMPLEX_UNIT_SP,9);
                 textView.setLayoutParams(
                         new ViewGroup.LayoutParams(CommonUtil.dip2px(this.getContext(),40),
                                 ViewGroup.LayoutParams.WRAP_CONTENT));

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

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <LinearLayout
+        android:id="@+id/ll_moment"
+        android:background="@color/white"
+        android:layout_height="wrap_content"
+        android:maxHeight="180dp"
+        android:minHeight="50dp"
+        style="@style/LinearLayout_horizontal">
+        <TextView
+            android:id="@+id/tv_less_key"
+            style="@style/TextView_Basic"
+            android:layout_margin="10dp"
+            android:layout_width="55dp"
+            android:textSize="14sp"
+            android:layout_gravity="center_vertical"
+            android:text="商机阶段商机阶段阶段:" />
+<!--android:background="@drawable/shape_from_edit"-->
+        <EditText
+            android:id="@+id/tv_less_value"
+            style="@style/TextView_Basic"
+            android:maxWidth="260dp"
+            android:minWidth="240dp"
+            
+            android:maxHeight="150dp"
+            android:textSize="14sp"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:layout_width="260dp"
+            android:background="@drawable/shape_from_edit"
+            android:gravity="right|center"
+            android:padding="5dp"
+            android:layout_margin="10dp"
+            android:hint="请输入(必填)" />
+    </LinearLayout>
+</LinearLayout>