添加蒲公英监测

app/build.gradle

@@ -66,15 +66,13 @@ dependencies {
     implementation 'com.qcloud.cos:cos-android:5.7.3'
     implementation 'com.tencent.tpns:tpns:1.2.7.1-release'
 
-
+    implementation 'com.pgyer:analytics:4.2.0'
     implementation 'com.tencent.liteav:LiteAVSDK_TRTC:latest.release'
     implementation 'com.tencent.imsdk:imsdk:5.1.66'
     implementation 'cn.jzvd:jiaozivideoplayer:7.7.0'
 
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
 
-    implementation 'com.tencent.bugly:crashreport:latest.release'
-    implementation 'com.tencent.bugly:nativecrashreport:latest.release'
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.wisewoods.eduandroid">
 
     <uses-permission android:name="android.permission.CALL_PHONE" />
@@ -9,6 +10,11 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_LOGS" />
 
+    <uses-permission
+        android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"
+        tools:ignore="ProtectedPermissions" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+
 
     <application
         android:name=".app.App"
@@ -18,6 +24,18 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 
+        <meta-data
+            android:name="PGYER_API_KEY"
+            android:value="b5042b8f1c95ba384dfc83c90ecdd235"></meta-data>
+        <meta-data
+            android:name="PGYER_FRONTJS_KEY"
+            android:value="ac4b829ed3400d93c8eb2bd1751d4793"></meta-data>
+
+        <!--添加新版本检测-->
+        <meta-data
+            android:name="PGYER_FEATURE_CHECK_UNPDATE"
+            android:value="true"></meta-data>
+
         <activity
             android:name=".ui.LoginActivity"
             android:launchMode="singleTop"

app/src/main/java/com/wisewoods/eduandroid/app/App.java

@@ -1,32 +1,39 @@
 package com.wisewoods.eduandroid.app;
 
 
-import android.content.ActivityNotFoundException;
 import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
 import android.util.Log;
-import android.widget.Toast;
 
-import com.blankj.utilcode.util.FileUtils;
+import com.pgyer.pgyersdk.PgyerSDKManager;
 import com.tencent.android.tpush.XGIOperateCallback;
 import com.tencent.android.tpush.XGPushConfig;
 import com.tencent.android.tpush.XGPushManager;
-import com.tencent.bugly.crashreport.CrashReport;
 import com.wisewoods.base.app.BaseApp;
 
-import java.io.File;
-
 public class App extends BaseApp {
 
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+        //在attachBaseContext方法中调用初始化sdk
+        initPgyerSDK(this);
+    }
+
+    /**
+     *  初始化蒲公英SDK
+     */
+    private static void initPgyerSDK( App application){
+        new PgyerSDKManager.Init()
+                .setContext(application) //设置上下问对象
+                .start();
+    }
+
     @Override
     public void onCreate() {
         super.onCreate();
 
         //注册推送
         initPush();
-
-        CrashReport.initCrashReport(getApplicationContext(), BUGLY_ID, false);
     }
 
     private void initPush() {

app/src/main/java/com/wisewoods/eduandroid/app/ImgManager.java

@@ -51,7 +51,6 @@ import com.wisewoods.base.utils.GlideEngine;
 import com.wisewoods.eduandroid.R;
 import com.wisewoods.eduandroid.ui.BuildingBaseActivity;
 import com.wisewoods.eduandroid.ui.ChangePwdActivity;
-import com.wisewoods.eduandroid.ui.HostelActivity;
 import com.wisewoods.eduandroid.ui.LiveListActivity;
 import com.wisewoods.eduandroid.ui.MessageActivity;
 import com.wisewoods.eduandroid.ui.MettingActivity;
@@ -190,7 +189,7 @@ public class ImgManager {
             });
         }));
         maps.put("教室统计", new MainTab("教室统计", R.drawable.ic_tab_room, RoomActivity.class));
-        maps.put("宿舍查询", new MainTab("宿舍查询", R.drawable.ic_tab_sleep, HostelActivity.class));
+//        maps.put("宿舍查询", new MainTab("宿舍查询", R.drawable.ic_tab_sleep, HostelActivity.class));
         maps.put("基地管理", new MainTab("基地管理", R.drawable.ic_tab_base, v -> {
 
             App.api.selectBaseLibraryListByStuId()

app/src/main/java/com/wisewoods/eduandroid/ui/MainActivity.java

@@ -9,15 +9,10 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.Utils;
+import com.pgyer.pgyersdk.PgyerSDKManager;
 import com.tencent.android.tpush.XGPushManager;
 import com.tencent.liteav.meeting.model.TRTCMeeting;
-import com.wisewoods.eduandroid.R;
-import com.wisewoods.eduandroid.app.App;
-import com.wisewoods.eduandroid.app.ImgManager;
 import com.wisewoods.base.app.UserManager;
-import com.wisewoods.eduandroid.databinding.ActivityMainBinding;
-import com.wisewoods.eduandroid.ui.adapter.MainTab;
-import com.wisewoods.eduandroid.ui.adapter.MainTabAdapter;
 import com.wisewoods.base.base.BaseActivity;
 import com.wisewoods.base.bean.BaseEvent;
 import com.wisewoods.base.bean.LoginUser;
@@ -25,6 +20,12 @@ import com.wisewoods.base.bean.MsgCount;
 import com.wisewoods.base.bean.Role;
 import com.wisewoods.base.net.JCallback;
 import com.wisewoods.base.utils.ImgUtils;
+import com.wisewoods.eduandroid.R;
+import com.wisewoods.eduandroid.app.App;
+import com.wisewoods.eduandroid.app.ImgManager;
+import com.wisewoods.eduandroid.databinding.ActivityMainBinding;
+import com.wisewoods.eduandroid.ui.adapter.MainTab;
+import com.wisewoods.eduandroid.ui.adapter.MainTabAdapter;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -34,7 +35,6 @@ import retrofit2.Response;
 public class MainActivity extends BaseActivity<ActivityMainBinding> implements SwipeRefreshLayout.OnRefreshListener {
 
     private MainTabAdapter mAdapter;
-
     @Override
     protected boolean hasEvent() {
         return true;
@@ -77,7 +77,7 @@ public class MainActivity extends BaseActivity<ActivityMainBinding> implements S
         ImgUtils.loadCircle(activity, UserManager.getUser().avatar, R.drawable.ic_default_avtar, binding.ivAvater);
         mAdapter.setNewInstance(ImgManager.getMenu());
         binding.srf.setOnRefreshListener(this);
-
+        PgyerSDKManager.checkSoftwareUpdate(this);
     }
 
 

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

@@ -22,7 +22,7 @@
                 android:id="@+id/iv_cover"
                 android:layout_width="match_parent"
                 android:layout_height="250dp"
-                android:scaleType="fitCenter" />
+                android:scaleType="centerCrop" />
 
             <LinearLayout
                 android:layout_width="match_parent"

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

@@ -109,7 +109,7 @@
                 android:drawablePadding="7dp"
                 android:paddingTop="10dp"
                 android:paddingBottom="10dp"
-                android:text="全部"
+                android:text="类型"
                 android:textColor="#ff666666"
                 android:textSize="13sp" />
         </FrameLayout>

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

@@ -28,6 +28,7 @@
                 android:id="@+id/iv_course_cover"
                 android:layout_width="73dp"
                 android:layout_height="73dp"
+                android:scaleType="centerCrop"
                 android:layout_marginRight="13dp"
                 tools:src="@drawable/ic_default_avtar" />
 

base/src/main/java/com/wisewoods/base/app/BaseApp.java

@@ -18,7 +18,6 @@ public class BaseApp extends Application {
     public static Handler mHandler;
     public static ApiService api;
     public static int SDKAPPID = 1400492267;
-    public static String BUGLY_ID = "d7416135e5";
 
     @Override
     public void onCreate() {

base/src/main/java/com/wisewoods/base/net/ApiService.java

@@ -54,15 +54,15 @@ import retrofit2.http.Query;
 public interface ApiService {
 
 //    String SERVER = "https://sqdx.jiaxintech.com/prod-api/";  //正式环境
-        String SERVER = "https://edu.jiaxintech.com/prod-api/";  //正式环境
+//        String SERVER = "https://edu.jiaxintech.com/prod-api/";  //正式环境
 //        String SERVER = "http://192.168.1.145/dev-api/";  //正式环境
-//        String SERVER = "http://172.16.1.90/dev-api/";  //正式环境
+        String SERVER = "http://10.16.4.8/dev-api/";  //正式环境
 //    String FILE_SERVER = "https://sqdx.jiaxintech.com/prod-api/";  //正式环境
     String PROJECT = "";
     String APPID = "2";
 
     String HELP_ADDRESS = "https://edu.jiaxintech.com/wx_html/appInfoList.html?" + APPID;
-    String KEYNOTE_ADDRESS = "https://edu.jiaxintech.com/wx_html/keynote.html?";
+    String KEYNOTE_ADDRESS = "https://edu.jiaxintech.com/wx_html/hostSpeech.html?";
 
     //   登录
     @POST("auth/manage/login")

settings.gradle

@@ -5,6 +5,8 @@ dependencyResolutionManagement {
         mavenCentral()
         jcenter() // Warning: this repository is going to shut down soon
         maven { url 'https://jitpack.io' }
+        maven { url "https://frontjs-static.pgyer.com/dist/sdk/pgyersdk" }
+
     }
 }
 rootProject.name = "EduAndroid"