diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java index 18cdd8a..a08996d 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java @@ -2,18 +2,25 @@ package com.arpa.hndahesudintocctmsdriver; import android.app.ActivityManager; import android.app.Application; +import android.app.PendingIntent; import android.content.Context; +import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.res.Configuration; import android.content.res.Resources; import android.util.Log; +import android.widget.Toast; import com.alct.mdp.MDPLocationCollectionManager; import com.arpa.hndahesudintocctmsdriver.report.JTTProcess; import com.arpa.hndahesudintocctmsdriver.request.net.Api; +import com.arpa.hndahesudintocctmsdriver.ui.MainActivity; import com.dahe.mylibrary.CommonBaseLibrary; +import com.dahe.mylibrary.utils.ToastUtils; import com.esign.esignsdk.EsignSdk; import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil; +import com.gyf.cactus.Cactus; +import com.gyf.cactus.callback.CactusBackgroundCallback; import com.umeng.commonsdk.UMConfigure; import cn.jiguang.verifysdk.api.JVerificationInterface; @@ -28,6 +35,7 @@ public class App extends Application { public static int APP_STATUS = APP_STATUS_KILLED; // 记录App的启动状态 private Context con; public static App mApplication = null; + @Override public void onCreate() { super.onCreate(); @@ -63,6 +71,33 @@ public class App extends Application { Log.e("-error-", "初始化失败sss"); } } + + PendingIntent pendingIntent = + PendingIntent.getActivity(this, 0, new Intent(this, MainActivity.class), PendingIntent.FLAG_UPDATE_CURRENT); + Cactus.getInstance() + .isDebug(true) + //可选,设置通知栏点击事件 + .setPendingIntent(pendingIntent) +// .setBackgroundMusicEnabled(true)//可选,退到后台是否可以播放音乐 +// .setMusicId(R.raw.main) //可选,设置音乐 +// .setPendingIntent(pendingIntent)//可选,设置通知栏点击事件 +// .addCallback(new CactusCallback())//可选,运行时回调 + .setCrashRestartUIEnabled(true) //可选,设置奔溃可以重启,google原生rom android 10以下可以正常重启 + .setCrashRestartUIEnabled(true)//可选,设置奔溃可以重启,google原生rom android 10以下可以正常重启 + .setTitle("大河好运") + .setSmallIcon(R.drawable.diver_logo) + .addBackgroundCallback(new CactusBackgroundCallback() { + @Override + public void onBackground(boolean b) { +// String s = ""; +// if (b) +// s="退到后台啦" ; +// else +// s = "跑到前台啦"; +// ToastUtils.showToast(mApplication,s); + } + }) + .register(this); } public static App getApp() { diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/MainActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/MainActivity.kt index b3881d5..c82b81c 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/MainActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/MainActivity.kt @@ -1,6 +1,7 @@ package com.arpa.hndahesudintocctmsdriver.ui import android.Manifest +import android.annotation.SuppressLint import android.content.Intent import android.os.Build import android.os.Bundle @@ -20,8 +21,10 @@ import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity import com.arpa.hndahesudintocctmsdriver.util.view.BottomTabUtil import com.arpa.hndahesudintocctmsdriver.util.view.PanDuanUtil import com.google.gson.Gson +import com.gyf.cactus.ext.cactusUpdateNotification import com.permissionx.guolindev.PermissionX - +@Suppress("DIVISION_BY_ZERO") +@SuppressLint("SetTextI18n") class MainActivity : BaseAppCompatActivity() { private var ibs = arrayOf() @@ -45,6 +48,10 @@ class MainActivity : BaseAppCompatActivity() { super.onCreate(savedInstanceState) StateStyleUtil.stateTextColor(this) setContentView(R.layout.activity_main) + cactusUpdateNotification { + setTitle("好运司机") + setContent("您的接单小助手") + } con = this act = this //隐藏标题栏 diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java index 2e7e924..d601c57 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java @@ -47,6 +47,8 @@ import com.arpa.hndahesudintocctmsdriver.util.PicturlUtil; import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil; import com.bumptech.glide.Glide; import com.google.gson.Gson; +import com.gyf.cactus.Cactus; +import com.gyf.cactus.ext.CactusExtKt; import com.hjq.xtoast.XToast; import com.lxj.xpopup.XPopup; import com.lxj.xpopup.interfaces.OnConfirmListener; @@ -94,6 +96,9 @@ import org.greenrobot.eventbus.Subscribe; import java.util.ArrayList; import java.util.List; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; + /** * @author hlh * @version 1.0.0 @@ -383,6 +388,7 @@ public class HomeFragment extends BaseFragment { @Override public void initView(Object obj) { super.initView(obj); + Cactus.getInstance().updateNotification(getActivity()); List list = new ArrayList<>(); list.add(new ManyBean(new Model(), R.layout.item_home)); as = brv.creates(con, list); diff --git a/app/src/main/res/raw/main.mp3 b/app/src/main/res/raw/main.mp3 new file mode 100644 index 0000000..cec3fdd Binary files /dev/null and b/app/src/main/res/raw/main.mp3 differ diff --git a/mylibrary/build.gradle b/mylibrary/build.gradle index 47a9248..1e77988 100644 --- a/mylibrary/build.gradle +++ b/mylibrary/build.gradle @@ -77,7 +77,7 @@ dependencies { api rootProject.ext.dependencies["3Dmap"] api rootProject.ext.dependencies["Location"] api rootProject.ext.dependencies["Search"] - + api 'com.gyf.cactus:cactus:1.1.3-beta13' //友盟基础库(必须) // api 'com.umeng.umsdk:common:9.4.4'