友盟统计，多渠道打包

51d8488e · chengfengpiaopiao · d1c73b0c · 51d8488e · 51d8488e · 51d8488e
Commit 51d8488e authored Nov 13, 2017 by chengfengpiaopiao
Showing with 100 additions and 28 deletions
app/build.gradle
app/src/main/AndroidManifest.xml
app/src/main/java/com/maile/jingcai/base/BaseApplication.java
app/src/main/java/com/maile/jingcai/view/activity/MainActivity.java
app/src/main/java/com/maile/jingcai/view/fragment/SimpleCardFragment.java
app/src/main/res/layout/activity_main.xml
app/src/main/res/mipmap-xhdpi/select_gamepad.png
app/src/main/res/mipmap-xhdpi/select_shoppingcart.png
app/src/main/res/mipmap-xhdpi/select_user.png
app/src/main/res/mipmap-xhdpi/unselect_gamepad.png
app/src/main/res/mipmap-xhdpi/unselect_shoppingcart.png
app/src/main/res/mipmap-xhdpi/unselect_user.png
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -59,4 +59,5 @@ dependencies {
    compile 'cz.msebera.android:httpclient:4.4.1.1'
    compile 'com.flyco.tablayout:FlycoTabLayout_Lib:2.1.2@aar'
+    compile 'com.umeng.analytics:analytics:latest.integration'
 }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,6 +19,20 @@
        android:label="@string/app_name"
        android:supportsRtl="true"
        android:theme="@style/AppTheme">
+        <meta-data
+            android:name="UMENG_APPKEY"
+            android:value="58c25576c895767d61000ec7" />
+        <meta-data
+            android:name="UMENG_MESSAGE_SECRET"
+            android:value="771f0753ec80810bfced1e7347520fe7"/>
+        <meta-data
+            android:name="UMENG_CHANNEL"
+            android:value="android-app" />
+        <meta-data
+            android:name="TD_CHANNEL_ID"
+            android:value="maile" />
        <activity
            android:launchMode="singleTop"
            android:screenOrientation="portrait"

--- a/app/src/main/java/com/maile/jingcai/base/BaseApplication.java
+++ b/app/src/main/java/com/maile/jingcai/base/BaseApplication.java
@@ -2,6 +2,9 @@ package com.maile.jingcai.base;
 import android.app.Application;
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.util.Log;
 import com.maile.jingcai.util.DrawUtil;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
@@ -21,6 +24,7 @@ public class BaseApplication extends Application{
        super.onCreate();
        DrawUtil.resetDensity(this);
        regToWx();
+        Log.i("tangwen", "Application: 获取渠道包信息 " + getChannel(getApplicationContext(),"UMENG_CHANNEL"));
    }
    //初始化微信SDK
@@ -32,6 +36,17 @@ public class BaseApplication extends Application{
    }
+    //key为渠道名的key，对应友盟的 UMENG_CHANNEL
+    private String getChannel(Context context,String key) {
+        try {
+            PackageManager pm = context.getPackageManager();
+            ApplicationInfo appInfo = pm.getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA);
+            return appInfo.metaData.getString(key);
+        } catch (PackageManager.NameNotFoundException ignored) {
+        }
+        return "错误";
+    }
    public static Context getAppContext() {
        return sInstance;
    }

--- a/app/src/main/java/com/maile/jingcai/view/activity/MainActivity.java
+++ b/app/src/main/java/com/maile/jingcai/view/activity/MainActivity.java
@@ -7,6 +7,7 @@ import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.Window;
@@ -19,10 +20,14 @@ import com.flyco.tablayout.listener.OnTabSelectListener;
 import com.maile.jingcai.R;
 import com.maile.jingcai.module.entity.TabEntity;
 import com.maile.jingcai.util.PublicUtils;
+import com.maile.jingcai.util.preferences.IPreferencesIds;
+import com.maile.jingcai.util.preferences.PreferencesManager;
 import com.maile.jingcai.view.ViewFindUtils;
 import com.maile.jingcai.view.fragment.SimpleCardFragment;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Random;
 import butterknife.ButterKnife;
@@ -49,7 +54,7 @@ public class MainActivity extends FragmentActivity {
    private ViewPager mViewPager;
    private CommonTabLayout mTabLayout_2;
    private long exitTime;
-    private String[] urls = {"http://h5.test.7peng.cn/","http://www.mailejifen.com/","http://h5.test.7peng.cn/profile.html"};
+    private String[] urls = {"http://h5.test.7peng.cn/","http://192.168.1.250:81/shop","http://h5.test.7peng.cn/profile.html"};
@@ -64,6 +69,13 @@ public class MainActivity extends FragmentActivity {
        setContentView(R.layout.activity_main);
        ButterKnife.inject(this);
+        PreferencesManager preferencesManager = PreferencesManager.getSharedPreference(getApplicationContext(),
+                IPreferencesIds.DEFAULT_SHAREPREFERENCES_FILE,
+                Context.MODE_PRIVATE);
+        final String token = preferencesManager.getString(IPreferencesIds.TOKEN, "");
+        urls[0] = "http://h5.test.7peng.cn/" + "?token=" +token + "&platform=android" ;
+        Log.i("tangwen", "urls " + urls.toString());
        for (int i = 0 ; i < mTitles.length; i ++){
            mFragments.add(SimpleCardFragment.getInstance(mTitles[i],urls[i]));
@@ -75,7 +87,7 @@ public class MainActivity extends FragmentActivity {
        mDecorView = getWindow().getDecorView();
        mViewPager = ViewFindUtils.find(mDecorView, R.id.vp_2);
-        mViewPager.setOffscreenPageLimit(2);
+        mViewPager.setOffscreenPageLimit(1);
        mViewPager.setAdapter(new MyPagerAdapter(getSupportFragmentManager()));
        /** with nothing */
        /** with ViewPager */
@@ -119,7 +131,7 @@ public class MainActivity extends FragmentActivity {
            @Override
            public void onTabReselect(int position) {
                if (position == 0) {
-                    mTabLayout_2.showMsg(0, mRandom.nextInt(100) + 1);
+                   // mTabLayout_2.showMsg(0, mRandom.nextInt(100) + 1);
 //                    UnreadMsgUtils.show(mTabLayout_2.getMsgView(0), mRandom.nextInt(100) + 1);
                }
            }

--- a/app/src/main/java/com/maile/jingcai/view/fragment/SimpleCardFragment.java
+++ b/app/src/main/java/com/maile/jingcai/view/fragment/SimpleCardFragment.java
@@ -29,9 +29,12 @@ import com.maile.jingcai.module.net.RetrofitManager;
 import com.maile.jingcai.util.PublicUtils;
 import com.maile.jingcai.util.preferences.IPreferencesIds;
 import com.maile.jingcai.util.preferences.PreferencesManager;
+import com.umeng.analytics.MobclickAgent;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
 import butterknife.ButterKnife;
 import butterknife.InjectView;
@@ -54,13 +57,14 @@ public class SimpleCardFragment extends BaseFragment {
    private String mUrl;
-    public static SimpleCardFragment getInstance(String title,String mUrl) {
+    public static SimpleCardFragment getInstance(String title, String mUrl) {
        SimpleCardFragment sf = new SimpleCardFragment();
        sf.mTitle = title;
        sf.mUrl = mUrl;
        return sf;
    }
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
        View view = inflater.inflate(R.layout.fr_simple_card, container, false);
@@ -70,6 +74,30 @@ public class SimpleCardFragment extends BaseFragment {
        return view;
    }
+//    @Override
+//    public void onResume() {
+//        super.onResume();
+//        Log.i("tangwen", "onResume: " + mUrl);
+//        if(mUrl.equals("http://192.168.1.250:81/shop")){
+//            Log.i("tangwen", "onResume: " + "第二页");
+//            mWebView.loadUrl(mUrl);
+//        }
+//        Log.i("tangwen", "onResume: " + "其他页面");
+//    }
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if (isVisibleToUser) {
+            Log.i("tangwen", "onResume: " + mUrl);
+            if (mUrl.equals("http://192.168.1.250:81/shop")) {
+                Log.i("tangwen", "onResume: " + "第二页");
+                mWebView.loadUrl(mUrl);
+            }
+            Log.i("tangwen", "onResume: " + "其他页面");
+        }
+    }
    @Override
    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);
@@ -97,21 +125,21 @@ public class SimpleCardFragment extends BaseFragment {
        webSettings.setAllowFileAccess(true);
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW );
+            webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
        }
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
            WebView.setWebContentsDebuggingEnabled(true);
        }
-        if(Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) {
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) {
-            CookieManager.getInstance().setAcceptThirdPartyCookies(mWebView,true);
+            CookieManager.getInstance().setAcceptThirdPartyCookies(mWebView, true);
        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN){
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
            mWebView.getSettings().setAllowUniversalAccessFromFileURLs(true);
-        }else{
+        } else {
            try {
                Class<?> clazz = mWebView.getSettings().getClass();
                Method method = clazz.getMethod("setAllowUniversalAccessFromFileURLs", boolean.class);
@@ -128,9 +156,13 @@ public class SimpleCardFragment extends BaseFragment {
        }
        //WebView加载web资源
+        PreferencesManager preferencesManager = PreferencesManager.getSharedPreference(getContext(),
+                IPreferencesIds.DEFAULT_SHAREPREFERENCES_FILE,
+                Context.MODE_PRIVATE);
+        final String token = preferencesManager.getString(IPreferencesIds.TOKEN, "");
        mWebView.loadUrl(url);
        //覆盖WebView默认使用第三方或系统默认浏览器打开网页的行为，使网页用WebView打开
        mWebView.setWebViewClient(new WebViewClient() {
            @Override
@@ -139,6 +171,7 @@ public class SimpleCardFragment extends BaseFragment {
                view.loadUrl(url);
                return true;
            }
            @Override
            public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
                super.onReceivedError(view, errorCode, description, failingUrl);
@@ -149,30 +182,26 @@ public class SimpleCardFragment extends BaseFragment {
            @Override
            public void onPageFinished(WebView view, String url) {
-                mLoading.setVisibility(View.INVISIBLE);
+                if (mLoading != null) {
-               // super.onPageFinished(view, url);
+                    mLoading.setVisibility(View.INVISIBLE);
-                if(!mUrl.equals("http://h5.test.7peng.cn/")){
+                }
+                // super.onPageFinished(view, url);
+                if (!mUrl.equals("http://h5.test.7peng.cn/")) {
                    return;
                }
                isLoading = true;
-                PreferencesManager preferencesManager = PreferencesManager.getSharedPreference(getContext(),
-                        IPreferencesIds.DEFAULT_SHAREPREFERENCES_FILE,
-                        Context.MODE_PRIVATE);
-                final String token = preferencesManager.getString(IPreferencesIds.TOKEN, "");
                Log.i("ggg", "onPageFinished:  " + "ggg");
-                new Handler().postDelayed(new Runnable(){
+                new Handler().postDelayed(new Runnable() {
                    public void run() {
                        //mWebView.loadUrl("javascript:console.log('ggg'); (function(){localStorage.setItem(\"__token__\", '"+token+"');})();");
-                        mWebView.loadUrl("javascript:console.log('type：'+ typeof(window.h5AutoLogin));h5AutoLogin('"+token+"')");
+                        mWebView.loadUrl("javascript:console.log('type：'+ typeof(window.h5AutoLogin));h5AutoLogin('" + token + "')");
                    }
                }, 2000);
                //mWebView.loadUrl("javascript:console.log('ggg');h5AutoLogin('"+token+"')");
 //                RetrofitManager.getInstance().createReq(LoginApiService.class).h5AutoLogin(token).subscribeOn(Schedulers.io())
 //                        .observeOn(AndroidSchedulers.mainThread())
 //                        .subscribe(new Observer<WrapperRspEntity<String>>() {
@@ -212,6 +241,7 @@ public class SimpleCardFragment extends BaseFragment {
                    }
                }
            }
            @Override
            public boolean onJsAlert(WebView view, String url, String message, JsResult result) {
                Log.i("tangwen", "<WebViewActivity> onJsAlert");

--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -15,7 +15,7 @@
            android:id="@+id/vp_2"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
-            android:paddingBottom="60dp"
+            android:paddingBottom="50dp"
            />
    </LinearLayout>
@@ -23,16 +23,16 @@
    <com.flyco.tablayout.CommonTabLayout
        android:id="@+id/tl_2"
        android:layout_width="match_parent"
-        android:layout_height="60dp"
+        android:layout_height="50dp"
        android:background="#ffffff"
        android:layout_alignParentBottom="true"
-        tl:tl_iconHeight="35dp"
+        tl:tl_iconHeight="30dp"
-        tl:tl_iconWidth="35dp"
+        tl:tl_iconWidth="30dp"
        tl:tl_indicator_color="#2C97DE"
        tl:tl_indicator_height="0dp"
        tl:tl_textSelectColor="#2C97DE"
        tl:tl_textUnselectColor="#66000000"
-        tl:tl_textsize="14sp"
+        tl:tl_textsize="13sp"
        tl:tl_underline_color="#DDDDDD"
        tl:tl_underline_height="1dp"/>

--- a/app/src/main/res/mipmap-xhdpi/select_gamepad.png
+++ b/app/src/main/res/mipmap-xhdpi/select_gamepad.png
--- a/app/src/main/res/mipmap-xhdpi/select_shoppingcart.png
+++ b/app/src/main/res/mipmap-xhdpi/select_shoppingcart.png
--- a/app/src/main/res/mipmap-xhdpi/select_user.png
+++ b/app/src/main/res/mipmap-xhdpi/select_user.png
--- a/app/src/main/res/mipmap-xhdpi/unselect_gamepad.png
+++ b/app/src/main/res/mipmap-xhdpi/unselect_gamepad.png
--- a/app/src/main/res/mipmap-xhdpi/unselect_shoppingcart.png
+++ b/app/src/main/res/mipmap-xhdpi/unselect_shoppingcart.png
--- a/app/src/main/res/mipmap-xhdpi/unselect_user.png
+++ b/app/src/main/res/mipmap-xhdpi/unselect_user.png