4.2.0

.idea/misc.xml

@@ -1,6 +1,6 @@
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.hbc.hbc"
         minSdk 24
         targetSdk 33
-        versionCode 19
-        versionName "3.0.1"
+        versionCode 80
+        versionName "4.2.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

app/debug/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 19,
-      "versionName": "3.0.1",
+      "versionCode": 80,
+      "versionName": "4.2.0",
       "outputFile": "app-debug.apk"
     }
   ],

app/release/hbc.apk.cache/code-version

@@ -0,0 +1 @@
+13:1.4.7:cc60397faac154890c9f2f4683bb70b6:d9dc9d03a74a99507881eea4e96185e3

app/release/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 19,
-      "versionName": "3.0.1",
+      "versionCode": 80,
+      "versionName": "4.2.0",
       "outputFile": "app-release.apk"
     }
   ],

app/src/main/AndroidManifest.xml

@@ -102,6 +102,15 @@
             android:launchMode="singleTask"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
+        <activity
+            android:name="com.hbc.hbc.wxapi.WXPayEntryActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:exported="true"
+            android:label="@string/application_name"
+            android:taskAffinity="@string/package_name"
+            android:launchMode="singleTop"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+
         <activity
             android:name="com.tencent.tauth.AuthActivity"
             android:noHistory="true"

app/src/main/assets/sources/static/js/elastiStack1.js

@@ -307,17 +307,15 @@ function RequestAlipay(OrderInfo, SuccessUrl, FailUrl) {
     Func.Alipay(row);
 }
 
-function RequestWechatPay(data) {
-    if (isWeChat) {
-        var wechat = JSON.parse(data);
-        WeChatPay(wechat, "29");
-    } else if (isWeb) {
-        window.location.href = WebHost + 'Web/Pay/Wap?OrderNo=' + data + "&Kind=2";
-    } else if (isAndroid) {
-        Func.WechatPay(data);
-    } else if (isIOS) {
-        window.webkit.messageHandlers.WechatPay.postMessage(JSON.parse(data));
-    }
+function RequestWechatPay(OrderInfo, SuccessUrl, FailUrl) {
+    SuccessUrl = UrlTransfer(SuccessUrl);
+    FailUrl = UrlTransfer(FailUrl);
+    var row = "{";
+    row += "\"OrderInfo\":" + OrderInfo + ",";
+    row += "\"SuccessUrl\":\"" + SuccessUrl + "\",";
+    row += "\"FailUrl\":\"" + FailUrl + "\"";
+    row += "}";
+    Func.WeChatPay(row);
 }
 
 function PhoneCall(Phone) {

app/src/main/java/com/hbc/hbc/activity/SplashActivity.java

@@ -402,13 +402,6 @@ public class SplashActivity extends ParentActivity {
             Utils.putCookieInfo(SplashActivity.this, getString(R.string.application_name), MainApplication.MainApp.VERSION_NAME, newVersionName);
         }
 
-        String toPath = getExternalFilesDir(null).getPath() + "/Web/";
-        Utils.deleteDirWithFile(new File(toPath));
-        Utils.clearCookie(SplashActivity.this, getString(R.string.application_name));
-        Utils.clearCookie(SplashActivity.this, getString(R.string.app_template));
-        Utils.copyAssetsFiles(SplashActivity.this, "sources", toPath);
-        Utils.putCookieInfo(SplashActivity.this, getString(R.string.application_name), MainApplication.MainApp.VERSION_NAME, newVersionName);
-
     }
 
     /**

app/src/main/java/com/hbc/hbc/function/WebFragmentFunction.java

@@ -21,6 +21,7 @@ import com.hbc.hbc.utils.AliPayUtil;
 import com.hbc.hbc.utils.CameraUtils;
 import com.hbc.hbc.utils.QQShareUtils;
 import com.hbc.hbc.utils.WXShareUtils;
+import com.hbc.hbc.utils.WeChatPayUtils;
 import com.hjq.toast.Toaster;
 import com.lxj.xpopup.XPopup;
 import com.lxj.xpopup.interfaces.OnCancelListener;
@@ -477,6 +478,14 @@ public class WebFragmentFunction extends BaseFunction {
         AliPayUtil.aliPay(context, obj);
     }
 
+    /**
+     * 微信支付
+     */
+    @JavascriptInterface
+    public void WeChatPay(String obj) {
+        WeChatPayUtils.weChatPay(context, obj);
+    }
+
     /**
      * 二维码条形码扫码
      */

app/src/main/java/com/hbc/hbc/function/WebFunction.java

@@ -19,6 +19,7 @@ import com.hbc.hbc.utils.JsonUtils;
 import com.hbc.hbc.utils.QQShareUtils;
 import com.hbc.hbc.utils.Utils;
 import com.hbc.hbc.utils.WXShareUtils;
+import com.hbc.hbc.utils.WeChatPayUtils;
 import com.hbc.hbc.utils.WebUtils;
 import com.hbc.hbc.R;
 import com.hbc.hbc.activity.MainActivity;
@@ -572,6 +573,14 @@ public class WebFunction extends BaseFunction {
         AliPayUtil.aliPay(context, obj);
     }
 
+    /**
+     * 微信支付
+     */
+    @JavascriptInterface
+    public void WeChatPay(String obj) {
+        WeChatPayUtils.weChatPay(context, obj);
+    }
+
     /**
      * 拨打电话
      */

app/src/main/java/com/hbc/hbc/utils/AliPayUtil.java

@@ -11,6 +11,7 @@ import android.text.TextUtils;
 
 import com.alipay.sdk.app.PayTask;
 import com.hbc.hbc.R;
+import com.hbc.hbc.app.MainApplication;
 import com.hbc.hbc.manager.ThreadPoolManager;
 
 import org.json.JSONException;
@@ -43,22 +44,24 @@ public class AliPayUtil {
 
                     String callbackSuccess = (String) Utils.getCookieInfo(context, context.getString(R.string.userdata), "callbackSuccess", Utils.Type.String);
                     String callbackFail = (String) Utils.getCookieInfo(context, context.getString(R.string.userdata), "callbackFail", Utils.Type.String);
-                    Intent intent = new Intent();
-                    Bundle bundle = new Bundle();
-                    intent.setClass(context, context.getClass());
                     // 同步返回需要验证的信息
                     String resultInfo = payResult.getResult();
-                    if (TextUtils.equals(resultStatus, "9000")) {
-                        bundle.putString("Url", callbackSuccess);
-                        intent.putExtras(bundle);
-                        context.startActivity(intent);
-                    } else {
-                        if (!"".equals(callbackFail)) {
-                            bundle.putString("Url", callbackFail);
-                            intent.putExtras(bundle);
-                            context.startActivity(intent);
-                        }
+
+                    if(!(context instanceof Activity)){
+                        return;
                     }
+                    Activity activity = (Activity) context;
+                    activity.runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (TextUtils.equals(resultStatus, "9000")) {
+                                WebUtils.doWebJs(MainApplication.MainApp.publicWebUrl, callbackSuccess + "()");
+                            } else {
+                                WebUtils.doWebJs(MainApplication.MainApp.publicWebUrl, callbackFail + "()");
+                            }
+                        }
+                    });
+
                 }
             }
         };

app/src/main/java/com/hbc/hbc/utils/WeChatPayUtils.java

@@ -0,0 +1,64 @@
+package com.hbc.hbc.utils;
+
+import android.content.Context;
+
+import com.hbc.hbc.R;
+import com.tencent.mm.opensdk.modelpay.PayReq;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * @author Bei
+ * @date 2025/1/23
+ */
+public class WeChatPayUtils {
+
+    public static void weChatPay(Context context, String obj) {
+
+        String orderInfo = "";
+        String partnerId = "";
+        String prepayId = "";
+        String packageValue = "";
+        String nonceStr = "";
+        String timeStamp = "";
+        String sign = "";
+        try {
+            JSONObject json = new JSONObject(obj);
+            orderInfo = JsonUtils.getString(json, "OrderInfo");
+            String successUrl = JsonUtils.getString(json, "SuccessUrl");
+            String failUrl = JsonUtils.getString(json, "FailUrl");
+
+            Utils.putCookieInfo(context, context.getString(R.string.userdata), "callbackSuccess", successUrl);
+            Utils.putCookieInfo(context, context.getString(R.string.userdata), "callbackFail", failUrl);
+
+            JSONObject jsonObject = new JSONObject(orderInfo);
+            partnerId = JsonUtils.getString(jsonObject,"partnerId");
+            prepayId = JsonUtils.getString(jsonObject,"prepayId");
+//            packageValue = JsonUtils.getString(jsonObject,"packageValue");
+            nonceStr = JsonUtils.getString(jsonObject,"nonceStr");
+            timeStamp = JsonUtils.getString(jsonObject,"timeStamp");
+            sign = JsonUtils.getString(jsonObject,"sign");
+
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        IWXAPI api = WXAPIFactory.createWXAPI(context, context.getResources().getString(R.string.wx_app_id), true);
+        api.registerApp(context.getResources().getString(R.string.wx_app_id));
+
+        PayReq request = new PayReq();
+        request.appId = context.getResources().getString(R.string.wx_app_id);
+        request.partnerId = partnerId;
+        request.prepayId = prepayId;
+        request.packageValue = "Sign=WXPay";
+        request.nonceStr = nonceStr;
+        request.timeStamp = timeStamp;
+        request.sign = sign;
+        api.sendReq(request);
+
+    }
+
+}

app/src/main/java/com/hbc/hbc/wxapi/WXPayEntryActivity.java

@@ -0,0 +1,68 @@
+package com.hbc.hbc.wxapi;
+
+import android.app.Activity;
+
+import com.hbc.hbc.R;
+import com.hbc.hbc.app.MainApplication;
+import com.hbc.hbc.utils.Utils;
+import com.hbc.hbc.utils.WebUtils;
+import com.orhanobut.logger.Logger;
+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.openapi.IWXAPIEventHandler;
+
+/**
+ * @author Bei
+ * @date 2025/1/24
+ */
+public class WXPayEntryActivity extends Activity implements IWXAPIEventHandler {
+    @Override
+    public void onReq(BaseReq baseReq) {
+    }
+
+    @Override
+    public void onResp(BaseResp baseResp) {
+
+       if (baseResp.getType() == ConstantsAPI.COMMAND_PAY_BY_WX) {
+
+            String callbackSuccess = (String) Utils.getCookieInfo(this, getString(R.string.userdata), "callbackSuccess", Utils.Type.String);
+            String callbackFail = (String) Utils.getCookieInfo(this, getString(R.string.userdata), "callbackFail", Utils.Type.String);
+            String result;
+            switch (baseResp.errCode) {
+                case BaseResp.ErrCode.ERR_OK:
+                    result = "支付成功";
+                    Logger.d(result);
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            WebUtils.doWebJs(MainApplication.MainApp.publicWebUrl, callbackSuccess + "()");
+                        }
+                    });
+                    break;
+                case BaseResp.ErrCode.ERR_COMM:
+                    result = "支付失败";
+                    Logger.d(result);
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            WebUtils.doWebJs(MainApplication.MainApp.publicWebUrl, callbackFail + "()");
+                        }
+                    });
+                    break;
+                case BaseResp.ErrCode.ERR_USER_CANCEL:
+                    result = "支付取消";
+                    Logger.d(result);
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            WebUtils.doWebJs(MainApplication.MainApp.publicWebUrl, callbackFail + "()");
+                        }
+                    });
+                    break;
+                default:
+            }
+        }
+
+    }
+}

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

@@ -22,7 +22,7 @@
     <string name="local_page_info" translatable="false">PageInfoList</string>
     <string name="local_lib_file" translatable="false">LibFile</string>
 
-    <string name="wx_app_id" translatable="false">wxa558a494301cd27e</string>
+    <string name="wx_app_id" translatable="false">wx7333dbccace4e0dd</string>
     <string name="wx_app_secret" translatable="false">6dccae664d4b4f03a62285a34b891824</string>
 
     <string name="qq_app_id" translatable="false">1106410049</string>