1.修改包名

2.增加弹窗

app/build.gradle

@@ -17,11 +17,11 @@ android {
     }
     compileSdkVersion 28
     defaultConfig {
-        applicationId "com.edufound.mobile"
+        applicationId "com.edufound.mobile.xxt"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 80000
-        versionName "8.0.0.0"
+        versionCode 10000
+        versionName "1.0.0.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.edufound.mobile">
+    package="com.edufound.mobile.xxt">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -12,6 +12,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="com.xiaomi.permission.AUTH_THIRDPAY" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <uses-sdk tools:overrideLibrary="tv.danmaku.ijk.media.player_arm64,tv.danmaku.ijk.media.player_x86_64" />
 
@@ -66,7 +67,7 @@
         <!--友盟start-->
         <meta-data
             android:name="UMENG_APPKEY"
-            android:value="5e34d2fb4ca3574b1800005b" />
+            android:value="" />
         <meta-data
             android:name="UMENG_CHANNEL"
             android:value="@string/app_code_yf" />
@@ -80,7 +81,7 @@
 
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="com.edufound.mobile.fileprovider"
+            android:authorities="com.edufound.mobile.xxt.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

app/src/main/java/com/edufound/mobile/activity/IJKPlayerActivity.java

@@ -1,25 +1,21 @@
-package com.edufound.mobile.activity;
+package com.edufound.mobile.xxt.activity;
 
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.view.GestureDetector;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
 
-import com.edufound.mobile.R;
-import com.edufound.mobile.base.BaseActivity;
-import com.edufound.mobile.ijkplayer.media.IjkVideoView;
-import com.edufound.mobile.util.ContextUtil;
-import com.edufound.mobile.util.EduFoundUtil;
-import com.edufound.mobile.util.Logger;
-import com.edufound.mobile.util.ToastUtil;
-import com.edufound.mobile.video.VideoAView;
-import com.edufound.mobile.video.VideoPersenter;
+import com.edufound.mobile.xxt.R;
+import com.edufound.mobile.xxt.base.BaseActivity;
+import com.edufound.mobile.xxt.ijkplayer.media.IjkVideoView;
+import com.edufound.mobile.xxt.util.ContextUtil;
+import com.edufound.mobile.xxt.video.VideoAView;
+import com.edufound.mobile.xxt.video.VideoPersenter;
 
 import tv.danmaku.ijk.media.player.IMediaPlayer;
 import tv.danmaku.ijk.media.player.IjkMediaPlayer;

app/src/main/java/com/edufound/mobile/activity/MainActivity.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.activity;
+package com.edufound.mobile.xxt.activity;
 
 import android.app.Activity;
 import android.content.BroadcastReceiver;
@@ -8,6 +8,7 @@ import android.content.IntentFilter;
 import android.graphics.drawable.AnimationDrawable;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -16,17 +17,16 @@ import android.webkit.WebView;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
-import com.edufound.mobile.R;
-import com.edufound.mobile.application.EApplication;
-import com.edufound.mobile.base.BaseActivity;
-import com.edufound.mobile.main.MainPersenter;
-import com.edufound.mobile.main.MainView;
-import com.edufound.mobile.util.ContextUtil;
-import com.edufound.mobile.util.DeviceUuidFactory;
-import com.edufound.mobile.util.Logger;
-import com.edufound.mobile.util.NotificationUtil;
-import com.edufound.mobile.util.SPutil;
-import com.edufound.mobile.util.ShowDebugUrl;
+import com.edufound.mobile.xxt.R;
+import com.edufound.mobile.xxt.application.EApplication;
+import com.edufound.mobile.xxt.base.BaseActivity;
+import com.edufound.mobile.xxt.main.MainPersenter;
+import com.edufound.mobile.xxt.main.MainView;
+import com.edufound.mobile.xxt.util.ContextUtil;
+import com.edufound.mobile.xxt.util.DeviceUuidFactory;
+import com.edufound.mobile.xxt.util.Logger;
+import com.edufound.mobile.xxt.util.NotificationUtil;
+import com.edufound.mobile.xxt.util.ShowDebugUrl;
 
 
 //调用Persenter里面的方法

app/src/main/java/com/edufound/mobile/activity/VideoActivity.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.activity;
+package com.edufound.mobile.xxt.activity;
 
 import android.app.Activity;
 import android.media.MediaPlayer;
@@ -15,13 +15,11 @@ import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.VideoView;
 
-import com.edufound.mobile.R;
-import com.edufound.mobile.base.BaseActivity;
-import com.edufound.mobile.util.ContextUtil;
-import com.edufound.mobile.util.Logger;
-import com.edufound.mobile.util.ToastUtil;
-import com.edufound.mobile.video.VideoAView;
-import com.edufound.mobile.video.VideoPersenter;
+import com.edufound.mobile.xxt.R;
+import com.edufound.mobile.xxt.base.BaseActivity;
+import com.edufound.mobile.xxt.util.ContextUtil;
+import com.edufound.mobile.xxt.video.VideoAView;
+import com.edufound.mobile.xxt.video.VideoPersenter;
 
 public class VideoActivity extends BaseActivity implements VideoAView {
 

app/src/main/java/com/edufound/mobile/application/EApplication.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.application;
+package com.edufound.mobile.xxt.application;
 
 import android.app.Activity;
 import android.app.ActivityManager;
@@ -6,16 +6,12 @@ import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
 import android.support.annotation.Nullable;
-import android.view.Window;
 
-import com.edufound.mobile.R;
-import com.edufound.mobile.pay.PayInit;
-import com.edufound.mobile.util.ContextUtil;
-import com.edufound.mobile.util.Logger;
-import com.edufound.mobile.util.SPutil;
+import com.edufound.mobile.xxt.R;
+import com.edufound.mobile.xxt.pay.PayInit;
+import com.edufound.mobile.xxt.util.ContextUtil;
+import com.edufound.mobile.xxt.util.SPutil;
 import com.umeng.commonsdk.UMConfigure;
-import com.umeng.message.IUmengRegisterCallback;
-import com.umeng.message.PushAgent;
 
 import org.android.agoo.huawei.HuaWeiRegister;
 import org.android.agoo.vivo.VivoRegister;
@@ -43,18 +39,18 @@ public class EApplication extends Application {
         //根据appcode初始化支付sdk
         UMConfigure.setLogEnabled(true);
         UMConfigure.init(this, "5e34d2fb4ca3574b1800005b", getAppCode() + "", UMConfigure.DEVICE_TYPE_PHONE, "dfc59afd6dc6b1550ff1c2e0c7eb10fd");
-        PushAgent mPushAgent = PushAgent.getInstance(this);
-        mPushAgent.register(new IUmengRegisterCallback() {
-            @Override
-            public void onSuccess(String deviceToken) {
-                Logger.e("DeviceToken:" + deviceToken);
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Logger.e("注册失败：-------->  " + "s:" + s + ",s1:" + s1);
-            }
-        });
+//        PushAgent mPushAgent = PushAgent.getInstance(this);
+//        mPushAgent.register(new IUmengRegisterCallback() {
+//            @Override
+//            public void onSuccess(String deviceToken) {
+//                Logger.e("DeviceToken:" + deviceToken);
+//            }
+//
+//            @Override
+//            public void onFailure(String s, String s1) {
+//                Logger.e("注册失败：-------->  " + "s:" + s + ",s1:" + s1);
+//            }
+//        });
 
 
         if (getAppCode().equals(getString(R.string.app_code_xm))) {

app/src/main/java/com/edufound/mobile/base/BaseActivity.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.base;
+package com.edufound.mobile.xxt.base;
 
 import android.app.Activity;
 import android.app.ActivityManager;
@@ -13,15 +13,13 @@ import android.view.KeyEvent;
 import android.view.View;
 import android.view.Window;
 
-import com.edufound.mobile.application.EApplication;
-import com.edufound.mobile.receiver.HomeKeyEventReceiver;
-import com.edufound.mobile.receiver.NetworkChangeReceiver;
-import com.edufound.mobile.util.ContextUtil;
-import com.edufound.mobile.util.EduFoundUtil;
-import com.edufound.mobile.util.LiuHaiScreenUtil;
-import com.edufound.mobile.util.Logger;
-import com.edufound.mobile.util.ShowDevice;
-import com.edufound.mobile.util.ShowSetting;
+import com.edufound.mobile.xxt.receiver.HomeKeyEventReceiver;
+import com.edufound.mobile.xxt.receiver.NetworkChangeReceiver;
+import com.edufound.mobile.xxt.util.EduFoundUtil;
+import com.edufound.mobile.xxt.util.LiuHaiScreenUtil;
+import com.edufound.mobile.xxt.util.Logger;
+import com.edufound.mobile.xxt.util.ShowDevice;
+import com.edufound.mobile.xxt.util.ShowSetting;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.message.PushAgent;
 

app/src/main/java/com/edufound/mobile/base/BaseModel.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.base;
+package com.edufound.mobile.xxt.base;
 
 public interface BaseModel {
 

app/src/main/java/com/edufound/mobile/base/BasePersenter.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.base;
+package com.edufound.mobile.xxt.base;
 
 public interface BasePersenter {
     void loadData();

app/src/main/java/com/edufound/mobile/base/BaseView.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.base;
+package com.edufound.mobile.xxt.base;
 
 import android.app.Activity;
 

app/src/main/java/com/edufound/mobile/bean/FunPayDataBean.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.bean;
+package com.edufound.mobile.xxt.bean;
 
 public class FunPayDataBean {
     public String accountName;

app/src/main/java/com/edufound/mobile/xxt/bean/MessageDialogBean.java

@@ -0,0 +1,7 @@
+package com.edufound.mobile.xxt.bean;
+
+public class MessageDialogBean {
+    public String title;
+    public String message;
+    public String buttontext;
+}

app/src/main/java/com/edufound/mobile/bean/NotificationBean.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.bean;
+package com.edufound.mobile.xxt.bean;
 
 public class NotificationBean {
     private String display_type;

app/src/main/java/com/edufound/mobile/bean/UpgradeBean.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.bean;
+package com.edufound.mobile.xxt.bean;
 
 public class UpgradeBean {
     public String title;

app/src/main/java/com/edufound/mobile/ijkplayer/application/Settings.java

@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package com.edufound.mobile.ijkplayer.application;
+package com.edufound.mobile.xxt.ijkplayer.application;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
-import com.edufound.mobile.R;
+import com.edufound.mobile.xxt.R;
 
 public class Settings {
     private Context mAppContext;

app/src/main/java/com/edufound/mobile/ijkplayer/media/FileMediaDataSource.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.edufound.mobile.ijkplayer.media;
+package com.edufound.mobile.xxt.ijkplayer.media;
 
 import java.io.File;
 import java.io.IOException;

app/src/main/java/com/edufound/mobile/ijkplayer/media/IMediaController.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.edufound.mobile.ijkplayer.media;
+package com.edufound.mobile.xxt.ijkplayer.media;
 
 import android.view.View;
 import android.widget.MediaController;

app/src/main/java/com/edufound/mobile/ijkplayer/media/IRenderView.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.edufound.mobile.ijkplayer.media;
+package com.edufound.mobile.xxt.ijkplayer.media;
 
 import android.graphics.SurfaceTexture;
 import android.support.annotation.NonNull;

app/src/main/java/com/edufound/mobile/ijkplayer/media/IjkVideoView.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.edufound.mobile.ijkplayer.media;
+package com.edufound.mobile.xxt.ijkplayer.media;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -37,10 +37,9 @@ import android.widget.MediaController;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.edufound.mobile.R;
-import com.edufound.mobile.ijkplayer.application.Settings;
-import com.edufound.mobile.ijkplayer.services.MediaPlayerService;
-import com.edufound.mobile.util.Logger;
+import com.edufound.mobile.xxt.R;
+import com.edufound.mobile.xxt.ijkplayer.application.Settings;
+import com.edufound.mobile.xxt.ijkplayer.services.MediaPlayerService;
 
 import java.io.File;
 import java.io.IOException;

app/src/main/java/com/edufound/mobile/ijkplayer/media/MeasureHelper.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.edufound.mobile.ijkplayer.media;
+package com.edufound.mobile.xxt.ijkplayer.media;
 
 import android.view.View;
 

app/src/main/java/com/edufound/mobile/ijkplayer/media/SurfaceRenderView.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.edufound.mobile.ijkplayer.media;
+package com.edufound.mobile.xxt.ijkplayer.media;
 
 import android.annotation.TargetApi;
 import android.content.Context;

app/src/main/java/com/edufound/mobile/ijkplayer/media/TextureRenderView.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.edufound.mobile.ijkplayer.media;
+package com.edufound.mobile.xxt.ijkplayer.media;
 
 import android.annotation.TargetApi;
 import android.content.Context;

app/src/main/java/com/edufound/mobile/ijkplayer/services/MediaPlayerService.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.edufound.mobile.ijkplayer.services;
+package com.edufound.mobile.xxt.ijkplayer.services;
 
 import android.app.Service;
 import android.content.Context;

app/src/main/java/com/edufound/mobile/interfaces/EfunboxPayInterfaces.java

@@ -1,12 +1,10 @@
-package com.edufound.mobile.interfaces;
+package com.edufound.mobile.xxt.interfaces;
 
 import android.content.Intent;
 import android.webkit.JavascriptInterface;
 
-import com.edufound.mobile.main.MainView;
-import com.edufound.mobile.pay.PayActivity;
-import com.edufound.mobile.pay.PayPersenter;
-import com.edufound.mobile.util.Logger;
+import com.edufound.mobile.xxt.main.MainView;
+import com.edufound.mobile.xxt.pay.PayActivity;
 
 public class EfunboxPayInterfaces {
     public static final int START_PAY_DB = 0x3211;

app/src/main/java/com/edufound/mobile/interfaces/JsInterfaces.java

@@ -1,35 +1,35 @@
-package com.edufound.mobile.interfaces;
+package com.edufound.mobile.xxt.interfaces;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.media.MediaPlayer;
+import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.webkit.JavascriptInterface;
 
-import com.edufound.mobile.R;
-import com.edufound.mobile.activity.IJKPlayerActivity;
-import com.edufound.mobile.activity.VideoActivity;
-import com.edufound.mobile.application.EApplication;
-import com.edufound.mobile.bean.UpgradeBean;
-import com.edufound.mobile.main.MainView;
-import com.edufound.mobile.pay.PayInit;
-import com.edufound.mobile.util.ContextUtil;
-import com.edufound.mobile.util.Logger;
-import com.edufound.mobile.util.SPutil;
-import com.edufound.mobile.util.ShowDebugUrl;
-import com.edufound.mobile.util.ShowDevice;
-import com.edufound.mobile.util.ShowSetting;
-import com.edufound.mobile.util.ToastUtil;
-import com.edufound.mobile.util.UpdateUtil;
+import com.edufound.mobile.xxt.R;
+import com.edufound.mobile.xxt.activity.IJKPlayerActivity;
+import com.edufound.mobile.xxt.activity.VideoActivity;
+import com.edufound.mobile.xxt.application.EApplication;
+import com.edufound.mobile.xxt.bean.MessageDialogBean;
+import com.edufound.mobile.xxt.bean.UpgradeBean;
+import com.edufound.mobile.xxt.main.MainView;
+import com.edufound.mobile.xxt.pay.PayInit;
+import com.edufound.mobile.xxt.util.ContextUtil;
+import com.edufound.mobile.xxt.util.Logger;
+import com.edufound.mobile.xxt.util.SPutil;
+import com.edufound.mobile.xxt.util.ShowDebugUrl;
+import com.edufound.mobile.xxt.util.ShowDevice;
+import com.edufound.mobile.xxt.util.ShowSetting;
+import com.edufound.mobile.xxt.util.ToastUtil;
+import com.edufound.mobile.xxt.util.UpdateUtil;
 import com.google.gson.Gson;
 import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram;
 import com.tencent.mm.opensdk.modelmsg.SendAuth;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
-import java.security.interfaces.ECKey;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -38,6 +38,8 @@ public class JsInterfaces {
     Gson mGson;
     MainView mView;
     MediaPlayer mediaPlayer;
+    AlertDialog.Builder mMessageDialogBuilder;
+    MessageDialogBean mMessageBean;
 
     public JsInterfaces(MainView view) {
         mGson = new Gson();
@@ -286,4 +288,28 @@ public class JsInterfaces {
     public void showDebugDialog() {
         ShowDebugUrl.getInstance().show(mView);
     }
+
+    @JavascriptInterface
+    public void showMessageDialog(String json) {
+        if (mMessageDialogBuilder == null) {
+            mMessageDialogBuilder = new AlertDialog.Builder(mView.getActivity());
+        }
+        mMessageBean = mGson.fromJson(json, MessageDialogBean.class);
+        mMessageDialogBuilder.setIcon(R.drawable.icon_mobile_256_v8);
+        mMessageDialogBuilder.setTitle(mMessageBean.title);
+        mMessageDialogBuilder.setMessage(mMessageBean.message);
+        mMessageDialogBuilder.setPositiveButton(mMessageBean.buttontext, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                dialog.dismiss();
+            }
+        });
+        mMessageDialogBuilder.create().show();
+    }
+
+    @JavascriptInterface
+    public void showToast(String message) {
+        ToastUtil.showToast(message);
+    }
+
 }

app/src/main/java/com/edufound/mobile/main/MainModel.java

@@ -1,8 +1,8 @@
-package com.edufound.mobile.main;
+package com.edufound.mobile.xxt.main;
 
-import com.edufound.mobile.R;
-import com.edufound.mobile.base.BaseModel;
-import com.edufound.mobile.util.ContextUtil;
+import com.edufound.mobile.xxt.R;
+import com.edufound.mobile.xxt.base.BaseModel;
+import com.edufound.mobile.xxt.util.ContextUtil;
 
 //做请求操作之类的
 public class MainModel implements BaseModel {

app/src/main/java/com/edufound/mobile/main/MainPersenter.java

@@ -1,7 +1,6 @@
-package com.edufound.mobile.main;
+package com.edufound.mobile.xxt.main;
 
 import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
@@ -27,18 +26,18 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
-import com.edufound.mobile.application.EApplication;
-import com.edufound.mobile.base.BaseModel;
-import com.edufound.mobile.base.BasePersenter;
-import com.edufound.mobile.interfaces.EfunboxPayInterfaces;
-import com.edufound.mobile.interfaces.JsInterfaces;
-import com.edufound.mobile.util.ContextUtil;
-import com.edufound.mobile.util.DeviceUtil;
-import com.edufound.mobile.util.DeviceUuidFactory;
-import com.edufound.mobile.util.Logger;
-import com.edufound.mobile.util.SPutil;
-import com.edufound.mobile.util.ToastUtil;
-import com.edufound.mobile.view.ErrorView;
+import com.edufound.mobile.xxt.application.EApplication;
+import com.edufound.mobile.xxt.base.BaseModel;
+import com.edufound.mobile.xxt.base.BasePersenter;
+import com.edufound.mobile.xxt.interfaces.EfunboxPayInterfaces;
+import com.edufound.mobile.xxt.interfaces.JsInterfaces;
+import com.edufound.mobile.xxt.util.ContextUtil;
+import com.edufound.mobile.xxt.util.DeviceUtil;
+import com.edufound.mobile.xxt.util.DeviceUuidFactory;
+import com.edufound.mobile.xxt.util.Logger;
+import com.edufound.mobile.xxt.util.SPutil;
+import com.edufound.mobile.xxt.util.ToastUtil;
+import com.edufound.mobile.xxt.view.ErrorView;
 
 public class MainPersenter implements MainIPersenter {
 

app/src/main/java/com/edufound/mobile/main/MainView.java

@@ -1,8 +1,8 @@
-package com.edufound.mobile.main;
+package com.edufound.mobile.xxt.main;
 
 import android.app.Activity;
 
-import com.edufound.mobile.base.BaseView;
+import com.edufound.mobile.xxt.base.BaseView;
 
 
 public interface MainView extends BaseView {

app/src/main/java/com/edufound/mobile/pay/PayActivity.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.pay;
+package com.edufound.mobile.xxt.pay;
 
 import android.app.Activity;
 import android.content.BroadcastReceiver;
@@ -6,24 +6,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.text.TextUtils;
 
-import com.alipay.sdk.app.PayTask;
-import com.edufound.mobile.R;
-import com.edufound.mobile.application.EApplication;
-import com.edufound.mobile.base.BaseView;
-import com.edufound.mobile.interfaces.EfunboxPayInterfaces;
-import com.edufound.mobile.pay.ali.PayResult;
-import com.edufound.mobile.util.ContextUtil;
-import com.edufound.mobile.util.Logger;
-import com.edufound.mobile.util.ToastUtil;
-import com.tencent.mm.opensdk.modelpay.PayReq;
-
-import org.json.JSONObject;
-
-import java.util.Map;
+import com.edufound.mobile.xxt.R;
+import com.edufound.mobile.xxt.base.BaseView;
+import com.edufound.mobile.xxt.util.ContextUtil;
 
 public class PayActivity extends Activity implements BaseView {
 

app/src/main/java/com/edufound/mobile/pay/PayInit.java

@@ -1,10 +1,8 @@
-package com.edufound.mobile.pay;
+package com.edufound.mobile.xxt.pay;
 
 import android.app.Application;
 
-import com.edufound.mobile.R;
-import com.edufound.mobile.util.ContextUtil;
-import com.edufound.mobile.util.Logger;
+import com.edufound.mobile.xxt.util.ContextUtil;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 

app/src/main/java/com/edufound/mobile/pay/PayPersenter.java

@@ -1,17 +1,17 @@
-package com.edufound.mobile.pay;
+package com.edufound.mobile.xxt.pay;
 
 import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
 
 import com.alipay.sdk.app.PayTask;
-import com.edufound.mobile.base.BasePersenter;
-import com.edufound.mobile.base.BaseView;
-import com.edufound.mobile.interfaces.EfunboxPayInterfaces;
-import com.edufound.mobile.main.MainPersenter;
-import com.edufound.mobile.pay.ali.PayResult;
-import com.edufound.mobile.util.Logger;
-import com.edufound.mobile.util.ToastUtil;
+import com.edufound.mobile.xxt.base.BasePersenter;
+import com.edufound.mobile.xxt.base.BaseView;
+import com.edufound.mobile.xxt.interfaces.EfunboxPayInterfaces;
+import com.edufound.mobile.xxt.main.MainPersenter;
+import com.edufound.mobile.xxt.pay.ali.PayResult;
+import com.edufound.mobile.xxt.util.Logger;
+import com.edufound.mobile.xxt.util.ToastUtil;
 import com.tencent.mm.opensdk.modelpay.PayReq;
 
 import org.json.JSONObject;

app/src/main/java/com/edufound/mobile/push/MipushTestActivity.java

@@ -1,12 +1,11 @@
-package com.edufound.mobile.push;
+package com.edufound.mobile.xxt.push;
 
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.edufound.mobile.R;
-import com.edufound.mobile.activity.MainActivity;
-import com.edufound.mobile.bean.NotificationBean;
-import com.edufound.mobile.util.Logger;
+import com.edufound.mobile.xxt.activity.MainActivity;
+import com.edufound.mobile.xxt.bean.NotificationBean;
+import com.edufound.mobile.xxt.util.Logger;
 import com.google.gson.Gson;
 import com.umeng.message.UmengNotifyClickActivity;
 

app/src/main/java/com/edufound/mobile/receiver/HomeKeyEventReceiver.java

@@ -1,12 +1,11 @@
-package com.edufound.mobile.receiver;
+package com.edufound.mobile.xxt.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.text.TextUtils;
 
-import com.edufound.mobile.application.EApplication;
-import com.edufound.mobile.util.Logger;
+import com.edufound.mobile.xxt.util.Logger;
 
 public class HomeKeyEventReceiver extends BroadcastReceiver {
 

app/src/main/java/com/edufound/mobile/receiver/NetworkChangeReceiver.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.receiver;
+package com.edufound.mobile.xxt.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -9,10 +9,10 @@ import android.os.Handler;
 import android.os.Message;
 import android.telephony.TelephonyManager;
 
-import com.edufound.mobile.base.BaseView;
-import com.edufound.mobile.util.ContextUtil;
-import com.edufound.mobile.util.Logger;
-import com.edufound.mobile.util.ToastUtil;
+import com.edufound.mobile.xxt.base.BaseView;
+import com.edufound.mobile.xxt.util.ContextUtil;
+import com.edufound.mobile.xxt.util.Logger;
+import com.edufound.mobile.xxt.util.ToastUtil;
 
 
 /**

app/src/main/java/com/edufound/mobile/util/AesUtil.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.util;
+package com.edufound.mobile.xxt.util;
 
 import org.bouncycastle.util.encoders.Base64;
 

app/src/main/java/com/edufound/mobile/util/ContextUtil.java

@@ -1,10 +1,8 @@
-package com.edufound.mobile.util;
+package com.edufound.mobile.xxt.util;
 
 import android.app.Application;
 import android.content.Context;
 
-import com.edufound.mobile.base.BaseView;
-
 public class ContextUtil {
 
     public static final String CLOSE_ACTIVITY_SPLASH = "com.edufound.mobile.close.splash";

app/src/main/java/com/edufound/mobile/util/DeviceUtil.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.util;
+package com.edufound.mobile.xxt.util;
 
 import android.app.Activity;
 import android.content.Context;

app/src/main/java/com/edufound/mobile/util/DeviceUuidFactory.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.util;
+package com.edufound.mobile.xxt.util;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

app/src/main/java/com/edufound/mobile/util/DrawableUtil.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.util;
+package com.edufound.mobile.xxt.util;
 
 import android.app.Activity;
 import android.graphics.Bitmap;

app/src/main/java/com/edufound/mobile/util/EduFoundUtil.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.util;
+package com.edufound.mobile.xxt.util;
 
 import android.app.Activity;
 import android.app.AlarmManager;
@@ -15,6 +15,7 @@ import android.net.Uri;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Build;
+import android.support.v4.content.FileProvider;
 import android.text.Editable;
 import android.text.Selection;
 import android.text.TextWatcher;
@@ -81,18 +82,25 @@ public class EduFoundUtil {
 
     public static void openFile(Context context, File file) {
         // TODO Auto-generated method stub
-        String cmd = "chmod 777 " + file;
-        try {
-            Runtime.getRuntime().exec(cmd);
-            Log.e("OpenFile", file.getName());
-            Intent intent = new Intent();
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            intent.setAction(android.content.Intent.ACTION_VIEW);
-            intent.setDataAndType(Uri.fromFile(file), "application/vnd.android.package-archive");
-            context.startActivity(intent);
-        } catch (IOException e) {
-            e.printStackTrace();
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            Uri uri = FileProvider.getUriForFile(context, "com.edufound.mobile.fileprovider", file);
+            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+            intent.setDataAndType(uri, "application/vnd.android.package-archive");
+        } else {
+            String cmd = "chmod 777 " + file;
+            try {
+                Runtime.getRuntime().exec(cmd);
+                Log.e("OpenFile", file.getName());
+                intent.setAction(android.content.Intent.ACTION_VIEW);
+                intent.setDataAndType(Uri.fromFile(file), "application/vnd.android.package-archive");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
         }
+        context.startActivity(intent);
 
     }
 

app/src/main/java/com/edufound/mobile/util/LiuHaiScreenUtil.java

@@ -1,9 +1,8 @@
-package com.edufound.mobile.util;
+package com.edufound.mobile.xxt.util;
 
 import android.app.Activity;
 import android.view.DisplayCutout;
 import android.view.View;
-import android.view.Window;
 import android.view.WindowInsets;
 import android.view.WindowManager;
 

app/src/main/java/com/edufound/mobile/util/Logger.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.util;
+package com.edufound.mobile.xxt.util;
 
 import android.util.Log;
 

app/src/main/java/com/edufound/mobile/util/NotificationUtil.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.util;
+package com.edufound.mobile.xxt.util;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -12,10 +12,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.support.annotation.RequiresApi;
 import android.support.v4.app.NotificationManagerCompat;
-import android.view.View;
-import android.widget.TextView;
-
-import com.edufound.mobile.R;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;

app/src/main/java/com/edufound/mobile/util/OKHttpUtil.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.util;
+package com.edufound.mobile.xxt.util;
 
 import org.apache.http.conn.ssl.SSLSocketFactory;
 

app/src/main/java/com/edufound/mobile/util/PlayerGestureListener.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.util;
+package com.edufound.mobile.xxt.util;
 
 import android.content.Context;
 import android.util.DisplayMetrics;

app/src/main/java/com/edufound/mobile/util/SPutil.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.util;
+package com.edufound.mobile.xxt.util;
 
 import android.content.Context;
 import android.content.SharedPreferences;

app/src/main/java/com/edufound/mobile/util/ShowDebugUrl.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.util;
+package com.edufound.mobile.xxt.util;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -15,8 +15,8 @@ import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
 
-import com.edufound.mobile.R;
-import com.edufound.mobile.main.MainView;
+import com.edufound.mobile.xxt.R;
+import com.edufound.mobile.xxt.main.MainView;
 
 public final class ShowDebugUrl implements Callback {
 

app/src/main/java/com/edufound/mobile/util/ShowDevice.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.util;
+package com.edufound.mobile.xxt.util;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -15,7 +15,7 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.widget.TextView;
 
-import com.edufound.mobile.R;
+import com.edufound.mobile.xxt.R;
 
 public final class ShowDevice implements Callback {
 

app/src/main/java/com/edufound/mobile/util/ShowSetting.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.util;
+package com.edufound.mobile.xxt.util;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -15,7 +15,7 @@ import android.view.WindowManager;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 
-import com.edufound.mobile.R;
+import com.edufound.mobile.xxt.R;
 
 public final class ShowSetting implements Callback {
 

app/src/main/java/com/edufound/mobile/util/ToastUtil.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.util;
+package com.edufound.mobile.xxt.util;
 
 import android.widget.Toast;
 

app/src/main/java/com/edufound/mobile/util/UpdateUtil.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.util;
+package com.edufound.mobile.xxt.util;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -18,7 +18,7 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.edufound.mobile.R;
+import com.edufound.mobile.xxt.R;
 
 import java.io.File;
 import java.io.FileOutputStream;

app/src/main/java/com/edufound/mobile/video/VideoAView.java

@@ -1,10 +1,8 @@
-package com.edufound.mobile.video;
+package com.edufound.mobile.xxt.video;
 
 import android.net.Uri;
 
-import com.edufound.mobile.base.BaseView;
-
-import tv.danmaku.ijk.media.player.IMediaPlayer;
+import com.edufound.mobile.xxt.base.BaseView;
 
 
 public interface VideoAView extends BaseView {

app/src/main/java/com/edufound/mobile/video/VideoModel.java

@@ -1,6 +1,6 @@
-package com.edufound.mobile.video;
+package com.edufound.mobile.xxt.video;
 
-import com.edufound.mobile.base.BaseModel;
+import com.edufound.mobile.xxt.base.BaseModel;
 
 public class VideoModel implements BaseModel {
 

app/src/main/java/com/edufound/mobile/video/VideoPersenter.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.video;
+package com.edufound.mobile.xxt.video;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -30,18 +30,18 @@ import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import com.edufound.mobile.R;
-import com.edufound.mobile.application.EApplication;
-import com.edufound.mobile.base.BaseModel;
-import com.edufound.mobile.base.BasePersenter;
-import com.edufound.mobile.util.AesUtil;
-import com.edufound.mobile.util.ContextUtil;
-import com.edufound.mobile.util.DeviceUtil;
-import com.edufound.mobile.util.DrawableUtil;
-import com.edufound.mobile.util.EduFoundUtil;
-import com.edufound.mobile.util.Logger;
-import com.edufound.mobile.util.ToastUtil;
-import com.edufound.mobile.view.ErrorView;
+import com.edufound.mobile.xxt.R;
+import com.edufound.mobile.xxt.application.EApplication;
+import com.edufound.mobile.xxt.base.BaseModel;
+import com.edufound.mobile.xxt.base.BasePersenter;
+import com.edufound.mobile.xxt.util.AesUtil;
+import com.edufound.mobile.xxt.util.ContextUtil;
+import com.edufound.mobile.xxt.util.DeviceUtil;
+import com.edufound.mobile.xxt.util.DrawableUtil;
+import com.edufound.mobile.xxt.util.EduFoundUtil;
+import com.edufound.mobile.xxt.util.Logger;
+import com.edufound.mobile.xxt.util.ToastUtil;
+import com.edufound.mobile.xxt.view.ErrorView;
 import com.google.gson.Gson;
 import com.warkiz.widget.IndicatorSeekBar;
 import com.warkiz.widget.TickMarkType;

app/src/main/java/com/edufound/mobile/view/ErrorView.java

@@ -1,4 +1,4 @@
-package com.edufound.mobile.view;
+package com.edufound.mobile.xxt.view;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -7,9 +7,9 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import com.edufound.mobile.R;
-import com.edufound.mobile.base.BaseView;
-import com.edufound.mobile.util.ToastUtil;
+import com.edufound.mobile.xxt.R;
+import com.edufound.mobile.xxt.base.BaseView;
+import com.edufound.mobile.xxt.util.ToastUtil;
 
 public class ErrorView extends FrameLayout {
     BaseView mView;

app/src/main/java/com/edufound/mobile/wxapi/WXEntryActivity.java

@@ -1,21 +1,19 @@
-package com.edufound.mobile.wxapi;
+package com.edufound.mobile.xxt.wxapi;
 
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
 import android.os.Message;
 import android.support.annotation.RequiresApi;
 import android.view.WindowManager;
 
-import com.edufound.mobile.base.BaseActivity;
-import com.edufound.mobile.main.MainPersenter;
-import com.edufound.mobile.pay.PayInit;
-import com.edufound.mobile.util.Logger;
-import com.edufound.mobile.util.OKHttpUtil;
+import com.edufound.mobile.xxt.base.BaseActivity;
+import com.edufound.mobile.xxt.main.MainPersenter;
+import com.edufound.mobile.xxt.pay.PayInit;
+import com.edufound.mobile.xxt.util.Logger;
+import com.edufound.mobile.xxt.util.OKHttpUtil;
 import com.tencent.mm.opensdk.constants.ConstantsAPI;
 import com.tencent.mm.opensdk.modelbase.BaseReq;
 import com.tencent.mm.opensdk.modelbase.BaseResp;
-import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram;
 import com.tencent.mm.opensdk.modelmsg.SendAuth;
 import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;

app/src/main/java/com/edufound/mobile/wxapi/WXPayEntryActivity.java

@@ -1,14 +1,14 @@
-package com.edufound.mobile.wxapi;
+package com.edufound.mobile.xxt.wxapi;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;
 
-import com.edufound.mobile.R;
-import com.edufound.mobile.main.MainPersenter;
-import com.edufound.mobile.pay.PayInit;
-import com.edufound.mobile.util.ContextUtil;
+import com.edufound.mobile.xxt.R;
+import com.edufound.mobile.xxt.main.MainPersenter;
+import com.edufound.mobile.xxt.pay.PayInit;
+import com.edufound.mobile.xxt.util.ContextUtil;
 import com.tencent.mm.opensdk.constants.ConstantsAPI;
 import com.tencent.mm.opensdk.modelbase.BaseReq;
 import com.tencent.mm.opensdk.modelbase.BaseResp;

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

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/black"
-    tools:context=".activity.MainActivity">
+    tools:context=".xxt.activity.MainActivity">
 
     <WebView
         android:id="@+id/myWebView"

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

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

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

@@ -1,5 +1,5 @@
-<resources tools:ignore="ExtraTranslation" xmlns:tools="http://schemas.android.com/tools">
-    <string name="app_name">义方快乐学堂</string>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ExtraTranslation">
+    <string name="app_name">学有义方</string>
     <!--<string name="title_activity_main">MainActivity</string>-->
     <string name="VideoView_error_text_invalid_progressive_playback">Invalid progressive playback</string>
     <string name="VideoView_error_text_unknown">Unknown</string>

app/src/main/res/xml/apk_file_paths.xml

@@ -2,7 +2,7 @@
 <paths>
     <root-path
         name="apk"
-        path="Android/data/com.edufound.mobile/" />
+        path="Android/data/com.edufound.mobile.xxt/" />
     <root-path
         name="external_storage_root"
         path="." />

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

@@ -1,3 +1,3 @@
-#Tue Feb 25 11:24:25 CST 2020
+#Thu Mar 05 11:22:47 CST 2020
 G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\res\\layout\\upush_bar_image_notification.xml=G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\build\\intermediates\\packaged_res\\debug\\layout\\upush_bar_image_notification.xml
 G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\res\\layout\\upush_notification.xml=G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\build\\intermediates\\packaged_res\\debug\\layout\\upush_notification.xml

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

@@ -1,3 +1,3 @@
-#Tue Feb 11 16:27:18 CST 2020
-G\:\\WorkSpace\\Git_WorkSpace\\efunbox_8.0_mobile\\efunbox-android-mobile-8.0-master\\push\\res\\layout\\upush_notification.xml=G\:\\WorkSpace\\Git_WorkSpace\\efunbox_8.0_mobile\\efunbox-android-mobile-8.0-master\\push\\build\\intermediates\\packaged_res\\release\\layout\\upush_notification.xml
-G\:\\WorkSpace\\Git_WorkSpace\\efunbox_8.0_mobile\\efunbox-android-mobile-8.0-master\\push\\res\\layout\\upush_bar_image_notification.xml=G\:\\WorkSpace\\Git_WorkSpace\\efunbox_8.0_mobile\\efunbox-android-mobile-8.0-master\\push\\build\\intermediates\\packaged_res\\release\\layout\\upush_bar_image_notification.xml
+#Thu Mar 05 11:24:38 CST 2020
+G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\res\\layout\\upush_bar_image_notification.xml=G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\build\\intermediates\\packaged_res\\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