Merge branch 'draft' of https://gitlab.com/Arisono/SkWeiChat-Baidu into uu_v2.0

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

@@ -41,9 +41,9 @@ import java.util.Map;
 
 public class PersonalRegActivity extends BaseActivity implements View.OnClickListener{
     @ViewInject(R.id.phone_et)
-    private EditText phone_et;
+    private FormEditText phone_et;
     @ViewInject(R.id.password_et)
-    private EditText password_et;
+    private FormEditText password_et;
     @ViewInject(R.id.name_et)
     private FormEditText name_et;
     @ViewInject(R.id.male_et)
@@ -130,30 +130,29 @@ public class PersonalRegActivity extends BaseActivity implements View.OnClickLis
     }
 
     private void registerJudge() {
-        if (StringUtils.isEmpty(phone_et.getText().toString())){
+      /*  if (StringUtils.isEmpty(phone_et.getText().toString())){
             ToastMessage(getString(R.string.input_phone_number));
             return;
-        }
+        }*/
 
-        if (StringUtils.isEmpty(password_et.getText().toString())){
+       /* if (!StringUtils.isEmpty(password_et.getText().toString())){
             ToastMessage(getString(R.string.please_input_password));
             return;
         }
-
-        md5_password = Md5Util.toMD5(password_et.getText().toString());
-        if (!name_et.testValidity()){
-            return;
-        }
-        if (StringUtils.isEmpty(name_et.getText().toString())){
+*/
+       /* if (StringUtils.isEmpty(name_et.getText().toString())){
             ToastMessage(getString(R.string.input_name));
             return;
+        }*/
+        if (phone_et.testValidity() && password_et.testValidity() && name_et.testValidity()){
+            if(!CommonUtil.isNetWorkConnected(this)){
+                ToastMessage(getString(R.string.common_notlinknet));
+            }else {
+                md5_password = Md5Util.toMD5(password_et.getText().toString());
+                doRegiter();
+            }
         }
 
-        if(!CommonUtil.isNetWorkConnected(this)){
-            ToastMessage(getString(R.string.common_notlinknet));
-        }
-        doRegiter();
-
     }
 
     private void doRegiter() {

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

@@ -127,6 +127,14 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                         tv_process_un_num.setVisibility(View.VISIBLE);
                         tv_process_un_num.setText(array.size() + "");
                     }
+
+                    if (wait_app){
+                        if ( mPosition < array.size()){
+                            mList.getRefreshableView().setSelection(mPosition);
+                        }else {
+                            mList.getRefreshableView().setSelection(array.size()-1);
+                        }
+                    }
                     progressDialog.dismiss();
                     break;
                 case SUSSCESS_already:
@@ -204,6 +212,8 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
             }
         }
     };
+    private boolean wait_app = false;
+    private int mPosition;
 
     private void getEmimids(JSONArray array) {
         if (!ListUtils.isEmpty(im_ids)) im_ids.clear();
@@ -324,7 +334,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
         mList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                int mPosition = (int) parent.getItemIdAtPosition(position);
+                mPosition = (int) parent.getItemIdAtPosition(position);
                 ProcessAdapter.ViewModel model = (ProcessAdapter.ViewModel) view.getTag();
                 currentId = position;
                 LogUtil.d(TAG, position + "");
@@ -372,6 +382,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                     Intent intent = new Intent(ct, ApprovalActivity.class);
                     intent.putExtra("imid", d_imids);
                     intent.putExtra("title", title);
+                    intent.putExtra("type",tab_type);
                     intent.putExtra("nodeid", Integer.valueOf(model.JP_NODEID));
                     startActivity(intent);
                 }
@@ -404,6 +415,15 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
 
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (resultCode == 170809){
+            wait_app = true;
+            loadProcessToDo(page);
+        }
+    }
 
     @Override
     public void onClick(View v) {
@@ -498,7 +518,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
     @Override
     protected void onResume() {
         super.onResume();
-        mList.setRefreshing(true);
+//        mList.setRefreshing(true);
 
     }
 
@@ -662,7 +682,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                         String codename = jsonArray.getJSONObject(position).getString("JP_NODENAME");
                         if (!StringUtils.isEmpty(status)) {
                             if (status.equals("待审批")) {
-                                model.status.setTextColor(getResources().getColor(R.color.new_waitting_approvel));
+                                model.status.setTextColor(getResources().getColor(R.color.approvaling));
                                 nodename = nodename == null ? "" : nodename;
                                 status = "等待" + nodename + "(" + codename + ")" + getString(R.string.approvel);
                             } else if (status.equals("未通过")) {

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

@@ -107,7 +107,7 @@ public class SelectCollisionActivity extends OABaseActivity implements ISelectAc
         sidebar.setOnTouchingLetterChangedListener(new SideBar.OnTouchingLetterChangedListener() {
             @Override
             public void onTouchingLetterChanged(String s) {
-                if (adapter == null || ListUtils.isEmpty(adapter.getListData())) return;
+                if (adapter == null || ListUtils.isEmpty(adapter.getListData()) || StringUtils.isEmpty(s)) return;
                 // 该字母首次出现的位置
                 if ("↑".equals(s)) {
                     listView.setSelection(0);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddErpActivity.java

@@ -15,11 +15,15 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
+import com.iflytek.cloud.RecognizerResult;
+import com.iflytek.cloud.SpeechError;
+import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.SelectCalendarActivity;
@@ -31,6 +35,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.OAConfig;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.RecognizerDialogUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.TagGroup;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
@@ -45,7 +50,7 @@ import java.util.Map;
  * Created by FANGlh on 2017/3/30.
  * function:erp添加任务界面同步于b2b任务添加界面
  */
-public class TaskAddErpActivity extends BaseActivity implements View.OnClickListener {
+public class TaskAddErpActivity extends BaseActivity implements View.OnClickListener,RecognizerDialogListener {
     private static final int TASK_ADD_ERP = 0x330;
     @ViewInject(R.id.et_title)
     private EditText et_title;
@@ -59,6 +64,8 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
     private TextView et_startime;
     @ViewInject(R.id.et_endtime)
     private TextView et_endtime;
+    @ViewInject(R.id.voice_search_iv)
+    private ImageView voice_search_iv;
 
     private String[] tagValues;
     private int save = 0;
@@ -108,6 +115,13 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
         String current_time = TimeUtils.f_long_2_str(System.currentTimeMillis());
         et_startime.setText(current_time);
         et_endtime.setText(current_time);
+
+        voice_search_iv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                RecognizerDialogUtil.showRecognizerDialog(ct,TaskAddErpActivity.this);
+            }
+        });
     }
 
     @Override
@@ -341,4 +355,15 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
             }
         }
     };
+
+    @Override
+    public void onResult(RecognizerResult recognizerResult, boolean b) {
+        String text = JsonParser.parseIatResult(recognizerResult.getResultString());
+        et_task_detail.setText(et_task_detail.getText().toString() + CommonUtil.getPlaintext(text));
+    }
+
+    @Override
+    public void onError(SpeechError speechError) {
+
+    }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/QSearchPpwindowUtils.java

@@ -72,10 +72,10 @@ public class QSearchPpwindowUtils{
                 isqSearch[0] = false;
             }
         });
-        contentView.findViewById(R.id.next_tv).setOnClickListener(new View.OnClickListener() {
+        contentView.findViewById(R.id.no_tv).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                PreferenceUtils.putInt(MainActivity.UU_STEP, 1);
+                PreferenceUtils.putInt(MainActivity.Q_SEARCH, 1);
                 popupWindow.dismiss();  //不再提示
                 isqSearch[0] = false;
             }

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

@@ -38,11 +38,23 @@
             android:layout_height="30dp">
             <TextView
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent" 
-               android:gravity="bottom"
+                android:layout_height="match_parent"
+                android:gravity="bottom"
                 android:layout_marginLeft="10dp"
                 android:text="@string/task_detail"/>
-            </RelativeLayout>
+
+
+            <ImageView
+                android:id="@+id/voice_search_iv"
+                android:background="@drawable/btn_yuyin_nor"
+                android:visibility="visible"
+                android:layout_marginRight="20dp"
+                android:layout_alignParentRight="true"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_marginTop="8dp"
+                />
+        </RelativeLayout>
         <EditText
             android:id="@+id/et_task_detail"
             android:background="@color/white"
@@ -52,7 +64,7 @@
             android:paddingLeft="10dp"
             android:layout_marginBottom="10dp"
             android:hint="@string/common_input" />
-        
+
         <RelativeLayout
             style="@style/form_relative_customer"
             android:background="@color/white"
@@ -152,13 +164,13 @@
                 android:hint="@string/common_select" />
 
         </RelativeLayout>
-<!--
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            android:background="@color/light_grey" />-->
+        <!--
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0.5dp"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:background="@color/light_grey" />-->
         <!-- 语音 -->
         <LinearLayout
             android:id="@+id/lay_voice_layout"
@@ -270,12 +282,12 @@
 
         </RelativeLayout>
 
-       <!-- <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            android:background="@color/light_grey" />-->
+        <!-- <View
+             android:layout_width="match_parent"
+             android:layout_height="0.5dp"
+             android:layout_marginLeft="5dp"
+             android:layout_marginRight="5dp"
+             android:background="@color/light_grey" />-->
 
         <LinearLayout style="@style/form_linear_customer">
 

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

@@ -38,7 +38,7 @@
                 android:layout_width="@dimen/line"
                 android:layout_height="30dp"
                 android:background="@color/white"/>
-            <EditText
+            <com.andreabaccega.widget.FormEditText
                 android:id="@+id/phone_et"
                 android:layout_width="match_parent"
                 android:layout_height="40dp"
@@ -50,6 +50,8 @@
                 android:textSize="15sp"
                 android:inputType="number"
                 android:maxLength="11"
+                whatever:customRegexp="^((13[1-9])|(15[^4])|(18[0,2,3,5-9])|(17[0-8])|(147))\\d{8}$"
+                whatever:testErrorString="请输入正确的手机号"
                 />
         </LinearLayout>
         <LinearLayout
@@ -73,7 +75,7 @@
                 android:layout_width="@dimen/line"
                 android:layout_height="30dp"
                 android:background="@color/white"/>
-            <EditText
+            <com.andreabaccega.widget.FormEditText
                 android:id="@+id/password_et"
                 android:layout_width="match_parent"
                 android:layout_height="40dp"
@@ -84,7 +86,9 @@
                 android:textColorHint="@color/white"
                 android:textSize="15sp"
                 android:inputType="textPassword"
-                android:maxLength="6"
+                android:maxLength="12"
+                whatever:customRegexp="^[0-9a-zA-Z]{6,12}$"
+                whatever:testErrorString="请输入6-12位密码（仅限数字+字母组合）"
                 />
         </LinearLayout>
     <LinearLayout

app_core/imageload/build.gradle

@@ -2,13 +2,13 @@ apply plugin: 'com.android.library'
 
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "25.0.0"
 
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 25
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
 

app_core/network/build.gradle

@@ -2,13 +2,13 @@ apply plugin: 'com.android.library'
 
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "25.0.0"
 
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 25
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
 

settings.gradle

@@ -30,4 +30,4 @@ project(':pullToRefershLibraryMy').projectDir = new File('app_third/pullToRefers
 project(':materialdialogs').projectDir = new File('app_third/materialdialogs')
 project(':MPAndroidChart').projectDir = new File('app_third/MPAndroidChart')
 project(':libfloatingactionbutton').projectDir = new File('app_third/libfloatingactionbutton')
-project(':library-swipemenu_lv').projectDir = new File('app_third/library-swipemenu_lv')
+project(':library-swipemenu_lv').projectDir = new File('app_third/library-swipemenu_lv')