1.提交阿里支付

.idea/modules/-1880156357/proj.android-studio.libcocos2dx.iml

@@ -42,7 +42,7 @@
       <excludeFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/platform/android/libcocos2dx/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 30 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: ./../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/platform/android/java/libs/okhttp-3.12.7.jar" level="project" />

.idea/modules/app/proj.android-studio.efunbox-ott-launcher.iml

@@ -208,8 +208,10 @@
     <content url="file://$MODULE_DIR$/../../../src">
       <sourceFolder url="file://$MODULE_DIR$/../../../src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 30 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: ./libs/alipaySdk-20180601.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./libs/dom4j-1.6.1.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/platform/android/java/libs/okhttp-3.12.7.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/platform/android/java/libs/okio-1.15.0.jar" level="project" />
@@ -221,7 +223,6 @@
     <orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-android:1.7.21" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: ./libs/alipaysdk-15.8.05.211018174351.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./libs/auth_number_product-2.12.3-log-online-standard-release.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./libs/crashshield-2.1.2-release.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./libs/logger-2.1.2-release.aar" level="project" />

.idea/modules/game/proj.android-studio.game.iml

@@ -197,14 +197,15 @@
     <content url="file://$MODULE_DIR$/../../../jni/hellojavascript">
       <sourceFolder url="file://$MODULE_DIR$/../../../jni/hellojavascript" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 30 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: ./libs/alipaySdk-20180601.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./libs/dom4j-1.6.1.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/platform/android/java/libs/okhttp-3.12.7.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/platform/android/java/libs/okio-1.15.0.jar" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-android:1.7.21" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: ./libs/alipaysdk-15.8.05.211018174351.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./libs/auth_number_product-2.12.3-log-online-standard-release.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./libs/crashshield-2.1.2-release.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./libs/logger-2.1.2-release.aar" level="project" />

app/AndroidManifest.xml

@@ -14,13 +14,13 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /><!-- 本地信息缓存 -->
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> <!--开关wifi状态，解决国内机型移动⽹络权限问题需要 -->
 
-<!--    <queries>-->
-<!--        &lt;!&ndash; 正式环境 &ndash;&gt;-->
-<!--        <package android:name="com.eg.android.AlipayGphone" />-->
-<!--        &lt;!&ndash; 沙箱环境 &ndash;&gt;-->
-<!--        <package android:name="com.eg.android.AlipayGphoneRC" />-->
-<!--        <package android:name="hk.alipay.wallet" />-->
-<!--    </queries>-->
+    <!--    <queries>-->
+    <!--        &lt;!&ndash; 正式环境 &ndash;&gt;-->
+    <!--        <package android:name="com.eg.android.AlipayGphone" />-->
+    <!--        &lt;!&ndash; 沙箱环境 &ndash;&gt;-->
+    <!--        <package android:name="com.eg.android.AlipayGphoneRC" />-->
+    <!--        <package android:name="hk.alipay.wallet" />-->
+    <!--    </queries>-->
 
     <application
             android:name="org.cocos2dx.javascript.application.EApplication"
@@ -39,7 +39,7 @@
                 android:label="@string/app_name"
                 android:launchMode="singleTask"
                 android:screenOrientation="sensorLandscape"
-                android:taskAffinity=""
+                android:taskAffinity="com.edufound.mobile"
                 android:theme="@style/AppStartTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -48,8 +48,7 @@
             </intent-filter>
         </activity>
 
-
-        <!--联通电信授权页-->
+        <!--联通电信授权页  -->
         <!--如果不需要使用窗口模式，不要使用authsdk_activity_dialog主题，会出现异常动画-->
         <!--如果需要使用authsdk_activity_dialog主题，则screenOrientation一定不能指定明确的方向，
                比如portrait、sensorPortrait，在8.0的系统上不允许窗口模式指定orientation，会发生crash，需要指定为behind，
@@ -79,7 +78,7 @@
                 android:exported="true"
                 android:launchMode="singleTask"
                 android:screenOrientation="landscape"
-                android:taskAffinity="com.edufound.android.xyyf"
+                android:taskAffinity="com.edufound.mobile"
                 android:theme="@style/transcutestyle"></activity>
 
         <activity
@@ -89,6 +88,21 @@
                 android:theme="@style/transcutestyle">
 
         </activity>
+
+
+        <activity
+                android:name="com.alipay.sdk.app.H5PayActivity"
+                android:configChanges="orientation|keyboardHidden|navigation|screenSize"
+                android:exported="false"
+                android:screenOrientation="behind"
+                android:windowSoftInputMode="adjustResize|stateHidden"></activity>
+        <activity
+                android:name="com.alipay.sdk.app.H5AuthActivity"
+                android:configChanges="orientation|keyboardHidden|navigation"
+                android:exported="false"
+                android:screenOrientation="behind"
+                android:windowSoftInputMode="adjustResize|stateHidden"></activity>
+
     </application>
 
 </manifest>

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

@@ -36,4 +36,10 @@
         <item name="android:windowAnimationStyle">@null</item>
     </style>
 
+
+    <style name="DialogActivity" parent="@style/Theme.AppCompat.Dialog">
+        <item name="android:windowBackground">@android:color/transparent</item><!--背景透明-->
+        <item name="android:backgroundDimAmount">0.5</item><!--透明度 0.0f到1.0f。1.0完全不透明，0.0f完全透明-->
+    </style>
+
 </resources>

gradle.properties

@@ -13,13 +13,13 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 # Android SDK version that will be used as the compile project
-PROP_COMPILE_SDK_VERSION=31
+PROP_COMPILE_SDK_VERSION=28
 # Android SDK version that will be used as the earliest version of android this application can run on
 PROP_MIN_SDK_VERSION=16
 # Android SDK version that will be used as the latest version of android this application has been tested on
-PROP_TARGET_SDK_VERSION=31
+PROP_TARGET_SDK_VERSION=28
 # Android Build Tools version that will be used as the compile project
-PROP_BUILD_TOOLS_VERSION=30
+PROP_BUILD_TOOLS_VERSION=28
 # List of CPU Archtexture to build that application with
 # Available architextures (armeabi-v7a | arm64-v8a | x86)
 # To build for multiple architexture, use the `:` between them

src/org/cocos2dx/javascript/AppActivity.java

@@ -39,6 +39,7 @@ import com.edufound.mobile.R;
 import com.google.gson.Gson;
 
 import org.cocos2dx.javascript.presenter.MainPresenter;
+import org.cocos2dx.javascript.util.Consts;
 import org.cocos2dx.javascript.util.Logger;
 import org.cocos2dx.lib.Cocos2dxActivity;
 import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
@@ -59,25 +60,19 @@ public class AppActivity extends Cocos2dxActivity {
         // Workaround in
         // https://stackoverflow.com/questions/16283079/re-launch-of-activity-on-home-button-but-only-the-first-time/16447508
         if (!isTaskRoot()) {
-            // Android launched another instance of the root activity into an existing task
-            // so just quietly finish and go away, dropping the user back into the activity
-            // at the top of the stack (ie: the last state of this task)
-            // Don't need to finish it again since it's finished in super.onCreate .
+            Intent mainIntent = getIntent();
+            String action = mainIntent.getAction();
+            if (mainIntent.hasCategory(Intent.CATEGORY_LAUNCHER) && action.equals(Intent.ACTION_MAIN)) {
+                finish();
+                return;
+            }
             return;
         }
         // DO OTHER INITIALIZATION BELOW
-
+        sendBroadcast(new Intent("android.intent.action.STATUSBAR_DISABLE"));
         SDKWrapper.getInstance().init(this);
         showSplash();
         mPresenter = new MainPresenter(this);
-        Map<String, String> map = new HashMap<>();
-        map.put("sd", "1");
-        map.put("sd1", "11");
-        map.put("sd11", "111");
-        map.put("sd111", "1111");
-        Gson gson = new Gson();
-        String json = gson.toJson(map);
-        Logger.e("测试json:" + json);
     }
 
     @SuppressLint("ResourceType")
@@ -114,6 +109,7 @@ public class AppActivity extends Cocos2dxActivity {
     protected void onResume() {
         super.onResume();
         SDKWrapper.getInstance().onResume();
+        Logger.e("onResume");
 
     }
 
@@ -121,6 +117,7 @@ public class AppActivity extends Cocos2dxActivity {
     protected void onPause() {
         super.onPause();
         SDKWrapper.getInstance().onPause();
+        Logger.e("onPause");
 
     }
 
@@ -134,6 +131,7 @@ public class AppActivity extends Cocos2dxActivity {
         }
 
         SDKWrapper.getInstance().onDestroy();
+        Logger.e("onDestroy");
 
     }
 
@@ -147,48 +145,71 @@ public class AppActivity extends Cocos2dxActivity {
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         SDKWrapper.getInstance().onNewIntent(intent);
+        Logger.e("onNewIntent");
     }
 
     @Override
     protected void onRestart() {
         super.onRestart();
         SDKWrapper.getInstance().onRestart();
+        Logger.e("onRestart");
     }
 
     @Override
     protected void onStop() {
         super.onStop();
         SDKWrapper.getInstance().onStop();
+        Logger.e("onStop");
     }
 
     @Override
     public void onBackPressed() {
         SDKWrapper.getInstance().onBackPressed();
         super.onBackPressed();
+        Logger.e("onBackPressed");
     }
 
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         SDKWrapper.getInstance().onConfigurationChanged(newConfig);
         super.onConfigurationChanged(newConfig);
+        Logger.e("onConfigurationChanged");
     }
 
     @Override
     protected void onRestoreInstanceState(Bundle savedInstanceState) {
         SDKWrapper.getInstance().onRestoreInstanceState(savedInstanceState);
         super.onRestoreInstanceState(savedInstanceState);
+        Logger.e("onRestoreInstanceState");
     }
 
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         SDKWrapper.getInstance().onSaveInstanceState(outState);
         super.onSaveInstanceState(outState);
+        Logger.e("onSaveInstanceState");
     }
 
     @Override
     protected void onStart() {
         SDKWrapper.getInstance().onStart();
         super.onStart();
+        Logger.e("onStart");
+    }
+
+
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+//            Intent mHomeIntent = new Intent(Intent.ACTION_MAIN);
+//            mHomeIntent.addCategory(Intent.CATEGORY_HOME);
+//            mHomeIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
+//            Consts.mApplicatonContext.startActivity(mHomeIntent);
+
+
+        
+
+
     }
 
     @Override

src/org/cocos2dx/javascript/presenter/MainPresenter.java

@@ -53,8 +53,6 @@ public class MainPresenter {
         mActivity = activity;
         mGson = new Gson();
         mDeviceUtil = new DeviceUtil();
-        Logger.e("getWidth:" + mDeviceUtil.getWidth(mActivity));
-        Logger.e("getHeight:" + mDeviceUtil.getHeight(mActivity));
         mPackageUtil = new PackageUtil(activity);
         new DeviceUuidFactory(Consts.mApplicatonContext);
         mPhoneNumberAuthHelper = PhoneNumberAuthHelper.getInstance(mActivity, mTokenResultListener);
@@ -156,7 +154,6 @@ public class MainPresenter {
 
 
     public static void WeChatPay(String json) {
-        Logger.e("WeChatPay:json-" + json);
         if (!WX_API.isWXAppInstalled()) {
             Toast.makeText(mActivity, "请安装微信", Toast.LENGTH_SHORT).show();
             return;
@@ -169,7 +166,6 @@ public class MainPresenter {
 
 
     public static void ALIPay(final String orderInfo) {
-        Logger.e("orderInfo:" + orderInfo);
         Runnable payRunnable = new Runnable() {
             @Override
             public void run() {
@@ -188,7 +184,6 @@ public class MainPresenter {
 
     @JavascriptInterface
     public void toMiniProgram(String programId, String path) {
-        Logger.e("toMiniProgram:programId-" + programId + "--path:" + path);
         if (!WX_API.isWXAppInstalled()) {
             Toast.makeText(mActivity, "请安装微信", Toast.LENGTH_SHORT).show();
             return;
@@ -218,7 +213,6 @@ public class MainPresenter {
     TokenResultListener mTokenResultListener = new TokenResultListener() {
         @Override
         public void onTokenSuccess(String json) {
-            Logger.e("onTokenSuccess:" + json);
             try {
                 JSONObject object = new JSONObject(json);
                 String code = object.getString("code");
@@ -231,7 +225,6 @@ public class MainPresenter {
 
         @Override
         public void onTokenFailed(String json) {
-            Logger.e("onTokenFailed:" + json);
             try {
                 JSONObject object = new JSONObject(json);
                 int code = Integer.valueOf(object.getString("code"));
@@ -290,7 +283,6 @@ public class MainPresenter {
                                 req.timeStamp = json.getString("timestamp");
                                 req.packageValue = json.getString("package");
                                 req.sign = json.getString("sign");
-                                Logger.e("req-json:" + mGson.toJson(req));
                                 WX_API.sendReq(req);
                             } else {
                                 Logger.e("返回错误" + json.getString("retmsg"));
@@ -307,16 +299,18 @@ public class MainPresenter {
                     AliPayResult payResult = new AliPayResult((Map<String, String>) msg.obj);
                     final String resultInfo = payResult.getResult();// 同步返回需要验证的信息
                     final String resultStatus = payResult.getResultStatus();
-                    if (resultStatus.equals("4000")) {
-                        Toast.makeText(mActivity, "未找到支付宝客户端", Toast.LENGTH_SHORT).show();
-                    } else {
-                        mActivity.runOnGLThread(new Runnable() {
-                            @Override
-                            public void run() {
-                                Cocos2dxJavascriptJavaBridge.evalString("PUBLIC.AliPayCallback('" + resultInfo + "','" + resultStatus + "')");
-                            }
-                        });
-                    }
+                    Logger.e("resultInfo:" + resultInfo);
+                    Logger.e("resultStatus:" + resultStatus);
+//                    if (resultStatus.equals("4000")) {
+//                        Toast.makeText(mActivity, "未找到支付宝客户端", Toast.LENGTH_SHORT).show();
+//                    } else {
+                    mActivity.runOnGLThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            Cocos2dxJavascriptJavaBridge.evalString("PUBLIC.AliPayCallback('" + resultInfo + "','" + resultStatus + "')");
+                        }
+                    });
+//                    }
 
 
                     break;