1.提交修改的代码方法

app/build.gradle

@@ -8,14 +8,14 @@ android {
     compileSdkVersion 28
     defaultConfig {
         applicationId "com.edufound.android.xyyf"
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 28
-        versionCode 10005
-        versionName "1.0.0.5"
+        versionCode 10010
+        versionName "1.0.1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         flavorDimensions "versionCode"
-        manifestPlaceholders = [UMENG_CHANNEL_VALUE: "2006"]//添加一个默认渠道号
+        manifestPlaceholders = [UMENG_CHANNEL_VALUE: "2012"]//添加一个默认渠道号
     }
     signingConfigs {
         efunbox {
@@ -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 == ("2012")) {
+                            newoutputFile = "\\天猫精灵\\"
                         }
                         output.outputFileName = new File(newoutputFile, fileName)
                     }
@@ -90,86 +72,14 @@ android {
     }
     productFlavors {
         //义方
-        channel_efunbox {
+        channel_tmail {
             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: "2012",
                     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"
@@ -209,31 +119,12 @@ dependencies {
 //    //PushSDK
 //    implementation "com.umeng.umsdk:push:6.0.1"
     api project(":push")
-    //小米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"
-    //vivo Push通道
-    implementation "com.umeng.umsdk:vivo-push:2.3.1"
-    implementation "com.umeng.umsdk:vivo-umengaccs:1.0.4"
-    //Oppo Push通道
-    implementation "com.umeng.umsdk:oppo-push:1.0.1"
-    implementation "com.umeng.umsdk:oppo-umengaccs:1.0.3"
     //cardView
     implementation 'com.android.support:cardview-v7:28.0.0'
     //recyclerview
     implementation 'com.android.support:recyclerview-v7:28.0.0'
     //wheelview
     implementation 'com.cncoderx.wheelview:library:1.2.5'
-    //阿里一键登录和校验
-//    implementation(name: 'crashshield-release', ext: 'aar')
-//    implementation(name: 'phoneNumber-L-AuthSDK-2.11.1.1', ext: 'aar')
 
 }
 

app/src/main/AndroidManifest.xml

@@ -45,17 +45,7 @@
                 android:resizeableActivity="true"
                 android:screenOrientation="landscape"
                 android:theme="@style/AppStartTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
 
-                <data
-                        android:host="com.edufound.android.xyyf"
-                        android:path="/main"
-                        android:scheme="efunbox" />
-            </intent-filter>
         </activity>
         <activity
                 android:name="com.edufound.android.xyyf.activity.AgreementActivity"
@@ -69,11 +59,6 @@
             </intent-filter>
         </activity>
 
-        <activity
-                android:name=".activity.PhoneNumLoginActivity"
-                android:launchMode="singleInstance"
-                android:screenOrientation="portrait"
-                android:theme="@style/NoTitle"></activity>
         <!--友盟start-->
         <meta-data
                 android:name="UMENG_APPKEY"
@@ -135,41 +120,7 @@
                 android:launchMode="singleTask" />
 
 
-        <meta-data
-                android:name="com.huawei.hms.client.appid"
-                android:value="appid=xxxxxx" />
-
-        <!--vivo push参数声明 -->
-        <!-- vivo start-->
-        <meta-data
-                android:name="com.vivo.push.api_key"
-                android:value="xxxxxx" />
-        <meta-data
-                android:name="com.vivo.push.app_id"
-                android:value="xxxxxx" />
-        <!-- VIVO end-->
-
 
-        <!--联通电信授权页-->
-        <activity
-                android:name="com.mobile.auth.gatewayauth.LoginAuthActivity"
-                android:configChanges="orientation|keyboardHidden|screenSize"
-                android:exported="false"
-                android:launchMode="singleTop"
-                android:theme="@style/authsdk_activity_dialog" />
-        <!--协议页面webview-->
-        <activity
-                android:name="com.mobile.auth.gatewayauth.activity.AuthWebVeiwActivity"
-                android:configChanges="orientation|keyboardHidden|screenSize"
-                android:exported="false"
-                android:launchMode="singleTop"
-                android:screenOrientation="behind" />
-        <!--移动授权页-->
-        <activity
-                android:name="com.cmic.sso.sdk.activity.LoginAuthActivity"
-                android:configChanges="orientation|keyboardHidden|screenSize"
-                android:exported="false"
-                android:launchMode="singleTop" />
 
     </application>
 

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

@@ -13,7 +13,6 @@ import android.text.style.ClickableSpan;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
@@ -25,10 +24,9 @@ import com.edufound.android.xyyf.base.BaseActivity;
 import com.edufound.android.xyyf.useragreement.UserAgreementPersenter;
 import com.edufound.android.xyyf.useragreement.UserAgreementView;
 import com.edufound.android.xyyf.util.ContextUtil;
+import com.edufound.android.xyyf.util.DeviceUtil;
 import com.edufound.android.xyyf.util.Logger;
 import com.edufound.android.xyyf.util.SPutil;
-import com.edufound.android.xyyf.util.ToastUtil;
-import com.mobile.auth.gatewayauth.activity.AuthWebVeiwActivity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -47,14 +45,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();
         }
 
     }
@@ -62,7 +56,18 @@ public class AgreementActivity extends BaseActivity implements UserAgreementView
     void init() {
         mPersenter = new UserAgreementPersenter(this);
         mRoot = findViewById(R.id.privacy_root);
+        DeviceUtil deviceUtil = new DeviceUtil();
+        int width = deviceUtil.getWidth(this);
+        int height = deviceUtil.getHeight(this);
+        if (width > height) {
+            //横屏应用
+            mRoot.setBackgroundResource(R.drawable.privacy_bg_landscape);
+        } else {
+            //竖屏
+            mRoot.setBackgroundResource(R.drawable.privacy_bg);
+        }
         mPrivacFrame = findViewById(R.id.privacy_text_frame);
+        mPrivacFrame.setVisibility(View.INVISIBLE);
         mTextContext = findViewById(R.id.privacy_context);
         setContext();
         mCancel = findViewById(R.id.privacy_cancel);
@@ -80,6 +85,12 @@ public class AgreementActivity extends BaseActivity implements UserAgreementView
                 toMain();
             }
         });
+        mPrivacFrame.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                mPrivacFrame.setVisibility(View.VISIBLE);
+            }
+        }, 2000);
     }
 
     List<Integer> leftBrackets = new ArrayList<>();

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

@@ -6,11 +6,8 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
 import android.support.v7.widget.RecyclerView;
@@ -20,10 +17,8 @@ import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.view.animation.LinearInterpolator;
 import android.webkit.WebView;
-import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.Toast;
 
 import com.edufound.android.xyyf.R;
 import com.edufound.android.xyyf.application.EApplication;
@@ -31,15 +26,12 @@ import com.edufound.android.xyyf.base.BaseActivity;
 import com.edufound.android.xyyf.bean.WindowVideoParams;
 import com.edufound.android.xyyf.main.MainPersenter;
 import com.edufound.android.xyyf.main.MainView;
-import com.edufound.android.xyyf.pay.PayInit;
 import com.edufound.android.xyyf.util.ContextUtil;
 import com.edufound.android.xyyf.util.DeviceUuidFactory;
 import com.edufound.android.xyyf.util.Logger;
 import com.edufound.android.xyyf.util.NotificationUtil;
 import com.edufound.android.xyyf.util.ShowDebugUrl;
-import com.edufound.android.xyyf.util.ToastUtil;
 import com.google.gson.Gson;
-import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram;
 
 
 //调用Persenter里面的方法
@@ -71,6 +63,7 @@ public class MainActivity extends BaseActivity implements MainView {
 //        startActivity(intent);
 //        }
 
+
     }
 
 
@@ -100,6 +93,7 @@ public class MainActivity extends BaseActivity implements MainView {
         mLoading.bringToFront();
         new DeviceUuidFactory(ContextUtil.getContext());
         mPersenter.openWeb(getIntent());
+        mPersenter.initASRClient();
     }
 
     @Override
@@ -119,6 +113,7 @@ public class MainActivity extends BaseActivity implements MainView {
         super.onDestroy();
         Logger.e("MainActivity---onDestroy");
 //        System.exit(0);
+        mPersenter.onDestroy();
         mPersenter.getJsInterfaces().desClickMusic();
         unregisterReceiver(mainBroad);
         mWebView.loadUrl("");
@@ -267,6 +262,7 @@ public class MainActivity extends BaseActivity implements MainView {
         mPersenter.onActivityResult(requestCode, resultCode, data);
     }
 
+
     void initCloseMain() {
         IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction(ContextUtil.CLOSE_ACTIVITY_MAIN);
@@ -275,10 +271,6 @@ public class MainActivity extends BaseActivity implements MainView {
     }
 
 
-    public void quitPhoneLoginPage() {
-        mPersenter.getJsInterfaces().quitLoginPage();
-    }
-
     BroadcastReceiver mainBroad = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {

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

@@ -10,17 +10,11 @@ import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 
-import com.edufound.android.xyyf.R;
 import com.edufound.android.xyyf.pay.PayInit;
 import com.edufound.android.xyyf.util.ContextUtil;
 import com.edufound.android.xyyf.util.Logger;
 import com.edufound.android.xyyf.util.OKHttpUtil;
 import com.edufound.android.xyyf.util.SPutil;
-import com.umeng.commonsdk.UMConfigure;
-
-import org.android.agoo.huawei.HuaWeiRegister;
-import org.android.agoo.vivo.VivoRegister;
-import org.android.agoo.xiaomi.MiPushRegistar;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -33,8 +27,6 @@ import okhttp3.Request;
 public class EApplication extends Application {
 
 
-    final String XIAOMI_ID = "";
-    final String XIAOMI_KEY = "";
     static String mUMengAppID;
     private int activityAount = 0;
     public boolean isForeground = false;
@@ -46,7 +38,7 @@ public class EApplication extends Application {
         ContextUtil.setContext(this);
         ContextUtil.setApplication(this);
         //上线关掉debug模式
-        ContextUtil.setIsDebug(true);
+        ContextUtil.setIsDebug(false);
         mUMengAppID = getChannelName();
 //        mUMengAppID = "3001";
         APP_START_TIME = System.currentTimeMillis();
@@ -67,13 +59,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);

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

@@ -5,6 +5,7 @@ import android.webkit.JavascriptInterface;
 
 import com.edufound.android.xyyf.main.MainView;
 import com.edufound.android.xyyf.pay.PayActivity;
+import com.edufound.android.xyyf.util.Logger;
 
 public class EfunboxPayInterfaces {
     public static final int START_PAY_DB = 0x3211;
@@ -37,4 +38,12 @@ public class EfunboxPayInterfaces {
         mView.getActivity().startActivity(intent);
     }
 
+    @JavascriptInterface
+    public void TMailPay(String orderInfo) {
+        Logger.e("orderInfo:" + orderInfo);
+        Intent intent = new Intent(mView.getActivity(), PayActivity.class);
+        intent.putExtra("type", "3");
+        intent.putExtra("payString", orderInfo);
+        mView.getActivity().startActivity(intent);
+    }
 }

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

@@ -7,24 +7,19 @@ import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.media.MediaPlayer;
-import android.util.Base64;
 import android.view.KeyEvent;
 import android.webkit.JavascriptInterface;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.ailabs.genie.assistant.sdk.asr.TBUserData;
+import com.alibaba.ailabs.genie.assistant.sdk.asr.UserDataProvider;
 import com.edufound.android.xyyf.R;
-import com.edufound.android.xyyf.activity.PhoneNumLoginActivity;
 import com.edufound.android.xyyf.application.EApplication;
 import com.edufound.android.xyyf.bean.MessageDialogBean;
 import com.edufound.android.xyyf.bean.UpgradeBean;
-import com.edufound.android.xyyf.config.AppUtils;
-import com.edufound.android.xyyf.config.AuthPageConfig;
-import com.edufound.android.xyyf.config.BaseUIConfig;
 import com.edufound.android.xyyf.main.MainView;
 import com.edufound.android.xyyf.pay.PayInit;
 import com.edufound.android.xyyf.util.ContextUtil;
 import com.edufound.android.xyyf.util.Logger;
-import com.edufound.android.xyyf.util.OKHttpUtil;
 import com.edufound.android.xyyf.util.SPutil;
 import com.edufound.android.xyyf.util.ShowDebugUrl;
 import com.edufound.android.xyyf.util.ShowDevice;
@@ -32,10 +27,6 @@ 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.mobile.auth.gatewayauth.PhoneNumberAuthHelper;
-import com.mobile.auth.gatewayauth.ResultCode;
-import com.mobile.auth.gatewayauth.TokenResultListener;
-import com.mobile.auth.gatewayauth.model.TokenRet;
 import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram;
 import com.tencent.mm.opensdk.modelmsg.SendAuth;
 
@@ -44,8 +35,6 @@ import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
-import okhttp3.Request;
-
 public class JsInterfaces {
 
     Gson mGson;
@@ -53,9 +42,6 @@ public class JsInterfaces {
     MediaPlayer mediaPlayer;
     AlertDialog.Builder mMessageDialogBuilder;
     MessageDialogBean mMessageBean;
-    PhoneNumberAuthHelper mPhoneNumberAuthHelperl;
-    String mSecret = "UgC3rEZPVMBKi8WqdoubeWMSJNSeeA6i0dLu3Z1GZKfIgXFhF8RmMLdsmDSgmwWjg2TUOhkvbuHZH6pt4RUxiQSpVyu9P1Q7h9Th05DhNVqxuOU2GRLLs0C43B59eS6nXrUEy7PZzn3wPTXEpelTmH5rMl+VZ7UKa3tC35qkB073Dfikr6ITRfCF31mTPjOGQRo9RKrtbeIhj4jIqx7M9PJSp9+W8huzLCUEOVquVNKDtpCBUq2Znu+PgISvLg3JouLtVv9ldoftxKci+VfHaO3izxkHOi+3jauqBTigrfA7D4I4va/7PlgCNoXJogcy";
-    public final String GET_USER_PHONENUMBER_URL = "http://m-xyyf-api.ai160.com/member/getMobile";
 
     public JsInterfaces(MainView view) {
         mGson = new Gson();
@@ -65,8 +51,6 @@ public class JsInterfaces {
             mediaPlayer.reset();
             mediaPlayer = MediaPlayer.create(mView.getActivity(), R.raw.click_music);
         }
-        mPhoneNumberAuthHelperl = PhoneNumberAuthHelper.getInstance(mView.getActivity(), tokenResultListener);
-        mPhoneNumberAuthHelperl.setAuthSDKInfo(mSecret);
     }
 
     Map<String, String> jsMap = new HashMap<>();
@@ -382,97 +366,6 @@ public class JsInterfaces {
     }
 
 
-    public int getdp(int num) {
-        return AppUtils.dp2px(mView.getActivity(), num);
-    }
-
-
-    @JavascriptInterface
-    public void showPhoneNumberLogin(int type) {
-        //0是横屏。2是竖屏
-        AuthPageConfig mUIConfig = BaseUIConfig.init(type, mView.getActivity(), mPhoneNumberAuthHelperl, mView);
-        mUIConfig.configAuthPage();
-        mPhoneNumberAuthHelperl.getLoginToken(mView.getActivity(), 3000);
-    }
-
-    @JavascriptInterface
-    public void showPhoneNumberLogin() {
-        AuthPageConfig mUIConfig = BaseUIConfig.init(2, mView.getActivity(), mPhoneNumberAuthHelperl, mView);
-        mUIConfig.configAuthPage();
-        mPhoneNumberAuthHelperl.getLoginToken(mView.getActivity(), 3000);
-    }
-
-    public void quitLoginPage() {
-        mPhoneNumberAuthHelperl.quitLoginPage();
-    }
-
-    public void NOUILOGIN() {
-//        AuthPageConfig mUIConfig = BaseUIConfig.init(1, mView.getActivity(), mPhoneNumberAuthHelperl,mView);
-//        mUIConfig.configAuthPage();
-//        mPhoneNumberAuthHelperl.getLoginToken(mView.getActivity(), 5000);
-    }
-
-    TokenResultListener tokenResultListener = new TokenResultListener() {
-        @Override
-        public void onTokenSuccess(String s) {
-            Logger.e("sssss:" + s);
-            TokenRet tokenRet = null;
-            try {
-                tokenRet = JSON.parseObject(s, TokenRet.class);
-                if (ResultCode.CODE_START_AUTHPAGE_SUCCESS.equals(tokenRet.getCode())) {
-//                    Logger.e("唤起授权页成功：" + s);
-                    mPhoneNumberAuthHelperl.hideLoginLoading();
-//                    ToastUtil.showToast(s);
-                }
-                if (ResultCode.CODE_GET_TOKEN_SUCCESS.equals(tokenRet.getCode())) {
-//                    Logger.e("获取token成功：" + s);
-//                    ToastUtil.showToast(s);
-                    mPhoneNumberAuthHelperl.hideLoginLoading();
-                    mPhoneNumberAuthHelperl.quitLoginPage();
-                    String token = JSON.parseObject(s).get("token").toString();
-                    OKHttpUtil.postDataAsync(GET_USER_PHONENUMBER_URL, new OKHttpUtil.ResultCallback() {
-                        @Override
-                        public void onError(Request request, Exception e) {
-                            Logger.e("error-------------");
-                        }
-
-                        @Override
-                        public void onResponse(Object response) {
-                            String a = JSON.parseObject(response.toString()).getString("data").toString();
-                            SPutil.setPrefString(mView.getActivity(), "user_phone", Base64.encodeToString(a.getBytes(), Base64.DEFAULT));
-                            mView.loadJsMehtod("phoneLogin('" + a + "')");
-                        }
-                    }, new OKHttpUtil.Param("accessToken", token));
-//
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        @Override
-        public void onTokenFailed(String s) {
-//            ToastUtil.showToast("失败了:" + s);
-            String code = JSON.parseObject(s).get("code").toString();
-            Logger.e("code:" + code);
-            Intent intent = new Intent(mView.getActivity(), PhoneNumLoginActivity.class);
-            if (code.equals("700000")) {
-                mView.loadJsMehtod("closeLogin(" + code + ")");
-            } else {
-                intent.putExtra("code", code);
-                mView.getActivity().startActivity(intent);
-                ToastUtil.showToast(JSON.parseObject(s).get("msg").toString());
-                mView.getActivity().startActivity(intent);
-                mPhoneNumberAuthHelperl.quitLoginPage();
-            }
-            return;
-
-        }
-
-
-    };
-
-
     @JavascriptInterface
     public void setScreenOriention(int oriention) {
         switch (oriention) {
@@ -501,4 +394,25 @@ public class JsInterfaces {
     public void removeSPUserPhone() {
         delPreData("user_phone");
     }
+
+
+    @JavascriptInterface
+    public String getUserID() {
+        return UserDataProvider.getUserID(mView.getActivity());
+        //1101585593650761728
+    }
+
+    @JavascriptInterface
+    public String getUUID() {
+        return UserDataProvider.getUUID(mView.getActivity());
+        //32EBE680BE5914F6240E4CD941CA77B0
+    }
+
+
+    @JavascriptInterface
+    public String getTBUserData() {
+        return mView.getGson().toJson(UserDataProvider.getTBUserData(mView.getActivity()));
+        //{"avatar":"https://wwc.alicdn.com/avatar/getAvatar.do?userNick\u003d%E7%BC%98%E6%9D%A5%E6%98%AF%E4%BD%A0%E5%93%9F666\u0026_input_charset\u003dUTF-8\u0026width\u003d160\u0026height\u003d160\u0026type\u003dsns","location":"","loginTime":"2021-05-20 15:16:46.074","mobile":"15832226563","tbNickName":"缘来是你哟666","tbUserId":"2845700557"}
+    }
+
 }

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

@@ -37,6 +37,11 @@ import android.webkit.WebViewClient;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
+import com.alibaba.ailabs.genie.assistant.sdk.asr.ASRClient;
+import com.alibaba.ailabs.genie.assistant.sdk.asr.ASRCommandReturn;
+import com.alibaba.ailabs.genie.assistant.sdk.asr.AppContextData;
+import com.alibaba.ailabs.genie.assistant.sdk.asr.OnASRCommandListener;
+import com.alibaba.ailabs.genie.assistant.sdk.asr.SelectListData;
 import com.cncoderx.wheelview.OnWheelChangedListener;
 import com.cncoderx.wheelview.WheelView;
 import com.edufound.android.xyyf.R;
@@ -68,6 +73,8 @@ public class MainPersenter implements MainIPersenter {
 
     public static final int WECHAT_LOGIN = 0x76761;
     public static final int PAY_RESULT = 0x76762;
+    public static final int HANDLER_MESSAGE_ASR_SDK = 0x1321;
+    public static final int HANDLER_MESSAGE_ASR_SDK_SHOWLOG = 0x1322;
     private static MainView mView = null;
     private MainModel mModel = null;
     private JsInterfaces mJsInterfaces = null;
@@ -78,6 +85,7 @@ public class MainPersenter implements MainIPersenter {
     private DeviceUtil deviceUtil;
     Bitmap mVideoBitmap = null;
     Intent getIntent;
+    ASRClient mAsrClient;
 
     public MainPersenter(MainView view) {
         mView = view;
@@ -279,6 +287,7 @@ public class MainPersenter implements MainIPersenter {
             case KeyEvent.KEYCODE_DPAD_UP:
                 // 上
                 mView.loadJsMehtod("boxEventHandler('key_down','KEY_UP')");
+
                 break;
             case KeyEvent.KEYCODE_DPAD_RIGHT:
                 // 右
@@ -291,6 +300,7 @@ public class MainPersenter implements MainIPersenter {
             case KeyEvent.KEYCODE_DPAD_LEFT:
                 // 左
                 mView.loadJsMehtod("boxEventHandler('key_down','KEY_LEFT')");
+
                 break;
         }
         return false;
@@ -649,6 +659,132 @@ public class MainPersenter implements MainIPersenter {
         }
     }
 
+
+    public void initASRClient() {
+        mAsrClient = new ASRClient(mView.getActivity());
+//        mAsrClient.setAliTVASREnable(true);
+        mAsrClient.setBackgroundService(true);
+        mAsrClient.setOnASRCommandListener(mASRListener);
+        mAsrClient.setASRListenerType(OnASRCommandListener.ASRListenerType.DEFAULT_LISTENER);
+        mAsrClient.init(mView.getActivity(), true);
+    }
+
+
+    OnASRCommandListener mASRListener = new OnASRCommandListener() {
+        @Override
+        public void onASRStatusUpdated(ASRStatus asrStatus, Bundle bundle) {
+            switch (asrStatus) {
+                case ASR_STATUS_NULL:
+                    //语音识别状态空
+                    Logger.e("ASR_STATUS_NULL");
+                    break;
+                case ASR_STATUS_RECORD_START:
+                    //录音开始状态
+                    Logger.e("ASR_STATUS_RECORD_START");
+                    break;
+                case ASR_STATUS_RECORD_END:
+                    //录音停止状态
+                    Logger.e("ASR_STATUS_RECORD_END");
+                    break;
+                case ASR_STATUS_RECOGNIZE_START:
+                    //识别开始状态
+                    Logger.e("ASR_STATUS_NULL");
+                    break;
+                case ASR_STATUS_RECOGNIZE_END:
+                    //识别结束状态
+                    Logger.e("ASR_STATUS_NULL");
+                    break;
+                case ASR_STATUS_VOLUME_UPDATE:
+                    //声音改变
+                    Logger.e("ASR_STATUS_NULL");
+                    break;
+                case ASR_STATUS_ERROR:
+                    Logger.e("ASR_STATUS_NULL");
+                    //错误
+                    break;
+
+            }
+        }
+
+
+        @Override
+        public void onASRServiceStatusUpdated(ASRServiceStatus asrServiceStatus) {
+            Logger.e("asrServiceStatus:" + asrServiceStatus);
+            Message msg = mASRHandler.obtainMessage();
+            msg.what = HANDLER_MESSAGE_ASR_SDK;
+            if (asrServiceStatus == ASRServiceStatus.ASR_SERVICE_STATUS_CONNECTED)
+                msg.obj = "语音服务注册成功...（" + Thread.currentThread().getId() + "）";
+            else
+                msg.obj = "语音服务注册失败...（" + Thread.currentThread().getId() + "）";
+
+            mASRHandler.sendMessage(msg);
+
+        }
+
+        @Override
+        public ASRCommandReturn onASRResult(String arg0, boolean b) {
+            Message msg = mASRHandler.obtainMessage();
+            msg.what = HANDLER_MESSAGE_ASR_SDK_SHOWLOG;
+            msg.obj = "onASRResult---ASR结果:" + arg0;
+            mASRHandler.sendMessage(msg);
+            Logger.e("onASRResult---ASR结果:" + arg0);
+            return null;
+        }
+
+        @Override
+        public ASRCommandReturn onNLUResult(String commandDomain, String command, String commandParams, Bundle nlpResult) {
+            Message msg = mASRHandler.obtainMessage();
+            msg.what = HANDLER_MESSAGE_ASR_SDK_SHOWLOG;
+            msg.obj = commandParams;
+            mASRHandler.sendMessage(msg);
+            return null;
+
+        }
+
+        @Override
+        public void getAppContextData(AppContextData appContextData) {
+            //此处设置技能的配置信息
+            appContextData.setSecretKey("62423ce6-babf-4663-8307-19b42d65198b");  //技能的secretKey
+            appContextData.setCanExitSkill(true);
+            SelectListData selectListData = new SelectListData();
+            appContextData.setSelectListData(selectListData);
+
+        }
+
+        @Override
+        public Bundle getSceneInfo(Bundle bundle) {
+            return null;
+        }
+
+        @Override
+        public Bundle asrToClient(Bundle bundle) {
+            return null;
+        }
+    };
+
+
+    Handler mASRHandler = new Handler(new Handler.Callback() {
+        @Override
+        public boolean handleMessage(Message msg) {
+            switch (msg.what) {
+                case HANDLER_MESSAGE_ASR_SDK:
+                    Logger.e("初始化SDK：" + msg.obj.toString());
+                    break;
+                case HANDLER_MESSAGE_ASR_SDK_SHOWLOG:
+                    //{"slots":[{"name":"index","domainSlot":"index:sys.anyNumber","liveTime":0,"value":"一","norm":"1"}],"domain":"小程序2019110568936438技能","query":"打开第一个","intent":"playByIndex"}
+                    Logger.e("mASRHandler:--" + msg.obj.toString());
+                    mView.loadJSMehtodPost("TMailASR('" + msg.obj.toString() + "')");
+                    break;
+                default:
+                    break;
+            }
+            return false;
+        }
+    });
+
+    public void onDestroy() {
+        mAsrClient.release();
+    }
 }
 
 

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

@@ -5,11 +5,16 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.net.Uri;
 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.util.ContextUtil;
+import com.edufound.android.xyyf.util.Logger;
+
+import org.json.JSONObject;
 
 public class PayActivity extends Activity implements BaseView {
 
@@ -18,6 +23,7 @@ public class PayActivity extends Activity implements BaseView {
     Activity mActivity;
     int firstResume = 0;
     int wechatOrAli = 0;
+    final int TMAIL_PAY_BACK = 0x1234;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -35,6 +41,12 @@ public class PayActivity extends Activity implements BaseView {
             case 2:
                 mPersenter.ALIPay(payjson);
                 break;
+            case 3:
+                //天猫支付J
+                Intent intent = new Intent("android.intent.action.VIEW", Uri.parse("genie://com.alibaba.ailabs.genie.commonpay/qrcode"));
+                intent.putExtra("data", payjson);
+                startActivityForResult(intent, TMAIL_PAY_BACK);
+                break;
         }
         IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction(ContextUtil.CLOSE_ACTIVITY_PAY);
@@ -77,6 +89,26 @@ public class PayActivity extends Activity implements BaseView {
 
 
     @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == TMAIL_PAY_BACK && resultCode == Activity.RESULT_OK) {
+            if (data != null) {
+                boolean isPaySuccess = data.getBooleanExtra("isPaySuccess", false);
+                String paySuccessDataJson = data.getStringExtra("paySuccessData");
+                int payErrorCode = data.getIntExtra("payErrorCode", -1);
+                String payErrorMsg = data.getStringExtra("payErrorMsg");
+                Logger.e("qrcode, isPaySuccess=" + isPaySuccess + "paySuccessDataJson = " +
+                        paySuccessDataJson + "payErrorCode = " + payErrorCode + " payErrorMsg = " + payErrorMsg);
+                MainActivity.getInstance().loadJSMehtodPost("AliPayCallBack(" + isPaySuccess + ",'" + paySuccessDataJson + "')");
+                finish();
+            } else {
+                Logger.e("PayActivity--onActivityResult--data == null");
+                finish();
+            }
+        }
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    @Override
     public void DisconnNetWork() {
         mPersenter.onDisConnNetWork();
     }

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

@@ -494,9 +494,9 @@ public class OKHttpUtil {
         }
         obj.put("timeAcc", String.valueOf(runtime));
         obj.put("deviceCode", DeviceUuidFactory.getUuid().toString());
-
         obj.put("mobile", userphone);
         String json = obj.toJSONString();
+        Logger.e("post user json:" + json);
         MediaType JSON = MediaType.parse("application/json;charset=utf-8");
         RequestBody requestBody = RequestBody.create(JSON, json);
         Request request = new Request.Builder().url(ContextUtil.URL_POST_USER_TIME).post(requestBody).build();

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

@@ -2,8 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/privacy_root"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/privacy_bg">
+        android:layout_height="match_parent">
 
     <LinearLayout
             android:layout_width="match_parent"

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

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