diff --git a/app/build.gradle b/app/build.gradle
index 307e9ce..245151d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,8 +61,8 @@ android {
         //新平台正式
         newly {
             flavorDimensions "default"
-            versionCode 14
-            versionName "2.3"
+            versionCode 15
+            versionName "2.4"
             /*********************************极光推送************************************/
             manifestPlaceholders = [
                     XG_ACCESS_ID : "1500026372",
diff --git a/app/src/main/java/com/aoleyun/sn/bean/UploadAppInfo.java b/app/src/main/java/com/aoleyun/sn/bean/UploadAppInfo.java
index f6c6d0a..d4c2256 100644
--- a/app/src/main/java/com/aoleyun/sn/bean/UploadAppInfo.java
+++ b/app/src/main/java/com/aoleyun/sn/bean/UploadAppInfo.java
@@ -9,14 +9,14 @@ public class UploadAppInfo implements Serializable {
 
     private static final long serialVersionUID = 1746386760446697855L;
 
-    private String package_name;
-    private String app_name;
-    private String install_time;
-    private String versionCode;
-    private int state;
-    //    private int id;
+    String package_name;
+    String app_name;
+    String install_time;
+    String versionCode;
+    int state;
+    //     int id;
     String versionName;
-    String app_size;
+    Long app_size;
 
     public String getPackage_name() {
         return package_name;
@@ -74,11 +74,11 @@ public class UploadAppInfo implements Serializable {
         this.versionName = versionName;
     }
 
-    public String getApp_size() {
+    public Long getApp_size() {
         return app_size;
     }
 
-    public void setApp_size(String app_size) {
+    public void setApp_size(Long app_size) {
         this.app_size = app_size;
     }
 
diff --git a/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java b/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java
index b257d2b..5645123 100644
--- a/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java
+++ b/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java
@@ -696,7 +696,7 @@ public class NetInterfaceManager {
     }
 
 
-    public void sendRunningAppInfo(ObserverCallback callback) {
+    public void sendInstalledAppInfo(ObserverCallback callback) {
         String jsonString = ApkUtils.getRunningAppInfo(mContext);
         getUploadAppInfoApi().getUploadAppInfoApi(NetInterfaceManager.HTTP_KEY,
                 Utils.getSerial(),
@@ -706,26 +706,26 @@ public class NetInterfaceManager {
                 .subscribe(new Observer<BaseResponse>() {
                     @Override
                     public void onSubscribe(Disposable d) {
-                        Log.e("sendRunningAppInfo", "onSubscribe: ");
+                        Log.e("sendInstalledAppInfo", "onSubscribe: ");
                         callback.onSubscribe(d);
                     }
 
                     @Override
                     public void onNext(BaseResponse baseResponse) {
-                        Log.e("sendRunningAppInfo", "onNext: " + baseResponse.toString());
+                        Log.e("sendInstalledAppInfo", "onNext: " + baseResponse.toString());
                         callback.onNext(baseResponse);
                     }
 
                     @Override
                     public void onError(Throwable e) {
-                        Log.e("sendRunningAppInfo", "onError: " + e.getMessage());
+                        Log.e("sendInstalledAppInfo", "onError: " + e.getMessage());
                         callback.onError(e);
                         onComplete();
                     }
 
                     @Override
                     public void onComplete() {
-                        Log.e("sendRunningAppInfo", "onComplete: ");
+                        Log.e("sendInstalledAppInfo", "onComplete: ");
                         callback.onComplete();
                     }
                 });
diff --git a/app/src/main/java/com/aoleyun/sn/receiver/NewAppReceiver.java b/app/src/main/java/com/aoleyun/sn/receiver/NewAppReceiver.java
index 6d4a8d9..30309ad 100644
--- a/app/src/main/java/com/aoleyun/sn/receiver/NewAppReceiver.java
+++ b/app/src/main/java/com/aoleyun/sn/receiver/NewAppReceiver.java
@@ -108,7 +108,7 @@ public class NewAppReceiver extends BroadcastReceiver {
                     public void onNext(@NonNull String s) {
                         Log.e(TAG, "sendAppInfo: onNext: " + s);
                         SaveListUtils.getDownLoadList().remove(s);
-                        NetInterfaceManager.getInstance().sendRunningAppInfo(new NetInterfaceManager.ObserverCallback() {
+                        NetInterfaceManager.getInstance().sendInstalledAppInfo(new NetInterfaceManager.ObserverCallback() {
                             @Override
                             public void onSubscribe(Disposable d) {
 
diff --git a/app/src/main/java/com/aoleyun/sn/service/main/MainService.java b/app/src/main/java/com/aoleyun/sn/service/main/MainService.java
index d4123e7..72dc50a 100644
--- a/app/src/main/java/com/aoleyun/sn/service/main/MainService.java
+++ b/app/src/main/java/com/aoleyun/sn/service/main/MainService.java
@@ -36,8 +36,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.aoleyun.sn.BuildConfig;
 import com.aoleyun.sn.R;
-import com.aoleyun.sn.activity.main.MainActivity;
-import com.aoleyun.sn.activity.main.MainAContact;
 import com.aoleyun.sn.activity.main.MainAPresenter;
 import com.aoleyun.sn.bean.BaseResponse;
 import com.aoleyun.sn.bean.PoweroffBean;
@@ -747,7 +745,7 @@ public class MainService extends Service implements MainSContact.MainView, Netwo
         if (loocked) {
             ToastUtil.betaShow("设备已上锁");
             //上传APP信息
-            NetInterfaceManager.getInstance().sendRunningAppInfo(new NetInterfaceManager.ObserverCallback() {
+            NetInterfaceManager.getInstance().sendInstalledAppInfo(new NetInterfaceManager.ObserverCallback() {
                 @Override
                 public void onSubscribe(Disposable d) {
 
diff --git a/app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java b/app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java
index b0f4eee..b192a76 100644
--- a/app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java
+++ b/app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java
@@ -426,7 +426,7 @@ public class MessageReceiver extends XGPushBaseReceiver {
     }
 
     private void show(Context context, String text) {
-        Toast.makeText(context, text, Toast.LENGTH_SHORT).show();
+//        Toast.makeText(context, text, Toast.LENGTH_SHORT).show();
     }
 
     private int changeNum(int paramInt) {
@@ -452,12 +452,15 @@ public class MessageReceiver extends XGPushBaseReceiver {
                 break;
             case MSG_DELETE:
                 ToastUtil.betaShow("收到管控：应用删除");
-                if (!TextUtils.isEmpty(title)) {
-                    if (SaveListUtils.getlist().contains(title)) {
-                        SaveListUtils.getlist().remove(title);
+                if (!TextUtils.isEmpty(extras)) {
+                    JSONObject jsonObject = JSON.parseObject(extras);
+                    String pkg = jsonObject.getString("package_name");
+                    if (TextUtils.isEmpty(pkg)) return;
+                    if (SaveListUtils.getlist().contains(pkg)) {
+                        SaveListUtils.getlist().remove(pkg);
                     }
                     SaveListUtils.sendForceAPP(mContext);
-                    ApkUtils.UninstallAPP(mContext, title);
+                    ApkUtils.UninstallAPP(mContext, pkg);
                 }
                 HTTPInterface.getAppLimit(mContext);
                 HTTPInterface.getNetAndLaunchSetting(mContext);
@@ -1312,9 +1315,8 @@ public class MessageReceiver extends XGPushBaseReceiver {
     }
 
     /**
-     * @param jsonString
-     * 		"is_log": 1,//是否开启运行日志 0关闭 1开启
-     * 		"is_log_type": 1 //获取运行日志类型 0即时 1定时
+     * @param jsonString "is_log": 1,//是否开启运行日志 0关闭 1开启
+     *                   "is_log_type": 1 //获取运行日志类型 0即时 1定时
      */
     private void senSNLogFile(String jsonString) {
         JSONObject jsonObject = JSON.parseObject(jsonString);
diff --git a/app/src/main/java/com/aoleyun/sn/utils/ApkUtils.java b/app/src/main/java/com/aoleyun/sn/utils/ApkUtils.java
index f15c105..3b04a32 100644
--- a/app/src/main/java/com/aoleyun/sn/utils/ApkUtils.java
+++ b/app/src/main/java/com/aoleyun/sn/utils/ApkUtils.java
@@ -100,16 +100,6 @@ public class ApkUtils {
         }
     }
 
-    public static void openApp(Context context, View view) {
-        try {
-            Intent intent = context.getPackageManager().getLaunchIntentForPackage((String) view.getTag(R.string.download_btn_had));
-            context.startActivity(intent);
-        } catch (Exception e) {
-            Toast.makeText(context, R.string.open_app_fail, Toast.LENGTH_LONG).show();
-        }
-        return;
-    }
-
     public static void openApp(Context context, String packageName) {
         Intent intent = context.getPackageManager().getLaunchIntentForPackage(packageName);
         if (intent != null) {
@@ -1160,7 +1150,7 @@ public class ApkUtils {
         for (PackageInfo packageInfo : packages) {
             String packageName = packageInfo.packageName;
             //排除桌面app和出厂自带app
-            if (desktopAPP.contains(packageName) || factoryapp.contains(packageName)) {
+            if (desktopAPP.contains(packageName) || factoryapp.contains(packageName) || aoleyunAPP.contains(packageName)) {
                 continue;
             }
             //排除所有系统应用，不显示
@@ -1180,6 +1170,7 @@ public class ApkUtils {
             uploadAppInfo.setInstall_time(firstInstallTime);
             uploadAppInfo.setVersionCode(String.valueOf(packageInfo.versionCode));
             uploadAppInfo.setState(0);
+            uploadAppInfo.setApp_size(getPackageSize(context, packageInfo.applicationInfo.publicSourceDir));
             uploadAppInfo.setVersionName(packageInfo.versionName);
             for (ActivityManager.RunningServiceInfo info : infoList) {
                 if (info.process.contains(packageInfo.packageName)) {
@@ -1241,4 +1232,10 @@ public class ApkUtils {
     }
 
 
+    public static long getPackageSize(Context context, String filePath) {
+        long size = new File(filePath).length();
+        return size;
+    }
+
+
 }
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
index 0864c52..1615ba7 100644
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -225,7 +225,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
-                        android:text="部门"
+                        android:text="组别"
                         android:textColor="#000000"
                         android:textSize="@dimen/sp_12"
                         app:layout_constraintBottom_toBottomOf="parent"
@@ -266,7 +266,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
-                        android:text="工号"
+                        android:text="编号"
                         android:textColor="#000000"
                         android:textSize="@dimen/sp_12"
                         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout-port/activity_main.xml b/app/src/main/res/layout-port/activity_main.xml
index f9bf671..1a71228 100644
--- a/app/src/main/res/layout-port/activity_main.xml
+++ b/app/src/main/res/layout-port/activity_main.xml
@@ -197,7 +197,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
-                android:text="部门"
+                android:text="组别"
                 android:textColor="#000000"
                 android:textSize="@dimen/sp_12"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -238,7 +238,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
-                android:text="工号"
+                android:text="编号"
                 android:textColor="#000000"
                 android:textSize="@dimen/sp_12"
                 app:layout_constraintBottom_toBottomOf="parent"