9-9至9-19bug

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

@@ -129,7 +129,7 @@ public class BusinessDetailActivty extends BaseActivity {
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 if (!StringUtils.isEmpty(search_edit.getText().toString())) {
-                    mAdapter.getFilter().filter(search_edit.getText().toString());
+                    mAdapter.getFilter().filter(search_edit.getText().toString().trim());
                 } else {
                     mAdapter.getFilter().filter("");
                 }

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

@@ -156,7 +156,7 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 if (!StringUtils.isEmpty(search_edit.getText().toString())) {
-                    mAdapter.getFilter().filter(search_edit.getText().toString());
+                    mAdapter.getFilter().filter(search_edit.getText().toString().trim());
                 } else {
                     mAdapter.getFilter().filter("");
                 }
@@ -179,13 +179,13 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
             type = intent.getIntExtra("bt_type", 0);
         }
         if (type == 0) {
-            getSupportActionBar().setTitle("跟进");
+            getSupportActionBar().setTitle("商机跟进");
             ll_top_state.setVisibility(View.VISIBLE);
         } else if (type == 1) {
-            getSupportActionBar().setTitle("抢");
+            getSupportActionBar().setTitle("抢商机");
             ll_top_state.setVisibility(View.GONE);
         } else if (type == 2) {
-            getSupportActionBar().setTitle("分配");
+            getSupportActionBar().setTitle("商机分配");
             ll_top_state.setVisibility(View.GONE);
         }
     }
@@ -418,10 +418,10 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
                     int countb = JSON.parseObject(msg.getData().getString("result")).getInteger("countb");
                     int countc = JSON.parseObject(msg.getData().getString("result")).getInteger("countc");
                     int countd = JSON.parseObject(msg.getData().getString("result")).getInteger("countd");
-                    CommonUtil.textSpanForStyle(tv_unmanger, "未排日程 " + counta, String.valueOf(counta), ct.getResources().getColor(R.color.yellow_home));
-                    CommonUtil.textSpanForStyle(tv_manged, "已排日程 " + countb, String.valueOf(countb), ct.getResources().getColor(R.color.yellow_home));
-                    CommonUtil.textSpanForStyle(tv_timeout, "即将超时 " + countc, String.valueOf(countc), ct.getResources().getColor(R.color.yellow_home));
-                    CommonUtil.textSpanForStyle(tv_transtered, "已转客户 " + countd, String.valueOf(countd), ct.getResources().getColor(R.color.yellow_home));
+                    CommonUtil.textSpanForStyle(tv_unmanger, counta + "\n未排日程", String.valueOf(counta), ct.getResources().getColor(R.color.yellow_home));
+                    CommonUtil.textSpanForStyle(tv_manged, countb + "\n已排日程", String.valueOf(countb), ct.getResources().getColor(R.color.yellow_home));
+                    CommonUtil.textSpanForStyle(tv_timeout, countc + "\n即将超时", String.valueOf(countc), ct.getResources().getColor(R.color.yellow_home));
+                    CommonUtil.textSpanForStyle(tv_transtered, countd + "\n已转客户", String.valueOf(countd), ct.getResources().getColor(R.color.yellow_home));
                     JSONArray array = new JSONArray();
                     switch (business_state) {
                         case 0:

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

@@ -72,7 +72,7 @@ public class UserSelectActivity extends BaseActivity {
                     String name = null;//em_name
                     String company = null;//em_name
                     String position = null;//em_name
-                    String imId = null;//em_department->em_post
+                    int imId;//em_department->em_post
                     JSONObject object = null;
                     for (int i = 0; i < array.size(); i++) {
                         object = array.getJSONObject(i);
@@ -80,12 +80,12 @@ public class UserSelectActivity extends BaseActivity {
                         entity.setClick(false);
                         code = object.containsKey("em_code") ? object.getString("em_code") : "";
                         name = object.containsKey("em_name") ? object.getString("em_name") : "";
-                        imId = object.containsKey("em_imid") ? object.getString("em_imid") : "";
+                        imId = object.containsKey("em_imid") ? object.getIntValue("em_imid") : 0;
                         company = array.getJSONObject(i).getString("em_department") == null ? "" : array.getJSONObject(i).getString("em_department");
                         position = (array.getJSONObject(i).getString("em_post") == null ? "" : array.getJSONObject(i).getString("em_post"));
                         entity.setEm_code(code);
                         entity.setEm_name(name);
-                        entity.setEm_id(Integer.parseInt(imId));
+                        entity.setEm_id(imId);
                         entity.setEm_depart(company);
                         entity.setEm_position(position);
                         list.add(entity);

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

@@ -26,7 +26,6 @@ import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
-import android.text.style.UnderlineSpan;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.Patterns;
@@ -663,8 +662,8 @@ public class CommonUtil {
                     Spannable.SPAN_INCLUSIVE_INCLUSIVE);
 //            style.setSpan(new StrikethroughSpan(), m.start(), m.end(), 
 //                    Spannable.SPAN_INCLUSIVE_INCLUSIVE);
-            style.setSpan(new UnderlineSpan(), m.start(), m.end(),
-                    Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+//            style.setSpan(new UnderlineSpan(), m.start(), m.end(),
+//                    Spannable.SPAN_INCLUSIVE_INCLUSIVE);
         }
         view.setText(style);
     }

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

@@ -6,53 +6,59 @@
     android:background="@color/white"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.BusinessLessActivity">
 
-    <TextView
-        android:text="处理结果:"
-        android:layout_margin="10dp"
-        style="@style/TextView_Basic"></TextView>
+    <LinearLayout
+        android:id="@+id/ll_result"
+        style="@style/LinearLayout_horizontal">
 
-    <EditText
-        android:id="@+id/et_remark"
-        android:layout_width="match_parent"
-        android:layout_height="120dp"
-        android:gravity="left|top"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:background="@drawable/shape_from_edit" />
+        <TextView
+            style="@style/TextView_Basic"
+            android:layout_margin="10dp"
+            android:text="处理结果:"></TextView>
+
+        <EditText
+            android:id="@+id/et_remark"
+            android:layout_width="260dp"
+            android:layout_height="120dp"
+            android:layout_margin="10dp"
+            android:padding="5dp"
+            android:background="@drawable/shape_from_edit"
+            android:gravity="left|top" />
+    </LinearLayout>
 
     <LinearLayout
         android:id="@+id/ll_leader"
         style="@style/LinearLayout_horizontal">
 
         <TextView
-            android:text="直属领导:"
+            style="@style/TextView_Basic"
             android:layout_margin="10dp"
-            style="@style/TextView_Basic" />
+            android:text="直属领导:" />
+
         <TextView
+            android:id="@+id/tv_leader"
+            style="@style/TextView_Basic"
+            android:layout_width="260dp"
+            android:layout_margin="10dp"
             android:background="@drawable/shape_from_edit"
             android:drawableRight="@drawable/nav_icon_search_default"
-            android:layout_margin="10dp"
-            android:layout_width="260dp"
-            android:padding="5dp"
-            style="@style/TextView_Basic"
-            android:id="@+id/tv_leader" />
+            android:padding="5dp" />
     </LinearLayout>
 
     <LinearLayout style="@style/LinearLayout_horizontal">
 
         <TextView
-            android:text="处理时间:"
+            style="@style/TextView_Basic"
             android:layout_margin="10dp"
-            style="@style/TextView_Basic" />
+            android:text="处理时间:" />
 
         <TextView
+            android:id="@+id/tv_date"
+            style="@style/TextView_Basic"
+            android:layout_width="260dp"
+            android:layout_margin="10dp"
             android:background="@drawable/shape_from_edit"
             android:drawableRight="@drawable/nav_icon_search_default"
-            android:layout_margin="10dp"
-            android:layout_width="260dp"
-            android:padding="5dp"
-            style="@style/TextView_Basic"
-            android:id="@+id/tv_date" />
+            android:padding="5dp" />
     </LinearLayout>
 
     <LinearLayout
@@ -60,19 +66,19 @@
         style="@style/LinearLayout_horizontal">
 
         <TextView
-            android:text="商机阶段:"
+            style="@style/TextView_Basic"
             android:layout_margin="10dp"
-            style="@style/TextView_Basic" />
+            android:text="商机阶段:" />
 
         <TextView
             android:id="@+id/tv_business_state"
-            android:text="未分配"
+            style="@style/TextView_Basic"
+            android:layout_width="260dp"
+            android:layout_margin="10dp"
             android:background="@drawable/shape_from_edit"
             android:drawableRight="@drawable/nav_icon_search_default"
-            android:layout_margin="10dp"
-            android:layout_width="260dp"
             android:padding="5dp"
-            style="@style/TextView_Basic" />
+            android:text="未分配" />
     </LinearLayout>
 </LinearLayout>
 

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

@@ -65,7 +65,7 @@
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
                 whatever:testType="regexp"
-                whatever:customRegexp="^[\u4e00-\u9fa5_a-zA-Z0-9_]{0,300}$"
+                whatever:customRegexp="^[\u4e00-\u9fa5_a-zA-Z0-9_\n]{0,300}$"
                 whatever:testErrorString="限定字符长度不大于300" />
         </RelativeLayout>
 

WeiChat/src/main/res/menu/main_btn_submit.xml

@@ -3,6 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/btn_save"
-        android:title="保存"
+        android:title="确定"
         app:showAsAction="ifRoom" />
 </menu>