提交代码

raedev · raedev · commit e55668de2651 · 2018-12-22T16:02:27.000+08:00
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/src/main/java/com/rae/cnblogs/MainActivity.java b/app/src/main/java/com/rae/cnblogs/MainActivity.java
@@ -11,6 +11,7 @@
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.webkit.CookieManager;
@@ -35,6 +36,7 @@
 import com.rae.cnblogs.sdk.event.PostMomentEvent;
 import com.rae.cnblogs.sdk.event.UserInfoChangedEvent;
 import com.rae.cnblogs.widget.ITopScrollable;
+import com.umeng.commonsdk.UMConfigure;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -74,6 +76,10 @@ public void onNext(Long aLong) {
         startService(new Intent(this, CnblogsService.class));
         if (BuildConfig.DEBUG) {
             debugLogin();
+
+            String[] testDeviceInfo = UMConfigure.getTestDeviceInfo(this);
+
+            Log.i("rae", "测试信息：" + TextUtils.concat(testDeviceInfo));
         }
     }
 
diff --git a/module-basic/src/main/java/com/rae/cnblogs/basic/AppMobclickAgent.java b/module-basic/src/main/java/com/rae/cnblogs/basic/AppMobclickAgent.java
@@ -8,7 +8,6 @@
 import android.text.TextUtils;
 
 import com.umeng.analytics.MobclickAgent;
-import com.umeng.commonsdk.UMConfigure;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -21,20 +20,6 @@
  */
 public final class AppMobclickAgent {
 
-    /**
-     * 初始化友盟统计
-     *
-     * @param applicationContext 上下文
-     * @param appKey             应用KEY
-     * @param channel            渠道名称
-     */
-    public static void init(Context applicationContext,
-                            String appKey,
-                            String channel) {
-        UMConfigure.setLogEnabled(false);
-        UMConfigure.init(applicationContext, appKey, channel, UMConfigure.DEVICE_TYPE_PHONE, null);
-    }
-
     /**
      * 统计打开时间
      */
diff --git a/module-basic/src/main/java/com/rae/cnblogs/basic/BasicActivity.java b/module-basic/src/main/java/com/rae/cnblogs/basic/BasicActivity.java
@@ -10,6 +10,8 @@
 import android.view.View;
 import android.widget.TextView;
 
+import com.umeng.analytics.MobclickAgent;
+
 import java.util.List;
 
 import butterknife.ButterKnife;
@@ -87,6 +89,18 @@ protected int getHomeAsUpIndicator() {
     }
 
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        MobclickAgent.onResume(this);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        MobclickAgent.onPause(this);
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
diff --git a/module-basic/src/main/java/com/rae/cnblogs/basic/BasicFragment.java b/module-basic/src/main/java/com/rae/cnblogs/basic/BasicFragment.java
@@ -9,16 +9,26 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.umeng.analytics.MobclickAgent;
+
 import java.util.List;
 
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
 
-public abstract class BasicFragment extends Fragment implements  IPresenterView {
+public abstract class BasicFragment extends Fragment implements IPresenterView {
 
     @Nullable
     private Unbinder mUnBinder;
 
+    private String mPageName = "Fragment";
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mPageName = getClass().getSimpleName();
+    }
+
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -46,6 +56,18 @@ public void onDestroy() {
         }
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        MobclickAgent.onPageStart(mPageName);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        MobclickAgent.onPageEnd(mPageName);
+    }
+
     /**
      * 实现类重写加载数据逻辑
      */
diff --git a/module-blog/src/main/java/com/rae/cnblogs/blog/detail/ContentDetailPresenterImpl.java b/module-blog/src/main/java/com/rae/cnblogs/blog/detail/ContentDetailPresenterImpl.java
@@ -64,7 +64,6 @@ protected void onStart() {
                 .map(new Function<String, String>() {
                     @Override
                     public String apply(String content) throws Exception {
-
                         // 网络不可用、WIFI情况、 关闭智能无图模式
                         if (!networkIsOk() || isWIFI() || !mAppConfig.disableBlogImage())
                             return content;
diff --git a/module-home/src/main/java/com/rae/cnblogs/home/LauncherActivity.java b/module-home/src/main/java/com/rae/cnblogs/home/LauncherActivity.java
@@ -10,6 +10,7 @@
 
 import com.rae.cnblogs.AppRoute;
 import com.rae.cnblogs.basic.AppImageLoader;
+import com.rae.cnblogs.basic.AppMobclickAgent;
 import com.rae.cnblogs.basic.BasicActivity;
 import com.rae.cnblogs.home.launcher.LauncherContract;
 import com.rae.cnblogs.home.launcher.LauncherPresenterImpl;
diff --git a/module-home/src/main/java/com/rae/cnblogs/home/launcher/LauncherPresenterImpl.java b/module-home/src/main/java/com/rae/cnblogs/home/launcher/LauncherPresenterImpl.java
@@ -63,6 +63,7 @@ public AdvertBean apply(DbAdvert dbAdvert) {
                     @Override
                     public void onNext(AdvertBean advertBean) {
                         mAdvertBean = advertBean;
+                        AppMobclickAgent.onLaunchAdExposureEvent(getContext(), advertBean.getAdId(), advertBean.getAdName());
                         getView().onLoadImage(advertBean.getAdName(), advertBean.getImageUrl());
                     }
 
@@ -108,6 +109,8 @@ protected void accept(AdvertBean data) {
                         mDbAdvert.save(data);
                         mAdvertBean = data;
 
+                        AppMobclickAgent.onLaunchAdExposureEvent(getContext(), data.getAdId(), data.getAdName());
+
                         // 加载图片
                         if (!TextUtils.isEmpty(data.getImageUrl()))
                             getView().onLoadImage(data.getAdName(), data.getImageUrl());
diff --git a/module-home/src/main/java/com/rae/cnblogs/home/search/SearchActivity.java b/module-home/src/main/java/com/rae/cnblogs/home/search/SearchActivity.java
@@ -6,6 +6,7 @@
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.text.Editable;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -127,10 +128,12 @@ public void onSearchClick() {
      * 执行搜索
      */
     private void performSearch(String text) {
+        if (TextUtils.isEmpty(text)) return;
         // 显示搜索结果页，由子Fragment处理
         if (mSearchResultFragment == null) {
             mSearchResultFragment = new SearchResultFragment();
         }
+        text = text.trim();
         Bundle args = new Bundle();
         args.putString(Intent.EXTRA_TEXT, text);
         mSearchResultFragment.setArguments(args);
@@ -140,6 +143,8 @@ private void performSearch(String text) {
         transaction.commit();
         UICompat.hideSoftInputFromWindow(this);
 
+        // 埋点
+        AppMobclickAgent.onSearchEvent(this, text);
         // 保存搜索记录
 //        saveHistory(text);
     }
diff --git a/module-home/src/main/res/layout/fm_mine.xml b/module-home/src/main/res/layout/fm_mine.xml
@@ -181,7 +181,7 @@
             android:paddingEnd="12dp"
             android:paddingBottom="12dp">
 
-            <TextView
+            <com.rae.cnblogs.widget.SkinDrawableTextView
                 android:id="@+id/tv_favorites"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -193,7 +193,7 @@
                 android:textColor="@color/ph1"
                 android:textSize="@dimen/h3" />
 
-            <TextView
+            <com.rae.cnblogs.widget.SkinDrawableTextView
                 android:id="@+id/tv_history"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -225,7 +225,7 @@
                         android:background="@drawable/bg_badge"
                         android:visibility="invisible" />
 
-                    <TextView
+                    <com.rae.cnblogs.widget.SkinDrawableTextView
                         android:id="@+id/tv_system_message"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -239,7 +239,7 @@
                 </FrameLayout>
             </FrameLayout>
 
-            <TextView
+            <com.rae.cnblogs.widget.SkinDrawableTextView
                 android:id="@+id/tv_night_mode"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
diff --git a/module-middleware/src/main/java/com/rae/cnblogs/CnblogsApplication.java b/module-middleware/src/main/java/com/rae/cnblogs/CnblogsApplication.java
@@ -1,5 +1,8 @@
 package com.rae.cnblogs;
 
+import android.text.TextUtils;
+import android.util.Log;
+
 import com.avos.avoscloud.AVOSCloud;
 import com.avos.avoscloud.feedback.FeedbackThread;
 import com.rae.cnblogs.basic.AppDataManager;
@@ -35,7 +38,7 @@ protected void onFirstCreate() {
                 BuildConfig.LEAN_CLOUD_APP_KEY);
         FeedbackThread.getInstance();
         // Bugly
-//        CrashReport.initCrashReport(this, BuildConfig.BUGLY_APP_ID, BuildConfig.DEBUG);
+        CrashReport.initCrashReport(this, BuildConfig.BUGLY_APP_ID, BuildConfig.DEBUG);
         initUMConfig();
     }
 
@@ -60,5 +63,7 @@ private void initUMConfig() {
         PlatformConfig.setWeixin(BuildConfig.WECHAT_APP_ID, BuildConfig.WECHAT_APP_SECRET);
         PlatformConfig.setSinaWeibo(BuildConfig.WEIBO_APP_ID, BuildConfig.WEIBO_APP_SECRET, "http://www.raeblog.com/cnblogs/index.php/share/weibo/redirect");
         PlatformConfig.setQQZone(BuildConfig.QQ_APP_ID, BuildConfig.QQ_APP_SECRET);
+
+        
     }
 }
diff --git a/module-resource/src/main/res/values/colors_night.xml b/module-resource/src/main/res/values/colors_night.xml
@@ -3,7 +3,7 @@
     <!--夜间模式-->
 
     <!--夜间模式主色调-->
-    <color name="nightIconColor">#ffffff</color>
+    <color name="nightIconColor">#ababab</color>
     <color name="nightColorPrimary">#1F1F21</color>
 
     <color name="colorPrimary_night">@color/nightColorPrimary</color>
diff --git a/module-user/src/main/java/com/rae/cnblogs/user/fragment/PersonalIntroduceFragment.java b/module-user/src/main/java/com/rae/cnblogs/user/fragment/PersonalIntroduceFragment.java
@@ -9,15 +9,20 @@
 
 import com.rae.cnblogs.UICompat;
 import com.rae.cnblogs.basic.BasicFragment;
+import com.rae.cnblogs.basic.rx.AndroidObservable;
+import com.rae.cnblogs.basic.rx.DefaultEmptyObserver;
 import com.rae.cnblogs.sdk.event.UserInfoChangedEvent;
 import com.rae.cnblogs.user.R;
 import com.rae.cnblogs.user.R2;
 import com.rae.cnblogs.web.WebViewFragment;
 
 import org.greenrobot.eventbus.EventBus;
 
+import java.util.concurrent.TimeUnit;
+
 import butterknife.BindView;
 import butterknife.OnClick;
+import io.reactivex.Observable;
 
 /**
  * 个性签名
@@ -58,13 +63,16 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         FragmentActivity activity = getActivity();
         if (activity == null) return;
         activity.findViewById(R.id.btn_save).setVisibility(View.GONE);
-        mTipsLayout.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                mTipsLayout.setVisibility(View.VISIBLE);
-                UICompat.fadeIn(mTipsLayout);
-            }
-        }, 2000);
+        AndroidObservable.create(Observable.timer(2, TimeUnit.SECONDS))
+                .with(this)
+                .subscribe(new DefaultEmptyObserver<Long>() {
+                    @Override
+                    public void onNext(Long aLong) {
+                        mTipsLayout.setVisibility(View.VISIBLE);
+                        UICompat.fadeIn(mTipsLayout);
+                    }
+                });
+
     }
 
     @OnClick(R2.id.btn_ensure)
diff --git a/module-widget/src/main/java/com/rae/cnblogs/theme/CnblogsLayoutInflater.java b/module-widget/src/main/java/com/rae/cnblogs/theme/CnblogsLayoutInflater.java
@@ -9,7 +9,6 @@
 import com.rae.cnblogs.widget.SkinFitWindowsFrameLayout;
 import com.rae.cnblogs.widget.SkinFitWindowsLinearLayout;
 import com.rae.cnblogs.widget.SkinNestedScrollView;
-import com.rae.cnblogs.widget.SkinRoundedImageView;
 
 import skin.support.app.SkinLayoutInflater;
 
@@ -22,8 +21,6 @@ public class CnblogsLayoutInflater implements SkinLayoutInflater {
     @Override
     public View createView(@NonNull Context context, String name, @NonNull AttributeSet attrs) {
         switch (name) {
-            case "com.makeramen.roundedimageview.RoundedImageView":
-                return new SkinRoundedImageView(context, attrs);
             case "android.support.v7.widget.CardView":
                 return new SkinCardView(context, attrs);
             case "android.support.v7.widget.FitWindowsFrameLayout":
diff --git a/module-widget/src/main/java/com/rae/cnblogs/widget/SkinDrawableTextView.java b/module-widget/src/main/java/com/rae/cnblogs/widget/SkinDrawableTextView.java
@@ -1,12 +1,10 @@
 package com.rae.cnblogs.widget;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.graphics.Color;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
-import android.util.Log;
 
 import com.rae.cnblogs.theme.ThemeCompat;
 
@@ -17,32 +15,34 @@
  * Copyright (c) https://github.com/raedev All rights reserved.
  */
 public class SkinDrawableTextView extends SkinCompatTextView {
+
     public SkinDrawableTextView(Context context) {
-        super(context);
+        this(context, null);
     }
 
     public SkinDrawableTextView(Context context, AttributeSet attrs) {
-        super(context, attrs);
+        this(context, attrs, 0);
     }
 
     public SkinDrawableTextView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
+        apply();
     }
 
     @Override
-    public void setCompoundDrawables(@Nullable Drawable left, @Nullable Drawable top, @Nullable Drawable right, @Nullable Drawable bottom) {
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT_WATCH && left != null) {
-            Drawable[] drawables = new Drawable[]{left, top, right, bottom};
-            Log.i("rae", "是否为夜间模式：" + ThemeCompat.isNight());
-            for (Drawable drawable : drawables) {
-                if (drawable == null) continue;
-                if (ThemeCompat.isNight()) {
-                    drawable.setTint(Color.RED);
-                } else {
-                    drawable.clearColorFilter();
-                }
-            }
+    public void applySkin() {
+        super.applySkin();
+        apply();
+    }
+
+    private void apply() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return;
+        if (ThemeCompat.isNight()) {
+            // 夜间模式的颜色
+            int nightColor = getResources().getColor(R.color.nightIconColor);
+            setCompoundDrawableTintList(ColorStateList.valueOf(nightColor));
+        } else {
+            setCompoundDrawableTintList(null);
         }
-        super.setCompoundDrawables(left, top, right, bottom);
     }
 }
diff --git a/module-widget/src/main/java/com/rae/cnblogs/widget/SkinRoundedImageView.java b/module-widget/src/main/java/com/rae/cnblogs/widget/SkinRoundedImageView.java
diff --git a/module-widget/src/main/res/values/attrs.xml b/module-widget/src/main/res/values/attrs.xml
