降版本

1.添加商机跟进程序错误处理
2.添加拜访报告新处理

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/AllSubscriptionAdapter.java

@@ -105,11 +105,11 @@ public class AllSubscriptionAdapter extends BaseAdapter {
             viewHolder.applyTextView.setEnabled(false);
         } else if (mSubscriptionNumbers.get(position).getStatus() == 3) {
 //            CommonUtil.textUnderlineForStyle(viewHolder.applyTextView,"申请","申请");
-            viewHolder.applyTextView.setText("＋订阅");
+            viewHolder.applyTextView.setText(R.string.subscribe_detail_commit);
             viewHolder.applyTextView.setTextColor(Color.BLUE);
             viewHolder.applyTextView.setEnabled(true);
         } else if (mSubscriptionNumbers.get(position).getStatus() == 2) {
-            viewHolder.applyTextView.setText("已申请");
+            viewHolder.applyTextView.setText(R.string.subscribe_requested);
             viewHolder.applyTextView.setTextColor(Color.GRAY);
             viewHolder.applyTextView.setEnabled(false);
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/AllSubscriptionNumbersAdapter.java

@@ -88,7 +88,7 @@ public class AllSubscriptionNumbersAdapter extends BaseAdapter {
         }else if (status == 2){
             viewHolder.nameTextView.setTextColor(mContext.getResources().getColor(R.color.gray));
             viewHolder.nameTextView.setBackground(mContext.getResources().getDrawable(R.drawable.shape_subscribe_selet_bg));
-            viewHolder.applyTextView.setText("已申请");
+            viewHolder.applyTextView.setText(R.string.subscribe_requested);
             viewHolder.applyTextView.setEnabled(false);
         }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/MySubscriptionAdapter.java

@@ -101,7 +101,7 @@ public class MySubscriptionAdapter extends BaseAdapter {
 
         viewHolder.titleTv.setText(mPersonalSubscriptionBeans.get(i).getTITLE());
         if (mPersonalSubscriptionBeans.get(i).getISAPPLED() == -1){
-            viewHolder.applyTv.setText("－退订");
+            viewHolder.applyTv.setText(R.string.unsubscribe);
             viewHolder.applyTv.setTextColor(Color.BLUE);
             viewHolder.applyTv.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -140,7 +140,7 @@ public class MySubscriptionAdapter extends BaseAdapter {
                 }
             });
         }else if (mPersonalSubscriptionBeans.get(i).getISAPPLED() == 0){
-            viewHolder.applyTv.setText("不可退订");
+            viewHolder.applyTv.setText(R.string.unsubscribe_able);
             viewHolder.applyTv.setTextColor(Color.GRAY);
         }
 

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

@@ -254,22 +254,22 @@ public class SubscribeDetailActivity extends BaseActivity {
     private void initDatas() {
         if (mSubStatus != -1) {
             if (mSubStatus == 1) {
-                mApplyButton.setText("已订阅");
+                mApplyButton.setText(R.string.subscribe_confirmed);
                 mApplyButton.setEnabled(false);
             } else if (mSubStatus == 2) {
-                mApplyButton.setText("已申请");
+                mApplyButton.setText(R.string.subscribe_requested);
                 mApplyButton.setEnabled(false);
             } else if (mSubStatus == 3) {
-                mApplyButton.setText("＋订阅");
+                mApplyButton.setText(R.string.subscribe_detail_commit);
                 mApplyButton.setEnabled(true);
             }
         }
         if (mIsApplied != -2) {
             if (mIsApplied == -1) {
-                mApplyButton.setText("－退订");
+                mApplyButton.setText(R.string.unsubscribe);
                 mApplyButton.setEnabled(true);
             } else if (mIsApplied == 0) {
-                mApplyButton.setText("该订阅号不可退订");
+                mApplyButton.setText(R.string.not_unsubscribe_able);
                 mApplyButton.setEnabled(false);
             }
         }

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

@@ -914,12 +914,12 @@ public class TaskActivity extends BaseActivity implements OnClickListener, Recog
                     if (type == 0 || real_List.get(mPosition).getMainname().equals("待确认")) {
                         if (doneList == null)
                             doneList = new ArrayList<>();
-                        real_List.get(mPosition).setMainname("已完成");
+                        real_List.get(mPosition).setMainname(getString(R.string.done));
                         doneList.add(0, real_List.get(mPosition));
                         real_List.remove(mPosition);
                         adapter.notifyDataSetChanged();
                     } else {
-                        real_List.get(mPosition).setMainname("待确认");
+                        real_List.get(mPosition).setMainname(getString(R.string.confirmed));
                         adapter.notifyDataSetChanged();
                     }
                 } else {

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

@@ -154,19 +154,6 @@ public class AddBusinessActivity extends OABaseActivity implements View.OnClickL
             ToastUtil.showToast(ct, getString(R.string.Company_Name) + getString(R.string.is_must_input));
             return false;
         }
-        if (adapter != null && ListUtils.getSize(adapter.getContacts()) <= 0) return true;
-        for (EmployeesModel e : adapter.getContacts()) {
-            if (!StringUtils.isEmpty(e.getEmployeeNames()) && !StringUtils.isEmpty(e.getEmployeecode()) && canSubmitPhone(e.getEmployeecode()))
-                return true;
-        }
-        return false;
-    }
-
-    private boolean canSubmitPhone(String phone) {
-        if (!com.xzjmyk.pm.activity.util.StringUtils.isMobileNumber(phone)) {
-            ToastUtil.showToast(ct, R.string.phone_number_format_error);
-            return false;
-        }
         return true;
     }
 

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

@@ -7,7 +7,6 @@ import android.os.Handler;
 import android.os.Message;
 import android.text.Editable;
 import android.text.TextUtils;
-import android.text.TextWatcher;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -31,6 +30,7 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.crm.Business;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
 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;
@@ -125,29 +125,18 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
 
             }
         });
-        search_edit.addTextChangedListener(new TextWatcher() {
+        search_edit.addTextChangedListener(new EditChangeListener() {
             @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
+            public void afterTextChanged(Editable s) {
                 if (mAdapter == null) {
                     ToastUtil.showToast(ct, R.string.networks_out);
                 } else {
                     if (!TextUtils.isEmpty(search_edit.getText())) {
-                        mAdapter.getFilter().filter(search_edit.getText().toString());
+                        mAdapter.getFilter().filter(s);
                     } else {
                         mAdapter.getFilter().filter("");
                     }
                 }
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-
             }
         });
     }
@@ -281,7 +270,6 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
                 protected FilterResults performFiltering(CharSequence constraint) {
                     //过滤数据
                     FilterResults searchResults = new FilterResults();
-
                     if (constraint == null || constraint.length() == 0) {
 
                         searchResults.values = mData;
@@ -291,11 +279,12 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
                         ArrayList<Business> newArry = new ArrayList<Business>();
                         for (int i = 0; i < mdata.size(); i++) {
                             Business model = mdata.get(i);
-                            if (model.getName().contains(constraint) || model.getLeader().contains(constraint)) {
+                            if (model != null && (!StringUtils.isEmpty(model.getName()) && model.getName().contains(constraint))
+                                    || (!StringUtils.isEmpty(model.getLeader()) && model.getLeader().contains(constraint))) {
                                 newArry.add(model);
                             }
                         }
-
+                        //这个是draft版本代码
                         searchResults.values = newArry;
                         searchResults.count = newArry.size();
                     }

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

@@ -101,10 +101,10 @@ public class SubscriptionAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
                 }
                 LoadLocalImageUtil.getInstance().displayFromDrawable(imageSrc, viewHolder.item_image);
                 if (!bean.isRead()) {
-                    isRead = "未读";
+                    isRead = MyApplication.getInstance().getString(R.string.unreaded);
                     isReColor = R.color.red;
                 } else {
-                    isRead = "已读";
+                    isRead = MyApplication.getInstance().getString(R.string.readed);
                     isReColor = isFist ? R.color.white : R.color.text_hine;
                 }
                 String title = StringUtils.isEmpty(bean.getTitle()) ? "" : bean.getTitle();

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

@@ -156,7 +156,7 @@ public class SubscriptionAllFragment extends BaseFragment {
             public boolean onItemLongClick(AdapterView<?> parent, View view, final int position, long id) {
                 View popView = View.inflate(getActivity(), R.layout.pop_subs_delete, null);
                 TextView deleteTv = (TextView) popView.findViewById(R.id.pop_subs_delete_tv);
-                deleteTv.setText("隐藏该订阅号");
+                deleteTv.setText(R.string.subscription_number);
                 deleteTv.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -227,7 +227,7 @@ public class SubscriptionAllFragment extends BaseFragment {
             public boolean onItemLongClick(AdapterView<?> parent, View view, final int position, long id) {
                 View popView = View.inflate(getActivity(), R.layout.pop_subs_delete, null);
                 TextView deleteTv = (TextView) popView.findViewById(R.id.pop_subs_delete_tv);
-                deleteTv.setText("隐藏该订阅类");
+                deleteTv.setText(R.string.subscription_class);
                 deleteTv.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {

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

@@ -38,7 +38,7 @@
             android:layout_marginLeft="30dp"
             android:background="@drawable/selector_flip_btn"
             android:gravity="center"
-            android:text="＜上一条"
+            android:text="@string/web_previous_tv"
             android:textColor="@color/white"
             android:textSize="16sp"
             android:visibility="gone"/>
@@ -53,7 +53,7 @@
             android:layout_marginRight="30dp"
             android:background="@drawable/selector_flip_btn"
             android:gravity="center"
-            android:text="下一条＞"
+            android:text="@string/web_next_tv"
             android:textColor="@color/white"
             android:textSize="16sp"
             android:visibility="gone"/>

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

@@ -30,7 +30,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_marginRight="10dp"
-        android:text="－退订"
+        android:text="@string/unsubscribe"
         android:gravity="center_vertical"
         android:textColor="@color/blue"
         android:layout_centerVertical="true"/>

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

@@ -18,7 +18,7 @@
         android:layout_marginTop="16dp"
         android:drawableTop="@drawable/ic_empty"
         android:gravity="center"
-        android:text="@string/empty_message"
+        android:text="@string/common_list_empty"
         android:textColor="@color/gray_light" />
 
 

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -787,6 +787,16 @@
         <item>禁言一个月</item>
     </string-array>
     <string name="missing_card">缺卡</string>
+    <string name="confirmed">待确认</string>
+    <string name="readed">已读</string>
+    <string name="unreaded">未读</string>
+    <string name="web_next_tv">下一条＞</string>
+    <string name="web_previous_tv">＜上一条</string>
+    <string name="subscription_number">隐藏该订阅号</string>
+    <string name="subscription_class">隐藏该订阅类</string>
+    <string name="unsubscribe">－退订</string>
+    <string name="not_unsubscribe_able">该订阅号不可退订</string>
+    <string name="unsubscribe_able">不可退订</string>
     <!--end by Bitliker-->
 
     <!--start by Arison-->

WeiChat/src/main/res/values-zh-rTW/strings.xml

@@ -760,6 +760,16 @@
     </string-array>
     <string name="missing_card">缺卡</string>
     <string name="before_work">上班前</string>
+    <string name="confirmed">待確認</string>
+    <string name="readed">已讀</string>
+    <string name="unreaded">未讀</string>
+    <string name="web_next_tv">下一條＞</string>
+    <string name="web_previous_tv">＜上一條</string>
+    <string name="subscription_number">隱藏該訂閱號</string>
+    <string name="subscription_class">隱藏該訂閱類</string>
+    <string name="unsubscribe">－退訂</string>
+    <string name="not_unsubscribe_able">該訂閱號不可退訂</string>
+    <string name="unsubscribe_able">不可退訂</string>
     <!--end by Bitliker-->
 
     <!--start by Arison-->
@@ -1351,7 +1361,7 @@
     <string name="language_rCN">简体中文</string>
     <string name="language_rTW">繁體中文</string>
     <string name="language_en">English</string>
-    
+
     <string name="update_business">修改商機</string>
     <string name="search_select_hint">蒐索項目、品牌、物料、型號等</string>
     <string name="not_search_message">沒有符合條件的結果</string>
@@ -1412,19 +1422,20 @@
     <string name="Scheduling_type">排班類型</string>
     <string name="Normal_frequency">正常班次</string>
 
-   <string name="no_flights">無班次，聯繫管理員</string>
-   <string name="Monday">週一</string>
-   <string name="Tuesday">週二</string>
-   <string name="Wednesday">週三</string>
-   <string name="Thursday">週四</string>
-   <string name="Friday">週五</string><string name="Saturday">週六</string>
-   <string name="Sunday">週日</string>
-   <string name="holiday_date1">12月31日~1月2日 共3天</string>
-   <string name="holiday_date2">1月27日~2月2日 共7天 調休;2月4日上班</string>
-   <string name="holiday_date3">4月2日~4月4日 共3天 調休;4月1日上班</string>
-   <string name="holiday_date4">4月29日~5月1日 共3天</string>
-   <string name="holiday_date5">5月28日~5月30日 共3天 調休;5月27日上班</string>
-   <string name="holiday_date6">10月1日~10月8日 共8天 調休;9月30日上班</string>
+    <string name="no_flights">無班次，聯繫管理員</string>
+    <string name="Monday">週一</string>
+    <string name="Tuesday">週二</string>
+    <string name="Wednesday">週三</string>
+    <string name="Thursday">週四</string>
+    <string name="Friday">週五</string>
+    <string name="Saturday">週六</string>
+    <string name="Sunday">週日</string>
+    <string name="holiday_date1">12月31日~1月2日 共3天</string>
+    <string name="holiday_date2">1月27日~2月2日 共7天 調休;2月4日上班</string>
+    <string name="holiday_date3">4月2日~4月4日 共3天 調休;4月1日上班</string>
+    <string name="holiday_date4">4月29日~5月1日 共3天</string>
+    <string name="holiday_date5">5月28日~5月30日 共3天 調休;5月27日上班</string>
+    <string name="holiday_date6">10月1日~10月8日 共8天 調休;9月30日上班</string>
     <string name="remove_blacklist">移出黑名單</string>
     <string name="say_hello">打招呼</string>
     <string name="send_msg">發消息</string>
@@ -1440,7 +1451,7 @@
     <string name="remove_blacklist_succ">移出黑名單成功</string>
     <string name="cancel_attention_prompt">確定要取消關注嗎？ </string>
     <string name="delete_all_prompt">徹底刪除操作，如果對方也關注了你，那麼也將取消對方對你的關注，確定要徹底刪除嗎？ </string>
-   <string name="cancel_attention_succ">取消關注成功</string>
+    <string name="cancel_attention_succ">取消關注成功</string>
     <string name="prompt_title">提示</string>
     <string name="delete_all_succ">刪除成功</string>
     <string name="remove_blacklist_prompt">確定要移出黑名單嗎</string>