6.7.0谷歌送审版本

common/src/main/java/com/yunbao/common/manager/InstructorRemarkManager.java

@@ -47,13 +47,11 @@ public class InstructorRemarkManager extends BaseCacheManager {
             if (null == instructorRemarkMap) {
                 String string = getString(KEY_INSTRUCTOR_REMARK);
                 if (!StringUtil.isEmpty(string)) {
-                  instructorRemarkMap = JSON.parseObject(string, new TypeReference<Map<String, String>>() {
-
-                    });
+                    instructorRemarkMap = JSON.parseObject(string, Map.class);
                 }
             }
-        }catch (Exception e){
-            Log.i("remark", "getInstructorRemark: "+getString(KEY_INSTRUCTOR_REMARK));
+        } catch (Exception e) {
+            Log.i("remark", "getInstructorRemark: " + getString(KEY_INSTRUCTOR_REMARK));
             e.printStackTrace();
         }
         if (instructorRemarkMap == null) {
@@ -66,12 +64,11 @@ public class InstructorRemarkManager extends BaseCacheManager {
      * 设置指导员备注信息
      */
     public void setInstructorRemark(String map) {
-        this.instructorRemarkMap = JSON.parseObject(map, new TypeReference<Map<String, String>>() {
-        });
+        this.instructorRemarkMap = JSON.parseObject(map, Map.class);
         put(KEY_INSTRUCTOR_REMARK, map);
         for (String key : instructorRemarkMap.keySet()) {
             UserInfo userInfo = RongUserInfoManager.getInstance().getUserInfo(key);
-            if(userInfo!=null){
+            if (userInfo != null && !StringUtil.isEmpty(instructorRemarkMap.get(key))) {
                 userInfo.setName(instructorRemarkMap.get(key));
                 RongUserInfoManager.getInstance().refreshUserInfoCache(userInfo);
             }
@@ -133,9 +130,7 @@ public class InstructorRemarkManager extends BaseCacheManager {
                         @Override
                         public void onSuccess(int code, String msg, String[] info) {
                             if (code == 0 && info.length > 0) {
-                                instructorRemarkMap = JSON.parseObject(info[0], new TypeReference<Map<String, String>>() {
-
-                                });
+                                instructorRemarkMap = JSON.parseObject(info[0], Map.class);
                                 setInstructorRemark(info[0]);
                             }
 

common/src/main/java/com/yunbao/common/manager/OpenAdManager.java

@@ -54,10 +54,18 @@ public class OpenAdManager {
     }
 
     public void clear() {
-        runnableMap.clear();
-        showMap.clear();
-        list.clear();
-        waitRunnableMap.clear();
+        if (runnableMap != null) {
+            runnableMap.clear();
+        }
+        if (showMap != null) {
+            showMap.clear();
+        }
+        if (list != null) {
+            list.clear();
+        }
+        if (waitRunnableMap != null) {
+            waitRunnableMap.clear();
+        }
         list = null;
         runNowRunnable = null;
     }
@@ -114,7 +122,7 @@ public class OpenAdManager {
     }
 
     private static long showTime = 0;
-    private OnItemClickListener<String> onItemClickListener=new OnItemClickListener<String>() {
+    private OnItemClickListener<String> onItemClickListener = new OnItemClickListener<String>() {
         @Override
         public void onItemClick(String bean, int position) {
 
@@ -123,7 +131,7 @@ public class OpenAdManager {
 
     public synchronized void show(int type, boolean isGuard) {
         showType = type;
-        if(true){
+        if (false) {
             //潘多拉不需要彈窗
             return;
         }
@@ -327,7 +335,7 @@ public class OpenAdManager {
             if (model.getShowModel() == OpenAdModel.SHOW_DIY) {
                 String nextTime = String.valueOf(System.currentTimeMillis() + (Long.parseLong(model.getSection()) * 60 * 1000));
                 SpUtil.setStringValue("open_ad_popup_time_" + model.getId(), nextTime);
-                Log.i(TAG, "run: 下一次展示时间:"+nextTime+" | "+model.getSection());
+                Log.i(TAG, "run: 下一次展示时间:" + nextTime + " | " + model.getSection());
                 showMap.remove(model.getId());
             }
             if (model.getModel() == OpenAdModel.MODEL_BOTTOM) {

common/src/main/java/com/yunbao/common/utils/DeviceUtils.java

@@ -90,6 +90,17 @@ public class DeviceUtils {
         }
         return "0";
 
+    }
+    public static String getVersionName2(Context context) {
+        try {
+            PackageManager manager = context.getPackageManager();
+            PackageInfo info = manager.getPackageInfo(context.getPackageName(), 0);
+            return info.versionCode+"";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "0";
+
     }
 
     /**