From: TrillGates <williamtrillgates@gmail.com>
Date: Sat, 19 Jun 2021 10:30:17 +0000 (+0800)
Subject: adjust dialog ui and fixed power too cost
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=78996da9cbab30f552afffc3207adf4d886fdf08;p=icsupport.git

adjust dialog ui and fixed power too cost
---

diff --git a/app/release/ICSer_V793_2106171608_release.apk b/app/release/ICSer_V794_2106171839_release.apk
similarity index 76%
rename from app/release/ICSer_V793_2106171608_release.apk
rename to app/release/ICSer_V794_2106171839_release.apk
index 8758d18d..d014eaec 100644
Binary files a/app/release/ICSer_V793_2106171608_release.apk and b/app/release/ICSer_V794_2106171839_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 130ede28..fd3f1768 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":793,"versionName":"2106171608","enabled":true,"outputFile":"ICSer_V793_2106171608_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V793_2106171608_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":794,"versionName":"2106171839","enabled":true,"outputFile":"ICSer_V794_2106171839_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V794_2106171839_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index 99478b39..d0de085c 100644
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -1030,7 +1030,6 @@ public class Config {
             DefaultTemperatureTestCycle = 15 * 60;
 
         } else {
-
             DefaultLocationMode = NORMAL_MOD;
             DefaultLocationCycle = 900;
             DefaultPPGTestCycle = 0;
diff --git a/app/src/main/java/com/enqualcomm/support/service/Deliver.java b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
index b7befc03..3f092691 100644
--- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java
+++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
@@ -13,7 +13,6 @@ import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
-import android.os.Parcelable;
 import android.os.PowerManager;
 import android.os.SystemClock;
 
@@ -575,7 +574,9 @@ public class Deliver extends AbstractConnectionService {
                 public void run() {
                     final Context context = (Deliver.this.mRuntime.getContextProxy()).context;
 
-                    Contact param2Contact = new Contact(CATEGORY_GROUP, (mRuntime.getContextProxy()).context.getResources().getString(R.string.all_group), Contact.GROUP_ALL);
+                    Contact param2Contact = new Contact(CATEGORY_GROUP,
+                            (mRuntime.getContextProxy()).context.getResources().getString(R.string.all_group),
+                            Contact.GROUP_ALL);
                     int i = mRuntime.getContextProxy().getTelephonyManager().getCallState();
                     if (!mRuntime.getBatteryLow() && 1 != i && 2 != i) {
                         if (Config.do_broadCast_message) {
@@ -591,13 +592,14 @@ public class Deliver extends AbstractConnectionService {
                             //   playVoice(context,paramStringMessage.isFromCache());
                             context.sendBroadcast(intent);
                         }
-
-                        if (Config.noVoiceNotifyDialog == false) {
-
+                        String isWeTalkActive = Util.getSystemProperties("persist.sys.ic.talk.active", "false");
+                        //如果现在，已经在应用里了，那么就不弹窗了
+                        ICLogger.d("isWeTalkActive == > " + isWeTalkActive);
+                        if (!Config.noVoiceNotifyDialog && "false".equals(isWeTalkActive)) {
                             Intent intent = new Intent();
                             //显示提示窗口
                             intent.setAction(DIALOG_ACTION);
-                            intent.putExtra("contact", (Parcelable) param2Contact);
+                            intent.putExtra("contact", param2Contact);
                             context.sendBroadcast(intent);
                         }
 
diff --git a/app/src/main/java/com/enqualcomm/support/utils/CustomDialog.java b/app/src/main/java/com/enqualcomm/support/utils/CustomDialog.java
index c76545d8..9b6ddc27 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/CustomDialog.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/CustomDialog.java
@@ -3,16 +3,11 @@ package com.enqualcomm.support.utils;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface.OnClickListener;
-import android.os.Bundle;
-import android.view.Display;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.view.Window;
-import android.widget.Button;
-import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -20,201 +15,200 @@ import com.enqualcomm.support.Config;
 import com.enqualcomm.support.R;
 
 public class CustomDialog extends Dialog {
-  public CustomDialog(Context var1) {
-    super(var1);
-  }
-
-  public CustomDialog(Context var1, int var2) {
-    super(var1, var2);
-  }
-
-
-  public static class Builder {
-    private int app_id;
-    private View contentView;
-    private Context context;
-    private CustomDialog mDialog;
-    private String message;
-    private OnClickListener negativeButtonClickListener;
-    private String negativeButtonText;
-    private OnClickListener positiveButtonClickListener;
-    private String positiveButtonText;
-    private String title;
-
-    public Builder(Context var1) {
-      this.context = var1;
+    public CustomDialog(Context var1) {
+        super(var1);
     }
 
-    private void resizewindow(){
-      if(Config.custom_name.equals("YQ")||Config.custom_name.equals("YQ_EN")) {
-        if(mDialog!=null)
-        {
-          Window window =mDialog.getWindow();
-          ViewGroup.LayoutParams windowLayoutParams = window.getAttributes(); // 获取对话框当前的参数值
-          windowLayoutParams.width = 200;//(int) (display.getWidth() * 0.7); // 宽度设置为屏幕的0.95
-          windowLayoutParams.height = 200;//(int) (display.getHeight() * 0.6); // 高度设置为屏幕的0.6
-        }
-      }
+    public CustomDialog(Context var1, int var2) {
+        super(var1, var2);
     }
-    private CustomDialog getDialogInstance() {
-
-      this.mDialog = new CustomDialog(this.context, R.style.Dialog);
-      LayoutInflater var1 = (LayoutInflater)this.context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-      View view;
-      if (this.app_id == 1) {
-        view = var1.inflate(R.layout.dialog_normal_layout, (ViewGroup)null);
-      } else {
-        view = var1.inflate(R.layout.dialog_misscall_layout, (ViewGroup)null);
-      }
-
-      this.mDialog.addContentView(view, new LayoutParams(-1, -2));
-      ((TextView)view.findViewById(R.id.title)).setText(this.title);
-      final CustomDialog dialog = this.mDialog;
-      if (this.positiveButtonText != null) {
-        if (this.app_id != 2) {
-          ((ImageButton)view.findViewById(R.id.positiveButton)).setImageResource(R.drawable.btn_ok_selector);
-          if (this.positiveButtonClickListener != null) {
-
-            ((ImageButton)view.findViewById(R.id.positiveButton)).setOnClickListener(new android.view.View.OnClickListener() {
-              public void onClick(View var1) {
-                Builder.this.positiveButtonClickListener.onClick(dialog, -1);
-              }
-            });
-          }
-        } else if (this.positiveButtonClickListener != null) {
-
-          ((Button)view.findViewById(R.id.positiveButton)).setOnClickListener(new android.view.View.OnClickListener() {
-            public void onClick(View var1) {
-              Builder.this.positiveButtonClickListener.onClick(dialog, -1);
+
+
+    public static class Builder {
+        private int app_id;
+        private View contentView;
+        private Context context;
+        private CustomDialog mDialog;
+        private String message;
+        private OnClickListener negativeButtonClickListener;
+        private String negativeButtonText;
+        private OnClickListener positiveButtonClickListener;
+        private String positiveButtonText;
+        private String title;
+
+        public Builder(Context var1) {
+            this.context = var1;
+        }
+
+        private void resizewindow() {
+            if (Config.custom_name.equals("YQ") || Config.custom_name.equals("YQ_EN")) {
+                if (mDialog != null) {
+                    Window window = mDialog.getWindow();
+                    ViewGroup.LayoutParams windowLayoutParams = window.getAttributes(); // 获取对话框当前的参数值
+                    windowLayoutParams.width = 200;//(int) (display.getWidth() * 0.7); // 宽度设置为屏幕的0.95
+                    windowLayoutParams.height = 200;//(int) (display.getHeight() * 0.6); // 高度设置为屏幕的0.6
+                }
             }
-          });
         }
-      } else {
-        view.findViewById(R.id.positiveButton).setVisibility(View.GONE);
-      }
 
-      if (this.negativeButtonText != null) {
-        ((ImageButton)view.findViewById(R.id.negativeButton)).setImageResource(R.drawable.btn_cancel_selector);
-        if (this.negativeButtonClickListener != null) {
+        private CustomDialog getDialogInstance() {
 
-          ((ImageButton)view.findViewById(R.id.negativeButton)).setOnClickListener(new android.view.View.OnClickListener() {
-            public void onClick(View var1) {
-              Builder.this.negativeButtonClickListener.onClick(dialog, -2);
+            this.mDialog = new CustomDialog(this.context, R.style.Dialog);
+            LayoutInflater var1 = (LayoutInflater) this.context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            View view;
+            if (this.app_id == 1) {
+                view = var1.inflate(R.layout.dialog_normal_layout, (ViewGroup) null);
+            } else {
+                view = var1.inflate(R.layout.dialog_misscall_layout, (ViewGroup) null);
             }
-          });
-        }
-      } else {
-        view.findViewById(R.id.negativeButton).setVisibility(View.GONE);
-      }
-
-      if (this.message != null) {
-        ((TextView)view.findViewById(R.id.message)).setText(this.message);
-      } else if (this.contentView != null) {
-        ((LinearLayout)(view.findViewById(R.id.content))).removeAllViews();
-        ((LinearLayout)(view.findViewById(R.id.content))).addView(this.contentView, new LayoutParams(-1, -1));
-      }
-
-      this.mDialog.setContentView(view);
-      mDialog.setCanceledOnTouchOutside(false);
-      resizewindow();
-      return this.mDialog;
-    }
 
-    public CustomDialog create() {
-      if (this.mDialog == null) {
-        synchronized(CustomDialog.class){}
+            this.mDialog.addContentView(view, new LayoutParams(-1, -2));
+            ((TextView) view.findViewById(R.id.title)).setText(this.title);
+            final CustomDialog dialog = this.mDialog;
+            if (this.positiveButtonText != null) {
+                if (this.app_id != 2) {
+                    if (this.positiveButtonClickListener != null) {
+                        view.findViewById(R.id.positiveButton).
+                                setOnClickListener(new android.view.View.OnClickListener() {
+                                    public void onClick(View var1) {
+                                        Builder.this.positiveButtonClickListener.onClick(dialog, -1);
+                                    }
+                                });
+                    }
+                } else if (this.positiveButtonClickListener != null) {
+                    view.findViewById(R.id.positiveButton).
+                            setOnClickListener(new android.view.View.OnClickListener() {
+                                public void onClick(View var1) {
+                                    Builder.this.positiveButtonClickListener.onClick(dialog, -1);
+                                }
+                            });
+                }
+            } else {
+                view.findViewById(R.id.positiveButton).setVisibility(View.GONE);
+            }
 
-        Throwable custmExeception;
-        boolean ret;
-        label144: {
-          try {
-            if (this.mDialog == null) {
-              this.mDialog = this.getDialogInstance();
+            if (this.negativeButtonText != null) {
+                if (this.negativeButtonClickListener != null) {
+                    view.findViewById(R.id.negativeButton).setOnClickListener(new android.view.View.OnClickListener() {
+                        public void onClick(View var1) {
+                            Builder.this.negativeButtonClickListener.onClick(dialog, -2);
+                        }
+                    });
+                }
+            } else {
+                view.findViewById(R.id.negativeButton).setVisibility(View.GONE);
             }
-          } catch (Throwable var13) {
-            custmExeception = var13;
-            ret = false;
-            break label144;
-          }
-
-          label141:
-          try {
+
+            if (this.message != null) {
+                ((TextView) view.findViewById(R.id.message)).setText(this.message);
+            } else if (this.contentView != null) {
+                ((LinearLayout) (view.findViewById(R.id.content))).removeAllViews();
+                ((LinearLayout) (view.findViewById(R.id.content))).addView(this.contentView, new LayoutParams(-1, -1));
+            }
+
+            this.mDialog.setContentView(view);
+            mDialog.setCanceledOnTouchOutside(false);
+            resizewindow();
             return this.mDialog;
-          } catch (Throwable var12) {
-            custmExeception = var12;
-            ret = false;
-            break label141;
-          }
         }
 
-        while(true) {
-          Throwable var1 = custmExeception;
-
-          try {
-            throw var1;
-          } catch (Throwable var11) {
-            custmExeception = var11;
-            ret = false;
-            continue;
-          }
+        public CustomDialog create() {
+            if (this.mDialog == null) {
+                synchronized (CustomDialog.class) {
+                }
+
+                Throwable custmExeception;
+                boolean ret;
+                label144:
+                {
+                    try {
+                        if (this.mDialog == null) {
+                            this.mDialog = this.getDialogInstance();
+                        }
+                    } catch (Throwable var13) {
+                        custmExeception = var13;
+                        ret = false;
+                        break label144;
+                    }
+
+                    label141:
+                    try {
+                        return this.mDialog;
+                    } catch (Throwable var12) {
+                        custmExeception = var12;
+                        ret = false;
+                        break label141;
+                    }
+                }
+
+                while (true) {
+                    Throwable var1 = custmExeception;
+
+                    try {
+                        throw var1;
+                    } catch (Throwable var11) {
+                        custmExeception = var11;
+                        ret = false;
+                        continue;
+                    }
+                }
+            } else {
+                return this.mDialog;
+            }
         }
-      } else {
-        return this.mDialog;
-      }
-    }
 
-    public CustomDialog.Builder setApp(int appid) {
-      this.app_id = appid;
-      return this;
-    }
+        public CustomDialog.Builder setApp(int appid) {
+            this.app_id = appid;
+            return this;
+        }
 
-    public CustomDialog.Builder setContentView(View view) {
-      this.contentView = view;
-      return this;
-    }
+        public CustomDialog.Builder setContentView(View view) {
+            this.contentView = view;
+            return this;
+        }
 
-    public CustomDialog.Builder setMessage(int resId) {
-      this.message = (String)this.context.getText(resId);
-      return this;
-    }
+        public CustomDialog.Builder setMessage(int resId) {
+            this.message = (String) this.context.getText(resId);
+            return this;
+        }
 
-    public CustomDialog.Builder setMessage(String msg) {
-      this.message = msg;
-      return this;
-    }
+        public CustomDialog.Builder setMessage(String msg) {
+            this.message = msg;
+            return this;
+        }
 
-    public CustomDialog.Builder setNegativeButton(int resid, OnClickListener onclicklistener) {
-      this.negativeButtonText = (String)this.context.getText(resid);
-      this.negativeButtonClickListener = onclicklistener;
-      return this;
-    }
+        public CustomDialog.Builder setNegativeButton(int resid, OnClickListener onclicklistener) {
+            this.negativeButtonText = (String) this.context.getText(resid);
+            this.negativeButtonClickListener = onclicklistener;
+            return this;
+        }
 
-    public CustomDialog.Builder setNegativeButton(String txt, OnClickListener onclicklistener) {
-      this.negativeButtonText = txt;
-      this.negativeButtonClickListener = onclicklistener;
-      return this;
-    }
+        public CustomDialog.Builder setNegativeButton(String txt, OnClickListener onclicklistener) {
+            this.negativeButtonText = txt;
+            this.negativeButtonClickListener = onclicklistener;
+            return this;
+        }
 
-    public CustomDialog.Builder setPositiveButton(int resid, OnClickListener onclicklistener) {
-      this.positiveButtonText = (String)this.context.getText(resid);
-      this.positiveButtonClickListener = onclicklistener;
-      return this;
-    }
+        public CustomDialog.Builder setPositiveButton(int resid, OnClickListener onclicklistener) {
+            this.positiveButtonText = (String) this.context.getText(resid);
+            this.positiveButtonClickListener = onclicklistener;
+            return this;
+        }
 
-    public CustomDialog.Builder setPositiveButton(String txt, OnClickListener onclicklistener) {
-      this.positiveButtonText = txt;
-      this.positiveButtonClickListener = onclicklistener;
-      return this;
-    }
+        public CustomDialog.Builder setPositiveButton(String txt, OnClickListener onclicklistener) {
+            this.positiveButtonText = txt;
+            this.positiveButtonClickListener = onclicklistener;
+            return this;
+        }
 
-    public CustomDialog.Builder setTitle(int resid) {
-      this.title = (String)this.context.getText(resid);
-      return this;
-    }
+        public CustomDialog.Builder setTitle(int resid) {
+            this.title = (String) this.context.getText(resid);
+            return this;
+        }
 
-    public CustomDialog.Builder setTitle(String txt) {
-      this.title = txt;
-      return this;
+        public CustomDialog.Builder setTitle(String txt) {
+            this.title = txt;
+            return this;
+        }
     }
-  }
 }
diff --git a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
index d0ed3027..cc9e04f1 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -108,7 +108,8 @@ public class ProcessReceiver extends BroadcastReceiver {
             mCustomDialog = tmpDialog.setMessage(var6.toString()).setPositiveButton(context.getString(R.string.ok), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface var1x, int var2x) {
                     var1x.dismiss();
-                    ComponentName var3 = new ComponentName("com.enqualcomm.imessage", "com.enqualcomm.imessage.ui.chat.ChatActivity_");
+                    ComponentName var3 = new ComponentName("com.ic.icwetalk",
+                            "com.ic.icwetalk.MainActivity");
                     Intent var5 = new Intent("android.intent.action.MAIN");
                     var5.putExtra("ACTIVITY_TYPE", 2);
                     var5.putExtra("contact", contact);
diff --git a/app/src/main/java/com/ic/protocols/protocol_fzd.java b/app/src/main/java/com/ic/protocols/protocol_fzd.java
index ca9170fd..af0f1f9e 100644
--- a/app/src/main/java/com/ic/protocols/protocol_fzd.java
+++ b/app/src/main/java/com/ic/protocols/protocol_fzd.java
@@ -15,8 +15,6 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.media.AudioManager;
-import android.media.Ringtone;
-import android.media.RingtoneManager;
 import android.net.Uri;
 import android.net.wifi.WifiConfiguration;
 import android.os.Build;
@@ -777,6 +775,9 @@ public class protocol_fzd {
             message2Db("", amrFilepath, FZDDatabaseHelper.MessageType.VOICE);
             //回复服务器状态
             mConnection.send(TK("1"));
+            //下发的语音消息，弹窗显示
+            //修改弹窗后的入口
+            mConnection.DeliverCMDMessageToSystem("NewVoice", amrFilepath);//通知下面线程状态变化
         } catch (Exception e) {
             e.printStackTrace();
             //失败
@@ -785,14 +786,14 @@ public class protocol_fzd {
     }
 
     private void message2Db(String remoteId, String amrFilepath, int type) {
-        try {
-            //通知有消息到
-            Uri uri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
-            Ringtone ringtone = RingtoneManager.getRingtone(mRuntime.getContextProxy().context, uri);
-            ringtone.play();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+//        try {
+//            //通知有消息到
+//            Uri uri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
+//            Ringtone ringtone = RingtoneManager.getRingtone(mRuntime.getContextProxy().context, uri);
+//            ringtone.play();
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
         //计算文件时长
         int amrDuration = 0;
         if (type == FZDDatabaseHelper.MessageType.VOICE) {
@@ -1461,19 +1462,19 @@ public class protocol_fzd {
         ICLogger.i("handleCmd " + type.name() + " strLen=" + data.length());
         if (Config.LOG_TOFILE) ICLogger.logToFile("APILog", " recv " + cmd + " " + data);
         switch (type) {
-            case BRREG:
-                ICLogger.i("收到本设备的佰锐Id == >  " + data);
-                //保存一份到sp里
-                //通知一callback
-                handleBRREG(mRuntime, data);
-                mConnection.DeliverCMDMessageToSystem(cmdMap.get(CMD_TYPE.BRREG), cmd);
-                break;
-            case MEMBERS:
-                ICLogger.i("收到群成员数据  ==>  " + data);
-                //处理一下数据
-                handleMEMBERS(mRuntime, data);
-                mConnection.DeliverCMDMessageToSystem(cmdMap.get(CMD_TYPE.MEMBERS), cmd);
-                break;
+//            case BRREG:
+//                ICLogger.i("收到本设备的佰锐Id == >  " + data);
+//                //保存一份到sp里
+//                //通知一callback
+//                handleBRREG(mRuntime, data);
+//                mConnection.DeliverCMDMessageToSystem(cmdMap.get(CMD_TYPE.BRREG), cmd);
+//                break;
+//            case MEMBERS:
+//                ICLogger.i("收到群成员数据  ==>  " + data);
+//                //处理一下数据
+//                handleMEMBERS(mRuntime, data);
+//                mConnection.DeliverCMDMessageToSystem(cmdMap.get(CMD_TYPE.MEMBERS), cmd);
+//                break;
             case RTALK:
                 //拒绝通话请求，当我们通过TALK向对方发起通话请求的时候，如果对方拒绝，则会收到此指令
                 //此指令由平台发送。
diff --git a/app/src/main/java/com/ic/protocols/protocol_ic.java b/app/src/main/java/com/ic/protocols/protocol_ic.java
index b91d39be..7e5900df 100644
--- a/app/src/main/java/com/ic/protocols/protocol_ic.java
+++ b/app/src/main/java/com/ic/protocols/protocol_ic.java
@@ -375,10 +375,10 @@ public class protocol_ic {
         boolean ret = true;
         String last_inCompletecmd = "";
         String cmd_msgbuf = new String(bytes);
-        log("bytes.size " + bytes.length);
+        ICLogger.d("bytes.size " + bytes.length);
 //        cmdbuf.append(cmd_msgbuf);
         cmdbuf.append(cmd_msgbuf);
-        log("cmdbuf.size " + cmdbuf.length() + " " + cmdbuf.toString());
+        ICLogger.d("cmdbuf.size " + cmdbuf.length() + " " + cmdbuf.toString());
     /*
         如果不是 #结尾，就认为 接收数据不全，置位。
          */
@@ -387,19 +387,19 @@ public class protocol_ic {
         }
         String[] cmdlist = cmd_msgbuf.split(CMDEND);
         int listlen = cmdlist.length;
-        log("listlen " + listlen);
+        ICLogger.d("listlen " + listlen);
         /**
          * 如果解析出来的cmdlist不是空，且数据不是完整cmd则保留 最后一条数据到last_inCompletecmd
          */
         if (cmdlist.length > 0 && iscmdComplete == false) {
             listlen -= 1;
             last_inCompletecmd = cmdlist[listlen];
-            log("cmd not complete , " + last_inCompletecmd);
+            ICLogger.d("cmd not complete , " + last_inCompletecmd);
         }
         for (int i = 0; i < listlen; i++) {
             for (CMD_TYPE key : cmdMap.keySet()) {
                 if (cmdlist[i].startsWith(CMDHEADER + cmdMap.get(key))) {
-                    log("found cmd keyid=" + key + " ,keyname=" + cmdMap.get(key) + " ,  " + cmdlist[i]);
+                    ICLogger.d("found cmd keyid=" + key + " ,keyname=" + cmdMap.get(key) + " ,  " + cmdlist[i]);
                     if (key == CMD_TYPE.BP28) {
                         //如果是BP28则 后面的数据是音频，需要保留
                         byte[] amrBuf;
@@ -1567,18 +1567,13 @@ public class protocol_ic {
                     ICLogger.i("save Amr file to " + amrFilepath);
                     voicePacket.getInstance().clearPacket();
                     VoiceContent voiceContent = VoiceContent.placeHolderIn(Content.CONTACT_CATEGORY_GROUP, GROUP_ALL, amrFilepath);
-
-
                     final Uri uri2 = runtime.getDbHelper().insertMessage(voiceContent);
-
                     //回复UI消息，表示已经接收到
                     voiceContent.status = 3;
                     voiceContent.serverTime = TimeUtil.getSystemTime3();
                     voiceContent.preview = String.valueOf(Util.getDuration(voiceContent.content));
                     runtime.getDbHelper().updateMessage(voiceContent, uri2);
-
 //                runtime.getContextProxy().sendBroadcast(ACTION_IMESSAGE, runtime);
-
                     connection.DeliverCMDMessageToSystem("NewVoice", amrFilepath);//通知下面线程状态变化
                 }
             } catch (Exception e) {
diff --git a/app/src/main/res/drawable/selector_btn_cancel.xml b/app/src/main/res/drawable/selector_btn_cancel.xml
new file mode 100644
index 00000000..ef4a8c9a
--- /dev/null
+++ b/app/src/main/res/drawable/selector_btn_cancel.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/shape_btn_cancel_press" android:state_pressed="true" />
+    <item android:drawable="@drawable/shape_btn_cancel_normal" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_btn_confirm.xml b/app/src/main/res/drawable/selector_btn_confirm.xml
new file mode 100644
index 00000000..baa4e6bb
--- /dev/null
+++ b/app/src/main/res/drawable/selector_btn_confirm.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/shape_btn_confirm_press" android:state_pressed="true" />
+    <item android:drawable="@drawable/shape_btn_confirm_normal" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_btn_cancel_normal.xml b/app/src/main/res/drawable/shape_btn_cancel_normal.xml
new file mode 100644
index 00000000..b82a8336
--- /dev/null
+++ b/app/src/main/res/drawable/shape_btn_cancel_normal.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="10dp" />
+    <solid android:color="#999999" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_btn_cancel_press.xml b/app/src/main/res/drawable/shape_btn_cancel_press.xml
new file mode 100644
index 00000000..8ae66f79
--- /dev/null
+++ b/app/src/main/res/drawable/shape_btn_cancel_press.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="10dp" />
+    <solid android:color="#dddddd" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_btn_confirm_normal.xml b/app/src/main/res/drawable/shape_btn_confirm_normal.xml
new file mode 100644
index 00000000..6bc973d6
--- /dev/null
+++ b/app/src/main/res/drawable/shape_btn_confirm_normal.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="10dp" />
+    <solid android:color="#2492F0" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_btn_confirm_press.xml b/app/src/main/res/drawable/shape_btn_confirm_press.xml
new file mode 100644
index 00000000..6bc973d6
--- /dev/null
+++ b/app/src/main/res/drawable/shape_btn_confirm_press.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="10dp" />
+    <solid android:color="#2492F0" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_normal_layout.xml b/app/src/main/res/layout/dialog_normal_layout.xml
index 9fe34467..65f6f632 100644
--- a/app/src/main/res/layout/dialog_normal_layout.xml
+++ b/app/src/main/res/layout/dialog_normal_layout.xml
@@ -1,84 +1,94 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    android:orientation="vertical"
-    android:padding="20.0dip"
-    android:clickable="true"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-  xmlns:android="http://schemas.android.com/apk/res/android">
+    android:clickable="true"
+    android:orientation="vertical"
+    android:padding="20.0dp">
+
     <LinearLayout
-        android:layout_gravity="center"
-        android:orientation="vertical"
-        android:background="@drawable/dialog_bottom_bg"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="#ffffff"
+        android:orientation="vertical">
+
         <TextView
-            android:gravity="center"
             android:id="@id/title"
-            android:visibility="visible"
-            android:layout_width="fill_parent"
-            android:layout_height="35dip"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:padding="10dp"
             android:text="@string/title_alert"
-            style="@style/text_18_ffffff"
-            android:textSize="30sp" />
+            android:textColor="#000000"
+            android:textSize="30sp"
+            android:visibility="visible" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="3dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:background="#B4B4B4" />
+
         <ScrollView
-            style="@android:style/Widget.DeviceDefault.Light.HorizontalScrollView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:scrollbars="vertical">
-        <LinearLayout
-            android:gravity="center"
-            android:id="@id/noticeContent"
-            android:orientation="vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-            <TextView
-                android:gravity="center|left"
-                android:id="@id/message"
-                android:background="#88ffffff"
-                android:paddingLeft="20.0dip"
-                android:paddingTop="15.0dip"
-                android:paddingRight="20.0dip"
-                android:paddingBottom="15.0dip"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:minHeight="120.0dip"
-                android:lineSpacingMultiplier="1.5"
-                style="@style/text_16_666666"
-                android:textSize="25sp"/>
-            <View
-                android:background="#ffd0d0d0"
-                android:layout_width="fill_parent"
-                android:layout_height="1.0px" />
+
             <LinearLayout
+                android:id="@id/noticeContent"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:gravity="center"
-                android:layout_gravity="bottom"
-                android:orientation="horizontal"
-                android:background="@drawable/bg_bombbox"
-                android:layout_width="fill_parent"
-                android:layout_height="60.0dip">
-                <ImageButton
-                    android:gravity="center"
-                    android:id="@id/positiveButton"
-                    android:background="#00000000"
-                    android:layout_width="0.0dip"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@id/message"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/btn_ok_selector"
-                    android:text="@string/ok"
-                    android:layout_weight="1.0" style="@style/text_15_ffffff_sdw" />
-                <ImageButton
-                    android:gravity="center"
-                    android:id="@id/negativeButton"
-                    android:background="#00000000"
-                    android:layout_width="0.0dip"
+                    android:gravity="center|left"
+                    android:minHeight="120dp"
+                    android:paddingLeft="20dp"
+                    android:paddingTop="15dp"
+                    android:paddingRight="20dp"
+                    android:paddingBottom="15dp"
+                    android:textColor="@android:color/black"
+                    android:textSize="25sp" />
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="20.0dip"
-                    android:src="@drawable/btn_cancel_selector"
-                    android:text="@string/cancel"
-                    android:layout_weight="1.0"
-                    style="@style/text_15_666666_sdw" />
+                    android:layout_gravity="bottom"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:padding="20dp">
+
+                    <TextView
+                        android:id="@id/positiveButton"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.0"
+                        android:background="@drawable/selector_btn_confirm"
+                        android:gravity="center"
+                        android:padding="20dp"
+                        android:text="@string/ok"
+                        android:textColor="@color/white" />
+
+                    <TextView
+                        android:id="@id/negativeButton"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="20dp"
+                        android:layout_weight="1.0"
+                        android:background="@drawable/selector_btn_cancel"
+                        android:gravity="center"
+                        android:padding="20dp"
+                        android:text="@string/cancel"
+                        android:textColor="@color/white" />
+                </LinearLayout>
             </LinearLayout>
-        </LinearLayout>
         </ScrollView>
 
     </LinearLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6f092f79..1ccbd826 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -31,9 +31,7 @@
 
 </style>
     <style name="text_18_ffffff">
-
     <item name="android:textSize">18.0dip</item>
-
     <item name="android:textColor">#ff0b5796</item>
 
 </style>
diff --git a/app/version_code.properties b/app/version_code.properties
index 47b248bb..d5f39a44 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Jun 17 16:08:51 CST 2021
-VERSION_CODE=793
+#Sat Jun 19 18:02:24 CST 2021
+VERSION_CODE=808