-<?xml version="1.0" encoding="UTF-8"?>\r
-<project version="4">\r
- <component name="VcsDirectoryMappings">\r
- <mapping directory="$PROJECT_DIR$" vcs="Git" />\r
- </component>\r
++<<<<<<< HEAD
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="$PROJECT_DIR$" vcs="Git" />
+ </component>
++=======
++<?xml version="1.0" encoding="UTF-8"?>
++<project version="4">
++ <component name="VcsDirectoryMappings">
++ <mapping directory="$PROJECT_DIR$" vcs="Git" />
++ </component>
++>>>>>>> origin/master
</project>
applicationId "com.ic.ak.launcher"
minSdkVersion 19
targetSdkVersion 29
- versionCode currentVersionCode
- versionName "${currentVersionName}"
+ versionCode 1
- versionName "2.0"
++ versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
@Override
public void onCreate() {
super.onCreate();
- //CrashHandler crashHandler = CrashHandler.getInstance();
- //crashHandler.init(getApplicationContext());
- ICLogger.setContext(this);
+ CrashHandler crashHandler = CrashHandler.getInstance();
+ crashHandler.init(getApplicationContext());
AndroidThreeTen.init(this);
IcLog.setLogHead("IcAk");
import com.ic.ak.launcher.BuildConfig;
import com.ic.ak.launcher.R;
- import com.ic.ak.launcher.data.play.PlaySoundEvent;
- import com.ic.ak.launcher.ui.dialog.ShowDialogEvent;
-import com.ic.ak.launcher.data.app.AppConfig;
import org.greenrobot.eventbus.EventBus;
import androidx.lifecycle.MutableLiveData;
import com.ic.ak.launcher.BuildConfig;
- import com.ic.ak.launcher.data.play.PlaySoundEvent;
- import com.ic.ak.launcher.data.play.SoundPlayUtils;
- import com.ic.ak.launcher.ui.dialog.AlertDialogManage;
- import com.ic.ak.launcher.ui.dialog.ShowDialogEvent;
-import com.ic.ak.launcher.data.app.AppConfig;
+ import com.ic.ak.launcher.ui.DialogActivity;
+ import com.ic.ak.launcher.ui.MainActivity;
import com.ic.ak.launcher.util.IcLog;
import org.greenrobot.eventbus.EventBus;
if (product == 1001) {
filter.addAction(ACTION_KEEPSIT_ALARM);
}
- if (product == 1002 || product == 1003) {
+ if (product == 1002) {
filter.addAction(STRIP_ACTION);
+ filter.addAction(ACTION_BATTERYLOW);
}
context.registerReceiver(mIntentReceiver, filter);
--- /dev/null
-import com.ic.ak.launcher.data.app.AppConfig;
+ package com.ic.ak.launcher.ui;
+
+ import androidx.appcompat.app.AppCompatActivity;
+
+ import android.content.Intent;
+ import android.os.Bundle;
+ import android.view.KeyEvent;
+
++import com.ic.ak.launcher.BuildConfig;
+ import com.ic.ak.launcher.R;
-import com.ic.ak.launcher.util.IcLog;
+ import com.ic.ak.launcher.data.play.SoundPlayUtils;
+ import com.ic.ak.launcher.ui.dialog.BatteryLowManage;
+ import com.ic.ak.launcher.ui.dialog.DialogDismissEvent;
+ import com.ic.ak.launcher.ui.dialog.NotificationDialogManage;
+ import com.ic.ak.launcher.ui.dialog.SedentaryDialogManage;
+ import com.ic.ak.launcher.ui.dialog.SlipTipsManage;
+ import com.ic.ak.launcher.ui.dialog.TextShowDialogManage;
-
- IcLog.i(DialogActivity.class.getSimpleName(),"keyCode "+keyCode+" "+event.getKeyCode());
-
- if(keyCode==KeyEvent.KEYCODE_BACK || keyCode==KeyEvent.KEYCODE_HOME){
- this.finish();
- IcLog.i(DialogActivity.class.getSimpleName(),"finish!");
- }
+
+ import org.greenrobot.eventbus.EventBus;
+ import org.greenrobot.eventbus.Subscribe;
+ import org.greenrobot.eventbus.ThreadMode;
+
+ public class DialogActivity extends AppCompatActivity {
+
+ private NotificationDialogManage notificationManage;
+ private BatteryLowManage dialogLowManage;
+ private SlipTipsManage dialogSlipManage;
+ private SedentaryDialogManage sedentaryManage;
+ private TextShowDialogManage showDialogManage;
+
+ private SoundPlayUtils soundPlayUtils;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_dialog);
+ EventBus.getDefault().register(this);
+ analysisIntent(getIntent());
+ }
+
+ @Override
+ protected void onNewIntent(Intent intent) {
+ super.onNewIntent(intent);
+ analysisIntent(intent);
+ }
+
+ @Override
+ public boolean onKeyDown(int keyCode, KeyEvent event) {
- soundPlayUtils.stopSoundPlay(SoundPlayUtils.a9_antioff_id);
+ return true;
+ }
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ EventBus.getDefault().unregister(this);
+ notificationManage = null;
+ dialogLowManage = null;
+ dialogSlipManage = null;
+ sedentaryManage = null;
+ showDialogManage = null;
+ }
+
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onMessageEvent(DialogDismissEvent event) {
+ finish();
+ if(soundPlayUtils != null){
- default:
++ soundPlayUtils.stopSoundPlay(16);
+ }
+ switch (event.index) {
+ case 1:
+ if (dialogLowManage != null) {
+ dialogLowManage.setShowLowTipsFalse();
+ }
+ break;
+ case 2:
+ if (dialogSlipManage != null) {
+ dialogSlipManage.setSlipTipsFalse();
+ }
+ break;
+ case 3:
+ if (notificationManage != null) {
+ notificationManage.setNotificationFalse();
+ }
+ break;
+ case 4:
+ if (sedentaryManage != null) {
+ sedentaryManage.setSedentaryFalse();
+ }
+ break;
+ case 5:
- if (AppConfig.productType == 1002|| AppConfig.productType == 1003) {
+ if (showDialogManage != null) {
+ showDialogManage.setTextShowFalse();
+ }
+ break;
+ }
+ }
+
+ private void analysisIntent(Intent intent) {
+ int type = 0;
+ String message = "";
+ if (intent != null) {
+ type = intent.getIntExtra("TYPE", 0);
+ message = intent.getStringExtra("MESSAGE");
+ }
+
+ switch (type) {
+ case 1000:
+ case 1001:
- } else if ( AppConfig.productType == 1001) {
++ if (BuildConfig.productType == 1002) {
+ if (showDialogManage == null) {
+ showDialogManage = new TextShowDialogManage();
+ } else {
+ showDialogManage.dismissTextShowDialog(getSupportFragmentManager());
+ }
+ showDialogManage.showTextShowDialog(getSupportFragmentManager(), message);
- if ( AppConfig.productType == 1001) {
++ } else if (BuildConfig.productType == 1001) {
+ if (notificationManage == null) {
+ notificationManage = new NotificationDialogManage();
+ } else {
+ notificationManage.dismissLowTipsDialog(getSupportFragmentManager());
+ }
+ notificationManage.showNotificationDialog(getSupportFragmentManager(), type,message);
+ }
+ break;
+ case 1002:
- if ( AppConfig.productType == 1002 || AppConfig.productType == 1003) {
++ if (BuildConfig.productType == 1001) {
+ if (sedentaryManage != null) {
+ return;
+ }
+ sedentaryManage = new SedentaryDialogManage();
+ sedentaryManage.showSedentaryDialog(getSupportFragmentManager());
+ }
+ break;
+ case 1003:
+ if (dialogLowManage != null) {
+ dialogLowManage.dismissLowTipsDialog(getSupportFragmentManager());
+ }
+ break;
+ case 1004:
+ if (dialogLowManage == null) {
+ dialogLowManage = new BatteryLowManage();
+ } else {
+ dialogLowManage.dismissLowTipsDialog(getSupportFragmentManager());
+ }
+ dialogLowManage.showLowTipsDialog(getSupportFragmentManager());
+ break;
+ case 1005:
+ if (dialogSlipManage != null) {
+ dialogSlipManage.dismissSlipTipsDialog(getSupportFragmentManager());
+ }
+ break;
+ case 1006:
+ playKeyboardSound();
+ if (dialogSlipManage == null) {
+ dialogSlipManage = new SlipTipsManage();
+ } else {
+ dialogSlipManage.dismissSlipTipsDialog(getSupportFragmentManager());
+ }
+ dialogSlipManage.showSlipTipsDialog(getSupportFragmentManager());
+ break;
+ case 1007:
+ playKeyboardSound();
- default:
- if (showDialogManage == null) {
- showDialogManage = new TextShowDialogManage();
- } else {
- showDialogManage.dismissTextShowDialog(getSupportFragmentManager());
- }
- showDialogManage.showTextShowDialog(getSupportFragmentManager(), message);
- break;
++ if (BuildConfig.productType == 1002) {
+ if (showDialogManage == null) {
+ showDialogManage = new TextShowDialogManage();
+ } else {
+ showDialogManage.dismissTextShowDialog(getSupportFragmentManager());
+ }
+ showDialogManage.showTextShowDialog(getSupportFragmentManager(), message);
+ }
+ break;
- int type = AppConfig.productType;
- if(type == 1002 || type == 1003){
+ }
+ }
+
+ private void playKeyboardSound(){
- soundPlayUtils.playKeyboardSound(this,SoundPlayUtils.a9_antioff_id);
++ int type = BuildConfig.productType;
++ if(type == 1002){
+ //A9
+ if(soundPlayUtils == null){
+ soundPlayUtils= new SoundPlayUtils();
++ soundPlayUtils.playKeyboardSound(this,16);
+ }
+ }
+ }
+ }
import com.ic.ak.launcher.BuildConfig;
import com.ic.ak.launcher.LauncherApp;
import com.ic.ak.launcher.R;
-import com.ic.ak.launcher.data.app.AppConfig;
+ import com.ic.ak.launcher.data.battery.BatteryConnectStateEvent;
import com.ic.ak.launcher.data.hardware.HardwareDispose;
- import com.ic.ak.launcher.data.play.PlaySoundEvent;
import com.ic.ak.launcher.data.play.SoundPlayUtils;
- import com.ic.ak.launcher.ui.dialog.AlertDialogManage;
- import com.ic.ak.launcher.ui.dialog.ShowDialogEvent;
-import com.ic.ak.launcher.util.IcLog;
import com.ic.ak.launcher.util.ServiceUtil;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
- import java.lang.ref.WeakReference;
-import java.util.Locale;
--
import butterknife.BindView;
import butterknife.ButterKnife;
}
@Subscribe(threadMode = ThreadMode.MAIN)
- public void onMessageEvent(PlaySoundEvent event) {
- soundPlayUtils.playKeyboardSound(this, event.key);
- }
-
- @Subscribe(threadMode = ThreadMode.MAIN)
- public void onMessageEvent(ShowDialogEvent event) {
- switch (event.event){
- case 0:
- dialogManage.dismissLoadingDialog();
- break;
- case 1006:
- soundPlayUtils.playKeyboardSound(this, 16);
- dialogManage.showSlipLowDialog(this);
- break;
- case 1001:
- if (BuildConfig.productType == 1002) {
- dialogManage.showTextDialog(this,event.message);
- }else if(BuildConfig.productType == 1001){
- dialogManage.showNotificationDialog(this,this,event.type,event.message);
- }
- break;
- case 1007:
- if (BuildConfig.productType == 1002) {
- dialogManage.showTextDialog(this,event.message);
- soundPlayUtils.playKeyboardSound(this, 16);
- }
- break;
- case 1002:
- if (BuildConfig.productType == 1001) {
- dialogManage.showSedentaryDialog(this,this);
- }
- break;
- case 1004:
- dialogManage.showBatteryLowDialog(this);
- break;
+ public void onMessageEvent(BatteryConnectStateEvent event) {
- IcLog.i("Launcher2.Main",Locale.getDefault().getDisplayLanguage());
+ if (event.state) {
- soundPlayUtils.playKeyboardSound(this, SoundPlayUtils.chrg_connect_id);
++ soundPlayUtils.playKeyboardSound(this, 0);
+ } else {
- soundPlayUtils.playKeyboardSound(this, SoundPlayUtils.chrg_remove_id);
++ soundPlayUtils.playKeyboardSound(this, 1);
}
}
--- /dev/null
- dialog.setCancelable(true);
+ package com.ic.ak.launcher.ui.dialog;
+
+ import android.app.Dialog;
+ import android.os.Bundle;
+ import android.util.DisplayMetrics;
+ import android.view.LayoutInflater;
+ import android.view.View;
+ import android.view.ViewGroup;
+ import android.widget.ImageView;
+
+ import androidx.fragment.app.DialogFragment;
+
+ import com.ic.ak.launcher.R;
+
+ import org.greenrobot.eventbus.EventBus;
+
+
+ public class BatteryLowFragment extends DialogFragment {
+
+ public static BatteryLowFragment newInstance() {
+ return new BatteryLowFragment();
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setStyle(DialogFragment.STYLE_NORMAL, R.style.TipsDialog);
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ Dialog dialog = getDialog();
+ if (dialog != null) {
+ DisplayMetrics dm = new DisplayMetrics();
+ getActivity().getWindowManager().getDefaultDisplay().getMetrics(dm);
+ dialog.getWindow().setLayout((int) (dm.widthPixels*0.85),180);
++ dialog.setCancelable(false);
+ }
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ // Inflate the layout for this fragment
+ View view = inflater.inflate(R.layout.fragment_image_battery_low, container, false);
+ ImageView btClose = view.findViewById(R.id.slip_bt_close);
+ btClose.setOnClickListener(v ->{
+ EventBus.getDefault().post(new DialogDismissEvent(1));
+ dismiss();
+ });
+ return view;
+ }
+ }
--- /dev/null
- dialog.setCancelable(true);
+ package com.ic.ak.launcher.ui.dialog;
+
+ import android.app.Dialog;
+ import android.content.ComponentName;
+ import android.content.Intent;
+ import android.os.Bundle;
+ import android.util.DisplayMetrics;
+ import android.view.LayoutInflater;
+ import android.view.View;
+ import android.view.ViewGroup;
+ import android.view.WindowManager;
+ import android.widget.Button;
+ import android.widget.TextView;
+
+ import androidx.annotation.NonNull;
+ import androidx.annotation.Nullable;
+ import androidx.fragment.app.DialogFragment;
+
+ import com.ic.ak.launcher.R;
+ import com.ic.ak.launcher.util.IcLog;
+ import com.ic.ak.launcher.widget.MultiRowTextView;
+
+ import org.greenrobot.eventbus.EventBus;
+
+ public class NotificationDialogFragment extends DialogFragment {
+
+ private static final String TYPE_PARAM = "TYPE_PARAM";
+ private static final String MESSAGE_PARAM = "MESSAGE_PARAM";
+ private String message;
+ private int type;
+
+ public static NotificationDialogFragment newInstance(int type,String message) {
+ NotificationDialogFragment fragment = new NotificationDialogFragment();
+ Bundle args = new Bundle();
+ args.putString(MESSAGE_PARAM, message);
+ args.putInt(TYPE_PARAM,type);
+ fragment.setArguments(args);
+ return fragment;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setStyle(DialogFragment.STYLE_NORMAL, R.style.NotificationDialog);
+ if (getArguments() != null) {
+ type = getArguments().getInt(TYPE_PARAM);
+ message = getArguments().getString(MESSAGE_PARAM);
+ }
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ Dialog dialog = getDialog();
+ if (dialog != null) {
+ DisplayMetrics dm = new DisplayMetrics();
+ getActivity().getWindowManager().getDefaultDisplay().getMetrics(dm);
+ dialog.getWindow().setLayout((int) (dm.widthPixels * 0.95), 180);
++ dialog.setCancelable(false);
+ }
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ // Inflate the layout for this fragment
+ View view = inflater.inflate(R.layout.dialog_notification, container, false);
+ MultiRowTextView msgText = view.findViewById(R.id.dialog_message);
+ TextView textView = view.findViewById(R.id.dialog_title);
+ if(type == 1000){
+ textView.setText("短信消息");
+ }
+ Button btClose = view.findViewById(R.id.dialog_bt_close);
+ Button btOpen = view.findViewById(R.id.dialog_bt_open);
+ msgText.setText(message);
+ btClose.setOnClickListener(v -> {
+ EventBus.getDefault().post(new DialogDismissEvent(3));
+ dismiss();
+ });
+
+ btOpen.setOnClickListener(v -> {
+ EventBus.getDefault().post(new DialogDismissEvent(3));
+ if(type == 1000){
+ startMessageActivity();
+ }else if(type == 1001){
+ startNotificationActivity(message);
+ }
+ dismiss();
+ });
+ return view;
+ }
+
+ private void startNotificationActivity(String message) {
+ try {
+ Intent intent = new Intent();
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.putExtra("N_MESSAGE", message);
+ intent.setComponent(new ComponentName(
+ "com.ic.ak.launcher",
+ "com.ic.ak.launcher.ui.notification.NotificationActivity"));
+ getActivity().startActivity(intent);
+ } catch (Exception e) {
+ }
+ }
+
+ private void startMessageActivity() {
+ try {
+ Intent intent = new Intent(Intent.ACTION_MAIN);
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.setComponent(new ComponentName(
+ "com.ic.message", "com.ic.message.MainActivity"));
+ getActivity().startActivity(intent);
+ } catch (Exception e) {
+ IcLog.e("HardwareDispose","",e);
+ }
+ }
+ }
--- /dev/null
- dialog.setCancelable(true);
+ package com.ic.ak.launcher.ui.dialog;
+
+ import android.app.Dialog;
+ import android.os.Bundle;
+ import android.util.DisplayMetrics;
+ import android.view.LayoutInflater;
+ import android.view.View;
+ import android.view.ViewGroup;
+ import android.widget.Button;
+ import android.widget.ImageView;
+
+ import androidx.fragment.app.DialogFragment;
+
+ import com.ic.ak.launcher.R;
+
+ import org.greenrobot.eventbus.EventBus;
+
+ public class SedentaryAlarmDialogFragment extends DialogFragment {
+
+ public static SedentaryAlarmDialogFragment newInstance() {
+ return new SedentaryAlarmDialogFragment();
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setStyle(DialogFragment.STYLE_NORMAL, R.style.TipsDialog);
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ Dialog dialog = getDialog();
+ if (dialog != null) {
+ DisplayMetrics dm = new DisplayMetrics();
+ getActivity().getWindowManager().getDefaultDisplay().getMetrics(dm);
+ dialog.getWindow().setLayout(dm.widthPixels, dm.heightPixels);
++ dialog.setCancelable(false);
+ }
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ // Inflate the layout for this fragment
+ View view = inflater.inflate(R.layout.dialog_sedentary_alarm, container, false);
+ ImageView btClose = view.findViewById(R.id.sedentary_close);
+ btClose.setOnClickListener(v -> {
+ EventBus.getDefault().post(new DialogDismissEvent(4));
+ dismiss();
+ });
+ return view;
+ }
+ }
--- /dev/null
- dialog.setCancelable(true);
+ package com.ic.ak.launcher.ui.dialog;
+
+ import android.app.Dialog;
+ import android.os.Bundle;
+ import android.util.DisplayMetrics;
+ import android.view.LayoutInflater;
+ import android.view.View;
+ import android.view.ViewGroup;
+ import android.widget.ImageView;
+
+ import androidx.fragment.app.DialogFragment;
+
+ import com.ic.ak.launcher.R;
+
+ import org.greenrobot.eventbus.EventBus;
+
+
+ public class SlipTipsFragment extends DialogFragment {
+
+
+ public static SlipTipsFragment newInstance() {
+ return new SlipTipsFragment();
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setStyle(DialogFragment.STYLE_NORMAL, R.style.TipsDialog);
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ Dialog dialog = getDialog();
+ if (dialog != null) {
+ DisplayMetrics dm = new DisplayMetrics();
+ getActivity().getWindowManager().getDefaultDisplay().getMetrics(dm);
+ dialog.getWindow().setLayout((int) (dm.widthPixels*0.85),180);
-
-
++ dialog.setCancelable(false);
+ }
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ // Inflate the layout for this fragment
+ View view = inflater.inflate(R.layout.fragment_image_slip, container, false);
+ ImageView btClose = view.findViewById(R.id.slip_bt_close);
+ btClose.setOnClickListener(v ->{
+ EventBus.getDefault().post(new DialogDismissEvent(2));
+ dismiss();
+ });
+ return view;
+ }
+ }
--- /dev/null
- dialog.setCancelable(true);
+ package com.ic.ak.launcher.ui.dialog;
+
+ import android.app.Dialog;
+ import android.os.Bundle;
+ import android.util.DisplayMetrics;
+ import android.view.LayoutInflater;
+ import android.view.View;
+ import android.view.ViewGroup;
+ import android.widget.ImageView;
+ import android.widget.TextView;
+
+ import androidx.fragment.app.DialogFragment;
+
+ import com.ic.ak.launcher.R;
+
+ import org.greenrobot.eventbus.EventBus;
+
+
+ public class TextShowDialogFragment extends DialogFragment {
+
+ private static final String MESSAGE_PARAM = "MESSAGE_PARAM";
+ private String message;
+
+ public static TextShowDialogFragment newInstance(String message) {
+ TextShowDialogFragment fragment = new TextShowDialogFragment();
+ Bundle args = new Bundle();
+ args.putString(MESSAGE_PARAM, message);
+ fragment.setArguments(args);
+ return fragment;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setStyle(DialogFragment.STYLE_NORMAL, R.style.TipsDialog);
+ if (getArguments() != null) {
+ message = getArguments().getString(MESSAGE_PARAM);
+ }
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ Dialog dialog = getDialog();
+ if (dialog != null) {
+ DisplayMetrics dm = new DisplayMetrics();
+ getActivity().getWindowManager().getDefaultDisplay().getMetrics(dm);
+ dialog.getWindow().setLayout((int) (dm.widthPixels*0.85),180);
++ dialog.setCancelable(false);
+ }
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ // Inflate the layout for this fragment
+ View view = inflater.inflate(R.layout.dialog_text_show_a9, container, false);
+ TextView textMessage = view.findViewById(R.id.message_tips_id);
+ ImageView btClose = view.findViewById(R.id.slip_bt_close);
+ textMessage.setText(message);
+ btClose.setOnClickListener(v ->{
+ EventBus.getDefault().post(new DialogDismissEvent(5));
+ dismiss();
+ });
+ return view;
+ }
+ }
-#Thu Oct 22 15:25:11 CST 2020\r
-VERSION_CODE=165\r
++<<<<<<< HEAD
+#Thu Oct 22 15:25:11 CST 2020
+VERSION_CODE=165
++=======
++#Thu Oct 22 15:25:11 CST 2020
++VERSION_CODE=165
++>>>>>>> origin/master
projects / aklauncher.git / commitdiff