Ver Fonte

1.根据测试反馈,处理关于审批流详情界面显示异常的问题
2.根据测试反馈,处理关于在切换新旧版本时候出现的显示问题

Bitliker há 8 anos atrás
pai
commit
ba409c0207

+ 1 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/ApprovalActivity.java

@@ -47,7 +47,6 @@ 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.DisplayUtil;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -321,7 +320,7 @@ public class ApprovalActivity extends OABaseActivity implements IApproval, Appro
         window.getContentView().measure(0, 0);
         window.setHeight(DisplayUtil.dip2px(this, 190));
         window.setWidth(DisplayUtil.dip2px(this, 85));
-        window.setAnimationStyle(R.style.MenuAnimationFade);
+//        window.setAnimationStyle(R.style.MenuAnimationFade);
         window.setOutsideTouchable(false);
         window.setFocusable(true);
         //获取需要在其上方显示的控件的位置信息

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/ApprovaPresenter.java

@@ -1015,7 +1015,7 @@ public class ApprovaPresenter implements OnHttpResultListener {
             iApproval.showToast("正在提交请求,请不要重复提交", R.color.load_submit);
             return false;
         }
-        return false;
+        return true;
     }
 
     //判断要点

+ 3 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/oa/RecognizerDialogUtil.java

@@ -5,6 +5,7 @@ import android.content.Context;
 import com.iflytek.cloud.SpeechConstant;
 import com.iflytek.cloud.ui.RecognizerDialog;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
+import com.xzjmyk.pm.activity.MyApplication;
 
 /**
  * Created by Bitliker on 2017/6/12.
@@ -13,6 +14,8 @@ import com.iflytek.cloud.ui.RecognizerDialogListener;
 public class RecognizerDialogUtil {
 
     public static void showRecognizerDialog(Context context, RecognizerDialogListener recognizerDialogListener) {
+        if (context == null)
+            context = MyApplication.getInstance();
         RecognizerDialog dialog = new RecognizerDialog(context, null);
         dialog.setParameter(SpeechConstant.LANGUAGE, "zh_cn");
         dialog.setParameter(SpeechConstant.ACCENT, "mandarin");

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

@@ -65,7 +65,7 @@ public class QSearchPpwindowUtils{
         new android.os.Handler().postDelayed(new Runnable() {
             @Override
             public void run() {
-                if (isqSearch[0]){
+                if (isqSearch[0]&&activity!=null&&!activity.isFinishing()){
                     RecognizerDialogUtil.showRecognizerDialog(activity,new RecognizerDialogListener() {
                         @Override
                         public void onResult(RecognizerResult recognizerResult, boolean b) {

+ 1 - 1
WeiChat/src/main/res/raw/versionconfiguration.properties

@@ -1,3 +1,3 @@
 #发布版本状态改为true,测试版本状态为false
 #release_version = false
-release_version=true
+release_version=false