-[{"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
DefaultTemperatureTestCycle = 15 * 60;
} else {
-
DefaultLocationMode = NORMAL_MOD;
DefaultLocationCycle = 900;
DefaultPPGTestCycle = 0;
import android.os.Build;
import android.os.Handler;
import android.os.HandlerThread;
-import android.os.Parcelable;
import android.os.PowerManager;
import android.os.SystemClock;
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) {
// 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);
}
\r
import android.app.Dialog;\r
import android.content.Context;\r
-import android.content.DialogInterface.OnClickListener;\r
-import android.os.Bundle;\r
-import android.view.Display;\r
import android.view.LayoutInflater;\r
import android.view.View;\r
import android.view.ViewGroup;\r
import android.view.ViewGroup.LayoutParams;\r
import android.view.Window;\r
-import android.widget.Button;\r
-import android.widget.ImageButton;\r
import android.widget.LinearLayout;\r
import android.widget.TextView;\r
\r
import com.enqualcomm.support.R;\r
\r
public class CustomDialog extends Dialog {\r
- public CustomDialog(Context var1) {\r
- super(var1);\r
- }\r
-\r
- public CustomDialog(Context var1, int var2) {\r
- super(var1, var2);\r
- }\r
-\r
-\r
- public static class Builder {\r
- private int app_id;\r
- private View contentView;\r
- private Context context;\r
- private CustomDialog mDialog;\r
- private String message;\r
- private OnClickListener negativeButtonClickListener;\r
- private String negativeButtonText;\r
- private OnClickListener positiveButtonClickListener;\r
- private String positiveButtonText;\r
- private String title;\r
-\r
- public Builder(Context var1) {\r
- this.context = var1;\r
+ public CustomDialog(Context var1) {\r
+ super(var1);\r
}\r
\r
- private void resizewindow(){\r
- if(Config.custom_name.equals("YQ")||Config.custom_name.equals("YQ_EN")) {\r
- if(mDialog!=null)\r
- {\r
- Window window =mDialog.getWindow();\r
- ViewGroup.LayoutParams windowLayoutParams = window.getAttributes(); // 获取对话框当前的参数值\r
- windowLayoutParams.width = 200;//(int) (display.getWidth() * 0.7); // 宽度设置为屏幕的0.95\r
- windowLayoutParams.height = 200;//(int) (display.getHeight() * 0.6); // 高度设置为屏幕的0.6\r
- }\r
- }\r
+ public CustomDialog(Context var1, int var2) {\r
+ super(var1, var2);\r
}\r
- private CustomDialog getDialogInstance() {\r
-\r
- this.mDialog = new CustomDialog(this.context, R.style.Dialog);\r
- LayoutInflater var1 = (LayoutInflater)this.context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);\r
- View view;\r
- if (this.app_id == 1) {\r
- view = var1.inflate(R.layout.dialog_normal_layout, (ViewGroup)null);\r
- } else {\r
- view = var1.inflate(R.layout.dialog_misscall_layout, (ViewGroup)null);\r
- }\r
-\r
- this.mDialog.addContentView(view, new LayoutParams(-1, -2));\r
- ((TextView)view.findViewById(R.id.title)).setText(this.title);\r
- final CustomDialog dialog = this.mDialog;\r
- if (this.positiveButtonText != null) {\r
- if (this.app_id != 2) {\r
- ((ImageButton)view.findViewById(R.id.positiveButton)).setImageResource(R.drawable.btn_ok_selector);\r
- if (this.positiveButtonClickListener != null) {\r
-\r
- ((ImageButton)view.findViewById(R.id.positiveButton)).setOnClickListener(new android.view.View.OnClickListener() {\r
- public void onClick(View var1) {\r
- Builder.this.positiveButtonClickListener.onClick(dialog, -1);\r
- }\r
- });\r
- }\r
- } else if (this.positiveButtonClickListener != null) {\r
-\r
- ((Button)view.findViewById(R.id.positiveButton)).setOnClickListener(new android.view.View.OnClickListener() {\r
- public void onClick(View var1) {\r
- Builder.this.positiveButtonClickListener.onClick(dialog, -1);\r
+\r
+\r
+ public static class Builder {\r
+ private int app_id;\r
+ private View contentView;\r
+ private Context context;\r
+ private CustomDialog mDialog;\r
+ private String message;\r
+ private OnClickListener negativeButtonClickListener;\r
+ private String negativeButtonText;\r
+ private OnClickListener positiveButtonClickListener;\r
+ private String positiveButtonText;\r
+ private String title;\r
+\r
+ public Builder(Context var1) {\r
+ this.context = var1;\r
+ }\r
+\r
+ private void resizewindow() {\r
+ if (Config.custom_name.equals("YQ") || Config.custom_name.equals("YQ_EN")) {\r
+ if (mDialog != null) {\r
+ Window window = mDialog.getWindow();\r
+ ViewGroup.LayoutParams windowLayoutParams = window.getAttributes(); // 获取对话框当前的参数值\r
+ windowLayoutParams.width = 200;//(int) (display.getWidth() * 0.7); // 宽度设置为屏幕的0.95\r
+ windowLayoutParams.height = 200;//(int) (display.getHeight() * 0.6); // 高度设置为屏幕的0.6\r
+ }\r
}\r
- });\r
}\r
- } else {\r
- view.findViewById(R.id.positiveButton).setVisibility(View.GONE);\r
- }\r
\r
- if (this.negativeButtonText != null) {\r
- ((ImageButton)view.findViewById(R.id.negativeButton)).setImageResource(R.drawable.btn_cancel_selector);\r
- if (this.negativeButtonClickListener != null) {\r
+ private CustomDialog getDialogInstance() {\r
\r
- ((ImageButton)view.findViewById(R.id.negativeButton)).setOnClickListener(new android.view.View.OnClickListener() {\r
- public void onClick(View var1) {\r
- Builder.this.negativeButtonClickListener.onClick(dialog, -2);\r
+ this.mDialog = new CustomDialog(this.context, R.style.Dialog);\r
+ LayoutInflater var1 = (LayoutInflater) this.context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);\r
+ View view;\r
+ if (this.app_id == 1) {\r
+ view = var1.inflate(R.layout.dialog_normal_layout, (ViewGroup) null);\r
+ } else {\r
+ view = var1.inflate(R.layout.dialog_misscall_layout, (ViewGroup) null);\r
}\r
- });\r
- }\r
- } else {\r
- view.findViewById(R.id.negativeButton).setVisibility(View.GONE);\r
- }\r
-\r
- if (this.message != null) {\r
- ((TextView)view.findViewById(R.id.message)).setText(this.message);\r
- } else if (this.contentView != null) {\r
- ((LinearLayout)(view.findViewById(R.id.content))).removeAllViews();\r
- ((LinearLayout)(view.findViewById(R.id.content))).addView(this.contentView, new LayoutParams(-1, -1));\r
- }\r
-\r
- this.mDialog.setContentView(view);\r
- mDialog.setCanceledOnTouchOutside(false);\r
- resizewindow();\r
- return this.mDialog;\r
- }\r
\r
- public CustomDialog create() {\r
- if (this.mDialog == null) {\r
- synchronized(CustomDialog.class){}\r
+ this.mDialog.addContentView(view, new LayoutParams(-1, -2));\r
+ ((TextView) view.findViewById(R.id.title)).setText(this.title);\r
+ final CustomDialog dialog = this.mDialog;\r
+ if (this.positiveButtonText != null) {\r
+ if (this.app_id != 2) {\r
+ if (this.positiveButtonClickListener != null) {\r
+ view.findViewById(R.id.positiveButton).\r
+ setOnClickListener(new android.view.View.OnClickListener() {\r
+ public void onClick(View var1) {\r
+ Builder.this.positiveButtonClickListener.onClick(dialog, -1);\r
+ }\r
+ });\r
+ }\r
+ } else if (this.positiveButtonClickListener != null) {\r
+ view.findViewById(R.id.positiveButton).\r
+ setOnClickListener(new android.view.View.OnClickListener() {\r
+ public void onClick(View var1) {\r
+ Builder.this.positiveButtonClickListener.onClick(dialog, -1);\r
+ }\r
+ });\r
+ }\r
+ } else {\r
+ view.findViewById(R.id.positiveButton).setVisibility(View.GONE);\r
+ }\r
\r
- Throwable custmExeception;\r
- boolean ret;\r
- label144: {\r
- try {\r
- if (this.mDialog == null) {\r
- this.mDialog = this.getDialogInstance();\r
+ if (this.negativeButtonText != null) {\r
+ if (this.negativeButtonClickListener != null) {\r
+ view.findViewById(R.id.negativeButton).setOnClickListener(new android.view.View.OnClickListener() {\r
+ public void onClick(View var1) {\r
+ Builder.this.negativeButtonClickListener.onClick(dialog, -2);\r
+ }\r
+ });\r
+ }\r
+ } else {\r
+ view.findViewById(R.id.negativeButton).setVisibility(View.GONE);\r
}\r
- } catch (Throwable var13) {\r
- custmExeception = var13;\r
- ret = false;\r
- break label144;\r
- }\r
-\r
- label141:\r
- try {\r
+\r
+ if (this.message != null) {\r
+ ((TextView) view.findViewById(R.id.message)).setText(this.message);\r
+ } else if (this.contentView != null) {\r
+ ((LinearLayout) (view.findViewById(R.id.content))).removeAllViews();\r
+ ((LinearLayout) (view.findViewById(R.id.content))).addView(this.contentView, new LayoutParams(-1, -1));\r
+ }\r
+\r
+ this.mDialog.setContentView(view);\r
+ mDialog.setCanceledOnTouchOutside(false);\r
+ resizewindow();\r
return this.mDialog;\r
- } catch (Throwable var12) {\r
- custmExeception = var12;\r
- ret = false;\r
- break label141;\r
- }\r
}\r
\r
- while(true) {\r
- Throwable var1 = custmExeception;\r
-\r
- try {\r
- throw var1;\r
- } catch (Throwable var11) {\r
- custmExeception = var11;\r
- ret = false;\r
- continue;\r
- }\r
+ public CustomDialog create() {\r
+ if (this.mDialog == null) {\r
+ synchronized (CustomDialog.class) {\r
+ }\r
+\r
+ Throwable custmExeception;\r
+ boolean ret;\r
+ label144:\r
+ {\r
+ try {\r
+ if (this.mDialog == null) {\r
+ this.mDialog = this.getDialogInstance();\r
+ }\r
+ } catch (Throwable var13) {\r
+ custmExeception = var13;\r
+ ret = false;\r
+ break label144;\r
+ }\r
+\r
+ label141:\r
+ try {\r
+ return this.mDialog;\r
+ } catch (Throwable var12) {\r
+ custmExeception = var12;\r
+ ret = false;\r
+ break label141;\r
+ }\r
+ }\r
+\r
+ while (true) {\r
+ Throwable var1 = custmExeception;\r
+\r
+ try {\r
+ throw var1;\r
+ } catch (Throwable var11) {\r
+ custmExeception = var11;\r
+ ret = false;\r
+ continue;\r
+ }\r
+ }\r
+ } else {\r
+ return this.mDialog;\r
+ }\r
}\r
- } else {\r
- return this.mDialog;\r
- }\r
- }\r
\r
- public CustomDialog.Builder setApp(int appid) {\r
- this.app_id = appid;\r
- return this;\r
- }\r
+ public CustomDialog.Builder setApp(int appid) {\r
+ this.app_id = appid;\r
+ return this;\r
+ }\r
\r
- public CustomDialog.Builder setContentView(View view) {\r
- this.contentView = view;\r
- return this;\r
- }\r
+ public CustomDialog.Builder setContentView(View view) {\r
+ this.contentView = view;\r
+ return this;\r
+ }\r
\r
- public CustomDialog.Builder setMessage(int resId) {\r
- this.message = (String)this.context.getText(resId);\r
- return this;\r
- }\r
+ public CustomDialog.Builder setMessage(int resId) {\r
+ this.message = (String) this.context.getText(resId);\r
+ return this;\r
+ }\r
\r
- public CustomDialog.Builder setMessage(String msg) {\r
- this.message = msg;\r
- return this;\r
- }\r
+ public CustomDialog.Builder setMessage(String msg) {\r
+ this.message = msg;\r
+ return this;\r
+ }\r
\r
- public CustomDialog.Builder setNegativeButton(int resid, OnClickListener onclicklistener) {\r
- this.negativeButtonText = (String)this.context.getText(resid);\r
- this.negativeButtonClickListener = onclicklistener;\r
- return this;\r
- }\r
+ public CustomDialog.Builder setNegativeButton(int resid, OnClickListener onclicklistener) {\r
+ this.negativeButtonText = (String) this.context.getText(resid);\r
+ this.negativeButtonClickListener = onclicklistener;\r
+ return this;\r
+ }\r
\r
- public CustomDialog.Builder setNegativeButton(String txt, OnClickListener onclicklistener) {\r
- this.negativeButtonText = txt;\r
- this.negativeButtonClickListener = onclicklistener;\r
- return this;\r
- }\r
+ public CustomDialog.Builder setNegativeButton(String txt, OnClickListener onclicklistener) {\r
+ this.negativeButtonText = txt;\r
+ this.negativeButtonClickListener = onclicklistener;\r
+ return this;\r
+ }\r
\r
- public CustomDialog.Builder setPositiveButton(int resid, OnClickListener onclicklistener) {\r
- this.positiveButtonText = (String)this.context.getText(resid);\r
- this.positiveButtonClickListener = onclicklistener;\r
- return this;\r
- }\r
+ public CustomDialog.Builder setPositiveButton(int resid, OnClickListener onclicklistener) {\r
+ this.positiveButtonText = (String) this.context.getText(resid);\r
+ this.positiveButtonClickListener = onclicklistener;\r
+ return this;\r
+ }\r
\r
- public CustomDialog.Builder setPositiveButton(String txt, OnClickListener onclicklistener) {\r
- this.positiveButtonText = txt;\r
- this.positiveButtonClickListener = onclicklistener;\r
- return this;\r
- }\r
+ public CustomDialog.Builder setPositiveButton(String txt, OnClickListener onclicklistener) {\r
+ this.positiveButtonText = txt;\r
+ this.positiveButtonClickListener = onclicklistener;\r
+ return this;\r
+ }\r
\r
- public CustomDialog.Builder setTitle(int resid) {\r
- this.title = (String)this.context.getText(resid);\r
- return this;\r
- }\r
+ public CustomDialog.Builder setTitle(int resid) {\r
+ this.title = (String) this.context.getText(resid);\r
+ return this;\r
+ }\r
\r
- public CustomDialog.Builder setTitle(String txt) {\r
- this.title = txt;\r
- return this;\r
+ public CustomDialog.Builder setTitle(String txt) {\r
+ this.title = txt;\r
+ return this;\r
+ }\r
}\r
- }\r
}\r
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);
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;
message2Db("", amrFilepath, FZDDatabaseHelper.MessageType.VOICE);
//回复服务器状态
mConnection.send(TK("1"));
+ //下发的语音消息，弹窗显示
+ //修改弹窗后的入口
+ mConnection.DeliverCMDMessageToSystem("NewVoice", amrFilepath);//通知下面线程状态变化
} catch (Exception e) {
e.printStackTrace();
//失败
}
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) {
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向对方发起通话请求的时候，如果对方拒绝，则会收到此指令
//此指令由平台发送。
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());
/*
如果不是 #结尾，就认为 接收数据不全，置位。
*/
}
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;
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) {
--- /dev/null
+<?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
--- /dev/null
+<?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
--- /dev/null
+<?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
--- /dev/null
+<?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
--- /dev/null
+<?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
--- /dev/null
+<?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
<?xml version="1.0" encoding="utf-8"?>\r
-<FrameLayout\r
- android:orientation="vertical"\r
- android:padding="20.0dip"\r
- android:clickable="true"\r
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
android:layout_width="fill_parent"\r
android:layout_height="fill_parent"\r
- xmlns:android="http://schemas.android.com/apk/res/android">\r
+ android:clickable="true"\r
+ android:orientation="vertical"\r
+ android:padding="20.0dp">\r
+\r
<LinearLayout\r
- android:layout_gravity="center"\r
- android:orientation="vertical"\r
- android:background="@drawable/dialog_bottom_bg"\r
android:layout_width="fill_parent"\r
- android:layout_height="wrap_content">\r
+ android:layout_height="wrap_content"\r
+ android:layout_gravity="center"\r
+ android:background="#ffffff"\r
+ android:orientation="vertical">\r
+\r
<TextView\r
- android:gravity="center"\r
android:id="@id/title"\r
- android:visibility="visible"\r
- android:layout_width="fill_parent"\r
- android:layout_height="35dip"\r
+ android:layout_width="match_parent"\r
+ android:layout_height="wrap_content"\r
+ android:gravity="center"\r
+ android:padding="10dp"\r
android:text="@string/title_alert"\r
- style="@style/text_18_ffffff"\r
- android:textSize="30sp" />\r
+ android:textColor="#000000"\r
+ android:textSize="30sp"\r
+ android:visibility="visible" />\r
+\r
+ <View\r
+ android:layout_width="match_parent"\r
+ android:layout_height="3dp"\r
+ android:layout_marginLeft="10dp"\r
+ android:layout_marginRight="10dp"\r
+ android:background="#B4B4B4" />\r
+\r
<ScrollView\r
- style="@android:style/Widget.DeviceDefault.Light.HorizontalScrollView"\r
- android:layout_width="wrap_content"\r
- android:layout_height="wrap_content"\r
+ android:layout_width="match_parent"\r
+ android:layout_height="match_parent"\r
android:scrollbars="vertical">\r
- <LinearLayout\r
- android:gravity="center"\r
- android:id="@id/noticeContent"\r
- android:orientation="vertical"\r
- android:layout_width="wrap_content"\r
- android:layout_height="wrap_content">\r
- <TextView\r
- android:gravity="center|left"\r
- android:id="@id/message"\r
- android:background="#88ffffff"\r
- android:paddingLeft="20.0dip"\r
- android:paddingTop="15.0dip"\r
- android:paddingRight="20.0dip"\r
- android:paddingBottom="15.0dip"\r
- android:layout_width="fill_parent"\r
- android:layout_height="wrap_content"\r
- android:minHeight="120.0dip"\r
- android:lineSpacingMultiplier="1.5"\r
- style="@style/text_16_666666"\r
- android:textSize="25sp"/>\r
- <View\r
- android:background="#ffd0d0d0"\r
- android:layout_width="fill_parent"\r
- android:layout_height="1.0px" />\r
+\r
<LinearLayout\r
+ android:id="@id/noticeContent"\r
+ android:layout_width="match_parent"\r
+ android:layout_height="wrap_content"\r
android:gravity="center"\r
- android:layout_gravity="bottom"\r
- android:orientation="horizontal"\r
- android:background="@drawable/bg_bombbox"\r
- android:layout_width="fill_parent"\r
- android:layout_height="60.0dip">\r
- <ImageButton\r
- android:gravity="center"\r
- android:id="@id/positiveButton"\r
- android:background="#00000000"\r
- android:layout_width="0.0dip"\r
+ android:orientation="vertical">\r
+\r
+ <TextView\r
+ android:id="@id/message"\r
+ android:layout_width="match_parent"\r
android:layout_height="wrap_content"\r
- android:src="@drawable/btn_ok_selector"\r
- android:text="@string/ok"\r
- android:layout_weight="1.0" style="@style/text_15_ffffff_sdw" />\r
- <ImageButton\r
- android:gravity="center"\r
- android:id="@id/negativeButton"\r
- android:background="#00000000"\r
- android:layout_width="0.0dip"\r
+ android:gravity="center|left"\r
+ android:minHeight="120dp"\r
+ android:paddingLeft="20dp"\r
+ android:paddingTop="15dp"\r
+ android:paddingRight="20dp"\r
+ android:paddingBottom="15dp"\r
+ android:textColor="@android:color/black"\r
+ android:textSize="25sp" />\r
+\r
+\r
+ <LinearLayout\r
+ android:layout_width="match_parent"\r
android:layout_height="wrap_content"\r
- android:layout_marginLeft="20.0dip"\r
- android:src="@drawable/btn_cancel_selector"\r
- android:text="@string/cancel"\r
- android:layout_weight="1.0"\r
- style="@style/text_15_666666_sdw" />\r
+ android:layout_gravity="bottom"\r
+ android:gravity="center"\r
+ android:orientation="horizontal"\r
+ android:padding="20dp">\r
+\r
+ <TextView\r
+ android:id="@id/positiveButton"\r
+ android:layout_width="0dp"\r
+ android:layout_height="wrap_content"\r
+ android:layout_weight="1.0"\r
+ android:background="@drawable/selector_btn_confirm"\r
+ android:gravity="center"\r
+ android:padding="20dp"\r
+ android:text="@string/ok"\r
+ android:textColor="@color/white" />\r
+\r
+ <TextView\r
+ android:id="@id/negativeButton"\r
+ android:layout_width="0dp"\r
+ android:layout_height="wrap_content"\r
+ android:layout_marginLeft="20dp"\r
+ android:layout_weight="1.0"\r
+ android:background="@drawable/selector_btn_cancel"\r
+ android:gravity="center"\r
+ android:padding="20dp"\r
+ android:text="@string/cancel"\r
+ android:textColor="@color/white" />\r
+ </LinearLayout>\r
</LinearLayout>\r
- </LinearLayout>\r
</ScrollView>\r
\r
</LinearLayout>\r
</style>
<style name="text_18_ffffff">
-
<item name="android:textSize">18.0dip</item>
-
<item name="android:textColor">#ff0b5796</item>
</style>
-#Thu Jun 17 16:08:51 CST 2021
-VERSION_CODE=793
+#Sat Jun 19 18:02:24 CST 2021
+VERSION_CODE=808
projects / protocol_srv.git / commitdiff