1.华为支付，登录等

.idea/jarRepositories.xml

@@ -34,17 +34,22 @@
     <remote-repository>
       <option name="id" value="G:\AndroidStudio\sdk\extras\android\m2repository" />
       <option name="name" value="G:\AndroidStudio\sdk\extras\android\m2repository" />
-      <option name="url" value="file:/G:/AndroidStudio/sdk/extras/android/m2repository/" />
+      <option name="url" value="file:/$PROJECT_DIR$/../../../../AndroidStudio/sdk/extras/android/m2repository/" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="G:\AndroidStudio\sdk\extras\m2repository" />
       <option name="name" value="G:\AndroidStudio\sdk\extras\m2repository" />
-      <option name="url" value="file:/G:/AndroidStudio/sdk/extras/m2repository/" />
+      <option name="url" value="file:/$PROJECT_DIR$/../../../../AndroidStudio/sdk/extras/m2repository/" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="G:\AndroidStudio\sdk\extras\google\m2repository" />
       <option name="name" value="G:\AndroidStudio\sdk\extras\google\m2repository" />
-      <option name="url" value="file:/G:/AndroidStudio/sdk/extras/google/m2repository/" />
+      <option name="url" value="file:/$PROJECT_DIR$/../../../../AndroidStudio/sdk/extras/google/m2repository/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://developer.huawei.com/repo/" />
     </remote-repository>
   </component>
 </project>

app/agconnect-services.json

@@ -0,0 +1,47 @@
+{
+	"agcgw_all":{
+		"CN":"connect-drcn.hispace.hicloud.com",
+		"CN_back":"connect-drcn.dbankcloud.cn",
+		"DE":"connect-dre.hispace.hicloud.com",
+		"DE_back":"connect-dre.dbankcloud.cn",
+		"RU":"connect-drru.hispace.hicloud.com",
+		"RU_back":"connect-drru.dbankcloud.cn",
+		"SG":"connect-dra.hispace.hicloud.com",
+		"SG_back":"connect-dra.dbankcloud.cn"
+	},
+	"client":{
+		"cp_id":"890086000102026936",
+		"product_id":"3629892982708115265",
+		"client_id":"543432685264056960",
+		"client_secret":"3558A22859CCCE02D8A782663732CFE52C19FF397A82602431BEACE005B8D3A7",
+		"project_id":"3629892982708115265",
+		"app_id":"103790191",
+		"api_key":"CgB6e3x9tFgJM6ParpPwatURYDA2rM/crVanSrZtEWS30sV2vYEyfhn3Jaf1ItEXAKh08gs+Y+JscDjEj2e/piVn",
+		"package_name":"com.edufound.android.xyyf"
+	},
+	"oauth_client":{
+		"client_id":"103790191",
+		"client_type":1
+	},
+	"app_info":{
+		"app_id":"103790191",
+		"package_name":"com.edufound.android.xyyf"
+	},
+	"configuration_version":"3.0",
+	"appInfos":[
+		{
+			"package_name":"com.edufound.android.xyyf",
+			"client":{
+				"app_id":"103790191"
+			},
+			"app_info":{
+				"package_name":"com.edufound.android.xyyf",
+				"app_id":"103790191"
+			},
+			"oauth_client":{
+				"client_type":1,
+				"client_id":"103790191"
+			}
+		}
+	]
+}

app/build.gradle

@@ -8,26 +8,26 @@ android {
     compileSdkVersion 28
     defaultConfig {
         applicationId "com.edufound.android.xyyf"
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 28
         versionCode 10005
         versionName "1.0.0.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         flavorDimensions "versionCode"
-        manifestPlaceholders = [UMENG_CHANNEL_VALUE: "2006"]//添加一个默认渠道号
+        manifestPlaceholders = [UMENG_CHANNEL_VALUE: "2011"]//添加一个默认渠道号
     }
     signingConfigs {
         efunbox {
             keyAlias "edufound_key"
             keyPassword "edufound321"
-            storeFile file("C:/Users/Candy/Desktop/edufound.keystore")
+            storeFile file("C:\\Users\\Candy\\Desktop\\义方教育\\edufound\\edufound.keystore")
             storePassword "edufound123"
         }
         debug {
             keyAlias "edufound_key"
             keyPassword "edufound321"
-            storeFile file("C:/Users/Candy/Desktop/edufound.keystore")
+            storeFile file("C:\\Users\\Candy\\Desktop\\义方教育\\edufound\\edufound.keystore")
             storePassword "edufound123"
         }
     }
@@ -44,26 +44,8 @@ android {
                         def fileName = "efunbox_mobile_xyyf_v${defaultConfig.versionCode}_${releaseTime()}_${variant.productFlavors[0].manifestPlaceholders.UMENG_CHANNEL_VALUE}_r.apk"
                         def channel = variant.productFlavors[0].manifestPlaceholders.UMENG_CHANNEL_VALUE;
                         def newoutputFile = "";
-                        if (channel == ("2006")) {
-                            newoutputFile = "\\义方\\"
-                        } else if (channel == ("2001")) {
-                            newoutputFile = "\\应用宝\\"
-                        } else if (channel == ("2002")) {
-                            newoutputFile = "\\360应用市场\\"
-                        } else if (channel == ("2003")) {
-                            newoutputFile = "\\百度手机助手\\"
-                        } else if (channel == ("2008")) {
-                            newoutputFile = "\\小米\\"
-                        } else if (channel == ("2007")) {
-                            newoutputFile = "\\vivo\\"
-                        } else if (channel == ("2004")) {
-                            newoutputFile = "\\oppo\\"
-                        } else if (channel == ("2005")) {
-                            newoutputFile = "\\huawei\\"
-                        } else if (channel == ("2009")) {
-                            newoutputFile = "\\萌庄园\\"
-                        } else if (channel == ("2010")) {
-                            newoutputFile = "\\步步高\\"
+                        if (channel == ("2011")) {
+                            newoutputFile = "\\华为联运\\"
                         }
                         output.outputFileName = new File(newoutputFile, fileName)
                     }
@@ -90,86 +72,14 @@ android {
     }
     productFlavors {
         //义方
-        channel_efunbox {
+        channel_huaweilianyun {
             signingConfig signingConfigs.efunbox
             manifestPlaceholders = [
-                    appCode: "2006",
-                    appIcon: "@drawable/icon",
-            ]
-        }
-        //应用宝
-        channel_yyb {
-            signingConfig signingConfigs.efunbox
-            manifestPlaceholders = [
-                    appCode: "2001",
-                    appIcon: "@drawable/icon",
-            ]
-        }
-        //360应用市场
-        channel_360 {
-            signingConfig signingConfigs.efunbox
-            manifestPlaceholders = [
-                    appCode: "2002",
-                    appIcon: "@drawable/icon",
-            ]
-        }
-        //百度手机助手
-        channel_bdsjzs {
-            signingConfig signingConfigs.efunbox
-            manifestPlaceholders = [
-                    appCode: "2003",
-                    appIcon: "@drawable/icon",
-            ]
-        }
-        //vivo
-        channel_vivo {
-            signingConfig signingConfigs.efunbox
-            manifestPlaceholders = [
-                    appCode: "2007",
-                    appIcon: "@drawable/icon",
-            ]
-        }
-        //小米
-        channel_xiaomi {
-            signingConfig signingConfigs.efunbox
-            manifestPlaceholders = [
-                    appCode: "2008",
-                    appIcon: "@drawable/icon",
-            ]
-        }
-        //OPPO
-        channel_oppo {
-            signingConfig signingConfigs.efunbox
-            manifestPlaceholders = [
-                    appCode: "2004",
-                    appIcon: "@drawable/icon",
-            ]
-        }
-        //华为
-        channel_huawei {
-            signingConfig signingConfigs.efunbox
-//            applicationIdSuffix ".hw"
-            manifestPlaceholders = [
-                    appCode: "2005",
-                    appIcon: "@drawable/icon",
-            ]
-        }
-        //萌状元
-        channel_mengzhuangyuan {
-            signingConfig signingConfigs.efunbox
-            manifestPlaceholders = [
-                    appCode: "2009",
-                    appIcon: "@drawable/icon",
-            ]
-        }
-        //步步高
-        channel_bubugao {
-            signingConfig signingConfigs.efunbox
-            manifestPlaceholders = [
-                    appCode: "2010",
+                    appCode: "2011",
                     appIcon: "@drawable/icon",
             ]
         }
+
     }
     productFlavors.all {
         flavor -> flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: manifestPlaceholders.appCode, icon: manifestPlaceholders.appIcon]
@@ -181,7 +91,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"
@@ -190,7 +100,6 @@ dependencies {
     api files("libs/commons-codec-1.7.jar")
     api files("libs/commons-lang-2.2.jar")
     api files("libs/commons-net-3.3.jar")
-    api files("libs/bcprov-jdk15-136.jar")
     api "com.google.code.gson:gson:2.8.6"
     implementation 'com.alibaba:fastjson:1.2.73'
     //微信登录、微信支付等
@@ -212,10 +121,6 @@ dependencies {
     //小米Push通道
     implementation "com.umeng.umsdk:xiaomi-push:3.6.17"
     implementation "com.umeng.umsdk:xiaomi-umengaccs:1.1.0"
-    //华为Push通道
-    implementation "com.umeng.umsdk:huawei-basetb:2.6.3.305"
-    implementation "com.umeng.umsdk:huawei-pushtb:2.6.3.305"
-    implementation "com.umeng.umsdk:huawei-umengaccs:1.2.1"
     //魅族Push通道
     implementation "com.umeng.umsdk:meizu-push:3.8.1"
     implementation "com.umeng.umsdk:meizu-umengaccs:1.0.6"
@@ -234,6 +139,9 @@ dependencies {
     //阿里一键登录和校验
 //    implementation(name: 'crashshield-release', ext: 'aar')
 //    implementation(name: 'phoneNumber-L-AuthSDK-2.11.1.1', ext: 'aar')
-
+    implementation 'com.huawei.hms:hwid:5.2.0.300'
+    implementation 'com.huawei.hms:iap:5.1.0.300'
+    implementation 'com.huawei.hms:appservice:5.0.4.303'
+    implementation 'com.huawei.hms:hianalytics:5.2.0.301'
 }
 

app/src/main/AndroidManifest.xml

@@ -15,10 +15,10 @@
     <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"
+            android:appComponentFactory="huawei"
             android:icon="${icon}"
             android:label="@string/app_name"
             android:networkSecurityConfig="@xml/network_security_config"
@@ -26,7 +26,7 @@
             android:supportsRtl="true"
             android:theme="@style/NoTitle"
             android:usesCleartextTraffic="true"
-            tools:replace="allowBackup">
+            tools:replace="android:allowBackup,android:appComponentFactory">
 
         <meta-data
                 android:name="android.notch_support"
@@ -134,10 +134,12 @@
                 android:exported="true"
                 android:launchMode="singleTask" />
 
-
+        <meta-data
+                android:name="com.huawei.hms.client.channel.androidMarket"
+                android:value="false" />
         <meta-data
                 android:name="com.huawei.hms.client.appid"
-                android:value="appid=xxxxxx" />
+                android:value="appid=103790191" />
 
         <!--vivo push参数声明 -->
         <!-- vivo start-->

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

@@ -47,14 +47,10 @@ public class AgreementActivity extends BaseActivity implements UserAgreementView
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_privacypolicy);
-        if (EApplication.getAppCode().equals("2001")) {
-            if (SPutil.getPrefBoolean(this, spKey, false)) {
-                toMain();
-            } else {
-                init();
-            }
-        } else {
+        if (SPutil.getPrefBoolean(this, spKey, false)) {
             toMain();
+        } else {
+            init();
         }
 
     }

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

@@ -23,6 +23,7 @@ import android.webkit.WebView;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.Toast;
 
 import com.edufound.android.xyyf.R;
@@ -100,6 +101,27 @@ public class MainActivity extends BaseActivity implements MainView {
         mLoading.bringToFront();
         new DeviceUuidFactory(ContextUtil.getContext());
         mPersenter.openWeb(getIntent());
+//        LinearLayout linearLayout = new LinearLayout(this);
+//        Button btn = new Button(this);
+//        btn.setText("测试登录");
+//        btn.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                mPersenter.getJsInterfaces().showPhoneNumberLogin();
+//            }
+//        });
+//        Button btnpay = new Button(this);
+//        btnpay.setText("测试支付");
+//        btnpay.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                mPersenter.getPayInterfaces().HuaWeiPay("{\"productId\":\"1052\",\"developerPayload\":\"developerPayload。。。。。。。\"}");
+//            }
+//        });
+//        linearLayout.addView(btn);
+//        linearLayout.addView(btnpay);
+//        mRootView.addView(linearLayout);
+        mPersenter.checkHWUpdate();
     }
 
     @Override

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

@@ -5,6 +5,7 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.app.Activity;
+import android.content.Intent;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
@@ -32,6 +33,14 @@ import com.edufound.android.xyyf.config.AppUtils;
 import com.edufound.android.xyyf.phonelogin.PhoneLoginPersenter;
 import com.edufound.android.xyyf.phonelogin.PhoneLoginView;
 import com.edufound.android.xyyf.util.Logger;
+import com.edufound.android.xyyf.util.ToastUtil;
+import com.huawei.hmf.tasks.Task;
+import com.huawei.hms.common.ApiException;
+import com.huawei.hms.support.account.AccountAuthManager;
+import com.huawei.hms.support.account.request.AccountAuthParams;
+import com.huawei.hms.support.account.request.AccountAuthParamsHelper;
+import com.huawei.hms.support.account.result.AuthAccount;
+import com.huawei.hms.support.account.service.AccountAuthService;
 
 import org.json.JSONException;
 
@@ -51,6 +60,8 @@ public class PhoneNumLoginActivity extends BaseActivity implements PhoneLoginVie
     int countDownNum = 60;
     int oldWidth = -1;
     boolean haveError = false;
+    LinearLayout mHWLogin;
+    ImageView mHWIcon;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -136,6 +147,20 @@ public class PhoneNumLoginActivity extends BaseActivity implements PhoneLoginVie
             }
         });
 
+        View view = findViewById(R.id.otherlogin_include);
+        mHWIcon = view.findViewById(R.id.otherlogin_icon_huawei);
+        mHWIcon.getLayoutParams().width = AppUtils.dp2px(this, 57.6f);
+        mHWIcon.getLayoutParams().height = AppUtils.dp2px(this, 57.6f);
+        mHWLogin = view.findViewById(R.id.otherlogin_login_huawei);
+        mHWIcon.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Logger.e("华为登录");
+                AccountAuthParams authParams = new AccountAuthParamsHelper(AccountAuthParams.DEFAULT_AUTH_REQUEST_PARAM).setAuthorizationCode().createParams();
+                AccountAuthService service = AccountAuthManager.getService(getActivity(), authParams);
+                getActivity().startActivityForResult(service.getSignInIntent(), 8888);
+            }
+        });
     }
 
     void setTextSize(View view, int dpsize) {
@@ -147,6 +172,33 @@ public class PhoneNumLoginActivity extends BaseActivity implements PhoneLoginVie
     }
 
     @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        switch (requestCode) {
+            case 8888:
+                Task<AuthAccount> authAccountTask = AccountAuthManager.parseAuthResultFromIntent(data);
+                if (authAccountTask.isSuccessful()) {
+//                    ToastUtil.showToast("登录成功");
+                    //登录成功，获取用户的帐号信息和Authorization Code
+                    AuthAccount authAccount = authAccountTask.getResult();
+                    try {
+                        MainActivity.getInstance().loadJSMehtodPost("huaweiLoginSuccess(" + authAccount.toJson() + ")");
+                        MainActivity.getInstance().mPersenter.getJsInterfaces().quitLoginPage();
+                        finish();
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
+                } else {
+                    //登录失败
+                    int code = ((ApiException) authAccountTask.getException()).getStatusCode();
+                    ToastUtil.showToast("登录失败:" + code);
+                    Logger.e("sign in failed:" + code);
+                }
+                break;
+        }
+    }
+
+    @Override
     protected void onDestroy() {
         super.onDestroy();
         removeAllHandler();

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

@@ -16,9 +16,7 @@ import com.edufound.android.xyyf.util.ContextUtil;
 import com.edufound.android.xyyf.util.Logger;
 import com.edufound.android.xyyf.util.OKHttpUtil;
 import com.edufound.android.xyyf.util.SPutil;
-import com.umeng.commonsdk.UMConfigure;
 
-import org.android.agoo.huawei.HuaWeiRegister;
 import org.android.agoo.vivo.VivoRegister;
 import org.android.agoo.xiaomi.MiPushRegistar;
 
@@ -48,7 +46,6 @@ public class EApplication extends Application {
         //上线关掉debug模式
         ContextUtil.setIsDebug(true);
         mUMengAppID = getChannelName();
-        mUMengAppID = "3001";
         APP_START_TIME = System.currentTimeMillis();
         //根据appcode初始化支付sdk
 //        UMConfigure.setLogEnabled(true);
@@ -67,13 +64,6 @@ public class EApplication extends Application {
 //        });
 
         registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
-        if (getAppCode().equals(getString(R.string.app_code_xm))) {
-            MiPushRegistar.register(this, XIAOMI_ID, XIAOMI_KEY);
-        } else if (getAppCode().equals(getString(R.string.app_code_huawei))) {
-            HuaWeiRegister.register(this);
-        } else if (getAppCode().equals(getString(R.string.app_code_vivo))) {
-            VivoRegister.register(this);
-        }
 
 
         PayInit.getInstance().initPaySDK(Integer.valueOf(getAppCode()), EApplication.this);
@@ -86,16 +76,6 @@ public class EApplication extends Application {
         if (SPutil.getPrefInt(this, SPutil.videoType, 0) == 0) {
             SPutil.setPrefInt(this, SPutil.videoType, SPutil.VIDEO_IJKPLAYER);
         }
-        /*
-        *    AppKey
-                5e34d2fb4ca3574b1800005b
-            Umeng Message Secret
-                dfc59afd6dc6b1550ff1c2e0c7eb10fd
-            App Master Secret
-                ojy29ycnnynpvyetpunc2m0ija4vskyo
-        *
-        * */
-
     }
 
     public static void exitApp() {

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

@@ -11,6 +11,9 @@ import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
@@ -19,6 +22,10 @@ import com.edufound.android.xyyf.activity.PhoneNumLoginActivity;
 import com.edufound.android.xyyf.application.EApplication;
 import com.edufound.android.xyyf.main.MainView;
 import com.edufound.android.xyyf.util.Logger;
+import com.huawei.hms.support.account.AccountAuthManager;
+import com.huawei.hms.support.account.request.AccountAuthParams;
+import com.huawei.hms.support.account.request.AccountAuthParamsHelper;
+import com.huawei.hms.support.account.service.AccountAuthService;
 import com.mobile.auth.gatewayauth.AuthRegisterViewConfig;
 import com.mobile.auth.gatewayauth.AuthRegisterXmlConfig;
 import com.mobile.auth.gatewayauth.AuthUIConfig;
@@ -85,10 +92,17 @@ public class FullPortConfig extends BaseUIConfig {
         });
         mAuthHelper.removeAuthRegisterXmlConfig();
         mAuthHelper.removeAuthRegisterViewConfig();
+        mAuthHelper.removeAuthRegisterXmlConfig();
+        mAuthHelper.removeAuthRegisterViewConfig();
         mAuthHelper.addAuthRegisterXmlConfig(new AuthRegisterXmlConfig.Builder()
                 .setLayout(R.layout.login_phonenumber, new AbstractPnsViewDelegate() {
                     @Override
                     public void onViewCreated(final View view) {
+                        ImageView loginicon = (ImageView) findViewById(R.id.loginicon);
+                        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(AppUtils.dp2px(mView.getActivity(), 90), AppUtils.dp2px(mView.getActivity(), 90));
+                        params.gravity = Gravity.CENTER;
+                        params.setMargins(0, AppUtils.dp2px(mView.getActivity(), 30), 0, 0);
+                        loginicon.setLayoutParams(params);
                         phone_number = (EditText) findViewById(R.id.phonenumber_phonenumber);
                         intpu_verifaction = (EditText) findViewById(R.id.phonenumber_verifcation);
                         phonenumber_getverifcation = (TextView) findViewById(R.id.phonenumber_getverifcation);
@@ -98,6 +112,21 @@ public class FullPortConfig extends BaseUIConfig {
                         intpu_verifaction.setVisibility(View.INVISIBLE);
                         phonenumber_getverifcation.setVisibility(View.INVISIBLE);
                         phonenumber_login.setVisibility(View.INVISIBLE);
+                        View other = view.findViewById(R.id.otherlogin_include);
+                        ImageView mHWIcon = other.findViewById(R.id.otherlogin_icon_huawei);
+                        mHWIcon.getLayoutParams().width = AppUtils.dp2px(mView.getActivity(), 57.6f);
+                        mHWIcon.getLayoutParams().height = AppUtils.dp2px(mView.getActivity(), 57.6f);
+                        LinearLayout mHWLogin = other.findViewById(R.id.otherlogin_login_huawei);
+                        mHWIcon.setOnClickListener(new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                Logger.e("华为登录");
+                                AccountAuthParams authParams = new AccountAuthParamsHelper(AccountAuthParams.DEFAULT_AUTH_REQUEST_PARAM).setAuthorizationCode().createParams();
+                                AccountAuthService service = AccountAuthManager.getService(mView.getActivity(), authParams);
+                                mAuthHelper.quitLoginPage();
+                                mView.getActivity().startActivityForResult(service.getSignInIntent(), 8888);
+                            }
+                        });
                         change_text.setOnClickListener(new View.OnClickListener() {
                             @Override
                             public void onClick(View v) {
@@ -109,7 +138,6 @@ public class FullPortConfig extends BaseUIConfig {
                     }
                 })
                 .build());
-
         int authPageOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT;
         if (Build.VERSION.SDK_INT == 26) {
             authPageOrientation = ActivityInfo.SCREEN_ORIENTATION_BEHIND;
@@ -135,11 +163,12 @@ public class FullPortConfig extends BaseUIConfig {
                 .setVendorPrivacyPrefix("《")
                 .setVendorPrivacySuffix("》")
                 .setPageBackgroundPath("page_background_color")
-                .setLogoImgPath("icon")
+//                .setLogoImgPath("icon")
+                .setLogoHidden(true)
                 //一键登录按钮三种状态背景示例login_btn_bg.xml
                 .setLogBtnBackgroundPath("login_btn_bg")
                 .setLogBtnTextSize(AppUtils.dp2px(mContext, 6))
-                .setLogBtnOffsetY(AppUtils.dp2px(mContext, 100))
+                .setLogBtnOffsetY(AppUtils.dp2px(mContext, 95))
                 .setScreenOrientation(authPageOrientation)
                 .setNavText("")
                 .setNavReturnHidden(true)

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

@@ -1,10 +1,25 @@
 package com.edufound.android.xyyf.interfaces;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.webkit.JavascriptInterface;
 
+import com.alibaba.fastjson.JSONException;
+import com.edufound.android.xyyf.activity.MainActivity;
 import com.edufound.android.xyyf.main.MainView;
 import com.edufound.android.xyyf.pay.PayActivity;
+import com.edufound.android.xyyf.util.Logger;
+import com.huawei.hmf.tasks.OnFailureListener;
+import com.huawei.hmf.tasks.OnSuccessListener;
+import com.huawei.hmf.tasks.Task;
+import com.huawei.hms.iap.Iap;
+import com.huawei.hms.iap.IapApiException;
+import com.huawei.hms.iap.entity.ConsumeOwnedPurchaseReq;
+import com.huawei.hms.iap.entity.ConsumeOwnedPurchaseResult;
+import com.huawei.hms.iap.entity.InAppPurchaseData;
+import com.huawei.hms.iap.entity.OwnedPurchasesReq;
+import com.huawei.hms.iap.entity.OwnedPurchasesResult;
+import com.huawei.hms.support.api.client.Status;
 
 public class EfunboxPayInterfaces {
     public static final int START_PAY_DB = 0x3211;
@@ -16,6 +31,7 @@ public class EfunboxPayInterfaces {
     public static final int PAY_CANCEL = 0x00153ff7;
     public static final int PAY_BEGIN = 0x00153ff8;
     private MainView mView;
+    public static boolean isHuaWeiPaying = false;
 
     public EfunboxPayInterfaces(MainView view) {
         mView = view;
@@ -37,4 +53,102 @@ public class EfunboxPayInterfaces {
         mView.getActivity().startActivity(intent);
     }
 
+    @JavascriptInterface
+    public void HuaWeiPay(String orderInfo) {
+        Logger.e("华为支付");
+        if (isHuaWeiPaying) {
+            return;
+        }
+        Intent intent = new Intent(mView.getActivity(), PayActivity.class);
+        intent.putExtra("type", "3");
+        intent.putExtra("payString", orderInfo);
+        mView.getActivity().startActivity(intent);
+        isHuaWeiPaying = true;
+    }
+
+
+    @JavascriptInterface
+    public void checkDropOrder() {
+        // 构造一个OwnedPurchasesReq对象
+        OwnedPurchasesReq ownedPurchasesReq = new OwnedPurchasesReq();
+// priceType: 0：消耗型商品; 1：非消耗型商品; 2：订阅型商品
+        ownedPurchasesReq.setPriceType(0);
+// 获取调用接口的Activity对象
+        final Activity activity = mView.getActivity();
+// 调用obtainOwnedPurchases接口获取所有已购但未发货的消耗型商品的购买信息
+        Task<OwnedPurchasesResult> task = Iap.getIapClient(activity).obtainOwnedPurchases(ownedPurchasesReq);
+        task.addOnSuccessListener(new OnSuccessListener<OwnedPurchasesResult>() {
+            @Override
+            public void onSuccess(OwnedPurchasesResult result) {
+                // 获取接口请求成功的结果
+                if (result != null && result.getInAppPurchaseDataList() != null) {
+                    for (int i = 0; i < result.getInAppPurchaseDataList().size(); i++) {
+                        String inAppPurchaseData = result.getInAppPurchaseDataList().get(i);
+                        String inAppSignature = result.getInAppSignature().get(i);
+                        // 使用应用的IAP公钥验证inAppPurchaseData的签名数据
+                        // 如果验签成功，确认每个商品的购买状态。确认商品已支付后，检查此前是否已发过货，未发货则进行发货操作。发货成功后执行消耗操作
+                        try {
+                            InAppPurchaseData inAppPurchaseDataBean = new InAppPurchaseData(inAppPurchaseData);
+                            int purchaseState = inAppPurchaseDataBean.getPurchaseState();
+//                            huaweiConsumeOwned(inAppPurchaseData);
+                            Logger.e("checkDropOrder mView.getGson().toJson(result):" + mView.getGson().toJson(result));
+                            MainActivity.getInstance().loadJSMehtodPost("checkDropOrder(" + mView.getGson().toJson(result) + ")");
+                        } catch (JSONException | org.json.JSONException e) {
+                        }
+                    }
+                }
+            }
+        }).addOnFailureListener(new OnFailureListener() {
+            @Override
+            public void onFailure(Exception e) {
+                if (e instanceof IapApiException) {
+                    IapApiException apiException = (IapApiException) e;
+                    Status status = apiException.getStatus();
+                    int returnCode = apiException.getStatusCode();
+                } else {
+                    // 其他外部错误
+                }
+            }
+        });
+    }
+
+
+    @JavascriptInterface
+    public void huaweiConsumeOwned(String inAppPurchaseData, final String efunboxOrderId) {
+        ConsumeOwnedPurchaseReq req = new ConsumeOwnedPurchaseReq();
+        String purchaseToken = "";
+        try {
+            // purchaseToken需从购买信息InAppPurchaseData中获取
+            InAppPurchaseData inAppPurchaseDataBean = new InAppPurchaseData(inAppPurchaseData);
+            purchaseToken = inAppPurchaseDataBean.getPurchaseToken();
+        } catch (org.json.JSONException e) {
+        }
+        req.setPurchaseToken(purchaseToken);
+// 获取调用接口的Activity对象
+        final Activity activity = mView.getActivity();
+// 消耗型商品发货成功后，需调用consumeOwnedPurchase接口进行消耗
+        Task<ConsumeOwnedPurchaseResult> task = Iap.getIapClient(activity).consumeOwnedPurchase(req);
+        task.addOnSuccessListener(new OnSuccessListener<ConsumeOwnedPurchaseResult>() {
+            @Override
+            public void onSuccess(ConsumeOwnedPurchaseResult result) {
+                // 获取接口请求结果
+                Logger.e("huaweiConsumeOwned mView.getGson().toJson(result):" + mView.getGson().toJson(result));
+                MainActivity.getInstance().loadJSMehtodPost("huaweiConsumeOwned(" + mView.getGson().toJson(result) + ",'" + efunboxOrderId + "')");
+            }
+        }).addOnFailureListener(new OnFailureListener() {
+            @Override
+            public void onFailure(Exception e) {
+                if (e instanceof IapApiException) {
+                    IapApiException apiException = (IapApiException) e;
+                    Status status = apiException.getStatus();
+                    int returnCode = apiException.getStatusCode();
+
+                } else {
+
+                    // 其他外部错误
+                }
+            }
+        });
+    }
+
 }

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

@@ -32,6 +32,10 @@ import com.edufound.android.xyyf.util.ShowSetting;
 import com.edufound.android.xyyf.util.ToastUtil;
 import com.edufound.android.xyyf.util.UpdateUtil;
 import com.google.gson.Gson;
+import com.huawei.hms.support.account.AccountAuthManager;
+import com.huawei.hms.support.account.request.AccountAuthParams;
+import com.huawei.hms.support.account.request.AccountAuthParamsHelper;
+import com.huawei.hms.support.account.service.AccountAuthService;
 import com.mobile.auth.gatewayauth.PhoneNumberAuthHelper;
 import com.mobile.auth.gatewayauth.ResultCode;
 import com.mobile.auth.gatewayauth.TokenResultListener;
@@ -389,6 +393,7 @@ public class JsInterfaces {
 
     @JavascriptInterface
     public void showPhoneNumberLogin(int type) {
+        Logger.e("showPhoneNumberLogin(type)");
         //0是横屏。2是竖屏
         AuthPageConfig mUIConfig = BaseUIConfig.init(type, mView.getActivity(), mPhoneNumberAuthHelperl, mView);
         mUIConfig.configAuthPage();
@@ -397,6 +402,7 @@ public class JsInterfaces {
 
     @JavascriptInterface
     public void showPhoneNumberLogin() {
+        Logger.e("showPhoneNumberLogin");
         AuthPageConfig mUIConfig = BaseUIConfig.init(2, mView.getActivity(), mPhoneNumberAuthHelperl, mView);
         mUIConfig.configAuthPage();
         mPhoneNumberAuthHelperl.getLoginToken(mView.getActivity(), 3000);
@@ -501,4 +507,6 @@ public class JsInterfaces {
     public void removeSPUserPhone() {
         delPreData("user_phone");
     }
+
+
 }

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

@@ -16,7 +16,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.os.Process;
 import android.provider.MediaStore;
 import android.support.annotation.Nullable;
 import android.view.Display;
@@ -36,6 +35,7 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.FrameLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.cncoderx.wheelview.OnWheelChangedListener;
 import com.cncoderx.wheelview.WheelView;
@@ -49,20 +49,27 @@ import com.edufound.android.xyyf.util.ContextUtil;
 import com.edufound.android.xyyf.util.DeviceUtil;
 import com.edufound.android.xyyf.util.DeviceUuidFactory;
 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.edufound.android.xyyf.view.ErrorView;
-
-import java.io.IOException;
+import com.huawei.hmf.tasks.Task;
+import com.huawei.hms.common.ApiException;
+import com.huawei.hms.jos.AppUpdateClient;
+import com.huawei.hms.jos.JosApps;
+import com.huawei.hms.support.account.AccountAuthManager;
+import com.huawei.hms.support.account.result.AuthAccount;
+import com.huawei.updatesdk.service.appmgr.bean.ApkUpgradeInfo;
+import com.huawei.updatesdk.service.otaupdate.CheckUpdateCallBack;
+import com.huawei.updatesdk.service.otaupdate.UpdateKey;
+
+import org.json.JSONException;
+
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.Response;
 
 public class MainPersenter implements MainIPersenter {
 
@@ -355,6 +362,26 @@ public class MainPersenter implements MainIPersenter {
             case EfunboxPayInterfaces.START_PAY_XIAOMI:
 //                ToastUtil.showToast("START_PAY_XIAOMI");
                 break;
+            case 8888:
+                Task<AuthAccount> authAccountTask = AccountAuthManager.parseAuthResultFromIntent(data);
+                if (authAccountTask.isSuccessful()) {
+//                    ToastUtil.showToast("登录成功");
+                    //登录成功，获取用户的帐号信息和Authorization Code
+                    AuthAccount authAccount = authAccountTask.getResult();
+//                    Logger.e("serverAuthCode:" + authAccount.getAuthorizationCode());
+                    try {
+                        Logger.e("authAccount:" + authAccount.toJson());
+                        mView.loadJSMehtodPost("huaweiLoginSuccess(" + authAccount.toJson() + ")");
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
+                } else {
+                    //登录失败
+                    int code = ((ApiException) authAccountTask.getException()).getStatusCode();
+                    ToastUtil.showToast("登录失败:" + code);
+                    Logger.e("sign in failed:" + code);
+                }
+                break;
 
         }
         mView.acPostDelayed(new Runnable() {
@@ -649,6 +676,52 @@ public class MainPersenter implements MainIPersenter {
         }
     }
 
+    final int UPDATE_ERROR = 883312;
+
+    public void checkHWUpdate() {
+        final AppUpdateClient client = JosApps.getAppUpdateClient(mView.getActivity());
+        client.checkAppUpdate(mView.getActivity(), new CheckUpdateCallBack() {
+            @Override
+            public void onUpdateInfo(Intent intent) {
+                if (intent != null) {
+                    // 获取更新状态码， Default_value为取不到status时默认的返回码，由应用自行决定
+                    int status = intent.getIntExtra(UpdateKey.STATUS, UPDATE_ERROR);
+                    // 错误码，建议打印
+                    int rtnCode = intent.getIntExtra(UpdateKey.FAIL_CODE, UPDATE_ERROR);
+                    // 失败信息，建议打印
+                    String rtnMessage = intent.getStringExtra(UpdateKey.FAIL_REASON);
+
+                    Serializable info = intent.getSerializableExtra(UpdateKey.INFO);
+                    //可通过获取到的info是否属于ApkUpgradeInfo类型来判断应用是否有更新
+                    if (info instanceof ApkUpgradeInfo) {
+                        // 这里调用showUpdateDialog接口拉起更新弹窗，由于demo有单独拉起弹窗按钮，所以不在此调用，详见checkUpdatePop()方法
+                        client.showUpdateDialog(mView.getActivity(), (ApkUpgradeInfo) info, true);
+                    } else {
+                        Logger.e("status:" + status);
+                        Logger.e("rtnCode:" + rtnCode);
+                        Logger.e("rtnMessage:" + rtnMessage);
+                    }
+                }
+            }
+
+            @Override
+            public void onMarketInstallInfo(Intent intent) {
+
+            }
+
+            @Override
+            public void onMarketStoreError(int i) {
+
+            }
+
+            @Override
+            public void onUpdateStoreError(int i) {
+
+            }
+        });
+    }
+
+
 }
 
 
@@ -670,3 +743,6 @@ interface MainIPersenter extends BasePersenter {
 
     void showDateView(int type);
 }
+
+
+

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

@@ -5,11 +5,34 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.IntentSender;
 import android.os.Bundle;
 
 import com.edufound.android.xyyf.R;
+import com.edufound.android.xyyf.activity.MainActivity;
 import com.edufound.android.xyyf.base.BaseView;
+import com.edufound.android.xyyf.interfaces.EfunboxPayInterfaces;
 import com.edufound.android.xyyf.util.ContextUtil;
+import com.edufound.android.xyyf.util.Logger;
+import com.edufound.android.xyyf.util.ToastUtil;
+import com.huawei.hmf.tasks.OnFailureListener;
+import com.huawei.hmf.tasks.OnSuccessListener;
+import com.huawei.hmf.tasks.Task;
+import com.huawei.hms.iap.Iap;
+import com.huawei.hms.iap.IapApiException;
+import com.huawei.hms.iap.entity.ConsumeOwnedPurchaseReq;
+import com.huawei.hms.iap.entity.ConsumeOwnedPurchaseResult;
+import com.huawei.hms.iap.entity.InAppPurchaseData;
+import com.huawei.hms.iap.entity.IsEnvReadyResult;
+import com.huawei.hms.iap.entity.OrderStatusCode;
+import com.huawei.hms.iap.entity.PurchaseIntentReq;
+import com.huawei.hms.iap.entity.PurchaseIntentResult;
+import com.huawei.hms.iap.entity.PurchaseResultInfo;
+import com.huawei.hms.iap.util.IapClientHelper;
+import com.huawei.hms.support.api.client.Status;
+
+import org.json.JSONException;
+import org.json.JSONObject;
 
 public class PayActivity extends Activity implements BaseView {
 
@@ -26,15 +49,64 @@ public class PayActivity extends Activity implements BaseView {
         mActivity = this;
         mPersenter = new PayPersenter(this);
         int type = Integer.valueOf(getIntent().getStringExtra("type"));
-        final String payjson = getIntent().getStringExtra("payString");
         wechatOrAli = type;
         switch (type) {
             case 1:
+                payjson = getIntent().getStringExtra("payString");
                 mPersenter.WeChatPay(payjson);
                 break;
             case 2:
+                payjson = getIntent().getStringExtra("payString");
                 mPersenter.ALIPay(payjson);
                 break;
+            case 3:
+                //华为支付
+                payjson = getIntent().getStringExtra("payString");
+                Task<IsEnvReadyResult> task = Iap.getIapClient(mActivity).isEnvReady();
+                task.addOnSuccessListener(new OnSuccessListener<IsEnvReadyResult>() {
+                    @Override
+                    public void onSuccess(IsEnvReadyResult result) {
+                        // 获取接口请求的结果
+                        int accountFlag = result.getAccountFlag();
+                        try {
+                            huaweipay(payjson);
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }).addOnFailureListener(new OnFailureListener() {
+                    @Override
+                    public void onFailure(Exception e) {
+                        if (e instanceof IapApiException) {
+                            IapApiException apiException = (IapApiException) e;
+                            Status status = apiException.getStatus();
+                            if (status.getStatusCode() == OrderStatusCode.ORDER_HWID_NOT_LOGIN) {
+                                // 未登录帐号
+                                if (status.hasResolution()) {
+                                    try {
+                                        // 6666是您自定义的常量
+                                        // 启动IAP返回的登录页面
+                                        ToastUtil.showToast("启动IAP返回的登录页面");
+                                        status.startResolutionForResult(mActivity, 6666);
+                                    } catch (IntentSender.SendIntentException exp) {
+                                    }
+                                }
+                            } else if (status.getStatusCode() == OrderStatusCode.ORDER_ACCOUNT_AREA_NOT_SUPPORTED) {
+                                // 用户当前登录的华为帐号所在的服务地不在华为IAP支持结算的国家/地区中
+                                ToastUtil.showToast("用户当前登录的华为帐号所在的服务地不在华为IAP支持结算的国家");
+                                finish();
+                                EfunboxPayInterfaces.isHuaWeiPaying = false;
+                            }
+                        } else {
+                            // 其他外部错误
+                            ToastUtil.showToast("其他外部错误");
+                            finish();
+                            EfunboxPayInterfaces.isHuaWeiPaying = false;
+                        }
+                    }
+                });
+
+                break;
         }
         IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction(ContextUtil.CLOSE_ACTIVITY_PAY);
@@ -96,4 +168,143 @@ public class PayActivity extends Activity implements BaseView {
         super.onDestroy();
         unregisterReceiver(payBroad);
     }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        switch (requestCode) {
+            case 6666:
+                if (data == null) {
+                    Logger.e("data is null");
+                    finish();
+                    EfunboxPayInterfaces.isHuaWeiPaying = false;
+                    return;
+                }
+                // 调用parsePurchaseResultInfoFromIntent方法解析支付结果数据
+                PurchaseResultInfo purchaseResultInfo = Iap.getIapClient(this).parsePurchaseResultInfoFromIntent(data);
+                switch (purchaseResultInfo.getReturnCode()) {
+                    case OrderStatusCode.ORDER_STATE_CANCEL:
+                        // 用户取消
+//                        ToastUtil.showToast("用户取消");
+                        Logger.e("OrderStatusCode.ORDER_STATE_CANCEL");
+                        EfunboxPayInterfaces.isHuaWeiPaying = false;
+                        finish();
+                        break;
+                    case OrderStatusCode.ORDER_STATE_FAILED:
+                    case OrderStatusCode.ORDER_PRODUCT_OWNED:
+                        // 检查是否存在未发货商品
+                        Logger.e("OrderStatusCode.ORDER_PRODUCT_OWNED");
+                        Logger.e("OrderStatusCode.ORDER_STATE_FAILED");
+                        break;
+                    case OrderStatusCode.ORDER_STATE_SUCCESS:
+                        // 支付成功
+//                        ToastUtil.showToast("支付成功");
+                        String inAppPurchaseData = purchaseResultInfo.getInAppPurchaseData();
+                        String inAppPurchaseDataSignature = purchaseResultInfo.getInAppDataSignature();
+//                        // 使用您应用的IAP公钥验证签名
+//                        // 若验签成功，则进行发货
+//                        // 若用户购买商品为消耗型商品，您需要在发货成功后调用consumeOwnedPurchase接口进行消耗
+//                        huaweiConsumeOwned(inAppPurchaseData);
+                        Logger.e("OrderStatusCode.ORDER_STATE_SUCCESS");
+                        EfunboxPayInterfaces.isHuaWeiPaying = false;
+                        MainActivity.getInstance().loadJSMehtodPost("huaweiOrderSuccess(" + inAppPurchaseData + ")");
+                        finish();
+                        break;
+                    default:
+                        Logger.e("OrderStatusCode.default");
+                        break;
+                }
+                break;
+        }
+    }
+
+
+    public void huaweipay(String json) throws JSONException {
+
+        //                 构造一个PurchaseIntentReq对象
+        JSONObject jsonObject = new JSONObject(json);
+        String productId = jsonObject.getString("productId");
+        String developerPayload = jsonObject.getString("developerPayload");
+        String reservedinfor = jsonObject.getString("reservedinfor");
+        PurchaseIntentReq req = new PurchaseIntentReq();
+// 通过createPurchaseIntent接口购买的商品必须是您在AppGallery Connect网站配置的商品。
+        req.setProductId(productId);
+// priceType: 0：消耗型商品; 1：非消耗型商品; 2：订阅型商品
+        req.setPriceType(0);
+        req.setDeveloperPayload(developerPayload);
+        req.setReservedInfor(reservedinfor);
+// 获取调用接口的Activity对象
+        final Activity activity = getActivity();
+// 调用createPurchaseIntent接口创建托管商品订单
+        Task<PurchaseIntentResult> task = Iap.getIapClient(activity).createPurchaseIntent(req);
+        task.addOnSuccessListener(new OnSuccessListener<PurchaseIntentResult>() {
+            @Override
+            public void onSuccess(PurchaseIntentResult result) {
+                // 获取创建订单的结果
+                Status status = result.getStatus();
+                if (status.hasResolution()) {
+                    try {
+                        // 6666是您自定义的常量
+                        // 启动IAP返回的收银台页面
+                        status.startResolutionForResult(activity, 6666);
+                    } catch (IntentSender.SendIntentException exp) {
+                    }
+                }
+            }
+        }).addOnFailureListener(new OnFailureListener() {
+            @Override
+            public void onFailure(Exception e) {
+                if (e instanceof IapApiException) {
+                    IapApiException apiException = (IapApiException) e;
+                    Status status = apiException.getStatus();
+                    int returnCode = apiException.getStatusCode();
+                } else {
+                    // 其他外部错误
+
+                }
+                finish();
+                EfunboxPayInterfaces.isHuaWeiPaying = false;
+            }
+        });
+    }
+
+    public void huaweiConsumeOwned(final String inAppPurchaseData) {
+        ConsumeOwnedPurchaseReq req = new ConsumeOwnedPurchaseReq();
+        String purchaseToken = "";
+        try {
+            // purchaseToken需从购买信息InAppPurchaseData中获取
+            InAppPurchaseData inAppPurchaseDataBean = new InAppPurchaseData(inAppPurchaseData);
+            purchaseToken = inAppPurchaseDataBean.getPurchaseToken();
+        } catch (JSONException e) {
+        }
+        req.setPurchaseToken(purchaseToken);
+// 获取调用接口的Activity对象
+        final Activity activity = getActivity();
+// 消耗型商品发货成功后，需调用consumeOwnedPurchase接口进行消耗
+        Task<ConsumeOwnedPurchaseResult> task = Iap.getIapClient(activity).consumeOwnedPurchase(req);
+        task.addOnSuccessListener(new OnSuccessListener<ConsumeOwnedPurchaseResult>() {
+            @Override
+            public void onSuccess(ConsumeOwnedPurchaseResult result) {
+                // 获取接口请求结果
+                EfunboxPayInterfaces.isHuaWeiPaying = false;
+                MainActivity.getInstance().loadJSMehtodPost("huaweiOrderSuccess(" + inAppPurchaseData + ")");
+                finish();
+            }
+        }).addOnFailureListener(new OnFailureListener() {
+            @Override
+            public void onFailure(Exception e) {
+                if (e instanceof IapApiException) {
+                    IapApiException apiException = (IapApiException) e;
+                    Status status = apiException.getStatus();
+                    int returnCode = apiException.getStatusCode();
+
+                } else {
+
+                    // 其他外部错误
+                }
+                finish();
+                EfunboxPayInterfaces.isHuaWeiPaying = false;
+            }
+        });
+    }
 }

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

@@ -84,7 +84,7 @@ public class PayPersenter implements PayIPersenter {
                     ToastUtil.showToast("支付开始");
                     break;
                 case EfunboxPayInterfaces.PAY_SUCCESS:
-                    ToastUtil.showToast("支付成功");
+//                    ToastUtil.showToast("支付成功");
                     break;
                 case EfunboxPayInterfaces.PAY_ERROR:
                     ToastUtil.showToast("支付失败");

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

@@ -7,8 +7,9 @@ public class ToastUtil {
 
     public static void showToast(String message) {
         if (toast == null) {
-            toast = Toast.makeText(ContextUtil.getContext(), message, 5000);
+            toast = Toast.makeText(ContextUtil.getContext(), message, Toast.LENGTH_LONG);
         } else {
+            toast.setDuration(Toast.LENGTH_LONG);
             toast.setText(message);
         }
         toast.show();

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

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

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

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:gravity="bottom"
+        android:orientation="vertical"
+        android:paddingBottom="80dp">
+
+    <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginBottom="10dp"
+            android:gravity="center"
+            android:text="─ 其他方式登录 ─"
+            android:textColor="#FF666666"
+            android:textSize="18sp"></TextView>
+
+    <LinearLayout
+            android:id="@+id/otherlogin_login_huawei"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+        <ImageView
+                android:id="@+id/otherlogin_icon_huawei"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginBottom="10dp"
+                android:layout_weight="2"
+                android:src="@drawable/login_icon_huawei"></ImageView>
+
+        <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
+                android:gravity="center|top"
+                android:text="华为账号登录"
+                android:textColor="#FF666666"
+                android:textSize="18sp"
+                android:visibility="gone" />
+
+    </LinearLayout>
+</LinearLayout>

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

@@ -23,7 +23,7 @@
                     android:layout_height="16dp"
                     android:layout_gravity="center"
                     android:src="@drawable/icon"
-                    android:visibility="gone"></ImageView>
+                   ></ImageView>
         </FrameLayout>
 
         <LinearLayout
@@ -123,7 +123,7 @@
             <TextView
                     android:id="@+id/change_text"
                     android:layout_width="match_parent"
-                    android:layout_height="0dp"
+                    android:layout_height="33dp"
                     android:layout_gravity="center|bottom"
                     android:layout_weight="1"
                     android:gravity="top|center"
@@ -131,10 +131,15 @@
                     android:textColor="#0B0B0B"
                     android:textSize="16sp"></TextView>
 
-            <View
+            <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:layout_weight="5.5"></View>
+                    android:layout_weight="5.5">
+
+                <include
+                        android:id="@+id/otherlogin_include"
+                        layout="@layout/login_otherlogin"></include>
+            </FrameLayout>
         </LinearLayout>
     </LinearLayout>
 </FrameLayout>

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

@@ -1,29 +1,5 @@
 <?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="app_code_yf">2006</string>
-    <!--应用宝-->
-    <string name="app_code_yyb">2001</string>
-    <!--360应用市场-->
-    <string name="app_code_360">2002</string>
-    <!--百度手机助手-->
-    <string name="app_code_bdsjzs">2003</string>
-    <!--华为-->
-    <string name="app_code_huawei">2005</string>
-    <!--vivo-->
-    <string name="app_code_vivo">2007</string>
-    <!--小米-->
-    <string name="app_code_xm">2008</string>
-    <!--华科-->
-    <string name="app_code_hk">2012</string>
-    <!--步步高-->
-    <string name="app_code_bbg">2013</string>
-    <!--状元才子-->
-    <string name="app_code_zycz">2015</string>
+    <string name="default_url">http://192.168.1.126:8080/efunbox-xyyf-web/1.0.0/stage/index/index.html</string>
 </resources>

build.gradle

@@ -6,9 +6,11 @@ buildscript {
         jcenter()
         mavenCentral()
         maven { url 'https://dl.bintray.com/umsdk/release' }
+        maven {url 'https://developer.huawei.com/repo/'}
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.huawei.agconnect:agcp:1.5.0.300'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -21,6 +23,7 @@ allprojects {
         jcenter()
         mavenCentral()
         maven { url 'https://dl.bintray.com/umsdk/release' }
+        maven {url 'https://developer.huawei.com/repo/'}
     }
 }
 

gradle.properties

@@ -11,4 +11,5 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-android.injected.testOnly=false
+android.injected.testOnly=false
+android.useAndroidX=true

push/build.gradle

@@ -1,5 +1,5 @@
 apply plugin: 'com.android.library'
-
+apply plugin: 'com.huawei.agconnect'
 android {
 
     compileSdkVersion 27

push/build/.transforms/f8d0101894b2bc9df78d9a43679efe0f.bin

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

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

@@ -1,10 +1,10 @@
 [
     {
-        "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-huawei\\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-huawei\\push\\res\\layout\\upush_bar_image_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"
+        "merged": "G:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-huawei\\push\\build\\intermediates\\res\\merged\\release\\layout\\upush_notification.xml",
+        "source": "G:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-huawei\\push\\res\\layout\\upush_notification.xml"
     }
 ]

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
+#Tue May 11 16:16:45 CST 2021
+G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-huawei\\push\\res\\layout\\upush_bar_image_notification.xml=G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-huawei\\push\\build\\intermediates\\res\\merged\\release\\layout\\upush_bar_image_notification.xml
+G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-huawei\\push\\res\\layout\\upush_notification.xml=G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-huawei\\push\\build\\intermediates\\res\\merged\\release\\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
-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
+#Tue May 11 16:16:44 CST 2021
+G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-huawei\\push\\res\\layout\\upush_bar_image_notification.xml=G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-huawei\\push\\build\\intermediates\\packaged_res\\release\\layout\\upush_bar_image_notification.xml
+G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-huawei\\push\\res\\layout\\upush_notification.xml=G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-huawei\\push\\build\\intermediates\\packaged_res\\release\\layout\\upush_notification.xml

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

@@ -6,314 +6,314 @@
 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
+8-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml
 9        android:targetSdkVersion="25" />
-9-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-master\push\AndroidManifest.xml
+9-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+11-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:7:5-67
+11-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+12-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:8:5-79
+12-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+13-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:9:5-76
+13-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+14-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:10:5-81
+14-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+15-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:11:5-68
+15-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+16-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:12:5-75
+16-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+17-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:13:5-82
+17-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+18-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:14:5-84
+18-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+19-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:15:5-84
+19-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+20-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:16:5-85
+20-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+21-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:17:5-75
+21-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+22-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:18:5-68
+22-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+23-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:19:5-81
+23-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+24-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:20:5-79
+24-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+25-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:21:5-76
+25-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+27-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+28-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+29-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+30-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+31-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+32-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+33-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:30:17-80
+33-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+35-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+36-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:33:17-81
+36-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+39-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+40-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+41-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+42-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+43-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:41:17-80
+43-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+47-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+48-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+49-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+50-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+51-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:49:17-79
+51-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+53-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+54-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:52:17-79
+54-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+56-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+57-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:55:17-80
+57-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+59-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:56:17-50
+59-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+61-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+62-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:59:17-77
+62-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+65-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+66-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+67-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+68-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+69-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:67:17-80
+69-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+71-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+72-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:70:17-88
+72-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+76-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+77-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+78-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+79-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+80-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+81-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+82-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+83-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+84-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+85-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+86-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+87-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:41:17-80
+87-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+90-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+91-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+92-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+93-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+94-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+95-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:96:17-81
+95-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+98-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+99-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+100-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+101-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+102-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+103-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:96:17-81
+103-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+107-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+108-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+109-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+110-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+111-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+112-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:114:17-81
+112-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+114-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+115-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:55:17-80
+115-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+117-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:56:17-50
+117-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+121-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+122-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+123-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+124-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+125-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+126-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:127:17-89
+126-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+130-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+131-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+132-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+134-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+135-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+136-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+137-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+138-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+139-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:140:17-83
+139-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+141-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+142-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:143:17-82
+142-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+144-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+145-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:146:17-83
+145-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+147-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+148-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:149:17-83
+148-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+150-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+151-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:152:17-87
+151-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+154-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+155-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+156-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+157-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+159-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+160-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+161-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+162-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+163-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:165:13-62
+163-->G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:165:35-59
 164        </provider>
 165    </application>
 166

push/build/outputs/logs/manifest-merger-release-report.txt

@@ -1,317 +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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:2:1-169:12
+INJECTED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:2:1-169:12
+INJECTED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:2:1-169:12
+INJECTED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:2:1-169:12
+INJECTED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:2:1-169:12
+INJECTED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:2:1-169:12
+INJECTED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:3:5-36
+		INJECTED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml
+		INJECTED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:5:5-30
+		INJECTED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml
+		INJECTED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml:4:5-28
+		INJECTED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml
+		INJECTED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+INJECTED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml
+INJECTED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml
+INJECTED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml
+INJECTED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		INJECTED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml
+		INJECTED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\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
+		INJECTED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml
+		ADDED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml
+		INJECTED from G:\WorkSpace\Git_WorkSpace\efunbox-xyyf-mobile-android\efunbox-xyyf-mobile-android-huawei\push\AndroidManifest.xml