1.后置登录

app/build.gradle

@@ -10,13 +10,19 @@ android {
         applicationId "com.edufound.android.xyyf"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 10005
-        versionName "1.0.0.5"
+        versionCode 10011
+        versionName "1.0.0.1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         flavorDimensions "versionCode"
         manifestPlaceholders = [UMENG_CHANNEL_VALUE: "2006"]//添加一个默认渠道号
+        ndk {
+            //选择要添加的对应 cpu 类型的 .so 库。
+//            abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a','x86_64'
+            // 还可以添加 'x86', , 'mips', 'mips64'
+        }
     }
+
     signingConfigs {
         efunbox {
             keyAlias "edufound_key"
@@ -181,7 +187,7 @@ allprojects {
     }
 }
 dependencies {
-    implementation fileTree(dir: "libs", include: ["*.jar","*.aar"])
+    implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     implementation "com.android.support:appcompat-v7:28.0.0"
     implementation "android.arch.navigation:navigation-fragment:1.0.0"

app/src/main/AndroidManifest.xml

@@ -15,7 +15,6 @@
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /> <!-- 切换网络通道 -->
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> <!-- 开关wifi状态，解决国内机型移动网络权限问题需要 -->
-
     <application
             android:name="com.edufound.android.xyyf.application.EApplication"
             android:allowBackup="false"
@@ -71,7 +70,7 @@
 
         <activity
                 android:name=".activity.PhoneNumLoginActivity"
-                android:launchMode="singleInstance"
+                android:launchMode="singleTask"
                 android:screenOrientation="portrait"
                 android:theme="@style/NoTitle"></activity>
         <!--友盟start-->
@@ -150,13 +149,23 @@
         <!-- VIVO end-->
 
 
+        <activity
+                android:name=".activity.PhoneNumLoginActivityLandscape"
+                android:configChanges="orientation|keyboardHidden|screenSize"
+                android:exported="false"
+                android:launchMode="singleTop"
+                android:screenOrientation="landscape"
+                android:theme="@style/translucent">
+
+        </activity>
+
         <!--联通电信授权页-->
         <activity
                 android:name="com.mobile.auth.gatewayauth.LoginAuthActivity"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:exported="false"
                 android:launchMode="singleTop"
-                android:theme="@style/authsdk_activity_dialog" />
+                android:theme="@style/phonelogin_dialog_activity_landscape" />
         <!--协议页面webview-->
         <activity
                 android:name="com.mobile.auth.gatewayauth.activity.AuthWebVeiwActivity"

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

@@ -0,0 +1,279 @@
+package com.edufound.android.xyyf.activity;
+
+import android.app.Activity;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.Editable;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.TextPaint;
+import android.text.TextWatcher;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.WebView;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.edufound.android.xyyf.R;
+import com.edufound.android.xyyf.base.BaseActivity;
+import com.edufound.android.xyyf.phonelogin.PhoneLoginPersenter;
+import com.edufound.android.xyyf.phonelogin.PhoneLoginView;
+import com.edufound.android.xyyf.util.ContextUtil;
+import com.edufound.android.xyyf.util.DeviceUtil;
+import com.edufound.android.xyyf.util.LiuHaiScreenUtil;
+import com.edufound.android.xyyf.util.Logger;
+import com.edufound.android.xyyf.util.ToastUtil;
+
+import org.json.JSONException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class PhoneNumLoginActivityLandscape extends BaseActivity implements PhoneLoginView {
+
+    PhoneNumLoginActivityLandscape mIntences;
+    PhoneLoginPersenter mPersenter;
+    DeviceUtil mDeviceUtil;
+    LinearLayout mClose;
+    TextView mGetVetVer;
+    EditText mPhoneNumber;
+    EditText mInputVer;
+    LinearLayout mFrameLayout;
+    CheckBox mPrivacyCheckBox;
+    TextView mPrivacyContext;
+    boolean isShowWeb = false;
+    WebView mWebView;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_login_phone_landscape);
+        if (mIntences == null) {
+            mIntences = this;
+        }
+        mDeviceUtil = new DeviceUtil();
+        mPersenter = new PhoneLoginPersenter(this);
+        mFrameLayout = findViewById(R.id.phonenumber_login_l_frame);
+        int window_height = mDeviceUtil.getHeight(this);
+        int dialog_width = mDeviceUtil.getWidth(this) / 2;
+        int dialog_height = mDeviceUtil.getHeight(this) / 2;
+        Logger.e("window_height:" + window_height / 720f);
+        if ((window_height / 720f >= 1.4f) && (window_height / 720f <= 1.5f)) {
+
+        } else {
+            mFrameLayout.setLayoutParams(new LinearLayout.LayoutParams(dialog_width, dialog_height));
+        }
+
+        init();
+    }
+
+
+    void init() {
+        mClose = findViewById(R.id.login_phone_landscape_close);
+        mGetVetVer = findViewById(R.id.phonenumber_getverifcation);
+        mPhoneNumber = findViewById(R.id.phonenumber_login_number);
+        mInputVer = findViewById(R.id.phonenumber_login_ver);
+        mPersenter.setVerText(mGetVetVer);
+        mPrivacyCheckBox = findViewById(R.id.privacy_context_check);
+        mPrivacyContext = findViewById(R.id.privacy_context);
+        setContext();
+        initListener();
+    }
+
+    void initListener() {
+        mClose.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                MainActivity.getInstance().loadJSMehtodPost("closeLogin('700000')");
+                finish();
+            }
+        });
+        mGetVetVer.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+            }
+        });
+        mGetVetVer.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                switch (event.getAction()) {
+                    case MotionEvent.ACTION_DOWN:
+                        mGetVetVer.setBackgroundResource(R.drawable.shape_login_phonenumber_getverification_selected);
+                        mGetVetVer.setTextColor(Color.WHITE);
+                        break;
+                    case MotionEvent.ACTION_CANCEL:
+                    case MotionEvent.ACTION_UP:
+                        try {
+                            mPersenter.getVCode(mPhoneNumber.getText().toString());
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+
+                        break;
+                }
+                return false;
+            }
+        });
+        mInputVer.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (s.toString().length() == 4) {
+                    Logger.e("检查验证码并且登录");
+                    try {
+                        if (!mPrivacyCheckBox.isChecked()) {
+                            ToastUtil.showToast("请同意服务条款");
+                            return;
+                        }
+                        mPersenter.LoginByVCode(mPhoneNumber.getText().toString(), s.toString());
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        });
+        mPrivacyCheckBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (mInputVer.getText().toString().length() == 4 && isChecked) {
+                    try {
+                        mPersenter.LoginByVCode(mPhoneNumber.getText().toString(), mInputVer.getText().toString());
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        });
+    }
+
+
+    List<Integer> leftBrackets = new ArrayList<>();
+    List<Integer> rightBrackets = new ArrayList<>();
+    String text = "我已阅读并同意《服务协议》和《隐私政策》";
+
+    void setContext() {
+        leftBrackets = getChildIndexFromString(text, "《");
+        rightBrackets = getChildIndexFromString(text, "》");
+        SpannableStringBuilder style = new SpannableStringBuilder();
+        style.append(text);
+        for (int i = 0; i < leftBrackets.size(); i++) {
+            final int finalI = i;
+            style.setSpan(new ClickableSpan() {
+                @Override
+                public void onClick(@NonNull View widget) {
+                    lookPrivacy(finalI);
+                }
+
+                @Override
+                public void updateDrawState(@NonNull TextPaint ds) {
+                    ds.setUnderlineText(false);
+                    ds.setColor(Color.parseColor("#68a5dc"));
+                }
+
+            }, leftBrackets.get(i), rightBrackets.get(i) + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+        }
+        mPrivacyContext.setMovementMethod(LinkMovementMethod.getInstance());
+        mPrivacyContext.setHighlightColor(Color.BLACK);
+        mPrivacyContext.setText(style);
+
+    }
+
+    /**
+     * @param parent
+     * @param child
+     * @return
+     */
+    private List<Integer> getChildIndexFromString(String parent, String child) {
+        int startIndex = 0;
+        List<Integer> ids = new ArrayList<>();
+        while (parent.indexOf(child, startIndex) != -1) {
+            //ids.add(startIndex);
+            startIndex = parent.indexOf(child, startIndex);
+            ids.add(startIndex);
+            startIndex = startIndex + child.length();
+        }
+        return ids;
+    }
+
+
+    void lookPrivacy(int index) {
+        if (mWebView == null) {
+            mWebView = new WebView(ContextUtil.getContext());
+            mWebView.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        }
+        String url = "";
+        switch (index) {
+            case 0:
+                url = "http://m-xyyf-web.ai160.com/res/protocol/service.htm";
+                break;
+            case 1:
+                url = "http://m-xyyf-web.ai160.com/res/protocol/private.htm";
+                break;
+        }
+        mWebView.getSettings().setUseWideViewPort(true);
+        mWebView.getSettings().setLoadWithOverviewMode(true);
+        mWebView.getSettings().setJavaScriptEnabled(true);
+        mWebView.getSettings().setDomStorageEnabled(true);
+        mWebView.loadUrl(url);
+//        mFrameLayout.addView(webview);
+        ((FrameLayout) getWindow().getDecorView()).addView(mWebView);
+        isShowWeb = true;
+    }
+
+    @Override
+    public void changeVText(int type) {
+
+    }
+
+
+    @Override
+    public Activity getActivity() {
+        return mIntences;
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_ESCAPE:
+            case KeyEvent.KEYCODE_BACK:
+                if (isShowWeb) {
+                    isShowWeb = false;
+                    ((FrameLayout) getWindow().getDecorView()).removeView(mWebView);
+                    mWebView.loadUrl("");
+                    mWebView.clearCache(true);
+//                    if (mPrivacyContext.isChecked()) {
+//                        mPrivacyContext.setChecked(true);
+//                    } else {
+//                        mPrivacyContext.setChecked(false);
+//                    }
+                } else {
+                    MainActivity.getInstance().loadJSMehtodPost("closeLogin('700000')");
+                    finish();
+                }
+                return true;
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+}

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

@@ -11,6 +11,7 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 
 import com.edufound.android.xyyf.R;
+import com.edufound.android.xyyf.interfaces.JsInterfaces;
 import com.edufound.android.xyyf.pay.PayInit;
 import com.edufound.android.xyyf.util.ContextUtil;
 import com.edufound.android.xyyf.util.Logger;
@@ -192,6 +193,7 @@ public class EApplication extends Application {
                 isForeground = true;
 //                ToastUtil.showToast("app回到前台了");
                 Logger.e("app回到前台了");
+
                 APP_START_TIME = System.currentTimeMillis();
             }
             activityAount++;

app/src/main/java/com/edufound/android/xyyf/base/BaseActivity.java

@@ -6,13 +6,16 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.ActivityInfo;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.KeyEvent;
+import android.view.Surface;
 import android.view.View;
 import android.view.Window;
 
+import com.edufound.android.xyyf.config.AppUtils;
 import com.edufound.android.xyyf.receiver.HomeKeyEventReceiver;
 import com.edufound.android.xyyf.receiver.NetworkChangeReceiver;
 import com.edufound.android.xyyf.util.EduFoundUtil;
@@ -137,4 +140,6 @@ public class BaseActivity extends Activity implements BaseView {
     public String getLocalPckClas() {
         return getPackageName() + "." + getLocalClassName();
     }
+
+
 }

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

@@ -34,12 +34,29 @@ public abstract class BaseUIConfig implements AuthPageConfig {
         return null;
     }
 
+
+    public static AuthPageConfig init(int type, Activity activity, PhoneNumberAuthHelper authHelper) {
+        switch (type) {
+            case 0:
+                return new DialogLandConfig(activity, authHelper);
+            case 1:
+//                return new DialogLandConfigNoUI(activity, authHelper, view);
+            case 2:
+                return new FullPortConfig(activity, authHelper);
+        }
+        return null;
+    }
+
     public BaseUIConfig(Activity activity, PhoneNumberAuthHelper authHelper, MainView view) {
         mActivity = activity;
         mContext = activity.getApplicationContext();
         mAuthHelper = authHelper;
     }
-
+    public BaseUIConfig(Activity activity, PhoneNumberAuthHelper authHelper) {
+        mActivity = activity;
+        mContext = activity.getApplicationContext();
+        mAuthHelper = authHelper;
+    }
     protected void updateScreenSize(int authPageScreenOrientation) {
         int screenHeightDp = AppUtils.px2dp(mContext, AppUtils.getPhoneHeightPixels(mContext));
         int screenWidthDp = AppUtils.px2dp(mContext, AppUtils.getPhoneWidthPixels(mContext));

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

@@ -1,38 +1,65 @@
 package com.edufound.android.xyyf.config;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.pm.ActivityInfo;
+import android.graphics.Color;
 import android.os.Build;
-import android.util.Log;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.Gravity;
+import android.view.MotionEvent;
 import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.RelativeLayout;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import com.edufound.android.xyyf.R;
-import com.edufound.android.xyyf.interfaces.JsInterfaces;
+import com.edufound.android.xyyf.activity.MainActivity;
 import com.edufound.android.xyyf.main.MainView;
+import com.edufound.android.xyyf.phonelogin.PhoneLoginPersenter;
 import com.edufound.android.xyyf.util.Logger;
+import com.edufound.android.xyyf.util.ToastUtil;
 import com.mobile.auth.gatewayauth.AuthRegisterXmlConfig;
 import com.mobile.auth.gatewayauth.AuthUIConfig;
+import com.mobile.auth.gatewayauth.AuthUIControlClickListener;
 import com.mobile.auth.gatewayauth.PhoneNumberAuthHelper;
 import com.mobile.auth.gatewayauth.ui.AbstractPnsViewDelegate;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
 public class DialogLandConfig extends BaseUIConfig {
 
     private int mOldScreenOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT;
-
     MainView mView;
+    int showType = 0;
+    PhoneLoginPersenter mPersenter;
+    TextView title;
+    TextView change;
+    LinearLayout mLayout;
+    EditText mPhoneNum;
+    TextView mGetVer;
+    EditText mInputVer;
+    LinearLayout mClose;
+    boolean isCheckedUP = false;
 
     public DialogLandConfig(Activity activity, PhoneNumberAuthHelper authHelper, MainView view) {
         super(activity, authHelper, view);
         mView = view;
-        Logger.e("DialogLandConfig");
+        mPersenter = new PhoneLoginPersenter(null);
+    }
+
+    public DialogLandConfig(Activity activity, PhoneNumberAuthHelper authHelper) {
+        super(activity, authHelper);
+        mPersenter = new PhoneLoginPersenter(null);
     }
 
     @Override
     public void configAuthPage() {
-        Logger.e("configAuthPage");
         mAuthHelper.removeAuthRegisterXmlConfig();
         mAuthHelper.removeAuthRegisterViewConfig();
         int authPageOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
@@ -42,44 +69,104 @@ public class DialogLandConfig extends BaseUIConfig {
             authPageOrientation = ActivityInfo.SCREEN_ORIENTATION_BEHIND;
         }
         updateScreenSize(authPageOrientation);
-        final int dialogWidth = (int) (mScreenWidthDp * 0.9);
-        final int dialogHeight = (int) (mScreenHeightDp * 0.35);
-
-        //sdk默认控件的区域是marginTop50dp
-        int designHeight = dialogHeight - 60;
-        int unit = designHeight / 10;
-        int logBtnHeight = (int) (unit * 1.2);
-        final int logBtnOffsetY = unit * 3;
-
+        final int dialogWidth = (int) (mScreenWidthDp * 1.1);
+        final int dialogHeight = (int) (mScreenHeightDp * 0.4);
         mAuthHelper.addAuthRegisterXmlConfig(new AuthRegisterXmlConfig.Builder()
                 .setLayout(R.layout.custom_land_dialog, new AbstractPnsViewDelegate() {
                     @Override
-                    public void onViewCreated(View view) {
-                        findViewById(R.id.tv_title).setVisibility(View.VISIBLE);
-                        View close = findViewById(R.id.btn_close);
-                        close.setOnClickListener(new View.OnClickListener() {
+                    public void onViewCreated(final View view) {
+                        title = view.findViewById(R.id.custom_land_login_phone_title);
+                        change = view.findViewById(R.id.changePhoneNumLogin);
+                        mLayout = view.findViewById(R.id.custom_land_login_phone_frame);
+                        mPhoneNum = view.findViewById(R.id.phonenumber_login_number);
+                        mGetVer = view.findViewById(R.id.phonenumber_getverifcation);
+                        mInputVer = view.findViewById(R.id.phonenumber_login_ver);
+                        mClose = view.findViewById(R.id.login_phone_landscape_close);
+                        mGetVer.setOnClickListener(new View.OnClickListener() {
                             @Override
                             public void onClick(View v) {
-                                mView.loadJSMehtodPost("closeLogin()");
-                                mAuthHelper.quitLoginPage();
+
+                            }
+                        });
+                        mPersenter.setVerText(mGetVer);
+                        mGetVer.setOnTouchListener(new View.OnTouchListener() {
+                            @Override
+                            public boolean onTouch(View v, MotionEvent event) {
+                                switch (event.getAction()) {
+                                    case MotionEvent.ACTION_DOWN:
+                                        mGetVer.setBackgroundResource(R.drawable.shape_login_phonenumber_getverification_selected);
+                                        mGetVer.setTextColor(Color.WHITE);
+                                        break;
+                                    case MotionEvent.ACTION_CANCEL:
+                                    case MotionEvent.ACTION_UP:
+                                        try {
+                                            mPersenter.getVCode(mPhoneNum.getText().toString());
+                                        } catch (IOException e) {
+                                            e.printStackTrace();
+                                        }
+
+                                        break;
+                                }
+                                return false;
                             }
                         });
-                        int iconTopMargin = AppUtils.dp2px(getContext(), logBtnOffsetY + 130);
-                        View iconContainer = findViewById(R.id.container_icon);
-                        RelativeLayout.LayoutParams iconLayout = (RelativeLayout.LayoutParams) iconContainer.getLayoutParams();
-                        iconLayout.topMargin = iconTopMargin;
-                        View phoneNumLogin = findViewById(R.id.changePhoneNumLogin);
-                        phoneNumLogin.setOnClickListener(new View.OnClickListener() {
+                        change.setOnClickListener(new View.OnClickListener() {
                             @Override
                             public void onClick(View v) {
-//                                mView.getPersenter().getJsInterfaces().NOUILOGIN();
-                                mView.loadJSMehtodPost("changePhoneLogin()");
-                                mAuthHelper.quitLoginPage();
+                                switch (showType) {
+                                    case 0:
+                                        //
+                                        view.bringToFront();
+                                        mLayout.setVisibility(View.VISIBLE);
+                                        title.setText("登录注册解锁更多精彩内容");
+                                        change.setText("一键登录");
+                                        showType = 1;
+                                        break;
+                                    case 1:
+//                                        view.bringToFront();
+                                        mLayout.setVisibility(View.INVISIBLE);
+                                        change.setText("切换账号");
+                                        title.setText("登录");
+                                        showType = 0;
+                                        break;
+                                }
+
                             }
                         });
+                        mInputVer.addTextChangedListener(new TextWatcher() {
+                            @Override
+                            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
+                            }
+
+                            @Override
+                            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                                if (s.toString().length() == 4) {
+                                    Logger.e("检查验证码并且登录");
+                                    if (!isCheckedUP) {
+                                        ToastUtil.showToast("请同意服务条款");
+                                        return;
+                                    }
+                                    try {
+                                        mPersenter.LoginByVCode(mPhoneNum.getText().toString(), s.toString());
+                                    } catch (JSONException e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                            }
 
-//                        iconLayout.width = AppUtils.dp2px(getContext(), dialogWidth / 2 - 60);
+                            @Override
+                            public void afterTextChanged(Editable s) {
+
+                            }
+                        });
+                        mClose.setOnClickListener(new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                MainActivity.getInstance().loadJSMehtodPost("closeLogin('700000')");
+                                mAuthHelper.quitLoginPage();
+                            }
+                        });
                     }
                 }).build());
         showAllUi(dialogWidth, dialogHeight, authPageOrientation);
@@ -92,36 +179,63 @@ public class DialogLandConfig extends BaseUIConfig {
                 .setCheckboxHidden(false)
                 .setLogoHidden(true)
                 .setSloganHidden(true)
+                .setNavReturnHidden(true)
                 .setSwitchAccHidden(true)
 //                .setNumberFieldOffsetX(60)
                 .setNumberLayoutGravity(Gravity.CENTER)
                 .setNumberSize(24)
-                .setNumFieldOffsetY(20)
-                .setLogBtnOffsetY(80)
+                .setNumFieldOffsetY(10)
+                .setLogBtnOffsetY(60)
                 .setPrivacyOffsetY_B(10)
                 .setLogBtnMarginLeftAndRight(20)
-                .setLogBtnWidth(300)
+                .setLogBtnWidth(175)
+                .setLogBtnHeight(35)
                 .setLogBtnLayoutGravity(Gravity.CENTER)
-                .setLogBtnHeight(51)
-//                .setLogBtnBackgroundPath("login_btn_bg")
+                .setLogBtnText("本机号码一键登录")
+                .setLogBtnTextSize(18)
                 .setDialogWidth(dialogWidth)
+                .setNavText("")
                 .setDialogHeight(dialogHeight)
-                .setDialogBottom(false)
-//                .setAuthPageActIn("in_activity", "out_activity")
-//                .setAuthPageActOut("in_activity", "out_activity")
-                .setProtocolGravity(Gravity.CENTER_VERTICAL)
+                .setDialogOffsetY(0)
                 .setScreenOrientation(authPageOrientation)
+                .setAppPrivacyOne("《隐私权限和用户协议》", "http://m-xyyf-web.ai160.com/res/protocol/protocol.htm")
+                .setStatusBarHidden(true)
+                .setPrivacyMargin(60)
+                .setPrivacyTextSize(12)
+                .setVendorPrivacyPrefix("《")
+                .setVendorPrivacySuffix("》")
                 .create());
-        Logger.e("showAllUi");
+        mAuthHelper.setUIClickListener(new AuthUIControlClickListener() {
+            @Override
+            public void onClick(String s, Context context, String s1) {
+                Logger.e("s:" + s);
+                Logger.e("s1:" + s1);
+                switch (Integer.valueOf(s)) {
+                    case 700003:
+                        JSONObject jsonObject = null;
+                        try {
+                            jsonObject = new JSONObject(s1);
+                            isCheckedUP = jsonObject.getBoolean("isChecked");
+                            if (isCheckedUP && mInputVer.getText().toString().length() == 4) {
+                                mPersenter.LoginByVCode(mPhoneNum.getText().toString(), mInputVer.getText().toString());
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+
+                        break;
+                }
+            }
+        });
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        Logger.e("configAuthPage  onResume");
         if (mOldScreenOrientation != mActivity.getRequestedOrientation()) {
             mActivity.setRequestedOrientation(mOldScreenOrientation);
         }
     }
 
+
 }

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

@@ -51,18 +51,18 @@ public class DialogLandConfigNoUI extends BaseUIConfig {
                 .setLayout(R.layout.custom_land_dialog, new AbstractPnsViewDelegate() {
                     @Override
                     public void onViewCreated(View view) {
-                        findViewById(R.id.tv_title).setVisibility(View.VISIBLE);
-                        findViewById(R.id.btn_close).setOnClickListener(new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                mAuthHelper.quitLoginPage();
-                            }
-                        });
-                        int iconTopMargin = AppUtils.dp2px(getContext(), logBtnOffsetY + 130);
-                        View iconContainer = findViewById(R.id.container_icon);
-                        RelativeLayout.LayoutParams iconLayout = (RelativeLayout.LayoutParams) iconContainer.getLayoutParams();
-                        iconLayout.topMargin = iconTopMargin;
-                        View phoneNumLogin = findViewById(R.id.changePhoneNumLogin);
+//                        findViewById(R.id.tv_title).setVisibility(View.VISIBLE);
+//                        findViewById(R.id.btn_close).setOnClickListener(new View.OnClickListener() {
+//                            @Override
+//                            public void onClick(View v) {
+//                                mAuthHelper.quitLoginPage();
+//                            }
+//                        });
+//                        int iconTopMargin = AppUtils.dp2px(getContext(), logBtnOffsetY + 130);
+//                        View iconContainer = findViewById(R.id.container_icon);
+//                        RelativeLayout.LayoutParams iconLayout = (RelativeLayout.LayoutParams) iconContainer.getLayoutParams();
+//                        iconLayout.topMargin = iconTopMargin;
+//                        View phoneNumLogin = findViewById(R.id.changePhoneNumLogin);
 //                        final FrameLayout changePhoneUi = (FrameLayout) findViewById(R.id.changePhoneFrame);
 //                        phoneNumLogin.setOnClickListener(new View.OnClickListener() {
 //                            @Override

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

@@ -42,7 +42,9 @@ public class FullPortConfig extends BaseUIConfig {
         super(activity, authHelper, view);
         mView = view;
     }
-
+    public FullPortConfig(Activity activity, PhoneNumberAuthHelper authHelper) {
+        super(activity, authHelper);
+    }
     @Override
     public void configAuthPage() {
         mAuthHelper.setUIClickListener(new AuthUIControlClickListener() {

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

@@ -23,6 +23,7 @@ public class EfunboxPayInterfaces {
 
     @JavascriptInterface
     public void WeChatPay(String json) {
+        JsInterfaces.startWX = true;
         Intent intent = new Intent(mView.getActivity(), PayActivity.class);
         intent.putExtra("type", "1");
         intent.putExtra("payString", json);
@@ -31,6 +32,7 @@ public class EfunboxPayInterfaces {
 
     @JavascriptInterface
     public void AliPay(String orderInfo) {
+        JsInterfaces.startWX = true;
         Intent intent = new Intent(mView.getActivity(), PayActivity.class);
         intent.putExtra("type", "2");
         intent.putExtra("payString", orderInfo);

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

@@ -14,6 +14,7 @@ import android.webkit.JavascriptInterface;
 import com.alibaba.fastjson.JSON;
 import com.edufound.android.xyyf.R;
 import com.edufound.android.xyyf.activity.PhoneNumLoginActivity;
+import com.edufound.android.xyyf.activity.PhoneNumLoginActivityLandscape;
 import com.edufound.android.xyyf.application.EApplication;
 import com.edufound.android.xyyf.bean.MessageDialogBean;
 import com.edufound.android.xyyf.bean.UpgradeBean;
@@ -55,7 +56,7 @@ public class JsInterfaces {
     MessageDialogBean mMessageBean;
     PhoneNumberAuthHelper mPhoneNumberAuthHelperl;
     String mSecret = "UgC3rEZPVMBKi8WqdoubeWMSJNSeeA6i0dLu3Z1GZKfIgXFhF8RmMLdsmDSgmwWjg2TUOhkvbuHZH6pt4RUxiQSpVyu9P1Q7h9Th05DhNVqxuOU2GRLLs0C43B59eS6nXrUEy7PZzn3wPTXEpelTmH5rMl+VZ7UKa3tC35qkB073Dfikr6ITRfCF31mTPjOGQRo9RKrtbeIhj4jIqx7M9PJSp9+W8huzLCUEOVquVNKDtpCBUq2Znu+PgISvLg3JouLtVv9ldoftxKci+VfHaO3izxkHOi+3jauqBTigrfA7D4I4va/7PlgCNoXJogcy";
-    public final String GET_USER_PHONENUMBER_URL = "http://m-xyyf-api.ai160.com/member/getMobile";
+    public static boolean startWX = false;
 
     public JsInterfaces(MainView view) {
         mGson = new Gson();
@@ -231,6 +232,7 @@ public class JsInterfaces {
         if (!PayInit.getInstance().WX_API.isWXAppInstalled()) {
             ToastUtil.showToast("请安装微信");
         } else {
+            startWX = true;
             final SendAuth.Req req = new SendAuth.Req();
             req.scope = "snsapi_userinfo";
             req.state = "wechat_sdk_demo_test";
@@ -306,6 +308,7 @@ public class JsInterfaces {
                 req.path = path;                  //拉起小程序页面的可带参路径，不填默认拉起小程序首页
                 req.miniprogramType = WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE;// 可选打开 开发版，体验版和正式版
                 PayInit.getInstance().WX_API.sendReq(req);
+                startWX = true;
             }
         }, 800);
     }
@@ -390,9 +393,9 @@ 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(), 3000);
+//        AuthPageConfig mUIConfig = BaseUIConfig.init(type, mView.getActivity(), mPhoneNumberAuthHelperl, mView);
+//        mUIConfig.configAuthPage();
+//        mPhoneNumberAuthHelperl.getLoginToken(mView.getActivity(), 3000);
     }
 
     @JavascriptInterface
@@ -406,31 +409,29 @@ public class JsInterfaces {
         mPhoneNumberAuthHelperl.quitLoginPage();
     }
 
-    public void NOUILOGIN() {
-//        AuthPageConfig mUIConfig = BaseUIConfig.init(1, mView.getActivity(), mPhoneNumberAuthHelperl,mView);
-//        mUIConfig.configAuthPage();
-//        mPhoneNumberAuthHelperl.getLoginToken(mView.getActivity(), 5000);
+
+    @JavascriptInterface
+    public void showPhoneNumberLoginLandscape() {
+        AuthPageConfig mUIConfig = BaseUIConfig.init(0, mView.getActivity(), mPhoneNumberAuthHelperl);
+        mUIConfig.configAuthPage();
+        mPhoneNumberAuthHelperl.getLoginToken(mView.getActivity(), 3000);
     }
 
+
     TokenResultListener tokenResultListener = new TokenResultListener() {
         @Override
         public void onTokenSuccess(String s) {
-            Logger.e("sssss:" + s);
             TokenRet tokenRet = null;
             try {
                 tokenRet = JSON.parseObject(s, TokenRet.class);
                 if (ResultCode.CODE_START_AUTHPAGE_SUCCESS.equals(tokenRet.getCode())) {
-//                    Logger.e("唤起授权页成功：" + s);
                     mPhoneNumberAuthHelperl.hideLoginLoading();
-//                    ToastUtil.showToast(s);
                 }
                 if (ResultCode.CODE_GET_TOKEN_SUCCESS.equals(tokenRet.getCode())) {
-//                    Logger.e("获取token成功：" + s);
-//                    ToastUtil.showToast(s);
                     mPhoneNumberAuthHelperl.hideLoginLoading();
                     mPhoneNumberAuthHelperl.quitLoginPage();
                     String token = JSON.parseObject(s).get("token").toString();
-                    OKHttpUtil.postDataAsync(GET_USER_PHONENUMBER_URL, new OKHttpUtil.ResultCallback() {
+                    OKHttpUtil.postDataAsync(ContextUtil.getGetUserPhonenumberUrl(), new OKHttpUtil.ResultCallback() {
                         @Override
                         public void onError(Request request, Exception e) {
                             Logger.e("error-------------");
@@ -438,9 +439,9 @@ public class JsInterfaces {
 
                         @Override
                         public void onResponse(Object response) {
-                            String a = JSON.parseObject(response.toString()).getString("data").toString();
-                            SPutil.setPrefString(mView.getActivity(), "user_phone", Base64.encodeToString(a.getBytes(), Base64.DEFAULT));
-                            mView.loadJsMehtod("phoneLogin('" + a + "')");
+                            String user_phone = JSON.parseObject(response.toString()).getString("data").toString();
+                            SPutil.setPrefString(mView.getActivity(), "user_phone", Base64.encodeToString(user_phone.getBytes(), Base64.DEFAULT));
+                            mView.loadJsMehtod("phoneLogin('" + user_phone + "')");
                         }
                     }, new OKHttpUtil.Param("accessToken", token));
 //
@@ -455,14 +456,14 @@ public class JsInterfaces {
 //            ToastUtil.showToast("失败了:" + s);
             String code = JSON.parseObject(s).get("code").toString();
             Logger.e("code:" + code);
-            Intent intent = new Intent(mView.getActivity(), PhoneNumLoginActivity.class);
+            Intent intent = new Intent(mView.getActivity(), PhoneNumLoginActivityLandscape.class);
             if (code.equals("700000")) {
                 mView.loadJsMehtod("closeLogin(" + code + ")");
             } else {
                 intent.putExtra("code", code);
                 mView.getActivity().startActivity(intent);
-                ToastUtil.showToast(JSON.parseObject(s).get("msg").toString());
-                mView.getActivity().startActivity(intent);
+//                ToastUtil.showToast(JSON.parseObject(s).get("msg").toString());
+                Logger.e("一键登录onTokenFailed:" + JSON.parseObject(s).get("msg").toString());
                 mPhoneNumberAuthHelperl.quitLoginPage();
             }
             return;

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

@@ -273,7 +273,7 @@ public class MainPersenter implements MainIPersenter {
                 return true;
             case KeyEvent.KEYCODE_HOME:
                 // Home键 -,- P.S：不一定能监听到
-                Logger.DebugE("click home");
+                Logger.DebugE("onkeydown click home");
                 EApplication.exitApp();
                 break;
             case KeyEvent.KEYCODE_DPAD_UP:
@@ -299,7 +299,8 @@ public class MainPersenter implements MainIPersenter {
     @Override
     public boolean onKeyUp(int keycode, KeyEvent event) {
 //        getJsInterfaces().clickMusic("1", "1");
-        if (mView.getActivityPay()) {
+        if (mView.getActivityPay() || JsInterfaces.startWX) {
+            JsInterfaces.startWX = false;
             return true;
         }
         switch (keycode) {

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

@@ -1,13 +1,16 @@
 package com.edufound.android.xyyf.phonelogin;
 
 import android.animation.ValueAnimator;
+import android.graphics.Color;
 import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
 import android.util.Base64;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
+import com.edufound.android.xyyf.R;
 import com.edufound.android.xyyf.activity.MainActivity;
 import com.edufound.android.xyyf.application.EApplication;
 import com.edufound.android.xyyf.base.BasePersenter;
@@ -17,14 +20,11 @@ import com.edufound.android.xyyf.util.Logger;
 import com.edufound.android.xyyf.util.OKHttpUtil;
 import com.edufound.android.xyyf.util.SPutil;
 import com.edufound.android.xyyf.util.ToastUtil;
-import com.google.gson.JsonObject;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 
 import okhttp3.Call;
 import okhttp3.Callback;
@@ -36,6 +36,7 @@ public class PhoneLoginPersenter implements PhoneLoginIPersenter {
     PhoneLoginModel mModel;
     PhoneLoginView mView;
     String phoneNum = "";
+    TextView mVerText;
 
     public PhoneLoginPersenter(PhoneLoginView view) {
         mModel = new PhoneLoginModel();
@@ -92,13 +93,14 @@ public class PhoneLoginPersenter implements PhoneLoginIPersenter {
     }
 
     public void getVCode(String phoneNum) throws IOException {
+        Logger.e("getVCode--getVCode--getVCode");
         this.phoneNum = phoneNum;
         if (!isMobileNO(phoneNum)) {
             ToastUtil.showToast("请输入正确的手机号");
-            mView.changeVText(1);
+            handler.sendEmptyMessage(GET_VER_CODE_ERROR);
             return;
         }
-        mView.changeVText(0);
+        handler.sendEmptyMessage(GET_VER_CODE_SUCCESS);
         OKHttpUtil.getInstance().doGetSync(mModel.getVerificationCodeUrl() + phoneNum, new Callback() {
             @Override
             public void onFailure(Call call, IOException e) {
@@ -121,7 +123,6 @@ public class PhoneLoginPersenter implements PhoneLoginIPersenter {
                                 ToastUtil.showToast(error);
                             }
                         });
-                        mView.changeVText(1);
                     }
                 } catch (JSONException e) {
                     e.printStackTrace();
@@ -167,10 +168,14 @@ public class PhoneLoginPersenter implements PhoneLoginIPersenter {
                     JSONObject jsonObject1 = new JSONObject(json);
                     if (jsonObject1.getBoolean("success")) {
                         JSONObject user = jsonObject1.getJSONObject("data");
-                        SPutil.setPrefString(mView.getActivity(), "user_phone", Base64.encodeToString(user.getString("mobile").getBytes(), Base64.DEFAULT));
+                        SPutil.setPrefString(ContextUtil.getContext(), "user_phone", Base64.encodeToString(user.getString("mobile").getBytes(), Base64.DEFAULT));
                         MainActivity.getInstance().loadJSMehtodPost("phoneSuccess(" + json + ")");
                         MainActivity.getInstance().quitPhoneLoginPage();
-                        mView.getActivity().finish();
+                        if (mView == null) {
+
+                        } else {
+                            mView.getActivity().finish();
+                        }
                     } else {
                         final String error = jsonObject1.getString("message");
                         handler.post(new Runnable() {
@@ -188,9 +193,36 @@ public class PhoneLoginPersenter implements PhoneLoginIPersenter {
         });
     }
 
+    public void setVerText(TextView ver) {
+        mVerText = ver;
+    }
+
+    final int GET_VER_CODE_SUCCESS = 0x5564;
+    final int GET_VER_CODE_ERROR = 0x5565;
+    int countDownNum = 60;
     Handler handler = new Handler(new Handler.Callback() {
         @Override
         public boolean handleMessage(Message msg) {
+            switch (msg.what) {
+                case GET_VER_CODE_SUCCESS:
+                    if (countDownNum <= 0) {
+                        handler.sendEmptyMessage(GET_VER_CODE_ERROR);
+                        return true;
+                    }
+                    mVerText.setEnabled(false);
+                    countDownNum--;
+                    mVerText.setText(String.valueOf(countDownNum + "秒后重发"));
+                    handler.sendEmptyMessageDelayed(GET_VER_CODE_SUCCESS, 1000);
+                    break;
+                case GET_VER_CODE_ERROR:
+                    countDownNum = 60;
+                    mVerText.setEnabled(true);
+                    mVerText.setText("获取验证码");
+                    //    android:textColor="#FFA301"
+                    mVerText.setTextColor(Color.parseColor("#FFA301"));
+                    mVerText.setBackgroundResource(R.drawable.shape_login_phonenumber_getverification);
+                    break;
+            }
             return false;
         }
     });

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

@@ -12,7 +12,10 @@ 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";
+    public static final String URL_POST_USER_TIME = "http://m-xyyf-api.ai160.com/onlineTime";
+//    public static final String URL_POST_USER_TIME = "http://m-xyyf-api.efunbox.cn/onlineTime";//测试环境
+
+    public static final String GET_USER_PHONENUMBER_URL = "http://m-xyyf-api.ai160.com/member/getMobile";
     static Context mContext;
     static Application application;
 
@@ -55,5 +58,8 @@ public class ContextUtil {
         ContextUtil.isDebug = isDebug;
     }
 
+    public static String getGetUserPhonenumberUrl() {
+        return GET_USER_PHONENUMBER_URL;
+    }
 
 }

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

@@ -488,14 +488,12 @@ public class OKHttpUtil {
         long runtime = System.currentTimeMillis() - EApplication.APP_START_TIME;
         String userphone = SPutil.getPrefString(ContextUtil.getContext(), "user_phone", "");
         userphone = new String(Base64.decode(userphone.getBytes(), Base64.DEFAULT));
-        if (TextUtils.isEmpty(userphone)) {
-            Logger.e("没有用户");
-            return;
+        if (!TextUtils.isEmpty(userphone)) {
+//            userphone = "nouser";
+            obj.put("mobile", userphone);
         }
         obj.put("timeAcc", String.valueOf(runtime));
         obj.put("deviceCode", DeviceUuidFactory.getUuid().toString());
-
-        obj.put("mobile", userphone);
         String json = obj.toJSONString();
         MediaType JSON = MediaType.parse("application/json;charset=utf-8");
         RequestBody requestBody = RequestBody.create(JSON, json);

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

@@ -3,6 +3,6 @@
     <solid android:color="#FFA301" />
     <corners android:radius="25dp" />
     <stroke
-            android:width="2dp"
+            android:width="2px"
             android:color="#FFA301" />
 </shape>

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

@@ -3,6 +3,6 @@
     <solid android:color="#ffffff" />
     <corners android:radius="25dp" />
     <stroke
-            android:width="2dp"
+            android:width="2px"
             android:color="#FFA301" />
 </shape>

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

@@ -3,6 +3,6 @@
     <solid android:color="#FFA301" />
     <corners android:radius="25dp" />
     <stroke
-            android:width="2dp"
+            android:width="2px"
             android:color="#FFA301" />
 </shape>

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

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

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

@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/phonenumber_login_landscape_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/translucent_background"
+        android:orientation="vertical">
+
+    <Space
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.5"></Space>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="5"
+            android:orientation="horizontal">
+
+        <Space
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="2"></Space>
+
+        <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:layout_weight="4"
+                android:gravity="center">
+
+            <LinearLayout
+                    android:id="@+id/phonenumber_login_l_frame"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:background="@drawable/shape_login_phonenumber_landscape_bg"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                <Space
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="0.07"></Space>
+
+                <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="0.3">
+
+                    <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:orientation="horizontal">
+
+                        <Space
+                                android:layout_width="0dp"
+                                android:layout_height="match_parent"
+                                android:layout_weight="1"></Space>
+
+                        <TextView
+                                android:layout_width="0dp"
+                                android:layout_height="match_parent"
+                                android:layout_gravity="center"
+                                android:layout_weight="10"
+                                android:gravity="center"
+                                android:text="登录注册解锁更多精彩内容"
+                                android:textColor="#FF333333"
+                                android:textSize="16.67sp"
+                                android:textStyle="bold"></TextView>
+
+                        <LinearLayout
+                                android:id="@+id/login_phone_landscape_close"
+                                android:layout_width="0dp"
+                                android:layout_height="match_parent"
+                                android:layout_weight="1">
+
+                            <Space
+                                    android:layout_width="0dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_weight="0"></Space>
+
+                            <ImageView
+
+                                    android:layout_width="0dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_weight="1"
+                                    android:scaleType="centerInside"
+                                    android:src="@drawable/icon_close"></ImageView>
+
+                            <Space
+                                    android:layout_width="0dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_weight="2"></Space>
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+
+                </FrameLayout>
+
+                <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="1.5"
+                        android:orientation="vertical">
+
+                    <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1"
+                            android:orientation="horizontal">
+
+                        <Space
+                                android:layout_width="0dp"
+                                android:layout_height="match_parent"
+                                android:layout_weight="1"></Space>
+
+                        <LinearLayout
+                                android:id="@+id/custom_land_login_phone_frame"
+                                android:layout_width="0dp"
+                                android:layout_height="match_parent"
+                                android:layout_weight="5"
+                                android:background="@color/white"
+                                android:orientation="vertical">
+
+                            <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="0dp"
+                                    android:layout_weight="1"
+                                    android:orientation="vertical">
+
+                                <LinearLayout
+                                        android:layout_width="match_parent"
+                                        android:layout_height="0dp"
+                                        android:layout_weight="1"
+                                        android:orientation="horizontal">
+
+                                    <EditText
+                                            android:id="@+id/phonenumber_login_number"
+                                            android:layout_width="0dp"
+                                            android:layout_height="match_parent"
+                                            android:layout_weight="2.2"
+                                            android:background="@null"
+                                            android:gravity="bottom"
+                                            android:hint="输入手机号码"
+                                            android:imeOptions="flagNoExtractUi"
+                                            android:inputType="number"
+                                            android:maxLength="11"
+                                            android:paddingLeft="10dp"
+                                            android:paddingBottom="10dp"
+                                            android:textColor="#FF666666"
+                                            android:textColorHint="#FF666666"
+                                            android:textSize="13sp"></EditText>
+
+                                    <LinearLayout
+                                            android:layout_width="0dp"
+                                            android:layout_height="match_parent"
+                                            android:layout_weight="1"
+                                            android:orientation="vertical">
+
+                                        <Space
+                                                android:layout_width="match_parent"
+                                                android:layout_height="0dp"
+                                                android:layout_weight="2.4"></Space>
+
+                                        <TextView
+                                                android:id="@+id/phonenumber_getverifcation"
+                                                android:layout_width="match_parent"
+                                                android:layout_height="0dp"
+                                                android:layout_gravity="center|right"
+                                                android:layout_weight="1.5"
+                                                android:background="@drawable/shape_login_phonenumber_getverification"
+                                                android:gravity="center"
+                                                android:paddingLeft="5dp"
+                                                android:paddingRight="5dp"
+                                                android:text="获取验证码"
+                                                android:textColor="#FFA301"
+                                                android:textSize="13sp"></TextView>
+
+
+                                        <Space
+                                                android:layout_width="match_parent"
+                                                android:layout_height="0dp"
+                                                android:layout_weight="0.2"></Space>
+                                    </LinearLayout>
+
+                                </LinearLayout>
+
+                                <FrameLayout
+                                        android:layout_width="match_parent"
+                                        android:layout_height="0.5dp"
+                                        android:background="#999999"></FrameLayout>
+
+                            </LinearLayout>
+
+                            <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="0dp"
+                                    android:layout_weight="1"
+                                    android:orientation="vertical">
+
+                                <EditText
+                                        android:id="@+id/phonenumber_login_ver"
+                                        android:layout_width="match_parent"
+                                        android:layout_height="0dp"
+                                        android:layout_weight="1"
+                                        android:background="@null"
+                                        android:gravity="bottom"
+                                        android:hint="输入验证码"
+                                        android:imeOptions="flagNoExtractUi"
+                                        android:inputType="number"
+                                        android:maxLength="4"
+                                        android:paddingLeft="10dp"
+                                        android:paddingBottom="10dp"
+                                        android:textColor="#FF666666"
+                                        android:textColorHint="#FF666666"
+                                        android:textSize="13sp"></EditText>
+
+                                <FrameLayout
+                                        android:layout_width="match_parent"
+                                        android:layout_height="0.5dp"
+                                        android:background="#999999"></FrameLayout>
+
+                            </LinearLayout>
+
+                        </LinearLayout>
+
+                        <Space
+                                android:layout_width="0dp"
+                                android:layout_height="match_parent"
+                                android:layout_weight="1"></Space>
+                    </LinearLayout>
+
+
+                    <TextView
+                            android:id="@+id/changePhoneNumLogin"
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_gravity="bottom"
+                            android:layout_weight="0.2"
+                            android:gravity="center"
+                            android:paddingLeft="5dp"
+                            android:paddingRight="5dp"
+                            android:text="一键登录"
+                            android:textColor="#CC000000"
+                            android:textSize="13.33sp"
+                            android:visibility="invisible"></TextView>
+                </LinearLayout>
+
+                <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="0.6"
+                        android:gravity="bottom"
+                        android:orientation="vertical"
+                        android:visibility="gone">
+
+                    <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:text="其他账号登录"
+                            android:textColor="#FF666666"
+                            android:textSize="10sp"></TextView>
+
+                    <ImageView
+                            android:layout_width="28.83dp"
+                            android:layout_height="28.83dp"
+                            android:layout_gravity="center"
+                            android:layout_marginTop="10dp"
+                            android:src="@drawable/icon"></ImageView>
+                </LinearLayout>
+
+                <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="0.6">
+
+                    <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center"
+                            android:gravity="center"
+                            android:orientation="horizontal">
+
+                        <CheckBox
+                                android:id="@+id/privacy_context_check"
+                                android:layout_width="wrap_content"
+                                android:layout_height="match_parent"
+                                android:layout_gravity="center|right"
+                                android:clickable="true"
+                                android:gravity="center_vertical"
+                                android:minHeight="?android:attr/listPreferredItemHeight"
+                                android:textColor="?android:attr/textColorAlertDialogListItem"
+                                android:textSize="10sp">
+
+                        </CheckBox>
+
+                        <TextView
+                                android:id="@+id/privacy_context"
+                                android:layout_width="wrap_content"
+                                android:layout_height="match_parent"
+                                android:layout_gravity="center"
+                                android:gravity="center_vertical|left"
+                                android:minHeight="?android:attr/listPreferredItemHeight"
+                                android:text="123123123123"
+                                android:textAppearance="?android:attr/textAppearanceLarge"
+                                android:textColor="?android:attr/textColorAlertDialogListItem"
+                                android:textSize="10sp">
+
+                        </TextView>
+
+                    </LinearLayout>
+                </FrameLayout>
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <Space
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="2"></Space>
+    </LinearLayout>
+
+    <Space
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.5"></Space>
+</LinearLayout>

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

@@ -1,23 +1,276 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:background="@color/transparent"
+        android:orientation="vertical">
 
-    <include layout="@layout/custom_port_dialog_action_bar" />
 
-    <RelativeLayout
-            android:id="@+id/container_icon"
+    <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="51dp"
-            android:gravity="center"
-            android:orientation="horizontal">
+            android:layout_height="0dp"
+            android:layout_weight="3"
+            android:orientation="vertical">
 
-        <TextView
-                android:id="@+id/changePhoneNumLogin"
+        <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1">
+
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal">
+
+                <Space
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"></Space>
+
+                <TextView
+                        android:id="@+id/custom_land_login_phone_title"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center"
+                        android:layout_weight="10"
+                        android:gravity="center"
+                        android:text="登 录"
+                        android:textColor="#FF333333"
+                        android:textSize="16.67sp"
+                        android:textStyle="bold"></TextView>
+
+                <LinearLayout
+                        android:id="@+id/login_phone_landscape_close"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                    <Space
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="0"></Space>
+
+                    <ImageView
+
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:scaleType="centerInside"
+                            android:src="@drawable/icon_close"></ImageView>
+
+                    <Space
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="2"></Space>
+                </LinearLayout>
+
+            </LinearLayout>
+        </FrameLayout>
+
+        <LinearLayout
                 android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="2.5"
+                android:orientation="vertical">
+
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                <Space
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"></Space>
+
+                <LinearLayout
+                        android:id="@+id/custom_land_login_phone_frame"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="5"
+                        android:background="@color/white"
+                        android:orientation="vertical"
+                        android:visibility="invisible">
+
+                    <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="0.5"
+                            android:orientation="vertical">
+
+                        <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="0dp"
+                                android:layout_weight="1"
+                                android:orientation="horizontal">
+
+
+                            <EditText
+                                    android:id="@+id/phonenumber_login_number"
+                                    android:layout_width="0dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_weight="2"
+                                    android:background="@null"
+                                    android:gravity="bottom"
+                                    android:hint="输入手机号码"
+                                    android:imeOptions="flagNoExtractUi"
+                                    android:inputType="number"
+                                    android:maxLength="11"
+                                    android:paddingLeft="5dp"
+                                    android:paddingBottom="10dp"
+                                    android:textColor="#FF666666"
+                                    android:textColorHint="#FF666666"
+                                    android:textSize="13sp"></EditText>
+
+                            <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_weight="0.8"
+                                    android:orientation="vertical">
+
+                                <Space
+                                        android:layout_width="match_parent"
+                                        android:layout_height="0dp"
+                                        android:layout_weight="1.2"></Space>
+
+                                <TextView
+                                        android:id="@+id/phonenumber_getverifcation"
+                                        android:layout_width="match_parent"
+                                        android:layout_height="0dp"
+                                        android:layout_gravity="center|right"
+                                        android:layout_weight="2"
+                                        android:background="@drawable/shape_login_phonenumber_getverification"
+                                        android:gravity="center"
+                                        android:paddingLeft="5dp"
+                                        android:paddingRight="5dp"
+                                        android:text="获取验证码"
+                                        android:textColor="#FFA301"
+                                        android:textSize="13sp"></TextView>
+
+                                <Space
+                                        android:layout_width="match_parent"
+                                        android:layout_height="0dp"
+                                        android:layout_weight="0.3"></Space>
+                            </LinearLayout>
+
+                        </LinearLayout>
+
+                        <FrameLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="0.5dp"
+                                android:background="#999999"></FrameLayout>
+                    </LinearLayout>
+
+                    <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="0.5"
+                            android:orientation="vertical">
+
+                        <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="0dp"
+                                android:layout_weight="1"
+                                android:orientation="horizontal">
+
+
+                            <EditText
+                                    android:id="@+id/phonenumber_login_ver"
+                                    android:layout_width="0dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_weight="2"
+                                    android:background="@null"
+                                    android:gravity="bottom"
+                                    android:hint="输入验证码"
+                                    android:imeOptions="flagNoExtractUi"
+                                    android:inputType="number"
+                                    android:maxLength="4"
+                                    android:paddingLeft="5dp"
+                                    android:paddingBottom="10dp"
+                                    android:textColor="#FF666666"
+                                    android:textColorHint="#FF666666"
+                                    android:textSize="13sp"></EditText>
+
+                            <ImageView
+                                    android:layout_width="0dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_marginLeft="-20dp"
+                                    android:layout_weight="1"
+                                    android:background="@null"
+                                    android:clickable="false"
+                                    android:orientation="vertical">
+
+
+                            </ImageView>
+
+                        </LinearLayout>
+
+
+                        <FrameLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="0.5dp"
+                                android:background="#999999"></FrameLayout>
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <Space
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"></Space>
+            </LinearLayout>
+
+
+            <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="0.5">
+
+                <TextView
+                        android:id="@+id/changePhoneNumLogin"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="bottom|center"
+                        android:gravity="center|bottom"
+                        android:text="切换账号"
+                        android:textColor="#CC000000"
+                        android:textSize="13.33sp"></TextView>
+            </FrameLayout>
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+    <!-- 没有其他方式登录，隐藏其他方式登录-->
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:gravity="bottom"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+        <TextView
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="切换手机号登录"></TextView>
-    </RelativeLayout>
+                android:layout_gravity="center"
+                android:text="其他账号登录"
+                android:textColor="#FF666666"
+                android:textSize="10sp"></TextView>
+
+        <ImageView
+                android:layout_width="28.83dp"
+                android:layout_height="28.83dp"
+                android:layout_gravity="center"
+                android:layout_marginTop="10dp"
+                android:src="@drawable/icon"></ImageView>
+    </LinearLayout>
+
 
-</RelativeLayout>
+    <Space
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="1"></Space>
+</LinearLayout>

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

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@android:color/transparent">
-
-    <TextView
-            android:id="@+id/tv_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:text="登录"
-            android:textColor="@android:color/holo_blue_light"
-            android:textSize="26sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-            android:id="@+id/btn_close"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_marginBottom="20dp"
-            android:paddingRight="10dp"
-            android:scaleType="fitCenter"
-            android:src="@drawable/icon_close"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-</android.support.constraint.ConstraintLayout>

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

@@ -1,11 +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://m-xyyf-web.ai160.com/stage/index/index.html</string>-->
     <!--    王洋本地-->
-<!--    <string name="default_url">http://192.168.1.66:8080/efunbox-xyyf-web/1.0.0/stage/index/index.html</string>-->
-    <!--    测试环境-->
-    <string name="default_url">http://m-xyyf-web.efunbox.cn/stage/index/index.html</string>
+    <string name="default_url">http://192.168.1.34:8080/efunbox-xyyf-web/1.0.0/stage/index/index.html</string>
     <!--义方渠道-->
     <string name="app_code_yf">2006</string>
     <!--应用宝-->

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

@@ -37,7 +37,7 @@
     </style>
 
     <style name="translucent">
-        <item name="android:windowBackground">@color/translucent_background</item>
+        <item name="android:windowBackground">@color/transparent</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
         <item name="android:windowFullscreen">true</item>
@@ -77,6 +77,7 @@
         <item name="android:background">@color/transparent</item>
         <item name="android:windowBackground">@color/transparent</item>
         <item name="android:backgroundDimEnabled">true</item>
+        <item name="actionBarSize">0dp</item>
     </style>
 
     <style name="phone_login" parent="@android:style/Theme.Dialog">
@@ -87,4 +88,20 @@
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:backgroundDimEnabled">false</item>
     </style>
+
+    <style name="phonelogin_dialog_activity_landscape" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowCloseOnTouchOutside">false</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowFrame">@android:color/transparent</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:backgroundDimAmount">0.1</item>
+        <item name="android:windowAnimationStyle">@null</item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowFullscreen">true</item>
+    </style>
 </resources>

push/build/.transforms/09905604a6e4f17335a0035d796233ff.bin

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

push/build/.transforms/ba7e55be106422172a4df981ed71154e.bin

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

push/build/.transforms/c00258f670a4fca9ef20a5f72fe3e1bf.bin

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

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

@@ -0,0 +1,12 @@
+/**
+ * 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

@@ -0,0 +1,167 @@
+<?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

@@ -0,0 +1,27 @@
+{
+  "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

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

push/build/intermediates/blame/res/release/single/layout.json

@@ -1,10 +0,0 @@
-[
-    {
-        "merged": "G:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\build\\intermediates\\res\\merged\\release\\layout\\upush_notification.xml",
-        "source": "G:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\res\\layout\\upush_notification.xml"
-    },
-    {
-        "merged": "G:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\build\\intermediates\\res\\merged\\release\\layout\\upush_bar_image_notification.xml",
-        "source": "G:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\res\\layout\\upush_bar_image_notification.xml"
-    }
-]

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

@@ -0,0 +1,9 @@
+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/mergeReleaseResources/compile-file-map.properties

@@ -1,3 +1,3 @@
-#Mon Apr 19 16:38:05 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\\res\\merged\\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\\res\\merged\\release\\layout\\upush_notification.xml
+#Wed Jun 09 17:21:37 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\\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 @@
-#Mon Apr 19 16:38:05 CST 2021
+#Wed Jun 09 11:20:44 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

@@ -0,0 +1,167 @@
+<?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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,320 @@
+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

@@ -0,0 +1,27 @@
+{
+  "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

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

push/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt

@@ -0,0 +1,10 @@
+com.umeng.message.lib
+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/outputs/logs/manifest-merger-debug-report.txt

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