🚑 隐藏错误提示框、修改logo、修复细节bug

app/src/main/AndroidManifest.xml

@@ -69,7 +69,7 @@
         <!-- 高德地图后台定位服务 -->
         <service android:name="com.amap.api.location.APSService"></service>
         <!-- 后台监听定位数据 -->
-        <service android:name=".service.LocationService" android:foregroundServiceType="location" android:exported="true"></service>
+        <service android:name=".util.LocationService" android:foregroundServiceType="location" android:exported="true"></service>
 
         <!-- 闪屏引导 -->
         <activity

app/src/main/java/com/kanglai/push/ui/activity/LoginActivity.java

@@ -114,10 +114,10 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding, LoginViewM
     public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] paramArrayOfInt) {
         super.onRequestPermissionsResult(requestCode, permissions, paramArrayOfInt);
         if (requestCode == AppConstant.PERMISSION_REQUEST_CODE) {
-            if (Arrays.stream(paramArrayOfInt).anyMatch(item -> 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("授权设备权限")

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;

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<FragmentUserBinding, UserViewMode
         mRecyclerView = getView().findViewById(R.id.recycler_view);
         // 设置列表
         List<UserRecyclerAdapter.UserEntity> 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<FragmentUserBinding, UserViewMode
         /** 列表点击事件 */
         switch (userEntity.code) {
             case "1":   // todo： 暂未定义内容 后续可用来测试
-
+                stopService(LocationService.class);
                 break;
             case "2":     // 关于我们
                 startActivity(AboutActivity.class);

app/src/main/java/com/kanglai/push/ui/fragment/WorkbenchFragment.java

@@ -66,19 +66,20 @@ public class WorkbenchFragment extends BaseFragment<FragmentWorkbenchBinding, Wo
         btnOa2 = getView().findViewById(R.id.btn_oa2);
         btnOa3 = getView().findViewById(R.id.btn_oa3);
         btnOa4 = getView().findViewById(R.id.btn_oa4);
+
+        /** 工作台四大功能入口 */
         btnOa1.setOnClickListener(v -> {
-        // 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);

app/src/main/java/com/kanglai/push/ui/vm/MessageViewModel.java

@@ -43,7 +43,7 @@ public class MessageViewModel extends ToolbarViewModel<MessageFragment> {
 
     public MessageViewModel(@NonNull Application application) {
         super(application);
-        super.setTitleText("有 信");
+        super.setTitleText("友 信");
         // 注入服务组件
         DaggerServiceComponent
                 .builder()

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);
     }
 

app/src/main/res/layout/activity_audit_list.xml

@@ -54,6 +54,7 @@
         </LinearLayout>
         <!-- 结果列表 -->
         <androidx.recyclerview.widget.RecyclerView
+
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -64,17 +65,17 @@
         <LinearLayout
             android:visibility="gone"
             android:id="@+id/default_empty"
-            android:gravity="center_horizontal"
+            android:gravity="center"
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
             <ImageView
                 android:src="@drawable/icon_empty"
-                android:layout_marginTop="@dimen/dp_80"
-                android:layout_width="@dimen/dp_120"
-                android:layout_height="@dimen/dp_120"/>
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_60"/>
             <TextView
                 android:text="暂无数据"
+                android:textSize="@dimen/dp_10"
                 android:textColor="@color/black60"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>

app/src/main/res/layout/activity_enterprise_list.xml

@@ -64,17 +64,17 @@
         <LinearLayout
             android:visibility="gone"
             android:id="@+id/default_empty"
-            android:gravity="center_horizontal"
+            android:gravity="center"
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
             <ImageView
                 android:src="@drawable/icon_empty"
-                android:layout_marginTop="@dimen/dp_80"
-                android:layout_width="@dimen/dp_120"
-                android:layout_height="@dimen/dp_120"/>
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_60"/>
             <TextView
                 android:text="暂无数据"
+                android:textSize="@dimen/dp_10"
                 android:textColor="@color/black60"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>

app/src/main/res/layout/activity_focus_list.xml

@@ -64,17 +64,17 @@
         <LinearLayout
             android:visibility="gone"
             android:id="@+id/default_empty"
-            android:gravity="center_horizontal"
+            android:gravity="center"
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
             <ImageView
                 android:src="@drawable/icon_empty"
-                android:layout_marginTop="@dimen/dp_80"
-                android:layout_width="@dimen/dp_120"
-                android:layout_height="@dimen/dp_120"/>
+                android:layout_width="@dimen/dp_60"
+                android:layout_height="@dimen/dp_60"/>
             <TextView
                 android:text="暂无数据"
+                android:textSize="@dimen/dp_10"
                 android:textColor="@color/black60"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>

app/src/main/res/values/strings.xml

@@ -7,8 +7,8 @@
 
 -->
     <string name="privacy_agreement">
-		感谢您选择有信!\n
-		为保障您的权利，在使用我们的服务前，请通过《有信用户协议》和《有信隐私政策》了解我们对于个人信息的使用情况与您所享有的相关权利。\n
+		感谢您选择友信!\n
+		为保障您的权利，在使用我们的服务前，请通过《友信用户协议》和《友信隐私政策》了解我们对于个人信息的使用情况与您所享有的相关权利。\n
 	</string>
 	<!-- 勿扰模式权限申请 -->
 	<string name="privacy_DND">

app/src/main/res/values/styles_common.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!-- 多状态布局样式 -->
+    <!-- 用于加载的第三方框架 -->
     <style name="LoadingLayoutStyle" parent="LoadingLayout.Style">
-        <item name="llEmptyImage">@drawable/icon_empty</item>
+        <item name="llEmptyImage">@drawable/icon_list_empty</item>
         <item name="llEmptyText">@string/empty_text</item>
+        <item name="llTextSize">@dimen/dp_12</item>
         <item name="llTextColor">@color/gray</item>
     </style>
     <!-- 下划线 -->

library/core/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">有信</string>
+    <string name="app_name">友信</string>
     <string name="app_version">exploit-1.0.1</string>
     <string name="app_channel">kanglai-push</string>
     <string name="crash_error_activity_error_occurred_explanation">发生意外错误。\n抱歉，给您带来不便。</string>

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);
                 }
             }