1.修改一键登录

app/build.gradle

@@ -36,7 +36,7 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
             signingConfig signingConfigs.efunbox
-            zipAlignEnabled true
+//            zipAlignEnabled true
             applicationVariants.all { variant ->
                 variant.outputs.each { output ->
                     def outputFile = output.outputFileName
@@ -56,6 +56,10 @@ android {
                             newoutputFile = "\\小米\\"
                         } else if (channel == ("2007")) {
                             newoutputFile = "\\vivo\\"
+                        } else if (channel == ("2004")) {
+                            newoutputFile = "\\oppo\\"
+                        } else if (channel == ("2005")) {
+                            newoutputFile = "\\huawei\\"
                         }
                         output.outputFileName = new File(newoutputFile, fileName)
                     }
@@ -129,6 +133,23 @@ android {
                     appIcon: "@drawable/icon",
             ]
         }
+        //OPPO
+        channel_oppo {
+            signingConfig signingConfigs.efunbox
+            manifestPlaceholders = [
+                    appCode: "2004",
+                    appIcon: "@drawable/icon",
+            ]
+        }
+        //华为
+        channel_huawei {
+            signingConfig signingConfigs.efunbox
+            applicationIdSuffix ".hw"
+            manifestPlaceholders = [
+                    appCode: "2005",
+                    appIcon: "@drawable/icon",
+            ]
+        }
 
     }
     productFlavors.all {
@@ -204,5 +225,6 @@ dependencies {
     //阿里一键登录和校验
     implementation(name: 'crashshield-release', ext: 'aar')
     implementation(name: 'phoneNumber-L-AuthSDK-2.11.1.1', ext: 'aar')
+
 }
 

app/src/main/AndroidManifest.xml

@@ -17,13 +17,13 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> <!-- 开关wifi状态，解决国内机型移动网络权限问题需要 -->
     <uses-sdk tools:overrideLibrary="tv.danmaku.ijk.media.player_arm64,tv.danmaku.ijk.media.player_x86_64" />
 
-
     <application
             android:name="com.edufound.android.xyyf.application.EApplication"
             android:allowBackup="false"
             android:icon="${icon}"
             android:label="@string/app_name"
             android:networkSecurityConfig="@xml/network_security_config"
+            android:usesCleartextTraffic="true"
             android:resizeableActivity="true"
             android:supportsRtl="true"
             android:theme="@style/NoTitle"
@@ -81,7 +81,7 @@
         <activity
                 android:name=".activity.PhoneNumLoginActivity"
                 android:screenOrientation="portrait"
-                android:theme="@style/phone_login"></activity>
+                android:theme="@style/NoTitle"></activity>
         <!--友盟start-->
         <meta-data
                 android:name="UMENG_APPKEY"

app/src/main/java/com/edufound/android/xyyf/activity/MainActivity.java

@@ -6,34 +6,21 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.graphics.drawable.AnimationDrawable;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.PagerSnapHelper;
 import android.support.v7.widget.RecyclerView;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
-import android.view.animation.Animation;
 import android.view.animation.LinearInterpolator;
-import android.view.animation.RotateAnimation;
 import android.webkit.WebView;
-import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 
 import com.edufound.android.xyyf.R;
-import com.edufound.android.xyyf.adapter.WindowVideoAdapter;
 import com.edufound.android.xyyf.application.EApplication;
 import com.edufound.android.xyyf.base.BaseActivity;
 import com.edufound.android.xyyf.bean.WindowVideoParams;
@@ -43,13 +30,9 @@ import com.edufound.android.xyyf.util.ContextUtil;
 import com.edufound.android.xyyf.util.DeviceUuidFactory;
 import com.edufound.android.xyyf.util.Logger;
 import com.edufound.android.xyyf.util.NotificationUtil;
-import com.edufound.android.xyyf.util.SPutil;
 import com.edufound.android.xyyf.util.ShowDebugUrl;
-import com.edufound.android.xyyf.video.VideoPersenter;
 import com.google.gson.Gson;
 
-import java.util.HashMap;
-
 
 //调用Persenter里面的方法
 public class MainActivity extends BaseActivity implements MainView {

app/src/main/java/com/edufound/android/xyyf/activity/PhoneNumLoginActivity.java

@@ -6,16 +6,21 @@ import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.app.Activity;
 import android.graphics.Color;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.support.annotation.Nullable;
+import android.view.Gravity;
+import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
+import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.FrameLayout;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -43,6 +48,7 @@ public class PhoneNumLoginActivity extends BaseActivity implements PhoneLoginVie
     TextView change_text;
     int countDownNum = 60;
     int oldWidth = -1;
+    boolean haveError = false;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -54,20 +60,36 @@ public class PhoneNumLoginActivity extends BaseActivity implements PhoneLoginVie
         init();
     }
 
+
     void init() {
         phone_number = (EditText) findViewById(R.id.phonenumber_phonenumber);
         intpu_verifaction = (EditText) findViewById(R.id.phonenumber_verifcation);
         phonenumber_getverifcation = (TextView) findViewById(R.id.phonenumber_getverifcation);
         phonenumber_login = (TextView) findViewById(R.id.phonenumber_login);
         change_text = (TextView) findViewById(R.id.change_text);
+        setTextSize(phone_number, 6);
+        setTextSize(intpu_verifaction, 6);
+        setTextSize(phonenumber_getverifcation, 6);
+        setTextSize(phonenumber_login, 6);
         change_text.setText("切换一键登录");
-        LinearLayout parent = (LinearLayout) phone_number.getParent();
-        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, AppUtils.dp2px(this, 280));
-        params.setMargins(AppUtils.dp2px(this, 20), 0, AppUtils.dp2px(this, 20), AppUtils.dp2px(this, 20));
-        parent.setLayoutParams(params);
+        if (getIntent().getStringExtra("code") != null && getIntent().getStringExtra("code").equals("600015")) {
+            change_text.setVisibility(View.GONE);
+            haveError = true;
+        }
+        LinearLayout parent = findViewById(R.id.phonenumber_page);
+        ImageView loginicon = findViewById(R.id.loginicon);
+        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(AppUtils.dp2px(this, 90), AppUtils.dp2px(this, 90));
+        params.gravity = Gravity.CENTER;
+        params.setMargins(0, AppUtils.dp2px(this, 30), 0, 0);
+        loginicon.setLayoutParams(params);
+        loginicon.setVisibility(View.VISIBLE);
+//        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+//        params.setMargins(0,  AppUtils.dp2px(this, 20), 0, AppUtils.dp2px(this, 20));
+//        parent.setLayoutParams(params);
         change_text.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+//                MainActivity.getInstance().mPersenter.getJsInterfaces().showPhoneNumberLogin(2);
                 finish();
             }
         });
@@ -114,6 +136,14 @@ public class PhoneNumLoginActivity extends BaseActivity implements PhoneLoginVie
 
     }
 
+    void setTextSize(View view, int dpsize) {
+        if (view instanceof EditText) {
+            ((EditText) view).setTextSize(AppUtils.dp2px(this, dpsize));
+        } else if (view instanceof TextView) {
+            ((TextView) view).setTextSize(AppUtils.dp2px(this, dpsize));
+        }
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -129,11 +159,11 @@ public class PhoneNumLoginActivity extends BaseActivity implements PhoneLoginVie
                         countDownNum = 60;
                         phonenumber_getverifcation.setEnabled(true);
                         phonenumber_getverifcation.setText("获取验证码");
-                        mPersenter.WidthAnim(phonenumber_getverifcation, oldWidth, 500);
+//                        mPersenter.WidthAnim(phonenumber_getverifcation, oldWidth, 500);
                         return true;
                     }
                     countDownNum--;
-                    phonenumber_getverifcation.setText(String.valueOf(countDownNum));
+                    phonenumber_getverifcation.setText(String.valueOf(countDownNum + "秒后重发"));
                     handler.sendEmptyMessageDelayed(COUNT_DOWN, 1000);
                     break;
             }
@@ -159,7 +189,7 @@ public class PhoneNumLoginActivity extends BaseActivity implements PhoneLoginVie
                 handler.post(new Runnable() {
                     @Override
                     public void run() {
-                        mPersenter.WidthAnim(phonenumber_getverifcation, phonenumber_getverifcation.getHeight(), 500);
+//                        mPersenter.WidthAnim(phonenumber_getverifcation, phonenumber_getverifcation.getHeight(), 500);
                         phonenumber_getverifcation.setEnabled(false);
                         handler.sendEmptyMessageDelayed(COUNT_DOWN, 0);
                     }
@@ -174,11 +204,24 @@ public class PhoneNumLoginActivity extends BaseActivity implements PhoneLoginVie
                         countDownNum = 60;
                         phonenumber_getverifcation.setEnabled(true);
                         phonenumber_getverifcation.setText("获取验证码");
-                        mPersenter.WidthAnim(phonenumber_getverifcation, oldWidth, 500);
+//                        mPersenter.WidthAnim(phonenumber_getverifcation, oldWidth, 500);
                         handler.removeMessages(COUNT_DOWN);
                     }
                 });
                 break;
         }
     }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_BACK:
+            case KeyEvent.KEYCODE_ESCAPE:
+                if (haveError) {
+                    MainActivity.getInstance().mPersenter.getJsInterfaces().closeApp();
+                }
+                break;
+        }
+        return super.onKeyDown(keyCode, event);
+    }
 }

app/src/main/java/com/edufound/android/xyyf/application/EApplication.java

@@ -7,11 +7,14 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.os.Bundle;
 import android.support.annotation.Nullable;
 
 import com.edufound.android.xyyf.R;
 import com.edufound.android.xyyf.pay.PayInit;
 import com.edufound.android.xyyf.util.ContextUtil;
+import com.edufound.android.xyyf.util.Logger;
+import com.edufound.android.xyyf.util.OKHttpUtil;
 import com.edufound.android.xyyf.util.SPutil;
 import com.umeng.commonsdk.UMConfigure;
 
@@ -25,12 +28,17 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import okhttp3.Request;
+
 public class EApplication extends Application {
 
 
     final String XIAOMI_ID = "";
     final String XIAOMI_KEY = "";
     static String mUMengAppID;
+    private int activityAount = 0;
+    public boolean isForeground = false;
+    public static long APP_START_TIME = 0;
 
     @Override
     public void onCreate() {
@@ -40,6 +48,7 @@ public class EApplication extends Application {
         //上线关掉debug模式
         ContextUtil.setIsDebug(true);
         mUMengAppID = getChannelName();
+        APP_START_TIME = System.currentTimeMillis();
         //根据appcode初始化支付sdk
 //        UMConfigure.setLogEnabled(true);
 //        UMConfigure.init(this, "5ffbb9e0f1eb4f3f9b58b05e", getAppCode() + "", UMConfigure.DEVICE_TYPE_PHONE, "dfc59afd6dc6b1550ff1c2e0c7eb10fd");
@@ -56,7 +65,7 @@ public class EApplication extends Application {
 //            }
 //        });
 
-
+        registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
         if (getAppCode().equals(getString(R.string.app_code_xm))) {
             MiPushRegistar.register(this, XIAOMI_ID, XIAOMI_KEY);
         } else if (getAppCode().equals(getString(R.string.app_code_huawei))) {
@@ -170,6 +179,63 @@ public class EApplication extends Application {
         return channelName;
     }
 
+    ActivityLifecycleCallbacks activityLifecycleCallbacks = new ActivityLifecycleCallbacks() {
+        @Override
+        public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+        }
+
+        @Override
+        public void onActivityStarted(Activity activity) {
+            if (activityAount == 0) {
+                //app回到前台
+                isForeground = true;
+//                ToastUtil.showToast("app回到前台了");
+                Logger.e("app回到前台了");
+            }
+            activityAount++;
+        }
+
+        @Override
+        public void onActivityResumed(Activity activity) {
+        }
+
+        @Override
+        public void onActivityPaused(Activity activity) {
+        }
+
+        @Override
+        public void onActivityStopped(Activity activity) {
+            activityAount--;
+            if (activityAount == 0) {
+                isForeground = false;
+//                ToastUtil.showToast("app后台了");
+                Logger.e("app后台了");
+                OKHttpUtil.getInstance().postUserTime(new OKHttpUtil.ResultCallback() {
+                    @Override
+                    public void onError(Request request, Exception e) {
+//                        exitApp();
+//                        android.os.Process.killProcess(android.os.Process.myPid());
+                    }
+
+                    @Override
+                    public void onResponse(Object response) {
+                        Logger.e("response:" + response);
+//                        exitApp();
+//                        android.os.Process.killProcess(android.os.Process.myPid());
+                    }
+                });
+
+            }
+        }
+
+        @Override
+        public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+        }
+
+        @Override
+        public void onActivityDestroyed(Activity activity) {
+        }
+    };
 }
 
 

app/src/main/java/com/edufound/android/xyyf/config/FullPortConfig.java

@@ -16,6 +16,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSONObject;
 import com.edufound.android.xyyf.R;
 import com.edufound.android.xyyf.activity.PhoneNumLoginActivity;
+import com.edufound.android.xyyf.application.EApplication;
 import com.edufound.android.xyyf.main.MainView;
 import com.edufound.android.xyyf.util.Logger;
 import com.mobile.auth.gatewayauth.AuthRegisterViewConfig;
@@ -100,7 +101,7 @@ public class FullPortConfig extends BaseUIConfig {
                         change_text.setOnClickListener(new View.OnClickListener() {
                             @Override
                             public void onClick(View v) {
-                                Logger.e("change_textchange_textchange_textchange_textchange_textchange_text");
+//                                mAuthHelper.quitLoginPage();
                                 Intent intent = new Intent(mActivity, PhoneNumLoginActivity.class);
                                 mActivity.startActivity(intent);
                             }
@@ -113,43 +114,89 @@ public class FullPortConfig extends BaseUIConfig {
         if (Build.VERSION.SDK_INT == 26) {
             authPageOrientation = ActivityInfo.SCREEN_ORIENTATION_BEHIND;
         }
-        mAuthHelper.setAuthUIConfig(new AuthUIConfig.Builder()
-                .setAppPrivacyOne("《APP用户协议》", "http://m-xyyf-web.ai160.com/res/protocol/protocol.htm")
+        AuthUIConfig authUIConfig = null;
+        if (EApplication.getAppCode().equals("2007")) {
+            authUIConfig = new AuthUIConfig.Builder()
+                    .setAppPrivacyOne("《APP用户协议》", "http://m-xyyf-web.ai160.com/res/protocol/protocol.htm")
 //                .setAppPrivacyTwo("《百度》", "https://www.baidu.com")
-                .setPrivacyState(true)
-                .setAppPrivacyColor(Color.parseColor("#0B0B0B"), Color.parseColor("#2CBCFF"))
-                //隐藏默认切换其他登录方式
-                .setSwitchAccHidden(true)
-                //隐藏默认Toast
-                .setLogBtnToastHidden(false)
-                //沉浸式状态栏
-                .setStatusBarHidden(false)
-                .setStatusBarColor(Color.WHITE)
-                .setStatusBarUIFlag(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN)
-                .setLightColor(true)
-                .setWebNavTextSize(20)
-                //图片或者xml的传参方式为不包含后缀名的全称 需要文件需要放在drawable或drawable-xxx目录下 in_activity.xml, mytel_app_launcher.png
+                    .setPrivacyState(false)
+                    .setAppPrivacyColor(Color.parseColor("#0B0B0B"), Color.parseColor("#2CBCFF"))
+                    //隐藏默认切换其他登录方式
+                    .setSwitchAccHidden(true)
+                    //隐藏默认Toast
+                    .setLogBtnToastHidden(false)
+                    //沉浸式状态栏
+                    .setStatusBarHidden(false)
+                    .setStatusBarColor(Color.WHITE)
+                    .setStatusBarUIFlag(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN)
+                    .setLightColor(true)
+                    .setWebNavTextSize(20)
+                    //图片或者xml的传参方式为不包含后缀名的全称 需要文件需要放在drawable或drawable-xxx目录下 in_activity.xml, mytel_app_launcher.png
 //                .setAuthPageActIn("in_activity", "out_activity")
 //                .setAuthPageActOut("in_activity", "out_activity")
-                .setVendorPrivacyPrefix("《")
-                .setVendorPrivacySuffix("》")
-                .setPageBackgroundPath("page_background_color")
-                .setLogoImgPath("icon")
-                //一键登录按钮三种状态背景示例login_btn_bg.xml
-                .setLogBtnBackgroundPath("login_btn_bg")
-                .setScreenOrientation(authPageOrientation)
-                .setNavText("")
-                .setNavReturnHidden(true)
-                .setNavColor(Color.WHITE)
-                .setSloganHidden(true)
-                .setSwitchAccText("其他手机号登录")
-                .setSwitchAccTextColor(Color.parseColor("#0B0B0B"))
-                .setProtocolLayoutGravity(Gravity.TOP)
-                .setUncheckedImgPath("logincheck")
-                .setCheckedImgPath("logincheck_selected")
-                .setPrivacyTextSize(12)
-                .setProtocolGravity(Gravity.TOP)
-                .create());
+                    .setVendorPrivacyPrefix("《")
+                    .setVendorPrivacySuffix("》")
+                    .setPageBackgroundPath("page_background_color")
+                    .setLogoImgPath("icon")
+                    //一键登录按钮三种状态背景示例login_btn_bg.xml
+                    .setLogBtnBackgroundPath("login_btn_bg")
+                    .setLogBtnTextSize(AppUtils.dp2px(mContext, 6))
+                    .setLogBtnOffsetY(AppUtils.dp2px(mContext, 100))
+                    .setScreenOrientation(authPageOrientation)
+                    .setNavText("")
+                    .setNavReturnHidden(true)
+                    .setNavColor(Color.WHITE)
+                    .setSloganHidden(true)
+                    .setSwitchAccText("其他手机号登录")
+                    .setSwitchAccTextColor(Color.parseColor("#0B0B0B"))
+                    .setProtocolLayoutGravity(Gravity.TOP)
+                    .setUncheckedImgPath("logincheck")
+                    .setCheckedImgPath("logincheck_selected")
+                    .setPrivacyTextSize(12)
+                    .setProtocolGravity(Gravity.TOP)
+                    .create();
+        } else {
+            authUIConfig = new AuthUIConfig.Builder()
+                    .setAppPrivacyOne("《APP用户协议》", "http://m-xyyf-web.ai160.com/res/protocol/protocol.htm")
+//                .setAppPrivacyTwo("《百度》", "https://www.baidu.com")
+                    .setPrivacyState(true)
+                    .setAppPrivacyColor(Color.parseColor("#0B0B0B"), Color.parseColor("#2CBCFF"))
+                    //隐藏默认切换其他登录方式
+                    .setSwitchAccHidden(true)
+                    //隐藏默认Toast
+                    .setLogBtnToastHidden(false)
+                    //沉浸式状态栏
+                    .setStatusBarHidden(false)
+                    .setStatusBarColor(Color.WHITE)
+                    .setStatusBarUIFlag(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN)
+                    .setLightColor(true)
+                    .setWebNavTextSize(20)
+                    //图片或者xml的传参方式为不包含后缀名的全称 需要文件需要放在drawable或drawable-xxx目录下 in_activity.xml, mytel_app_launcher.png
+//                .setAuthPageActIn("in_activity", "out_activity")
+//                .setAuthPageActOut("in_activity", "out_activity")
+                    .setVendorPrivacyPrefix("《")
+                    .setVendorPrivacySuffix("》")
+                    .setPageBackgroundPath("page_background_color")
+                    .setLogoImgPath("icon")
+                    //一键登录按钮三种状态背景示例login_btn_bg.xml
+                    .setLogBtnBackgroundPath("login_btn_bg")
+                    .setLogBtnTextSize(AppUtils.dp2px(mContext, 6))
+                    .setLogBtnOffsetY(AppUtils.dp2px(mContext, 100))
+                    .setScreenOrientation(authPageOrientation)
+                    .setNavText("")
+                    .setNavReturnHidden(true)
+                    .setNavColor(Color.WHITE)
+                    .setSloganHidden(true)
+                    .setSwitchAccText("其他手机号登录")
+                    .setSwitchAccTextColor(Color.parseColor("#0B0B0B"))
+                    .setProtocolLayoutGravity(Gravity.TOP)
+                    .setUncheckedImgPath("logincheck")
+                    .setCheckedImgPath("logincheck_selected")
+                    .setPrivacyTextSize(12)
+                    .setProtocolGravity(Gravity.TOP)
+                    .create();
+        }
+        mAuthHelper.setAuthUIConfig(authUIConfig);
     }
 
 }

app/src/main/java/com/edufound/android/xyyf/interfaces/JsInterfaces.java

@@ -3,14 +3,18 @@ package com.edufound.android.xyyf.interfaces;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.graphics.Color;
 import android.media.MediaPlayer;
+import android.util.Base64;
 import android.view.KeyEvent;
 import android.webkit.JavascriptInterface;
+import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.edufound.android.xyyf.R;
 import com.edufound.android.xyyf.activity.IJKPlayerActivity;
+import com.edufound.android.xyyf.activity.PhoneNumLoginActivity;
 import com.edufound.android.xyyf.activity.VideoActivity;
 import com.edufound.android.xyyf.application.EApplication;
 import com.edufound.android.xyyf.bean.MessageDialogBean;
@@ -53,7 +57,7 @@ public class JsInterfaces {
     AlertDialog.Builder mMessageDialogBuilder;
     MessageDialogBean mMessageBean;
     PhoneNumberAuthHelper mPhoneNumberAuthHelperl;
-    String mSecret = "RCV62WOrD1Dcypp4qiwqlLWsPf9jGQ9SzBKaUms/VuDvggYsJBmeFvQqkc6ptBBmTbKfRsB2zhXUQP+6meKyA/7TQbde3uLfVnhihmKahXTpaKYhjwZRT4R4VCZtq8umnzZTQPENjUiz/Hdd45EKA/OhTtXodbfEo+j6o79xukkjApKaF3qlSqPylppOAavtiGOKEVhZSLhPyQQDOdqTre4EfWJ07T4reo2oObslQqlZamXqzHkp/K+5M+xIPsxk6c14Oypu/EEJMCjzIP8aHdqa01PWcycKFz9Fbn0Q9/tFJ7yWNfHkuJQH/w6JV41q";
+    String mSecret = "UgC3rEZPVMBKi8WqdoubeWMSJNSeeA6i0dLu3Z1GZKfIgXFhF8RmMLdsmDSgmwWjg2TUOhkvbuHZH6pt4RUxiQSpVyu9P1Q7h9Th05DhNVqxuOU2GRLLs0C43B59eS6nXrUEy7PZzn3wPTXEpelTmH5rMl+VZ7UKa3tC35qkB073Dfikr6ITRfCF31mTPjOGQRo9RKrtbeIhj4jIqx7M9PJSp9+W8huzLCUEOVquVNKDtpCBUq2Znu+PgISvLg3JouLtVv9ldoftxKci+VfHaO3izxkHOi+3jauqBTigrfA7D4I4va/7PlgCNoXJogcy";
     public final String GET_USER_PHONENUMBER_URL = "http://ott80test-api.efunbox.cn:81/member/getMobile";
 
     public JsInterfaces(MainView view) {
@@ -395,16 +399,17 @@ public class JsInterfaces {
 
     @JavascriptInterface
     public void showPhoneNumberLogin(int type) {
+        //0是横屏。2是竖屏
         AuthPageConfig mUIConfig = BaseUIConfig.init(type, mView.getActivity(), mPhoneNumberAuthHelperl, mView);
         mUIConfig.configAuthPage();
-        mPhoneNumberAuthHelperl.getLoginToken(mView.getActivity(), 5000);
+        mPhoneNumberAuthHelperl.getLoginToken(mView.getActivity(), 3000);
     }
 
     @JavascriptInterface
     public void showPhoneNumberLogin() {
         AuthPageConfig mUIConfig = BaseUIConfig.init(2, mView.getActivity(), mPhoneNumberAuthHelperl, mView);
         mUIConfig.configAuthPage();
-        mPhoneNumberAuthHelperl.getLoginToken(mView.getActivity(), 5000);
+        mPhoneNumberAuthHelperl.getLoginToken(mView.getActivity(), 3000);
     }
 
     public void quitLoginPage() {
@@ -444,7 +449,7 @@ public class JsInterfaces {
                         @Override
                         public void onResponse(Object response) {
                             String a = JSON.parseObject(response.toString()).getString("data").toString();
-//                            ToastUtil.showToast(a);
+                            SPutil.setPrefString(mView.getActivity(), "user_phone", Base64.encodeToString(a.getBytes(), Base64.DEFAULT));
                             mView.loadJsMehtod("phoneLogin('" + a + "')");
                         }
                     }, new OKHttpUtil.Param("accessToken", token));
@@ -457,11 +462,56 @@ public class JsInterfaces {
 
         @Override
         public void onTokenFailed(String s) {
-//            Logger.e("失败了：" + s);
+            Logger.e("失败了：" + s);
 //            ToastUtil.showToast("失败了:" + s);
-            mView.loadJsMehtod("closeLogin()");
+            //{"carrierFailedResultData":"","code":"700000","msg":"用户取消登录","requestCode":0,"requestId":"41aa0bdf-1e6b-4d06-956d-c354500dab60","vendorName":"CUCC"}
+            String code = JSON.parseObject(s).get("code").toString();
+            Logger.e("code:" + code);
+            Intent intent = new Intent(mView.getActivity(), PhoneNumLoginActivity.class);
+            if (code.equals("600015")) {
+                intent.putExtra("code", "600015");
+                mView.getActivity().startActivity(intent);
+                ToastUtil.showToast("一键登录响应超时，切换手机号登录");
+                return;
+            } else if (code.equals("600005")) {
+                intent.putExtra("code", "600015");
+                mView.getActivity().startActivity(intent);
+                ToastUtil.showToast(JSON.parseObject(s).get("msg").toString());
+                return;
+            }
+            mView.loadJsMehtod("closeLogin(" + code + ")");
         }
 
 
     };
+
+
+    @JavascriptInterface
+    public void setScreenOriention(int oriention) {
+//        switch (oriention) {
+//            case 0:
+//                mView.getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+//                break;
+//            case 1:
+//                mView.getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+//                break;
+//        }
+    }
+
+    @JavascriptInterface
+    public void relWebView() {
+//        Logger.e("relWebView--relWebView");
+//        mView.getRootView().post(new Runnable() {
+//            @Override
+//            public void run() {
+//                mView.getPersenter().openWeb(mView.getActivity().getIntent());
+//            }
+//        });
+//        mView.getWebView().loadUrl("https://www.baidu.com");
+    }
+
+    @JavascriptInterface
+    public void removeSPUserPhone() {
+        delPreData("user_phone");
+    }
 }

app/src/main/java/com/edufound/android/xyyf/main/MainPersenter.java

@@ -356,27 +356,6 @@ public class MainPersenter implements MainIPersenter {
         }, 1000);
     }
 
-    @Override
-    public void postUserTime(long time) {
-        try {
-            OKHttpUtil.getInstance().doGetSync("?time=" + time, new Callback() {
-                @Override
-                public void onFailure(Call call, IOException e) {
-                    Logger.e("postUserTime---onFailure---");
-                }
-
-                @Override
-                public void onResponse(Call call, Response response) throws IOException {
-                    Logger.e("postUserTime---onResponse---");
-                    EApplication.clearActivity();
-                    android.os.Process.killProcess(Process.myPid());
-                }
-            });
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
 
     @Override
     public void onDisConnNetWork() {
@@ -452,7 +431,7 @@ public class MainPersenter implements MainIPersenter {
 
     public static Handler mPersenterHandler = new Handler(new Handler.Callback() {
         @Override
-        public boolean handleMessage(Message msg) {
+        public boolean handleMessage(final Message msg) {
             switch (msg.what) {
                 case WECHAT_LOGIN:
 //                    Logger.e("微信用户信息：" + msg.obj.toString());
@@ -568,7 +547,7 @@ public class MainPersenter implements MainIPersenter {
                     @Override
                     public void onClick(View v) {
                         dayindex = dayoldindex;
-                        Logger.e("dayindex:"+dayindex);
+                        Logger.e("dayindex:" + dayindex);
                         mView.loadJSMehtodPost("getAndroidDate('" + getYear + "','" + (getMonth) + "','" + getDay + "')");
                         mView.getRootView().removeView(layout);
                     }
@@ -679,7 +658,6 @@ interface MainIPersenter extends BasePersenter {
 
     void onActivityResult(int requestCode, int resultCode, @Nullable Intent data);
 
-    void postUserTime(long time);
 
     void showDateView(int type);
 }

app/src/main/java/com/edufound/android/xyyf/pay/PayPersenter.java

@@ -43,7 +43,6 @@ public class PayPersenter implements PayIPersenter {
 
     @Override
     public void WeChatPay(String json) {
-        Logger.e("WeChatPayWeChatPayWeChatPayWeChatPayWeChatPayWeChatPayWeChatPay:json--" + json);
         if (!PayInit.getInstance().WX_API.isWXAppInstalled()) {
             ToastUtil.showToast("请安装微信");
             return;

app/src/main/java/com/edufound/android/xyyf/phonelogin/PhoneLoginPersenter.java

@@ -4,6 +4,7 @@ import android.animation.ValueAnimator;
 import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
+import android.util.Base64;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -164,8 +165,9 @@ public class PhoneLoginPersenter implements PhoneLoginIPersenter {
                 String json = response.toString();
                 try {
                     JSONObject jsonObject1 = new JSONObject(json);
-                    Logger.e("登录:" + json);
                     if (jsonObject1.getBoolean("success")) {
+                        JSONObject user = jsonObject1.getJSONObject("data");
+                        SPutil.setPrefString(mView.getActivity(), "user_phone", Base64.encodeToString(user.getString("mobile").getBytes(), Base64.DEFAULT));
                         MainActivity.getInstance().loadJSMehtodPost("phoneSuccess(" + json + ")");
                         MainActivity.getInstance().quitPhoneLoginPage();
                         mView.getActivity().finish();

app/src/main/java/com/edufound/android/xyyf/util/ContextUtil.java

@@ -12,6 +12,7 @@ public class ContextUtil {
     public static final String CHANGE_VIDEO_TYPE_VIDEO = "com.edufound.mobile.change.video";
     public static final String CHANGE_VIDEO_TYPE_IJKPLAYER = "com.edufound.mobile.change.ijkplayer";
     public static final String NOTIFICATION_WEB_PLAYERTIME = "com.edufound.mobile.notification.playertime";
+    public static final String URL_POST_USER_TIME="http://m-xyyf-api.ai160.com/onlineTime";
     static Context mContext;
     static Application application;
 

app/src/main/java/com/edufound/android/xyyf/util/OKHttpUtil.java

@@ -3,6 +3,8 @@ package com.edufound.android.xyyf.util;
 
 import android.os.Handler;
 import android.os.Looper;
+import android.text.TextUtils;
+import android.util.Base64;
 
 
 import com.alibaba.fastjson.JSONObject;
@@ -480,15 +482,25 @@ public class OKHttpUtil {
     }
 
 
-    public static void postUserTime(ResultCallback resultCallback) {
-//        JSONObject obj = new JSONObject();
-//        obj.put("channel", EApplication.getAppCode());
-//        long runtime = System.currentTimeMillis() - ContextUtil.getAppStartTime();
-//        obj.put("timeAcc", String.valueOf(runtime));
-//        obj.put("deviceCode", ContextUtil.getUserUuid());
-//        String json = obj.toJSONString();
-//        Logger.e("post user time json:" + json);
-//        getInstance()._postJsonDataAsync(ContextUtil.getPostUserTimeUrl(), json, resultCallback);
+    public void postUserTime(ResultCallback resultCallback) {
+        JSONObject obj = new JSONObject();
+        obj.put("channel", EApplication.getAppCode());
+        long runtime = System.currentTimeMillis() - EApplication.APP_START_TIME;
+        obj.put("timeAcc", String.valueOf(runtime));
+        obj.put("deviceCode", DeviceUuidFactory.getUuid().toString());
+        Logger.e("user_phone:" + SPutil.getPrefString(ContextUtil.getContext(), "user_phone", ""));
+        String userphone = SPutil.getPrefString(ContextUtil.getContext(), "user_phone", "");
+        userphone = new String(Base64.decode(userphone.getBytes(), Base64.DEFAULT));
+        if (TextUtils.isEmpty(userphone)) {
+            Logger.e("没有用户");
+            return;
+        }
+        obj.put("mobile", userphone);
+        String json = obj.toJSONString();
+        MediaType JSON = MediaType.parse("application/json;charset=utf-8");
+        RequestBody requestBody = RequestBody.create(JSON, json);
+        Request request = new Request.Builder().url(ContextUtil.URL_POST_USER_TIME).post(requestBody).build();
+        deliveryResult(resultCallback, request);
     }
 
 

app/src/main/res/drawable-v24/shape_login_phonenumber_login.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#2CBCFF" />
+    <solid android:color="#1582E5" />
     <corners android:radius="25dp" />
     <stroke
             android:width="0dp"
-            android:color="#F3F3F3" />
+            android:color="#1582E5" />
 </shape>

app/src/main/res/drawable/shape_login_phonenumber_login.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#2CBCFF" />
+    <solid android:color="#1582E5" />
     <corners android:radius="25dp" />
     <stroke
             android:width="0dp"
-            android:color="#F3F3F3" />
+            android:color="#1582E5" />
 </shape>

app/src/main/res/layout/login_phonenumber.xml

@@ -5,108 +5,136 @@
         android:background="@color/transparent">
 
     <LinearLayout
+            android:id="@+id/phonenumber_page"
             android:layout_width="match_parent"
-            android:layout_height="250dp"
-            android:layout_marginLeft="30dp"
-            android:layout_marginTop="180dp"
-            android:layout_marginRight="30dp"
+            android:layout_height="match_parent"
             android:background="@color/white"
             android:orientation="vertical">
 
-        <EditText
-                android:id="@+id/phonenumber_phonenumber"
+        <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_weight="1"
-                android:background="@drawable/shape_login_phonenumber_edittext"
-                android:gravity="left|center"
-                android:hint="请输入手机号码"
-                android:inputType="number"
-                android:maxLength="11"
-                android:paddingLeft="30dp"
-                android:paddingRight="10dp"
-                android:textSize="20sp"></EditText>
-
-        <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="0.5"></View>
+                android:layout_gravity="center"
+                android:layout_weight="3.5">
+
+            <ImageView
+                    android:id="@+id/loginicon"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_gravity="center"
+                    android:src="@drawable/icon"
+                    android:visibility="gone"></ImageView>
+        </FrameLayout>
 
         <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_weight="1"
-                android:orientation="horizontal">
+                android:layout_weight="9"
+                android:background="@color/white"
+                android:orientation="vertical"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp">
+
 
             <EditText
-                    android:id="@+id/phonenumber_verifcation"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:layout_weight="1.3"
+                    android:id="@+id/phonenumber_phonenumber"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
                     android:background="@drawable/shape_login_phonenumber_edittext"
                     android:gravity="left|center"
-                    android:hint="请输入验证码"
+                    android:hint="请输入手机号码"
                     android:inputType="number"
-                    android:maxLength="4"
+                    android:maxLength="11"
                     android:paddingLeft="30dp"
                     android:paddingRight="10dp"
-                    android:textSize="20sp"></EditText>
+                    android:textSize="18sp"></EditText>
 
             <View
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.1"></View>
-
-            <FrameLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                <TextView
-                        android:id="@+id/phonenumber_getverifcation"
-                        android:layout_width="match_parent"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="0.5"></View>
+
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                <EditText
+                        android:id="@+id/phonenumber_verifcation"
+                        android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_gravity="center|right"
-                        android:background="@drawable/shape_login_phonenumber_getverification"
-                        android:gravity="center"
-                        android:text="获取验证码"
-                        android:textColor="#FFA301"
-                        android:textSize="20sp"></TextView>
-            </FrameLayout>
-        </LinearLayout>
+                        android:layout_gravity="center"
+                        android:layout_weight="1.3"
+                        android:background="@drawable/shape_login_phonenumber_edittext"
+                        android:gravity="left|center"
+                        android:hint="请输入验证码"
+                        android:inputType="number"
+                        android:maxLength="4"
+                        android:paddingLeft="30dp"
+                        android:paddingRight="10dp"
+                        android:textSize="18sp"></EditText>
 
-        <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="0.5"></View>
+                <View
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="0.1"></View>
 
-        <TextView
-                android:id="@+id/phonenumber_login"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:background="@drawable/shape_login_phonenumber_login"
-                android:gravity="center"
-                android:text="登 录"
-                android:textColor="@color/white"
-                android:textSize="20sp"></TextView>
-
-        <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="0.5"></View>
+                <FrameLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
 
-        <TextView
-                android:id="@+id/change_text"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_gravity="center|bottom"
-                android:layout_weight="1"
-                android:gravity="top|center"
-                android:text="切换手机号登录"
-                android:textColor="#0B0B0B"
-                android:textSize="16sp"></TextView>
+                    <TextView
+                            android:id="@+id/phonenumber_getverifcation"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center|right"
+                            android:background="@drawable/shape_login_phonenumber_getverification"
+                            android:gravity="center"
+                            android:text="获取验证码"
+                            android:textColor="#FFA301"
+                            android:textSize="18sp"></TextView>
+                </FrameLayout>
+            </LinearLayout>
+
+            <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="0.5"></View>
 
+            <TextView
+                    android:id="@+id/phonenumber_login"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/shape_login_phonenumber_login"
+                    android:gravity="center"
+                    android:text="登 录"
+                    android:textColor="@color/white"
+                    android:textSize="18sp"></TextView>
+
+            <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="0.5"></View>
+
+            <TextView
+                    android:id="@+id/change_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_gravity="center|bottom"
+                    android:layout_weight="1"
+                    android:gravity="top|center"
+                    android:text="切换手机号登录"
+                    android:textColor="#0B0B0B"
+                    android:textSize="16sp"></TextView>
+
+            <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="5.5"></View>
+        </LinearLayout>
     </LinearLayout>
 </FrameLayout>

app/src/main/res/values/projectstring.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--8.0生产环境前端地址 http://ott80-web.ai160.com/stage/index/index.html-->
-    <string name="default_url">http://192.168.1.126:8080/efunbox-xyyf-web/1.0.0/stage/index/index.html</string>
-    <!--    <string name="default_url">http://m-xyyf-web.ai160.com/stage/index/index.html</string>-->
+<!--    <string name="default_url">http://192.168.1.126:8080/efunbox-xyyf-web/1.0.0/stage/index/index.html</string>-->
+        <string name="default_url">http://m-xyyf-web.ai160.com/stage/index/index.html</string>
     <!--义方渠道-->
     <string name="app_code_yf">2006</string>
     <!--应用宝-->

push/build/.transforms/ba7e55be106422172a4df981ed71154e.bin

@@ -1 +0,0 @@
-o/classes

push/build/.transforms/c00258f670a4fca9ef20a5f72fe3e1bf.bin

@@ -1 +0,0 @@
-o/classes

push/build/generated/source/buildConfig/debug/com/umeng/message/lib/BuildConfig.java

@@ -1,12 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.umeng.message.lib;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = Boolean.parseBoolean("true");
-  public static final String LIBRARY_PACKAGE_NAME = "com.umeng.message.lib";
-  public static final String BUILD_TYPE = "debug";
-  public static final int VERSION_CODE = 1;
-  public static final String VERSION_NAME = "1.0";
-}

push/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml

@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.umeng.message.lib"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="25" />
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_ADDED" />
-    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_CHANGED" />
-    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_INSTALL" />
-    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_REPLACED" />
-    <uses-permission android:name="android.permission.RESTART_PACKAGES" />
-    <uses-permission android:name="android.permission.GET_TASKS" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-
-    <application>
-        <service
-            android:name="com.taobao.accs.ChannelService"
-            android:exported="true"
-            android:process=":channel" >
-            <intent-filter>
-                <action android:name="com.taobao.accs.intent.action.SERVICE" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.taobao.accs.intent.action.ELECTION" />
-            </intent-filter>
-        </service>
-        <service
-            android:name="com.taobao.accs.data.MsgDistributeService"
-            android:exported="true" >
-            <intent-filter>
-                <action android:name="com.taobao.accs.intent.action.RECEIVE" />
-            </intent-filter>
-        </service>
-
-        <receiver
-            android:name="com.taobao.accs.EventReceiver"
-            android:process=":channel" >
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_REMOVED" />
-
-                <data android:scheme="package" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.USER_PRESENT" />
-            </intent-filter>
-        </receiver>
-        <receiver
-            android:name="com.taobao.accs.ServiceReceiver"
-            android:process=":channel" >
-            <intent-filter>
-                <action android:name="com.taobao.accs.intent.action.COMMAND" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.taobao.accs.intent.action.START_FROM_AGOO" />
-            </intent-filter>
-        </receiver>
-
-        <service
-            android:name="com.taobao.accs.internal.AccsJobService"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:process=":channel" />
-        <service
-            android:name="com.taobao.accs.ChannelService$KernelService"
-            android:process=":channel" />
-        <service
-            android:name="org.android.agoo.accs.AgooService"
-            android:exported="true" >
-            <intent-filter>
-                <action android:name="com.taobao.accs.intent.action.RECEIVE" />
-            </intent-filter>
-        </service>
-        <service
-            android:name="com.umeng.message.UmengIntentService"
-            android:exported="true"
-            android:process=":channel" >
-            <intent-filter>
-                <action android:name="org.agoo.android.intent.action.RECEIVE" />
-            </intent-filter>
-        </service>
-        <service
-            android:name="com.umeng.message.XiaomiIntentService"
-            android:exported="true"
-            android:process=":channel" >
-            <intent-filter>
-                <action android:name="org.agoo.android.intent.action.RECEIVE" />
-            </intent-filter>
-        </service>
-
-        <receiver
-            android:name="com.taobao.agoo.AgooCommondReceiver"
-            android:exported="true"
-            android:process=":channel" >
-            <intent-filter>
-                <action android:name="dollar_openBracket_applicationId_closeBracket.intent.action.COMMAND" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_REMOVED" />
-
-                <data android:scheme="package" />
-            </intent-filter>
-        </receiver>
-
-        <service
-            android:name="com.umeng.message.UmengMessageIntentReceiverService"
-            android:exported="true"
-            android:process=":channel" >
-            <intent-filter>
-                <action android:name="org.android.agoo.client.MessageReceiverService" />
-            </intent-filter>
-        </service>
-
-        <receiver
-            android:name="com.umeng.message.NotificationProxyBroadcastReceiver"
-            android:exported="false" />
-
-        <service
-            android:name="com.umeng.message.UmengMessageCallbackHandlerService"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" >
-            <intent-filter>
-                <action android:name="com.umeng.messge.registercallback.action" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.umeng.message.enablecallback.action" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.umeng.message.disablecallback.action" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.umeng.message.message.handler.action" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.umeng.message.message.sendmessage.action" />
-            </intent-filter>
-        </service>
-        <service
-            android:name="com.umeng.message.UmengDownloadResourceService"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-
-        <provider
-            android:name="com.umeng.message.provider.MessageProvider"
-            android:authorities="dollar_openBracket_applicationId_closeBracket.umeng.message"
-            android:exported="false" >
-            <grant-uri-permission android:pathPattern=".*" />
-        </provider>
-    </application>
-
-</manifest>

push/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json

@@ -1,27 +0,0 @@
-{
-  "version": 1,
-  "applicationId": "com.umeng.message.lib",
-  "variantType": "LIBRARY",
-  "elements": [
-    {
-      "outputType": {
-        "type": "AAPT_FRIENDLY_MERGED_MANIFESTS"
-      },
-      "apkData": {
-        "type": "MAIN",
-        "splits": [],
-        "versionCode": 1,
-        "versionName": "1.0",
-        "outputFile": "push-debug.aar",
-        "fullName": "debug",
-        "baseName": "debug",
-        "dirName": ""
-      },
-      "path": "AndroidManifest.xml",
-      "properties": {
-        "packageId": "com.umeng.message.lib",
-        "split": ""
-      }
-    }
-  ]
-}

push/build/intermediates/annotation_processor_list/debug/annotationProcessors.json

@@ -1 +0,0 @@
-{}

push/build/intermediates/compile_symbol_list/debug/R.txt

@@ -1,9 +0,0 @@
-int id notification_bar_image 0x0
-int id notification_large_icon1 0x0
-int id notification_large_icon2 0x0
-int id notification_text 0x0
-int id notification_title 0x0
-int id upush_notification1 0x0
-int id upush_notification2 0x0
-int layout upush_bar_image_notification 0x0
-int layout upush_notification 0x0

push/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,3 +0,0 @@
-#Thu Dec 24 16:11:48 CST 2020
-G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\res\\layout\\upush_bar_image_notification.xml=G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\build\\intermediates\\packaged_res\\debug\\layout\\upush_bar_image_notification.xml
-G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\res\\layout\\upush_notification.xml=G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\build\\intermediates\\packaged_res\\debug\\layout\\upush_notification.xml

push/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties

@@ -1,3 +1,3 @@
-#Thu Dec 24 16:03:43 CST 2020
+#Mon Jan 18 17:08:36 CST 2021
 G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\res\\layout\\upush_bar_image_notification.xml=G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\build\\intermediates\\packaged_res\\release\\layout\\upush_bar_image_notification.xml
 G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\res\\layout\\upush_notification.xml=G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\build\\intermediates\\packaged_res\\release\\layout\\upush_notification.xml

push/build/intermediates/library_manifest/debug/AndroidManifest.xml

@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.umeng.message.lib"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="25" />
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_ADDED" />
-    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_CHANGED" />
-    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_INSTALL" />
-    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_REPLACED" />
-    <uses-permission android:name="android.permission.RESTART_PACKAGES" />
-    <uses-permission android:name="android.permission.GET_TASKS" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-
-    <application>
-        <service
-            android:name="com.taobao.accs.ChannelService"
-            android:exported="true"
-            android:process=":channel" >
-            <intent-filter>
-                <action android:name="com.taobao.accs.intent.action.SERVICE" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.taobao.accs.intent.action.ELECTION" />
-            </intent-filter>
-        </service>
-        <service
-            android:name="com.taobao.accs.data.MsgDistributeService"
-            android:exported="true" >
-            <intent-filter>
-                <action android:name="com.taobao.accs.intent.action.RECEIVE" />
-            </intent-filter>
-        </service>
-
-        <receiver
-            android:name="com.taobao.accs.EventReceiver"
-            android:process=":channel" >
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_REMOVED" />
-
-                <data android:scheme="package" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.USER_PRESENT" />
-            </intent-filter>
-        </receiver>
-        <receiver
-            android:name="com.taobao.accs.ServiceReceiver"
-            android:process=":channel" >
-            <intent-filter>
-                <action android:name="com.taobao.accs.intent.action.COMMAND" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.taobao.accs.intent.action.START_FROM_AGOO" />
-            </intent-filter>
-        </receiver>
-
-        <service
-            android:name="com.taobao.accs.internal.AccsJobService"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:process=":channel" />
-        <service
-            android:name="com.taobao.accs.ChannelService$KernelService"
-            android:process=":channel" />
-        <service
-            android:name="org.android.agoo.accs.AgooService"
-            android:exported="true" >
-            <intent-filter>
-                <action android:name="com.taobao.accs.intent.action.RECEIVE" />
-            </intent-filter>
-        </service>
-        <service
-            android:name="com.umeng.message.UmengIntentService"
-            android:exported="true"
-            android:process=":channel" >
-            <intent-filter>
-                <action android:name="org.agoo.android.intent.action.RECEIVE" />
-            </intent-filter>
-        </service>
-        <service
-            android:name="com.umeng.message.XiaomiIntentService"
-            android:exported="true"
-            android:process=":channel" >
-            <intent-filter>
-                <action android:name="org.agoo.android.intent.action.RECEIVE" />
-            </intent-filter>
-        </service>
-
-        <receiver
-            android:name="com.taobao.agoo.AgooCommondReceiver"
-            android:exported="true"
-            android:process=":channel" >
-            <intent-filter>
-                <action android:name="${applicationId}.intent.action.COMMAND" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_REMOVED" />
-
-                <data android:scheme="package" />
-            </intent-filter>
-        </receiver>
-
-        <service
-            android:name="com.umeng.message.UmengMessageIntentReceiverService"
-            android:exported="true"
-            android:process=":channel" >
-            <intent-filter>
-                <action android:name="org.android.agoo.client.MessageReceiverService" />
-            </intent-filter>
-        </service>
-
-        <receiver
-            android:name="com.umeng.message.NotificationProxyBroadcastReceiver"
-            android:exported="false" />
-
-        <service
-            android:name="com.umeng.message.UmengMessageCallbackHandlerService"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" >
-            <intent-filter>
-                <action android:name="com.umeng.messge.registercallback.action" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.umeng.message.enablecallback.action" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.umeng.message.disablecallback.action" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.umeng.message.message.handler.action" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.umeng.message.message.sendmessage.action" />
-            </intent-filter>
-        </service>
-        <service
-            android:name="com.umeng.message.UmengDownloadResourceService"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-
-        <provider
-            android:name="com.umeng.message.provider.MessageProvider"
-            android:authorities="${applicationId}.umeng.message"
-            android:exported="false" >
-            <grant-uri-permission android:pathPattern=".*" />
-        </provider>
-    </application>
-
-</manifest>

push/build/intermediates/local_only_symbol_list/debug/R-def.txt

@@ -1,11 +0,0 @@
-R_DEF: Internal format may change without notice
-local
-id notification_bar_image
-id notification_large_icon1
-id notification_large_icon2
-id notification_text
-id notification_title
-id upush_notification1
-id upush_notification2
-layout upush_bar_image_notification
-layout upush_notification

push/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -1,320 +0,0 @@
-1<?xml version="1.0" encoding="utf-8"?>
-2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-3    package="com.umeng.message.lib"
-4    android:versionCode="1"
-5    android:versionName="1.0" >
-6
-7    <uses-sdk
-8        android:minSdkVersion="14"
-8-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml
-9        android:targetSdkVersion="25" />
-9-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml
-10
-11    <uses-permission android:name="android.permission.INTERNET" />
-11-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:7:5-67
-11-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:7:22-64
-12    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-12-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:8:5-79
-12-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:8:22-76
-13    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-13-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:9:5-76
-13-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:9:22-73
-14    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-14-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:10:5-81
-14-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:10:22-78
-15    <uses-permission android:name="android.permission.WAKE_LOCK" />
-15-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:11:5-68
-15-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:11:22-65
-16    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-16-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:12:5-75
-16-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:12:22-72
-17    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_ADDED" />
-17-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:13:5-82
-17-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:13:22-79
-18    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_CHANGED" />
-18-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:14:5-84
-18-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:14:22-81
-19    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_INSTALL" />
-19-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:15:5-84
-19-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:15:22-81
-20    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_REPLACED" />
-20-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:16:5-85
-20-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:16:22-82
-21    <uses-permission android:name="android.permission.RESTART_PACKAGES" />
-21-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:17:5-75
-21-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:17:22-72
-22    <uses-permission android:name="android.permission.GET_TASKS" />
-22-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:18:5-68
-22-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:18:22-65
-23    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-23-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:19:5-81
-23-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:19:22-78
-24    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-24-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:20:5-79
-24-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:20:22-76
-25    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-25-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:21:5-76
-25-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:21:22-73
-26
-27    <application>
-27-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:23:5-167:19
-28        <service
-28-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:25:9-35:19
-29            android:name="com.taobao.accs.ChannelService"
-29-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:26:13-58
-30            android:exported="true"
-30-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:27:13-36
-31            android:process=":channel" >
-31-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:28:13-39
-32            <intent-filter>
-32-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:29:13-31:29
-33                <action android:name="com.taobao.accs.intent.action.SERVICE" />
-33-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:30:17-80
-33-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:30:25-77
-34            </intent-filter>
-35            <intent-filter>
-35-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:32:13-34:29
-36                <action android:name="com.taobao.accs.intent.action.ELECTION" />
-36-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:33:17-81
-36-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:33:25-78
-37            </intent-filter>
-38        </service>
-39        <service
-39-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:37:9-43:19
-40            android:name="com.taobao.accs.data.MsgDistributeService"
-40-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:38:13-69
-41            android:exported="true" >
-41-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:39:13-36
-42            <intent-filter>
-42-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:40:13-42:29
-43                <action android:name="com.taobao.accs.intent.action.RECEIVE" />
-43-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:41:17-80
-43-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:41:25-77
-44            </intent-filter>
-45        </service>
-46
-47        <receiver
-47-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:45:9-61:20
-48            android:name="com.taobao.accs.EventReceiver"
-48-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:46:13-57
-49            android:process=":channel" >
-49-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:47:13-39
-50            <intent-filter>
-50-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:48:13-50:29
-51                <action android:name="android.intent.action.BOOT_COMPLETED" />
-51-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:49:17-79
-51-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:49:25-76
-52            </intent-filter>
-53            <intent-filter>
-53-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:51:13-53:29
-54                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-54-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:52:17-79
-54-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:52:25-76
-55            </intent-filter>
-56            <intent-filter>
-56-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:54:13-57:29
-57                <action android:name="android.intent.action.PACKAGE_REMOVED" />
-57-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:55:17-80
-57-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:55:25-77
-58
-59                <data android:scheme="package" />
-59-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:56:17-50
-59-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:56:23-47
-60            </intent-filter>
-61            <intent-filter>
-61-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:58:13-60:29
-62                <action android:name="android.intent.action.USER_PRESENT" />
-62-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:59:17-77
-62-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:59:25-74
-63            </intent-filter>
-64        </receiver>
-65        <receiver
-65-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:63:9-72:20
-66            android:name="com.taobao.accs.ServiceReceiver"
-66-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:64:13-59
-67            android:process=":channel" >
-67-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:65:13-39
-68            <intent-filter>
-68-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:66:13-68:29
-69                <action android:name="com.taobao.accs.intent.action.COMMAND" />
-69-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:67:17-80
-69-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:67:25-77
-70            </intent-filter>
-71            <intent-filter>
-71-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:69:13-71:29
-72                <action android:name="com.taobao.accs.intent.action.START_FROM_AGOO" />
-72-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:70:17-88
-72-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:70:25-85
-73            </intent-filter>
-74        </receiver>
-75
-76        <service
-76-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:74:9-77:41
-77            android:name="com.taobao.accs.internal.AccsJobService"
-77-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:75:13-67
-78            android:permission="android.permission.BIND_JOB_SERVICE"
-78-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:76:13-69
-79            android:process=":channel" />
-79-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:77:13-39
-80        <service
-80-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:79:9-81:42
-81            android:name="com.taobao.accs.ChannelService$KernelService"
-81-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:80:13-72
-82            android:process=":channel" />
-82-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:81:13-39
-83        <service
-83-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:83:9-89:19
-84            android:name="org.android.agoo.accs.AgooService"
-84-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:84:13-61
-85            android:exported="true" >
-85-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:85:13-36
-86            <intent-filter>
-86-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:40:13-42:29
-87                <action android:name="com.taobao.accs.intent.action.RECEIVE" />
-87-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:41:17-80
-87-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:41:25-77
-88            </intent-filter>
-89        </service>
-90        <service
-90-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:91:9-98:19
-91            android:name="com.umeng.message.UmengIntentService"
-91-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:92:13-64
-92            android:exported="true"
-92-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:93:13-36
-93            android:process=":channel" >
-93-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:94:13-39
-94            <intent-filter>
-94-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:95:13-97:29
-95                <action android:name="org.agoo.android.intent.action.RECEIVE" />
-95-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:96:17-81
-95-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:96:25-78
-96            </intent-filter>
-97        </service>
-98        <service
-98-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:100:9-107:19
-99            android:name="com.umeng.message.XiaomiIntentService"
-99-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:101:13-65
-100            android:exported="true"
-100-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:102:13-36
-101            android:process=":channel" >
-101-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:103:13-39
-102            <intent-filter>
-102-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:95:13-97:29
-103                <action android:name="org.agoo.android.intent.action.RECEIVE" />
-103-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:96:17-81
-103-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:96:25-78
-104            </intent-filter>
-105        </service>
-106
-107        <receiver
-107-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:109:9-120:20
-108            android:name="com.taobao.agoo.AgooCommondReceiver"
-108-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:110:13-63
-109            android:exported="true"
-109-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:111:13-36
-110            android:process=":channel" >
-110-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:112:13-39
-111            <intent-filter>
-111-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:113:13-115:29
-112                <action android:name="${applicationId}.intent.action.COMMAND" />
-112-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:114:17-81
-112-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:114:25-78
-113            </intent-filter>
-114            <intent-filter>
-114-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:54:13-57:29
-115                <action android:name="android.intent.action.PACKAGE_REMOVED" />
-115-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:55:17-80
-115-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:55:25-77
-116
-117                <data android:scheme="package" />
-117-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:56:17-50
-117-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:56:23-47
-118            </intent-filter>
-119        </receiver>
-120
-121        <service
-121-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:122:9-129:19
-122            android:name="com.umeng.message.UmengMessageIntentReceiverService"
-122-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:123:13-79
-123            android:exported="true"
-123-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:124:13-36
-124            android:process=":channel" >
-124-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:125:13-39
-125            <intent-filter>
-125-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:126:13-128:29
-126                <action android:name="org.android.agoo.client.MessageReceiverService" />
-126-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:127:17-89
-126-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:127:25-86
-127            </intent-filter>
-128        </service>
-129
-130        <receiver
-130-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:131:9-133:40
-131            android:name="com.umeng.message.NotificationProxyBroadcastReceiver"
-131-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:132:13-80
-132            android:exported="false" />
-132-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:133:13-37
-133
-134        <service
-134-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:135:9-154:19
-135            android:name="com.umeng.message.UmengMessageCallbackHandlerService"
-135-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:136:13-80
-136            android:exported="false"
-136-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:138:13-37
-137            android:permission="android.permission.BIND_JOB_SERVICE" >
-137-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:137:13-69
-138            <intent-filter>
-138-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:139:13-141:29
-139                <action android:name="com.umeng.messge.registercallback.action" />
-139-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:140:17-83
-139-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:140:25-80
-140            </intent-filter>
-141            <intent-filter>
-141-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:142:13-144:29
-142                <action android:name="com.umeng.message.enablecallback.action" />
-142-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:143:17-82
-142-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:143:25-79
-143            </intent-filter>
-144            <intent-filter>
-144-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:145:13-147:29
-145                <action android:name="com.umeng.message.disablecallback.action" />
-145-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:146:17-83
-145-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:146:25-80
-146            </intent-filter>
-147            <intent-filter>
-147-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:148:13-150:29
-148                <action android:name="com.umeng.message.message.handler.action" />
-148-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:149:17-83
-148-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:149:25-80
-149            </intent-filter>
-150            <intent-filter>
-150-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:151:13-153:29
-151                <action android:name="com.umeng.message.message.sendmessage.action" />
-151-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:152:17-87
-151-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:152:25-84
-152            </intent-filter>
-153        </service>
-154        <service
-154-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:156:9-159:40
-155            android:name="com.umeng.message.UmengDownloadResourceService"
-155-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:157:13-74
-156            android:exported="false"
-156-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:159:13-37
-157            android:permission="android.permission.BIND_JOB_SERVICE" />
-157-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:158:13-69
-158
-159        <provider
-159-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:161:9-166:20
-160            android:name="com.umeng.message.provider.MessageProvider"
-160-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:162:13-70
-161            android:authorities="${applicationId}.umeng.message"
-161-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:163:13-65
-162            android:exported="false" >
-162-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:164:13-37
-163            <grant-uri-permission android:pathPattern=".*" />
-163-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:165:13-62
-163-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml:165:35-59
-164        </provider>
-165    </application>
-166
-167</manifest>

push/build/intermediates/merged_manifests/debug/output.json

@@ -1,27 +0,0 @@
-{
-  "version": 1,
-  "applicationId": "com.umeng.message.lib",
-  "variantType": "LIBRARY",
-  "elements": [
-    {
-      "outputType": {
-        "type": "MERGED_MANIFESTS"
-      },
-      "apkData": {
-        "type": "MAIN",
-        "splits": [],
-        "versionCode": 1,
-        "versionName": "1.0",
-        "outputFile": "push-debug.aar",
-        "fullName": "debug",
-        "baseName": "debug",
-        "dirName": ""
-      },
-      "path": "../../library_manifest/debug/AndroidManifest.xml",
-      "properties": {
-        "packageId": "com.umeng.message.lib",
-        "split": ""
-      }
-    }
-  ]
-}

push/build/intermediates/navigation_json/debug/navigation.json

@@ -1 +0,0 @@
-[]

push/build/intermediates/packaged_res/debug/layout/upush_bar_image_notification.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="64dp">
-
-    <ImageView
-        android:id="@+id/notification_bar_image"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="fitCenter"/>
-
-</LinearLayout>

push/build/intermediates/packaged_res/debug/layout/upush_notification.xml

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:background="#ffffff"
-    android:layout_height="64dp">
-
-    <RelativeLayout
-        android:id="@+id/upush_notification1"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="10dp"
-        android:layout_marginTop="10dp">
-
-        <ImageView
-            android:id="@+id/notification_large_icon1"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:scaleType="fitXY" />
-
-        <TextView
-            android:id="@+id/notification_title"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:layout_marginTop="3dp"
-            android:layout_toRightOf="@+id/notification_large_icon1"
-            android:maxLines="1"
-            android:text="Title"
-            android:textColor="#000000"
-            android:textSize="16sp" />
-
-        <TextView
-            android:id="@+id/notification_text"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/notification_title"
-            android:layout_marginLeft="10dp"
-            android:layout_marginTop="3dp"
-            android:layout_toRightOf="@+id/notification_large_icon1"
-            android:ellipsize="marquee"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:marqueeRepeatLimit="marquee_forever"
-            android:scrollHorizontally="false"
-            android:fadingEdge="horizontal"
-            android:singleLine="true"
-            android:text="Message"
-            android:textColor="#000000" />
-
-        <requestFocus />
-
-
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/upush_notification2"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone">
-
-        <ImageView
-            android:id="@+id/notification_large_icon2"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="fitXY" />
-    </RelativeLayout>
-</RelativeLayout>