wenjuan.su 1 рік тому
батько
коміт
28209d8d70

+ 1 - 1
app/src/main/java/com/yihucha/hbyhc/presentation/mine/MyCommissionActivity.kt

@@ -134,7 +134,7 @@ class MyCommissionActivity :
134 134
                         return
135 135
                     }
136 136
                     try {
137
-                        val number = s!!.toInt()
137
+                        val number = s!!.toDouble()
138 138
                         val total = mViewBinding.tvIncomeYueValue.text.toString().toDouble()
139 139
                         if (number>total){
140 140
                             Toast.makeText(this@MyCommissionActivity,"输入数量超过余额!",Toast.LENGTH_LONG).show()

+ 23 - 0
app/src/main/java/com/yihucha/hbyhc/presentation/mine/model/WechatOpenIdBean.java

@@ -1,5 +1,7 @@
1 1
 package com.yihucha.hbyhc.presentation.mine.model;
2 2
 
3
+import com.google.gson.annotations.SerializedName;
4
+
3 5
 /**
4 6
  * @author qmzh
5 7
  * @date 2022/8/3
@@ -11,7 +13,28 @@ public class WechatOpenIdBean {
11 13
     private String openid;//微信用户唯一表示
12 14
     private String unionid;//是用户和应用所有者共同生成的唯一id
13 15
     private User user;
16
+    @SerializedName("nickname")
17
+    private String nickName ;
18
+    private String avater ;
19
+
20
+
21
+    public void  setNickname(String nickName){
22
+        this.nickName = nickName ;
14 23
 
24
+    }
25
+
26
+    public String getNickName() {
27
+        return nickName == null ? "" : nickName;
28
+    }
29
+
30
+    public void  setAvater(String avater){
31
+        this.avater = avater ;
32
+
33
+    }
34
+
35
+    public String getAvater() {
36
+        return avater == null ? "" : avater;
37
+    }
15 38
     public String getUnionid() {
16 39
         return unionid == null ? "" : unionid;
17 40
     }

+ 1 - 1
app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/activity/HBActivity.kt

@@ -91,7 +91,7 @@ class HBActivity : ViewBindingBaseActivity<ActivityHongbaoBinding>() {
91 91
                         return
92 92
                     }
93 93
                     try {
94
-                        val number = s!!.toInt()
94
+                        val number = s!!.toDouble()
95 95
                         val total = mViewBinding.tvValueVar.text.toString().toDouble()
96 96
                         if (number>total){
97 97
                             Toast.makeText(this@HBActivity,"输入数量超过余额!",Toast.LENGTH_LONG).show()

+ 14 - 0
app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/activity/SMQActivity.kt

@@ -9,7 +9,10 @@ import androidx.recyclerview.widget.GridLayoutManager
9 9
 import androidx.recyclerview.widget.LinearLayoutManager
10 10
 import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter
11 11
 import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout
12
+import com.tencent.mm.opensdk.modelbiz.WXOpenCustomerServiceChat
13
+import com.tencent.mm.opensdk.openapi.WXAPIFactory
12 14
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity
15
+import com.yihucha.hbyhc.config.Constants
13 16
 import com.yihucha.hbyhc.databinding.ActivitySmqBinding
14 17
 import com.yihucha.hbyhc.presentation.pyyx.PyyxTvListBean
15 18
 import com.yihucha.hbyhc.presentation.pyyx.adapter.LocalLIfeCenterAdapter
@@ -79,6 +82,17 @@ class SMQActivity : ViewBindingTitleBaseActivity<ActivitySmqBinding>() {
79 82
                     ShopManagerActivity.launch(this)
80 83
                 }
81 84
 
85
+                KingKongKey.GFKF -> {
86
+                    val appId = Constants.WX_APP_ID
87
+                    val wxapi = WXAPIFactory.createWXAPI(this, appId)
88
+                    if (wxapi.wxAppSupportAPI >= com.tencent.mm.opensdk.constants.Build.SUPPORT_OPEN_CUSTOMER_SERVICE_CHAT) {
89
+                        val req = WXOpenCustomerServiceChat.Req().apply {
90
+                            corpId = "wwaeb55681929a37ae" // Replace with your actual corpId
91
+                            url = "https://work.weixin.qq.com/kfid/kfcb5641d3744471601" // Replace with your actual URL
92
+                        }
93
+                        wxapi.sendReq(req)
94
+                    }
95
+                }
82 96
                 else -> {
83 97
                     Toast.makeText(this, "升级中", Toast.LENGTH_LONG).show()
84 98
                 }

+ 6 - 3
app/src/main/java/com/yihucha/hbyhc/wxapi/WXEntryActivity.java

@@ -213,7 +213,10 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
213 213
 //                    map.put("openid",code);
214 214
 //                    AuthService authService= NetworkApi.createService(AuthService.class);
215 215
                         Log.d(TAG, "wechat onSuccess: "+ wechatOpenIdBeanDataJavaResponse.getData());
216
-                        getWechatLogin(wechatOpenIdBeanDataJavaResponse.getData().getUnionid());
216
+                        String nickName = wechatOpenIdBeanDataJavaResponse.getData().getNickName();
217
+                        String avatar = wechatOpenIdBeanDataJavaResponse.getData().getAvater();
218
+                        getUpdateAccount(code,nickName,avatar);
219
+//                        getWechatLogin(wechatOpenIdBeanDataJavaResponse.getData().getUnionid());
217 220
                         finish();
218 221
                     }
219 222
                 } else {
@@ -286,7 +289,7 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
286 289
         map.put("nickname", nickname);
287 290
         map.put("avater", avater);
288 291
         AuthService authService = NetworkApi.createService(AuthService.class);
289
-        authService.getBandOpenid(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse>() {
292
+        authService.getUpdateAccount(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse>() {
290 293
             @Override
291 294
             public void onSuccess(DataResponse dataResponse) {
292 295
                 ShowLoadingDialog.hideLoadingDialog();
@@ -337,7 +340,7 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
337 340
                     activityList.add(LoginHomeActivity.class.getSimpleName());
338 341
                     ActivityStack.getScreenManager().finishArrayActivity(activityList);
339 342
                     finish();
340
-                    LogUtil.LogInfo("Code++", JSON.toJSONString(loginModelDataResponse));
343
+                    LogUtil.LogInfo("wechat Code++", JSON.toJSONString(loginModelDataResponse));
341 344
                 } else if (loginModelDataResponse.responseCode == 400) {
342 345
                     ToastUtils.showLong(loginModelDataResponse.responseError);
343 346
                     System.out.println(loginModelDataResponse.responseCode+"  5555555555555555  "+ loginModelDataResponse.responseError);