Fenix Wang %!s(int64=8) %!d(string=hai) anos
pai
achega
ad092698cd

+ 3 - 7
app/app.iml

@@ -75,6 +75,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
@@ -88,8 +89,10 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
@@ -141,12 +144,5 @@
     <orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
     <orderEntry type="module" module-name="uikit" exported="" />
-    <orderEntry type="library" exported="" name="java-json" level="project" />
-    <orderEntry type="library" exported="" name="renderscript-v8" level="project" />
-    <orderEntry type="library" exported="" name="glide-3.7.0" level="project" />
-    <orderEntry type="library" exported="" name="nim-avchat-4.0.0" level="project" />
-    <orderEntry type="library" exported="" name="nim-basesdk-4.0.0" level="project" />
-    <orderEntry type="library" exported="" name="fastjson-1.1.34.android" level="project" />
-    <orderEntry type="library" exported="" name="nim-lucene-4.0.0" level="project" />
   </component>
 </module>

+ 2 - 1
app/src/com/sheishuo/app/cache/SocialInfoCache.java

@@ -21,7 +21,8 @@ public class SocialInfoCache {
     public static void reset()
     {
         socialInfoMap.clear();
-        followCache.clear();
+        if(followCache != null)
+            followCache.clear();
         NimUserInfoCache.getInstance().clear();
     }
 

+ 2 - 0
app/src/com/sheishuo/app/login/LoginActivity.java

@@ -20,6 +20,7 @@ import com.netease.nim.uikit.common.ui.dialog.DialogMaker;
 import com.netease.nim.uikit.common.ui.dialog.EasyAlertDialogHelper;
 import com.sheishuo.app.cache.AccountCache;
 import com.sheishuo.app.R;
+import com.sheishuo.app.cache.MineSocialCache;
 import com.sheishuo.app.cache.SocialInfoCache;
 import com.sheishuo.app.common.util.data.SPHelper;
 import com.sheishuo.app.common.util.net.INet;
@@ -166,6 +167,7 @@ public class LoginActivity extends SheishuoUI implements View.OnClickListener{
                 AccountCache.sync();
 
                 SocialInfoCache.reset();
+                MineSocialCache.setInfo(null);
 
 
 

+ 2 - 1
app/src/com/sheishuo/app/main/activity/MainActivity.java

@@ -126,10 +126,11 @@ public class MainActivity extends SheishuoUI {
             syncPushNoDisturb(UserPreferences.getStatusConfig());
         }
 
+
         CrashReport.initCrashReport(getApplicationContext(), "81e3f6e720", true);
 
         //for crash test
-        CrashReport.testJavaCrash();
+        //CrashReport.testJavaCrash();
 
         onInit();
 

+ 16 - 11
app/src/com/sheishuo/app/main/fragment/CircleOfFriendsFragment.java

@@ -106,17 +106,22 @@ public class CircleOfFriendsFragment extends MainTabFragment{
         //初始化朋友圈首页界面
         NimUserInfo user = NIMClient.getService(UserService.class).getUserInfo(AccountCache.getAccount().getId());
         String avatarUrl = user.getAvatar();
-        Glide.with(SheishuoApplication.getContext()).load(avatarUrl).into(avatar);
-        Glide.with(getActivity())
-                .load(SocialInfoCache.get(AccountCache.getAccount().getId()).getSocial_banner())
-                .centerCrop()
-                .into(backgroundImg);
-        backgroundImg.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                pickImage(MineFragment.BANNER_SELECTED);
-            }
-        });
+        try {
+            Glide.with(SheishuoApplication.getContext()).load(avatarUrl).into(avatar);
+            Glide.with(getActivity())
+                    .load(SocialInfoCache.get(AccountCache.getAccount().getId()).getSocial_banner())
+                    .centerCrop()
+                    .into(backgroundImg);
+            backgroundImg.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    pickImage(MineFragment.BANNER_SELECTED);
+                }
+            });
+        }catch (Exception e)
+        {
+            Log.e("Exception", e.getMessage());
+        }
 
         username.setText(SocialInfoCache.getNick(user.getAccount()));
         isLoaded = true;

+ 7 - 7
uikit/uikit.iml

@@ -59,13 +59,6 @@
       <sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -73,6 +66,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />