测试版本5.3.12 9-20

WeiChat/src/main/java/com/xzjmyk/pm/activity/ApplySubscribeActivity.java

@@ -10,9 +10,12 @@ import android.view.MenuItem;
 
 import com.andreabaccega.widget.FormEditText;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.util.CodeUtil;
 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.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
@@ -24,6 +27,7 @@ import org.json.JSONObject;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -36,6 +40,10 @@ public class ApplySubscribeActivity extends BaseActivity {
 
     private FormEditText mSubscribeNameEt, mDataEt, mStatusEt, mSubscribePersonEt, mPostEt, mBranchEt, mReasonEt;
     private int mAsId;
+    private DBManager dbManager;
+
+    private String mEmCode,mEmName,mEmDepart,mEmPort;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -44,8 +52,10 @@ public class ApplySubscribeActivity extends BaseActivity {
 
         initView();
         initEvent();
+        initData();
     }
 
+
     private Handler mHandler = new Handler(){
         @Override
         public void handleMessage(Message msg) {
@@ -80,6 +90,7 @@ public class ApplySubscribeActivity extends BaseActivity {
                     String submitResult = msg.getData().getString("result");
                     Log.d("apply_subscrive_submit",submitResult);
                     Crouton.makeText(ApplySubscribeActivity.this,"申请提交成功",Style.CONFIRM).show();
+                    CommonUtil.imageToast(ApplySubscribeActivity.this,R.drawable.ic_apply_submit_success,"",2000);
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
@@ -100,6 +111,8 @@ public class ApplySubscribeActivity extends BaseActivity {
         mReasonEt = (FormEditText) findViewById(R.id.apply_subscribe_reason_et);
 
         CommonUtil.getCommonId(this,"SUBSAPPLY_SEQ",mHandler,GET_AS_ID);
+
+        mEmCode = CommonUtil.getSharedPreferences(ct, "erp_username");
     }
 
     private void initEvent() {
@@ -107,6 +120,31 @@ public class ApplySubscribeActivity extends BaseActivity {
     }
 
 
+    private void initData() {
+        dbManager = new DBManager(ct);
+        List<EmployeesEntity> db = dbManager.select_getEmployee(
+                new String[]{CommonUtil.getSharedPreferences(ct, "erp_master"),
+                        CommonUtil.getSharedPreferences(ct, "erp_username")}
+                , "whichsys=? and em_code=? ");
+        if (!ListUtils.isEmpty(db)) {
+            for (EmployeesEntity model : db) {
+                Log.i(TAG, "initData:" + model.getEM_DEPART());
+                Log.i(TAG, "initData:" + model.getEM_POSITION());
+                Log.i(TAG, "initData:" + model.getCOMPANY());
+                Log.i(TAG, "initData:" +model.getEm_IMID()  );
+
+            }
+            mEmName = db.get(0).getEM_NAME();
+            mEmDepart = db.get(0).getEM_DEPART();
+            mEmPort = db.get(0).getEM_POSITION();
+        }
+
+        mDataEt.setText(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd"));
+        mStatusEt.setText("在录入");
+        mSubscribePersonEt.setText(mEmName);
+        mPostEt.setText(mEmPort);
+        mBranchEt.setText(mEmDepart);
+    }
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_apply_subscribe, menu);
@@ -118,7 +156,6 @@ public class ApplySubscribeActivity extends BaseActivity {
         switch (item.getItemId()) {
             case R.id.subscribe_apply:
 //                Crouton.makeText(this, "提交成功", Style.CONFIRM).show();
-                progressDialog.show();
                 CodeUtil.getInstance().getCode(ApplySubscribeActivity.this,
                         "SubsApply", new CodeUtil.OnCodeLinstener() {
                             @Override
@@ -155,6 +192,7 @@ public class ApplySubscribeActivity extends BaseActivity {
         if (mSubscribeNameEt.testValidity() && mDataEt.testValidity()
                 && mStatusEt.testValidity() && mSubscribePersonEt.testValidity()
                 && mPostEt.testValidity() && mBranchEt.testValidity()){
+            progressDialog.show();
             formStore =
                     "{\n" +
                             "\"id_\":" + mAsId
@@ -169,11 +207,11 @@ public class ApplySubscribeActivity extends BaseActivity {
                             + "\",\n" +
                             "\"statuscode_\":\"" +"ENTERING"
                             + "\",\n" +
-                            "\"empcode_\":\"" + ""
+                            "\"empcode_\":\"" + mEmCode
                             + "\",\n" +
-                            "\"empname_\":\"" + CommonUtil.getSharedPreferences(ct, "erp_username")
+                            "\"empname_\":\"" + mEmName
                             + "\",\n" +
-                            "\"empdep_\":\"" + ""
+                            "\"empdep_\":\"" + mEmDepart
                             + "\",\n" +
                             "\"num_id_\":\"" + ""
                             + "\",\n" +

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

@@ -85,7 +85,7 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
     private int falg = 0;//是否启用预录入客户
 
     private EmptyLayout mEmptyLayout;
-
+    private DBManager dbManager;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -151,8 +151,7 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
     private void initData() {
         em_code = CommonUtil.getSharedPreferences(ct, "erp_username");
         sendHttpResquest(Constants.HTTP_SUCCESS_INIT, kind, page, 0, "");
-        DBManager dbManager = new DBManager(ct);
-        //查询数据库失败---------------
+        dbManager = new DBManager(ct);
         List<EmployeesEntity> db = dbManager.select_getEmployee(
                 new String[]{CommonUtil.getSharedPreferences(ct, "erp_master"),
                         CommonUtil.getSharedPreferences(ct, "erp_username")}
@@ -486,8 +485,9 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
             kind = 0;
             em_code = entity.getEm_code();
             tv_name.setText(entity.getEm_name());
-            tv_department.setText(entity.getEm_depart());
+            tv_department.setText(entity.getEm_depart() + "->");
             tv_position.setText(entity.getEm_position());
+            AvatarHelper.getInstance().displayAvatar(String.valueOf(entity.getEm_id()), iv_head, false);
             sendHttpResquest(Constants.HTTP_SUCCESS_INIT, kind, page, isSelected, em_code);
         }
     }

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

@@ -6,6 +6,7 @@ import android.os.Handler;
 import android.os.Message;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -64,6 +65,7 @@ public class UserSelectActivity extends BaseActivity {
             switch (msg.what) {
                 case WHAT_LOAD:
                     JSONArray array = JSON.parseObject(message).getJSONArray("datas");//获取到数据
+                    Log.d("userMsg",array.toString());
                     if (array == null || array.size() <= 0) return;
                     Employees entity = null;
                     String code = null;//em_code

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

@@ -30,11 +30,16 @@ import android.text.style.UnderlineSpan;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.Patterns;
+import android.view.Gravity;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.andreabaccega.widget.FormEditText;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.assist.ImageScaleType;
+import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.bean.message.ChatMessage;
 import com.xzjmyk.pm.activity.bean.message.XmppMessage;
@@ -785,4 +790,39 @@ public class CommonUtil {
         temp = removeStringMark(temp);
         return temp;
     }
+
+    /**
+     * 添加图片的toast
+     * @param context
+     * @param imageId 图片id
+     * @param content 文字内容
+     * @param duration 显示时长
+     */
+    public static void imageToast(Context context, int imageId, String content, int duration){
+        Toast toast = new Toast(context);
+        //显示的时间
+        toast.setDuration(duration);
+        //显示的位置
+        toast.setGravity(Gravity.BOTTOM, 0, 300);
+
+        //自定义toast布局
+        LinearLayout toastLayout = new LinearLayout(context);
+        toastLayout.setGravity(Gravity.CENTER_VERTICAL);
+        toastLayout.setOrientation(LinearLayout.HORIZONTAL);
+
+        //添加ImageView
+        ImageView toastImage = new ImageView(context);
+        toastImage.setImageResource(imageId);
+        toastLayout.addView(toastImage);
+
+        //添加TextView
+        TextView toastText = new TextView(context);
+        toastText.setBackgroundColor(context.getResources().getColor(R.color.toast_bg));
+        toastText.setText(content);
+        toastLayout.addView(toastText);
+
+        toastLayout.setBackgroundColor(context.getResources().getColor(R.color.toast_bg));
+        toast.setView(toastLayout);
+        toast.show();
+    }
 }

WeiChat/src/main/res/values/colors.xml

@@ -271,4 +271,6 @@
 
     <color name="replay_text_color_normal">#ffa19992</color>
     <color name="oa_background_orange">#DC9A54</color>
+
+    <color name="toast_bg">#60808080</color><!--自定义toast背景色-->
 </resources>