配置文件冲突解决

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/SettingActivity.java

@@ -83,7 +83,6 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
     private RelativeLayout new_step_rl;
     private ProgressDialog dialog;
     private RelativeLayout share_rl;
-    private String uustep_service_name = "com.xzjmyk.pm.basepedo.service.StepService";
     private String newStep_service_name = "com.xzjmyk.pm.newpedo.service.StepService";
 
     @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/ComplaintDetailActivity.java

@@ -143,17 +143,16 @@ public class ComplaintDetailActivity extends BaseActivity {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (data == null) {
-            if (resultCode == 0x333) {
-                loadPlatAppFlow(detail_id);
-                mPlatComAfAdapter.notifyDataSetChanged();
-                a_and_disa_ll.setVisibility(View.GONE);
-                ToastMessage("变更成功，刷新审批节点");
-                change = data.getBooleanExtra("change",false);
-            } else {
-                return;
-            }
-        } else if (requestCode == 0x01 && resultCode == 0x20) {
+        if (data == null) return;
+        if (resultCode == 0x333) {
+            loadPlatAppFlow(detail_id);
+            mPlatComAfAdapter.notifyDataSetChanged();
+            a_and_disa_ll.setVisibility(View.GONE);
+            ToastMessage("变更成功，刷新审批节点");
+            change = data.getBooleanExtra("change",false);
+        }
+
+        if (requestCode == 0x01 && resultCode == 0x20) {
             SelectEmUser d = data.getParcelableExtra("data");
             if (d != null) {
                 String single_man_name = d.getEmName();

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

@@ -41,7 +41,7 @@
                     android:textSize="15sp"
                     android:gravity="center_vertical|right"
                     whatever:testType="regexp"
-                    whatever:customRegexp="^[A-Za-z\u4e00-\u9fa5]{1,24}+$"
+                    whatever:customRegexp="^[A-Za-z\u4e00-\u9fa5]{1,12}+$"
                     whatever:testErrorString="姓名只能为12个字符之内的中、英文"
                     android:layout_marginLeft="10dp"/>
             </RelativeLayout>