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

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/java/com/xzjmyk/pm/activity/CustomCrashActivity.java

@@ -8,6 +8,8 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 
+import com.afollestad.materialdialogs.MaterialDialog;
+
 import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
 
 /**
@@ -33,8 +35,8 @@ public class CustomCrashActivity extends Activity {
         stackTraceString = CustomActivityOnCrash.getAllErrorDetailsFromIntent(this,intent);
         if (stackTraceString != null){
             //Toast.makeText(this, stackTraceString, Toast.LENGTH_LONG).show();
-//            new MaterialDialog.Builder(this).content(stackTraceString)
-//                    .build().show();
+            new MaterialDialog.Builder(this).content(stackTraceString)
+                    .build().show();
         }
         final Class<? extends Activity> activityClassFromIntent = CustomActivityOnCrash.getRestartActivityClassFromIntent(intent);
         final CustomActivityOnCrash.EventListener listenerFromIntent = CustomActivityOnCrash.getEventListenerFromIntent(intent);

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

@@ -101,6 +101,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
     private String real_status;
     private String emCode;
     private View hide_above_af;
+    private String last_status;
 
 
     @Override
@@ -180,7 +181,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
         Log.i("mCaller", mCaller);
         Log.isLoggable("keyValue", mkeyValue);
         Log.i("real_status", real_status);
-        SetComDocStatus(real_status);
+
         //当获取到正确的单据caller和单据id时
         if (!TextUtils.isEmpty(mCaller) && mkeyValue != -1) {
             if ("Ask4Leave".equals(mCaller)) {
@@ -385,6 +386,18 @@ public class CommonDocDetailsActivity extends BaseActivity {
                                     Log.i("em_number", em_number);
                                 }
                             }
+
+                            //单据真正的状态
+                            if ((!TextUtils.isEmpty(fd_field) && fd_field.equals("va_status")) ||
+                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("wo_status")) ||
+                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("sa_status")) ||
+                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("FP_status"))) {
+                                if (!fd_field.equals("null")) {
+                                    last_status = formdataArray.getJSONObject(0).getString(fd_field);
+                                }
+                            }
+
+                            SetComDocStatus(real_status); //显示单据提交状态
                             getapplypeomsg(em_number);
                         }
                         mCommonDocMainMsgAdapter.setmFormconfigsBean(mFormconfigsBean);
@@ -436,9 +449,17 @@ public class CommonDocDetailsActivity extends BaseActivity {
                 status_tv.setText("已审批");
                 resanddel_ll.setVisibility(View.GONE);
             } else if (real_status.equals("已提交")) {
-                status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.no_approval));
-                status_tv.setText("待审批");
-                resanddel_ll.setVisibility(View.VISIBLE);
+
+                if (!TextUtils.isEmpty(last_status) && last_status.equals("已审核")){
+                    status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.approval));
+                    status_tv.setText("已审批");
+                    resanddel_ll.setVisibility(View.GONE);
+                }else {
+                    status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.no_approval));
+                    status_tv.setText("待审批");
+                    resanddel_ll.setVisibility(View.VISIBLE);
+                }
+
             } else if (real_status.equals("在录入")) {
                 status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.titleBlue));
                 status_tv.setText("未提交");

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

@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.os.Parcelable;
 import android.text.Html;
 import android.text.TextUtils;
 import android.util.Log;
@@ -29,6 +30,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;
 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.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
@@ -68,6 +70,12 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     private FormEditText tv_visit_content;
     @ViewInject(R.id.tv_relate_business)
     private FormEditText tv_relate_business;
+
+
+    @ViewInject(R.id.tv_visit_type)
+    private FormEditText tv_visit_type;
+    
+    
     private int vp_id = -1;
 
     private int mVrId;
@@ -93,12 +101,16 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             tv_relate_business.setKeyListener(null);
             tv_visit_steps.setOnClickListener(this);
             tv_relate_business.setOnClickListener(this);
+            tv_visit_type.setOnClickListener(this);
+            tv_visit_type.setKeyListener(null);
+            tv_visit_type.setFocusable(false);
             if (3 == getIntent().getIntExtra("type", -1)) {
                 setFocusable(tv_date_start, isMe && TextUtils.isEmpty(tv_date_start.getText()));
                 setFocusable(tv_date_end, isMe && TextUtils.isEmpty(tv_date_end.getText()));
                 setFocusable(tv_customer_login, isMe && TextUtils.isEmpty(tv_customer_login.getText()));
                 setFocusable(tv_address_login, isMe && TextUtils.isEmpty(tv_address_login.getText()));
                 setFocusable(tv_visit_theme, isMe && TextUtils.isEmpty(tv_visit_theme.getText()));
+                setFocusable(tv_visit_type, isMe && TextUtils.isEmpty(tv_visit_type.getText()));
             } else {
                 tv_date_start.setOnClickListener(this);
                 tv_date_start.setKeyListener(null);
@@ -117,6 +129,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             tv_visit_theme.setFocusable(false);
             tv_address_login.setFocusable(false);
             tv_linksman_login.setFocusable(false);
+            tv_visit_type.setFocusable(false);
         }
     }
 
@@ -334,6 +347,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             formStore =
                     "{\n" +
                             "\"vr_id\":" + mVrId + ",\n" +
+                            "\"vr_class\":\"" + tv_visit_type.getHint().toString() + "\",\n" +
                             "\"vr_code\":\"" + code
                             + "\",\n" +
                             "\"vr_visittime\":\""
@@ -467,6 +481,28 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                 intent.putExtra("title", "关联商机");
                 startActivityForResult(intent, 0x24);
                 break;
+            case R.id.tv_visit_type:
+                intent = new Intent(ct, SelectActivity.class);
+                intent.putExtra("type", 2);
+                intent.putExtra("reid", R.style.OAThemeMeet);
+                List<SelectBean> beanList=new ArrayList<>();
+
+                //华东地区，华南地区，华北地区，华中地区，西南地区，西北地区，东北地区，港澳台地区，海外地区，其它地区
+                SelectBean ben=new SelectBean();
+                ben.setName("客户拜访");
+                ben.setObject("OfficeClerk");
+                ben.setJson("OfficeClerk");
+                beanList.add(ben);
+
+                ben=new SelectBean();
+                ben.setName("原厂拜访");
+                ben.setObject("VisitRecord!Vender");
+                ben.setJson("VisitRecord!Vender");
+                beanList.add(ben);
+                intent.putExtra("title", "拜访类型");
+                intent.putParcelableArrayListExtra("data", (ArrayList<? extends Parcelable>) beanList);
+                startActivityForResult(intent, 0x27);
+                break;
         }
     }
 
@@ -511,6 +547,12 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                 JSONObject object = JSON.parseObject(b.getJson());
                 nichecode = object.getString("code");
             }
+        }else if(requestCode == 0x27 && resultCode == 0x20){
+            SelectBean b = data.getParcelableExtra("data");
+            LogUtil.d("b:"+JSON.toJSONString(b));
+            if (b == null || StringUtils.isEmpty(b.getJson())) return;
+            tv_visit_type.setText(b.getName());
+            tv_visit_type.setHint(b.getJson());
         }
     }
 

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

@@ -476,6 +476,9 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                 lists.remove(currentPosition-1);
                 rMap.put("listdata", lists);
                 adapter.notifyDataSetChanged();
+                if (adapter.getCount()==0){
+                    mEmptyLayout.showEmpty();
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -21,9 +21,9 @@ public class Data implements Parcelable {
     private String value;//编辑框的内容-界面显示
     private String displayValue;//下拉字段隐藏的值
     private String field;//字段名
-    private String formStoreKey;//formstore key 
+    private String formStoreKey;//formstore key 上传需要用到的key
     private int fdid;
-    private boolean isEditing;//是否正在编辑
+    private boolean isEditing=true;//是否正在编辑
     private String maxlength;//最大长度
     private String detailId;//关联主表id
     private String detailDid;//明细表id

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

@@ -1,92 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <ScrollView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/sv_top"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/sv_top"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity">
+
+    <LinearLayout
+        android:id="@+id/ll_top"
+       
         android:layout_width="match_parent"
-        android:fillViewport="true"
         android:layout_height="match_parent"
-        tools:context="com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity">
-        <LinearLayout
-            android:id="@+id/ll_top"
+        android:orientation="vertical">
+
+        <com.xzjmyk.pm.activity.ui.erp.view.ListViewInScroller
+            android:id="@+id/lv_datas"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
-            <com.xzjmyk.pm.activity.ui.erp.view.ListViewInScroller
-                android:id="@+id/lv_datas"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:dividerHeight="0.1dp"
-                android:listSelector="@color/transparent"
-                android:divider="@color/item_line"/>
-            <LinearLayout
-                android:id="@+id/ll_item_add"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/selector_me_menu_item_bg"
-                android:visibility="gone"
-                android:orientation="vertical">
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0.5dp"
-                    android:background="@color/item_line" />
-                <TextView
-                    android:id="@+id/tv_item_add"
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:textColor="@color/titleBlue"
-                    android:text="+ 新增明细"/>
-            </LinearLayout>
+            android:divider="@color/item_line"
+            android:dividerHeight="0.1dp"
+            android:listSelector="@color/transparent" />
+
+        <LinearLayout
+            android:id="@+id/ll_item_add"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/selector_me_menu_item_bg"
+            android:orientation="vertical"
+            android:visibility="gone">
 
-            <Button
-                android:id="@+id/click_btn"
+            <View
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/info"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:layout_marginTop="20dp"
-                android:background="@drawable/bg_blue_button"
-                android:padding="10dp"
-                android:text="提交"
-                android:visibility="gone"
-                android:textColor="@color/white"
-                android:layout_marginBottom="80dp"
-                android:textSize="@dimen/text_main" />
+                android:layout_height="0.5dp"
+                android:background="@color/item_line" />
 
-           <Button
-                android:id="@+id/btn_update"
+            <TextView
+                android:id="@+id/tv_item_add"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/info"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:layout_marginTop="20dp"
-                android:background="@drawable/bg_blue_button"
-                android:padding="10dp"
-                android:visibility="gone"
-                android:text="更新"
-                android:textColor="@color/white"
-                android:layout_marginBottom="80dp"
-                android:textSize="@dimen/text_main" />
-            <!--    <Button
+                android:layout_height="40dp"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="+ 新增明细"
+                android:textColor="@color/titleBlue" />
+        </LinearLayout>
 
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/info"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_marginTop="20dp"
-                    android:background="@drawable/bg_orange_btn"
-                    android:padding="10dp"
-                    android:text="反提交"
-                    android:textColor="@color/white"
-                    android:visibility="gone"
-                    android:textSize="@dimen/text_main" />-->
+        <Button
+            android:id="@+id/click_btn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/info"
+            android:layout_marginBottom="80dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_marginTop="20dp"
+            android:background="@drawable/bg_bule_btn"
+            android:padding="10dp"
+            android:text="提交"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_main"
+            android:visibility="gone"
+             />
 
-        </LinearLayout>
-    </ScrollView>
+        <Button
+            android:id="@+id/btn_update"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/info"
+            android:layout_marginBottom="80dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_marginTop="20dp"
+            android:background="@drawable/bg_bule_btn"
+            android:padding="10dp"
+            android:text="更新"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_main"
+            android:visibility="gone" />
+    </LinearLayout>
+</ScrollView>
 
 

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

@@ -182,6 +182,8 @@
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
+     
+
         <RelativeLayout
             style="@style/form_relative_customer"
             android:background="@color/white">
@@ -216,7 +218,42 @@
                 android:hint="请输入"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
+        <RelativeLayout
+            style="@style/form_relative_customer"
+            android:background="@color/white">
+
+            <TextView
+                android:id="@+id/tv_id61"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="20dp"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="拜访类型"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
 
+            <TextView
+                android:id="@+id/textView1"
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="20dp"
+                android:layout_toRightOf="@+id/tv_id61"
+                android:text="*"
+                android:visibility="invisible"
+                android:textColor="@color/red" />
+
+            <com.andreabaccega.widget.FormEditText
+                android:id="@+id/tv_visit_type"
+                style="@style/form_relative_right_text"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="11dp"
+                android:layout_toEndOf="@+id/textView1"
+                android:layout_toRightOf="@+id/textView1"
+                android:hint="请输入"
+                editTextFormExample:testType="nocheck" />
+        </RelativeLayout>
+        
         <RelativeLayout
             style="@style/form_relative_customer"
             android:background="@color/white">
@@ -250,6 +287,8 @@
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
+  
+        
         <RelativeLayout
             style="@style/form_relative_customer"
             android:background="@color/white">

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

@@ -16,6 +16,7 @@
             android:layout_margin="10dp"
             android:layout_width="60dp"
             android:textSize="14sp"
+            android:textColor="@color/text_main"
             android:layout_gravity="center_vertical"
             android:text="商机阶段商机阶段阶段:" />
 <!--android:background="@drawable/shape_from_edit"-->