diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 34440a7..25c763e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -69,7 +69,7 @@ - + item != PackageManager.PERMISSION_GRANTED)) { - requestPermissionNeedCheck = false; - PermissionUtil.openApplicationSettings(this, "当前应用缺少必要权限。\n请点击设置-权限-打开所需权限!"); - } +// if (Arrays.stream(paramArrayOfInt).anyMatch(item -> item != PackageManager.PERMISSION_GRANTED)) { +// requestPermissionNeedCheck = false; +// PermissionUtil.openApplicationSettings(this, "当前应用缺少必要权限。\n请点击设置-权限-打开所需权限!"); +// } if (!NotificationManagerCompat.from(getApplicationContext()).areNotificationsEnabled()) { new AlertDialog.Builder(this) .setTitle("授权设备权限") diff --git a/app/src/main/java/com/kanglai/push/ui/fragment/MessageFragment.java b/app/src/main/java/com/kanglai/push/ui/fragment/MessageFragment.java index 5d0eabb..bdb0add 100644 --- a/app/src/main/java/com/kanglai/push/ui/fragment/MessageFragment.java +++ b/app/src/main/java/com/kanglai/push/ui/fragment/MessageFragment.java @@ -39,7 +39,7 @@ import com.kanglai.push.constant.CommonConstant; import com.kanglai.push.databinding.FragmentMessageBinding; import com.kanglai.push.entity.LocalPushChatMsg; import com.kanglai.push.entity.User; -import com.kanglai.push.service.LocationService; +import com.kanglai.push.util.LocationService; import com.kanglai.push.ui.activity.InstantActivity; import com.kanglai.push.ui.adapter.MessageSwipeableRecyclerAdapter; import com.kanglai.push.ui.vm.MessageViewModel; diff --git a/app/src/main/java/com/kanglai/push/ui/fragment/UserFragment.java b/app/src/main/java/com/kanglai/push/ui/fragment/UserFragment.java index 5b1fa30..9f5baa1 100644 --- a/app/src/main/java/com/kanglai/push/ui/fragment/UserFragment.java +++ b/app/src/main/java/com/kanglai/push/ui/fragment/UserFragment.java @@ -2,7 +2,6 @@ package com.kanglai.push.ui.fragment; import static com.blankj.utilcode.util.ServiceUtils.stopService; -import android.content.Intent; import android.os.Bundle; import android.text.TextUtils; import android.util.Patterns; @@ -27,10 +26,8 @@ import com.kanglai.push.R; import com.kanglai.push.constant.CacheConstant; import com.kanglai.push.databinding.FragmentUserBinding; import com.kanglai.push.entity.User; -import com.kanglai.push.service.LocationService; +import com.kanglai.push.util.LocationService; import com.kanglai.push.ui.activity.AboutActivity; -import com.kanglai.push.ui.activity.LoginSurveyActivity; -import com.kanglai.push.ui.activity.PushTypeActivity; import com.kanglai.push.ui.adapter.UserRecyclerAdapter; import com.kanglai.push.ui.vm.UserViewModel; import com.kongzue.dialogx.DialogX; @@ -81,7 +78,7 @@ public class UserFragment extends BaseFragment list = CollectionUtils.newArrayList( - new UserRecyclerAdapter.UserEntity().setCode("1").setTitle("Bate-测试退出定位服务").setBadge(0).setImage(R.drawable.icon_about).setHidesLeftImage(true), + new UserRecyclerAdapter.UserEntity().setCode("1").setTitle("关闭定位服务").setBadge(0).setImage(R.drawable.icon_about).setHidesLeftImage(true), new UserRecyclerAdapter.UserEntity().setCode("2").setTitle("关于我们").setBadge(0).setImage(R.drawable.icon_about).setHidesLeftImage(true), new UserRecyclerAdapter.UserEntity().setCode("3").setTitle("退出登录").setBadge(0).setImage(R.drawable.icon_exit).setHidesLeftImage(true) ); @@ -109,7 +106,7 @@ public class UserFragment extends BaseFragment { - // todo: 新建任务 - startActivity(AddMessageActivity.class); +// startActivity(AddMessageActivity.class); + ToastUtil.showBottom("开发中，敬请期待..."); }); btnOa2.setOnClickListener(v -> { - ToastUtil.showTop("你刚刚点击了推送规则"); + ToastUtil.showBottom("开发中，敬请期待..."); }); btnOa3.setOnClickListener(v -> { - ToastUtil.showBottom("你刚刚点击了对接工作"); + ToastUtil.showBottom("开发中，敬请期待..."); }); btnOa4.setOnClickListener(v -> { -// ToastUtil.show("你刚刚点击了用户权限"); - MessageDialog.show("标题", "用户权限", "确定"); + ToastUtil.showBottom("开发中，敬请期待..."); }); /** 滚动轮播图控件 */ mXBanner = (XBanner) getView().findViewById(R.id.xbanner); diff --git a/app/src/main/java/com/kanglai/push/ui/vm/MessageViewModel.java b/app/src/main/java/com/kanglai/push/ui/vm/MessageViewModel.java index fab6708..ac3b1eb 100644 --- a/app/src/main/java/com/kanglai/push/ui/vm/MessageViewModel.java +++ b/app/src/main/java/com/kanglai/push/ui/vm/MessageViewModel.java @@ -43,7 +43,7 @@ public class MessageViewModel extends ToolbarViewModel { public MessageViewModel(@NonNull Application application) { super(application); - super.setTitleText("有 信"); + super.setTitleText("友 信"); // 注入服务组件 DaggerServiceComponent .builder() diff --git a/app/src/main/java/com/kanglai/push/service/LocationService.java b/app/src/main/java/com/kanglai/push/util/LocationService.java similarity index 82% rename from app/src/main/java/com/kanglai/push/service/LocationService.java rename to app/src/main/java/com/kanglai/push/util/LocationService.java index c94250c..0fd9cbc 100644 --- a/app/src/main/java/com/kanglai/push/service/LocationService.java +++ b/app/src/main/java/com/kanglai/push/util/LocationService.java @@ -1,17 +1,27 @@ -package com.kanglai.push.service; +package com.kanglai.push.util; +import android.app.Notification; import android.app.Service; import android.content.Intent; +import android.graphics.BitmapFactory; +import android.os.Build; import android.os.IBinder; import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; +import androidx.core.app.NotificationCompat; import com.amap.api.location.AMapLocation; import com.amap.api.location.AMapLocationClient; import com.amap.api.location.AMapLocationClientOption; import com.amap.api.location.AMapLocationListener; import com.blankj.utilcode.util.LogUtils; +import com.dolphin.core.util.NotificationUtil; +import com.kanglai.push.R; import com.kanglai.push.util.TimeFormatUtil; +import com.taobao.accs.common.Constants; + +import java.util.Random; /** * 高德长时间定位 @@ -71,8 +81,18 @@ public class LocationService extends Service implements AMapLocationListener { */ @Override public int onStartCommand(Intent intent, int flags, int startId) { - // todo 开始定位 locationConfigure(true); + // 将service设置为前台service 以达成保活 + +// NotificationUtil.notify(new Random().nextInt(), builder -> builder +// .setContentText("友信正在为您安全守护中...") +// .setContentTitle(" ") +// .setCategory(Notification.CATEGORY_REMINDER) +// .setStyle(new Notification.BigTextStyle().bigText("人生得意须尽欢，莫使金樽空对月。\n 天生我材必有用，千金散尽还复来。")) +// .setStyle(new Notification.BigPictureStyle() +// .bigPicture(BitmapFactory.decodeResource(getResources(), R.drawable.icon_app))) +// .setUsesChronometer(true).setNumber(10) ); + return super.onStartCommand(intent, flags, startId); } diff --git a/app/src/main/res/drawable-xxhdpi/icon_list_empty.png b/app/src/main/res/drawable-xxhdpi/icon_list_empty.png new file mode 100644 index 0000000..c8c8fa4 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_list_empty.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_umeng_push_default_splash_bg.png b/app/src/main/res/drawable-xxhdpi/icon_umeng_push_default_splash_bg.png index 37a2ed0..cf5248a 100644 Binary files a/app/src/main/res/drawable-xxhdpi/icon_umeng_push_default_splash_bg.png and b/app/src/main/res/drawable-xxhdpi/icon_umeng_push_default_splash_bg.png differ diff --git a/app/src/main/res/layout/activity_audit_list.xml b/app/src/main/res/layout/activity_audit_list.xml index 4cb93bb..dcbd2f9 100644 --- a/app/src/main/res/layout/activity_audit_list.xml +++ b/app/src/main/res/layout/activity_audit_list.xml @@ -54,6 +54,7 @@ + android:layout_width="@dimen/dp_60" + android:layout_height="@dimen/dp_60"/> diff --git a/app/src/main/res/layout/activity_enterprise_list.xml b/app/src/main/res/layout/activity_enterprise_list.xml index 20db8b2..0b4fb7d 100644 --- a/app/src/main/res/layout/activity_enterprise_list.xml +++ b/app/src/main/res/layout/activity_enterprise_list.xml @@ -64,17 +64,17 @@ + android:layout_width="@dimen/dp_60" + android:layout_height="@dimen/dp_60"/> diff --git a/app/src/main/res/layout/activity_focus_list.xml b/app/src/main/res/layout/activity_focus_list.xml index a931ab3..82a15dc 100644 --- a/app/src/main/res/layout/activity_focus_list.xml +++ b/app/src/main/res/layout/activity_focus_list.xml @@ -64,17 +64,17 @@ + android:layout_width="@dimen/dp_60" + android:layout_height="@dimen/dp_60"/> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 797a262..44c79cd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -7,8 +7,8 @@ --> - 感谢您选择有信!\n - 为保障您的权利，在使用我们的服务前，请通过《有信用户协议》和《有信隐私政策》了解我们对于个人信息的使用情况与您所享有的相关权利。\n + 感谢您选择友信!\n + 为保障您的权利，在使用我们的服务前，请通过《友信用户协议》和《友信隐私政策》了解我们对于个人信息的使用情况与您所享有的相关权利。\n diff --git a/app/src/main/res/values/styles_common.xml b/app/src/main/res/values/styles_common.xml index 834aaf5..d419c3a 100644 --- a/app/src/main/res/values/styles_common.xml +++ b/app/src/main/res/values/styles_common.xml @@ -1,10 +1,11 @@ - + diff --git a/library/core/src/main/res/drawable-hdpi/icon_app.png b/library/core/src/main/res/drawable-hdpi/icon_app.png index 840e7ec..ee5ba35 100644 Binary files a/library/core/src/main/res/drawable-hdpi/icon_app.png and b/library/core/src/main/res/drawable-hdpi/icon_app.png differ diff --git a/library/core/src/main/res/drawable-mdpi/icon_app.png b/library/core/src/main/res/drawable-mdpi/icon_app.png index 840e7ec..ee5ba35 100644 Binary files a/library/core/src/main/res/drawable-mdpi/icon_app.png and b/library/core/src/main/res/drawable-mdpi/icon_app.png differ diff --git a/library/core/src/main/res/drawable-xhdpi/icon_app.png b/library/core/src/main/res/drawable-xhdpi/icon_app.png index 840e7ec..ee5ba35 100644 Binary files a/library/core/src/main/res/drawable-xhdpi/icon_app.png and b/library/core/src/main/res/drawable-xhdpi/icon_app.png differ diff --git a/library/core/src/main/res/drawable-xxhdpi/icon_app.png b/library/core/src/main/res/drawable-xxhdpi/icon_app.png index 840e7ec..ee5ba35 100644 Binary files a/library/core/src/main/res/drawable-xxhdpi/icon_app.png and b/library/core/src/main/res/drawable-xxhdpi/icon_app.png differ diff --git a/library/core/src/main/res/drawable-xxhdpi/umeng_push_notification_default_large_icon.png b/library/core/src/main/res/drawable-xxhdpi/umeng_push_notification_default_large_icon.png index 7b19216..e1a17e0 100644 Binary files a/library/core/src/main/res/drawable-xxhdpi/umeng_push_notification_default_large_icon.png and b/library/core/src/main/res/drawable-xxhdpi/umeng_push_notification_default_large_icon.png differ diff --git a/library/core/src/main/res/drawable-xxhdpi/umeng_push_notification_default_small_icon.png b/library/core/src/main/res/drawable-xxhdpi/umeng_push_notification_default_small_icon.png index fe1bb4a..b51bcca 100644 Binary files a/library/core/src/main/res/drawable-xxhdpi/umeng_push_notification_default_small_icon.png and b/library/core/src/main/res/drawable-xxhdpi/umeng_push_notification_default_small_icon.png differ diff --git a/library/core/src/main/res/drawable-xxxhdpi/icon_app.png b/library/core/src/main/res/drawable-xxxhdpi/icon_app.png index 840e7ec..ee5ba35 100644 Binary files a/library/core/src/main/res/drawable-xxxhdpi/icon_app.png and b/library/core/src/main/res/drawable-xxxhdpi/icon_app.png differ diff --git a/library/core/src/main/res/values/strings.xml b/library/core/src/main/res/values/strings.xml index d8cf023..ba4b864 100644 --- a/library/core/src/main/res/values/strings.xml +++ b/library/core/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - 有信 + 友信 exploit-1.0.1 kanglai-push 发生意外错误。\n抱歉，给您带来不便。 diff --git a/library/umeng/src/main/java/com/dolphin/umeng/UmengClient.java b/library/umeng/src/main/java/com/dolphin/umeng/UmengClient.java index 265b1da..b325d2a 100644 --- a/library/umeng/src/main/java/com/dolphin/umeng/UmengClient.java +++ b/library/umeng/src/main/java/com/dolphin/umeng/UmengClient.java @@ -144,7 +144,7 @@ public final class UmengClient { if (!StringUtils.isTrimEmpty(msg.custom)) { Intent intent = new Intent("com.android.kanglai.push.TabBarActivity"); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - intent.putExtra(AppConstant.TAB_BAR_DEFAULT_INDEX, 1); + intent.putExtra(AppConstant.TAB_BAR_DEFAULT_INDEX, 0); // 指定跳转到界面的上的第0页 Utils.getApp().startActivity(intent); } }