1.添加违规事件判断。

2.Bugly添加用户id.

app/src/main/java/com/xhly/manageapp/broadcastreceiver/SimStateReceive.kt

@@ -8,18 +8,49 @@ import android.telephony.TelephonyManager
 import com.xhly.corelib.Const
 import com.xhly.corelib.eventbus.UIEvent
 import com.xhly.corelib.utils.LogShow
+import com.xhly.corelib.utils.SharedPreferencesUtils
+import com.xhly.corelib.utils.SystemUtil
 
 class SimStateReceive : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
-        println("sim state changed")
         try {
+            val spUtils by lazy { SharedPreferencesUtils.getInstance(context) }
             if (intent.action == ACTION_SIM_STATE_CHANGED) {
                 val tm = context.getSystemService(Service.TELEPHONY_SERVICE) as TelephonyManager
                 val state = tm.simState
                 when (state) {
                     TelephonyManager.SIM_STATE_READY -> {
-                        LogShow("有SIM卡$SIM_VALID"+tm.simSerialNumber)
-                        UIEvent(Const.SIMINSTALL).post()
+                        LogShow("有SIM卡$SIM_VALID")
+                        val phoneList= arrayListOf<String>()
+                        try {//获得之前存储的手机号
+                            val fromJson =
+                                spUtils.getFromJson(Const.SIMPHONENUM, Array<String>::class.java)
+                            if (fromJson!=null){
+                                val strings = fromJson as ArrayList<String>
+                                phoneList.addAll(strings)
+                            }
+                        }catch (e:Exception){
+
+                        }
+                        val phoneNumberList = SystemUtil.getPhoneNumber(context)
+                        //是否违规
+                        var sendFlag=false
+                        if (phoneNumberList.size>0){
+                            spUtils.saveJson(Const.SIMPHONENUM,phoneNumberList)
+                            if (phoneList.size==phoneNumberList.size){
+                                phoneList.forEach {
+                                    //有一个不包含就是违规
+                                    if (!phoneNumberList.contains(it)){
+                                        sendFlag=true
+                                    }
+                                }
+                            }else{
+                                sendFlag=true
+                            }
+                        }
+                       if (sendFlag){
+                           UIEvent(Const.SIMINSTALL).post()
+                       }
                     }
 
                     TelephonyManager.SIM_STATE_UNKNOWN, TelephonyManager.SIM_STATE_ABSENT,

app/src/main/java/com/xhly/manageapp/ui/login/activity/LoginActivity.kt

@@ -353,66 +353,6 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
             Const.CODE2007.toString() -> {
                 postLogPush(7)
             }
-
-            Const.SDINSTALL -> {
-                val data = LogdOperateBean()
-                ManageApplication.getDeviceInfo()?.let {
-                    data.sn = it
-                }
-                data.comm = EventLog.SDEMOUNTEDVENTSTRING
-                data.doEvent = EventLog.SDEMOUNTEDVENT
-                viewModel.eventLog(data)
-            }
-
-            Const.SDUNINSTALL -> {
-                val data = LogdOperateBean()
-                ManageApplication.getDeviceInfo()?.let {
-                    data.sn = it
-                }
-                data.comm =EventLog.SDEJECTEVENTSTRING
-                data.doEvent = EventLog.SDEJECTEVENT
-                viewModel.eventLog(data)
-            }
-
-            Const.SIMINSTALL -> {
-                val data = LogdOperateBean()
-                ManageApplication.getDeviceInfo()?.let {
-                    data.sn = it
-                }
-                data.comm = EventLog.SIMEVENTSTRING
-                data.doEvent = EventLog.SIMEVENT
-                viewModel.eventLog(data)
-            }
-
-            Const.BLUETOOTHOPEN -> {
-                val data = LogdOperateBean()
-                ManageApplication.getDeviceInfo()?.let {
-                    data.sn = it
-                }
-                data.comm = EventLog.BLUETOOHEVENTSTRING
-                data.doEvent = EventLog.BLUETOOHEVENT
-                viewModel.eventLog(data)
-            }
-
-            Const.USB_CONNECTED -> {
-                val data = LogdOperateBean()
-                ManageApplication.getDeviceInfo()?.let {
-                    data.sn = it
-                }
-                data.comm = EventLog.USBCONNECTEVENTSTRING
-                data.doEvent = EventLog.USBCONNECTEVENT
-                viewModel.eventLog(data)
-            }
-
-            Const.USB_NOCONNECTED -> {
-                val data = LogdOperateBean()
-                ManageApplication.getDeviceInfo()?.let {
-                    data.sn = it
-                }
-                data.comm = EventLog.USBDISCONNECTEVENTSTRING
-                data.doEvent = EventLog.USBDISCONNECTEVENT
-                viewModel.eventLog(data)
-            }
         }
 
     }

app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt

@@ -51,6 +51,7 @@ import com.hjq.toast.Toaster
 import com.kongzue.dialogx.dialogs.CustomDialog
 import com.kongzue.dialogx.interfaces.OnBindView
 import com.tbruyelle.rxpermissions2.RxPermissions
+import com.tencent.bugly.crashreport.CrashReport
 import com.xhkjedu.manageapp.R
 import com.xhkjedu.manageapp.databinding.ActivityMainBinding
 import com.xhly.corelib.Const
@@ -168,6 +169,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
             return
         } else {
             userBean = json as UserBean
+            userBean?.let {
+                CrashReport.setUserId(it.userid.toString())
+            }
         }
         //自动同时一次时间
         viewModel.postSyncTime()
@@ -1380,7 +1384,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                 }
                 data.comm = EventLog.SDEMOUNTEDVENTSTRING
                 data.doEvent = EventLog.SDEMOUNTEDVENT
-                viewModel.eventLog(data)
+                postEventLog(data)
             }
 
             Const.SDUNINSTALL -> {
@@ -1390,7 +1394,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                 }
                 data.comm = EventLog.SDEJECTEVENTSTRING
                 data.doEvent = EventLog.SDEJECTEVENT
-                viewModel.eventLog(data)
+                postEventLog(data)
             }
 
             Const.SIMINSTALL -> {
@@ -1410,7 +1414,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                 }
                 data.comm = EventLog.BLUETOOHEVENTSTRING
                 data.doEvent = EventLog.BLUETOOHEVENT
-                viewModel.eventLog(data)
+                postEventLog(data)
             }
 
             Const.USB_CONNECTED -> {
@@ -1420,7 +1424,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                 }
                 data.comm = EventLog.USBCONNECTEVENTSTRING
                 data.doEvent = EventLog.USBCONNECTEVENT
-                viewModel.eventLog(data)
+                postEventLog(data)
             }
 
             Const.USB_NOCONNECTED -> {
@@ -1430,7 +1434,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                 }
                 data.comm = EventLog.USBDISCONNECTEVENTSTRING
                 data.doEvent = EventLog.USBDISCONNECTEVENT
-                viewModel.eventLog(data)
+                postEventLog(data)
             }
 
             Const.ACCOUNTLOGINOUT -> {
@@ -1493,6 +1497,48 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
         }
     }
 
+    private fun postEventLog(data:LogdOperateBean){
+       try {
+           var sendFlag=true
+           val strategyBean =
+               spUtils.getFromJson(Const.STRATEGYBEANKEY, StrategyBean::class.java) as StrategyBean
+           when(data.doEvent){
+               EventLog.BLUETOOHEVENT->{
+                   //判断蓝牙事件是否违规
+                   val filter = strategyBean.padDevices?.filter { it.pdtype == Const.DEVICETYPE2 }
+                   if (filter!=null){
+                       if (filter[0].enabled==1){
+                        sendFlag=false
+                       }
+                   }
+               }
+               EventLog.USBCONNECTEVENT,EventLog.USBDISCONNECTEVENT->{
+                   //判断USB事件是否违规
+                   val filter = strategyBean.padDevices?.filter { it.pdtype == Const.DEVICETYPE3 }
+                   if (filter!=null){
+                       if (filter[0].enabled==1){
+                           sendFlag=false
+                       }
+                   }
+               }
+               EventLog.SDEMOUNTEDVENT,EventLog.SDEJECTEVENT->{
+                   //判断sd卡事件事件是否违规
+                   val filter = strategyBean.padDevices?.filter { it.pdtype == Const.DEVICETYPE9 }
+                   if (filter!=null){
+                       if (filter[0].enabled==1){
+                           sendFlag=false
+                       }
+                   }
+               }
+           }
+           if (sendFlag){
+               viewModel.eventLog(data)
+           }
+       }catch (e:Exception){
+           LogShow("问题是"+e.toString())
+       }
+    }
+
     /**
      * 系统级别的通知
      */

corelib/src/main/java/com/xhly/corelib/Const.kt

@@ -68,6 +68,10 @@ object Const {
 
     //存储区域码，存在则在弹窗出现时显示
     const val REGIONCODEKEY="REGIONCODEKEY"
+
+    //存储SIM卡号码
+    const val SIMPHONENUM= "SIMPHONENUM"
+
     //接口地址 正式地址mc.xhkjedu.com测试地址mcapitest.xhkjedu.com
 
     const val BASEURL="mcapitest.xhkjedu.com"

corelib/src/main/java/com/xhly/corelib/utils/PhoneInfoUtils.java

@@ -1,71 +0,0 @@
-package com.xhly.corelib.utils;
-import android.Manifest;
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.telephony.TelephonyManager;
-import androidx.core.app.ActivityCompat;
-
-
-/**
- * Created by WangJinyong on 2018/3/31.
- * 获取SIM卡信息和手机号码
- */
-
-public class PhoneInfoUtils {
-
-    private static String TAG = "PhoneInfoUtils";
-    private TelephonyManager telephonyManager;
-    //移动运营商编号
-    private String NetworkOperator;
-    private Context context;
-
-    public PhoneInfoUtils(Context context) {
-        this.context = context;
-        telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-    }
-
-    //获取sim卡iccid
-    public String getIccid() {
-        String iccid = "N/A";
-        iccid = telephonyManager.getSimSerialNumber();
-        return iccid;
-    }
-
-    //获取电话号码
-    @SuppressLint("MissingPermission")
-    public String getNativePhoneNumber(Context context) {
-        String nativePhoneNumber = "N/A";
-        nativePhoneNumber = telephonyManager.getLine1Number();
-        return nativePhoneNumber;
-    }
-
-    //获取手机服务商信息
-    public String getProvidersName() {
-        String providersName = "N/A";
-        NetworkOperator = telephonyManager.getNetworkOperator();
-        //IMSI号前面3位460是国家，紧接着后面2位00 02是中国移动，01是中国联通，03是中国电信。
-//        Flog.d(TAG,"NetworkOperator=" + NetworkOperator);
-        if (NetworkOperator.equals("46000") || NetworkOperator.equals("46002")) {
-            providersName = "中国移动";//中国移动
-        } else if (NetworkOperator.equals("46001")) {
-            providersName = "中国联通";//中国联通
-        } else if (NetworkOperator.equals("46003")) {
-            providersName = "中国电信";//中国电信
-        }
-        return providersName;
-    }
-
-    @SuppressLint("MissingPermission")
-    public  String getPhoneInfo(Context context) {
-        TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-        StringBuffer sb = new StringBuffer();
-        sb.append("\nLine1Number = " + tm.getLine1Number());
-        sb.append("\nNetworkOperator = " + tm.getNetworkOperator());//移动运营商编号
-        sb.append("\nNetworkOperatorName = " + tm.getNetworkOperatorName());//移动运营商名称
-        sb.append("\nSimCountryIso = " + tm.getSimCountryIso());
-        sb.append("\nSimOperator = " + tm.getSimOperator());
-        sb.append("\nSimOperatorName = " + tm.getSimOperatorName());
-        return sb.toString();
-    }
-}