15:48

WeiChat/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="100"
-    android:versionName="5.8.0">
+    android:versionCode="101"
+    android:versionName="5.8.1">
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -963,7 +963,8 @@
             android:label="@string/ablum_list"></activity>
         <activity android:name="com.xzjmyk.pm.im.audio.FaceRecognition.FaceView.OnlineFaceDemo"
             android:label="在线人脸识别"></activity>
-
+        <activity android:name=".ui.erp.activity.message.NewComApprovalActivity"
+            android:label="审批单详情"></activity>
     </application>
 
 </manifest>

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

@@ -0,0 +1,107 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.message;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import com.andreabaccega.widget.FormEditText;
+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.R;
+import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.RecognizerDialogUtil;
+
+/**
+ * Created by FANGLH on 2017/7/5.
+ */
+
+public class NewComApprovalActivity extends BaseActivity implements RecognizerDialogListener,View.OnClickListener {
+    @ViewInject(R.id.common_docui_sv)
+    private LinearLayout common_docui_sv;
+    @ViewInject(R.id.shuru_iv)
+    private ImageView shuru_iv;
+    @ViewInject(R.id.approval_word_et)
+    private FormEditText approval_word_et;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.newcom_approval_activity);
+        ViewUtils.inject(this);
+        initView();
+        initOnclickListener();
+        initData();
+        initOnclickEvents();
+    }
+    private void initView() {
+
+    }
+    private void initOnclickListener() {
+        findViewById(R.id.agree_ll).setOnClickListener(this);
+        findViewById(R.id.disagree_ll).setOnClickListener(this);
+        findViewById(R.id.change_dealman_ll).setOnClickListener(this);
+        findViewById(R.id.next_ll).setOnClickListener(this);
+        findViewById(R.id.voice_iv).setOnClickListener(this);
+        findViewById(R.id.common_language_iv).setOnClickListener(this);
+
+        approval_word_et.setOnClickListener(this);
+    }
+    private void initData() {
+
+    }
+
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()){
+            case R.id.agree_ll:
+                break;
+            case R.id.disagree_ll:
+                break;
+            case R.id.change_dealman_ll:
+                break;
+            case R.id.next_ll:
+                break;
+            case R.id.voice_iv:
+                RecognizerDialogUtil.showRecognizerDialog(ct, this);
+                break;
+        }
+    }
+    private void initOnclickEvents() {
+
+
+
+
+        // 审批语编辑框监听，隐藏左边图片
+        approval_word_et.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (count != 0) {
+                    shuru_iv.setVisibility(View.INVISIBLE);
+                }
+            }
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (TextUtils.isEmpty(s)) {
+                    shuru_iv.setVisibility(View.VISIBLE);
+                }
+            }
+        });
+    }
+    @Override
+    public void onResult(RecognizerResult recognizerResult, boolean b) {
+        String text = JsonParser.parseIatResult(recognizerResult.getResultString());
+        approval_word_et.setText(approval_word_et.getText().toString() + text);
+    }
+    @Override
+    public void onError(SpeechError speechError) {}
+}

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

@@ -35,6 +35,7 @@ import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.BaseInfoActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.message.NewComApprovalActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAMainActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Master;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
@@ -62,6 +63,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.xzjmyk.pm.activity.R.id.my_friend_rl;
+import static com.xzjmyk.pm.activity.R.id.theme_tv;
 import static com.xzjmyk.pm.activity.ui.erp.util.CommonUtil.getSharedPreferencesBoolean;
 
 
@@ -366,6 +368,14 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
             }
         });
 
+        picture_selector_rl.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                startActivity(new Intent(ct, NewComApprovalActivity.class));
+                return true;
+            }
+        });
+
     }
 
     @Override

WeiChat/src/main/java/com/xzjmyk/pm/pictureselector/ImgFileListActivity.java

@@ -1,5 +1,6 @@
 package com.xzjmyk.pm.pictureselector;
 
+import android.Manifest;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Bundle;
@@ -11,6 +12,7 @@ import android.widget.ListView;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.util.PermissionUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -82,4 +84,15 @@ public class ImgFileListActivity extends BaseActivity implements OnItemClickList
 			finish();
 		}
 	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		String[] permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
+		for (String permission : permissions) {
+			if (PermissionUtil.lacksPermissions(ct, permission)) {
+				PermissionUtil.requestPermission(this, PermissionUtil.DEFAULT_REQUEST, permission);
+			}
+		}
+	}
 }

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

@@ -0,0 +1,290 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:whatever="http://schemas.android.com/tools"
+    android:background="@color/bg_main"
+    android:orientation="vertical"
+    android:focusableInTouchMode="true">.
+    <com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView
+        android:id="@+id/common_docui_sv"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:fillViewport="true"
+        android:scrollbars="none"
+        android:focusableInTouchMode="true"
+        android:visibility="visible"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true">
+
+        <LinearLayout
+            android:id="@+id/ly_head_display"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_marginBottom="10dp">
+            <LinearLayout
+                android:id="@+id/common_docdata_rl"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                >
+
+                <de.hdodenhof.circleimageview.CircleImageView
+                    android:id="@+id/common_docui_photo_img"
+                    android:layout_width="45dp"
+                    android:layout_height="45dp"
+                    android:contentDescription="@string/app_name"
+                    android:src="@drawable/uuu"/>
+
+                <TextView
+                    android:id="@+id/common_doc_name_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:textColor="#575757"
+                    android:textSize="@dimen/text_size_month"
+                    android:text="鲁班七号的无尽之刃"
+                    android:layout_gravity="center_vertical"
+                    />
+            </LinearLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/item_line"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+                <com.xzjmyk.pm.activity.view.MyListView
+                    android:id="@+id/common_docui_main_msg_lv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginRight="10dp"
+                    android:focusableInTouchMode="false">
+                </com.xzjmyk.pm.activity.view.MyListView>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="10dp"
+                    android:background="@color/item_line"
+                    android:layout_marginTop="5dp"
+                    android:visibility="visible"/>
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:id="@+id/common_docui_secondmsg_ll"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                >
+
+                <com.xzjmyk.pm.activity.view.MyListView
+                    android:id="@+id/common_docui_second_msg_lv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="5dp"
+                    android:focusableInTouchMode="false"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp">
+                </com.xzjmyk.pm.activity.view.MyListView>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="10dp"
+                    android:background="@color/item_line"
+                    android:layout_marginTop="5dp"
+                    android:visibility="visible"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/common_docui_annex_ll"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="附件"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginTop="10dp"/>
+                <com.xzjmyk.pm.activity.view.MyListView
+                    android:id="@+id/common_docui_annex_lv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="13dp"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginRight="10dp"
+                    android:focusableInTouchMode="false"
+                    android:layout_marginLeft="30dp">
+                </com.xzjmyk.pm.activity.view.MyListView>
+            </LinearLayout>
+        </LinearLayout>
+    </com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@+id/common_language_iv"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:src="@drawable/changyongyu"
+            android:layout_gravity="center_vertical"
+            android:visibility="visible"
+            android:layout_marginTop="3dp"
+            android:layout_marginRight="10dp"
+            android:layout_alignParentRight="true"
+            />
+        <ImageView
+            android:id="@+id/voice_iv"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:src="@drawable/btn_yuyin_nor"
+            android:layout_gravity="center_vertical"
+            android:visibility="visible"
+            android:layout_marginRight="10dp"
+            android:layout_marginTop="3dp"
+            android:layout_toLeftOf="@+id/common_language_iv"
+            />
+        <ImageView
+            android:id="@+id/shuru_iv"
+            android:layout_width="15dp"
+            android:layout_height="15dp"
+            android:src="@drawable/shuru"
+            android:layout_marginTop="5dp"
+            android:layout_marginLeft="10dp"/>
+        <com.andreabaccega.widget.FormEditText
+            android:id="@+id/approval_word_et"
+            style="@style/form_relative_right_text2"
+            android:hint="请输入审批意见..."
+            whatever:testType="regexp"
+            whatever:customRegexp="^[\\s\\S]{0,10}$"
+            whatever:testErrorString="字数超限30了喔,亲!"
+            android:maxLength="30"
+            android:minHeight="50dp"
+            android:paddingTop="5dp"
+            android:layout_toRightOf="@+id/shuru_iv"
+            android:layout_toLeftOf="@+id/voice_iv"
+            android:layout_toStartOf="@+id/voice_iv"
+            android:layout_marginLeft="20dp"
+            android:paddingLeft="10dp"/>
+
+    </RelativeLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="8dp"
+        android:background="@color/gainsboro" />
+    <LinearLayout
+        android:id="@+id/approval_ll"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:background="@color/bg_main"
+        android:paddingBottom="5dp"
+        android:visibility="visible">
+    <LinearLayout
+        android:id="@+id/agree_ll"
+        android:layout_weight="2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:background="@drawable/selector_me_menu_item_bg"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:textSize="16sp"
+            android:textColor="@color/titleBlue"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
+            android:text="@string/agree"
+            />
+    </LinearLayout>
+
+    <View
+        android:layout_width="1dp"
+        android:layout_height="20dp"
+        android:background="@color/item_line"
+        android:layout_gravity="center_vertical"
+        />
+    <LinearLayout
+        android:id="@+id/disagree_ll"
+        android:layout_weight="2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:background="@drawable/selector_me_menu_item_bg">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:textSize="16sp"
+            android:textColor="@color/titleBlue"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
+            android:text="@string/common_disagree"
+            android:layout_marginLeft="8dp"/>
+    </LinearLayout>
+
+    <View
+        android:layout_width="1dp"
+        android:layout_height="20dp"
+        android:background="@color/item_line"
+        android:layout_gravity="center_vertical"
+        />
+    <LinearLayout
+        android:id="@+id/change_dealman_ll"
+        android:layout_weight="3"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:background="@drawable/selector_me_menu_item_bg">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:textSize="16sp"
+            android:textColor="@color/titleBlue"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
+            android:text="@string/common_changedealman"
+            android:layout_marginLeft="8dp"/>
+    </LinearLayout>
+        <View
+            android:layout_width="1dp"
+            android:layout_height="20dp"
+            android:background="@color/item_line"
+            android:layout_gravity="center_vertical"
+            />
+        <LinearLayout
+            android:id="@+id/next_ll"
+            android:layout_weight="2"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:background="@drawable/selector_me_menu_item_bg">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:textSize="16sp"
+                android:textColor="@color/titleBlue"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:text="下一条"
+                android:layout_marginLeft="8dp"/>
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>