1 调整网络框架请求逻辑

YangShuai
1 parent cc38dcb6
Showing 6 changed files with 160 additions and 86 deletions
app/strike/build.gradle
app/strike/src/main/java/com/cnlive/strike/MyActivity.java
app/strike/src/main/res/layout/activity_my.xml
core/network/src/main/java/com/cnlive/core/network/NetBuilder.java
core/network/src/main/java/com/cnlive/core/network/interceptor/DESEncryptInterceptor.java
core/network/src/main/java/com/cnlive/core/network/interceptor/NetPPPayEncryptInterceptor.java
@@ -39,6 +39,10 @@ android {
     dexOptions {
         javaMaxHeapSize '4g'
     }
+
+    dataBinding {
+        enabled true
+    }
     buildTypes {
         debug {
             signingConfig signingConfigs.debugConfig
@@ -169,6 +173,7 @@ dependencies {
     implementation project(path: ':core:network')
     implementation project(path: ':core:base')
     implementation project(path: ':cloud:user')
+    implementation project(path: ':cloud:pay')
     implementation project(path: ':core:imageload')
     implementation project(path: ':module:xiaojiasoundbox')
@@ -3,29 +3,83 @@ package com.cnlive.strike;
 import android.content.Intent;
 import android.text.TextUtils;
+import android.view.View;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
+import com.cnlive.core.network.HttpConn;
+import com.cnlive.core.network.NetCallBack;
+import com.cnlive.core.network.model.BaseResult;
+import com.cnlive.libs.wjjpay.model.GroupBalanceInfo;
+import com.cnlive.libs.wjjpay.pay.WjjPay;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
+import com.cnlive.strike.databinding.ActivityMyBinding;
 import com.cnlive.strike.user.auth.UserService;
 import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.AllDeviceActivity;
+import com.cnlive.strike.xiaojiaspeaker.util.QMUITipDialogUtil;
 @Route(path = "/strick/MyActivity")
 public class MyActivity extends BaseActivity {
+    public ActivityMyBinding binding;
     @Override
-    protected int getViewLayoutId() {
+    protected int getBindLayoutId() {
         return R.layout.activity_my;
     }
     @Override
+    protected void initBindingData() {
+        super.initBindingData();
+        binding = (ActivityMyBinding) baseBinding;
+    }
+
+    @Override
     protected void initView() {
 //        getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyFragment()).commitAllowingStateLoss();
         initXiaoJiaSoundBoxData();
-        startActivity(new Intent(MyActivity.this, RunLineActivity.class));
-        finish();
+//        startActivity(new Intent(MyActivity.this, RunLineActivity.class));
+//        finish();
+        binding.btnChange.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+//                WjjPay.passwordIsExisting(UserService.getUid(me), new NetCallBack<BaseResult<GroupBalanceInfo>>() {
+//                    @Override
+//                    public void onRequestState(int state) {
+//
+//                    }
+//
+//                    @Override
+//                    public void onSuccess(BaseResult<GroupBalanceInfo> data) {
+//                        QMUITipDialogUtil.successDialog(me, data.getErrorCode() + "" + data.getData().getBalance(), 5);
+//                    }
+//
+//                    @Override
+//                    public void onFailure(String errCode, String errMsg) {
+//                        QMUITipDialogUtil.failedDialog(me, errMsg, 3);
+//                    }
+//                });
+                WjjPay.setPassword(UserService.getUid(me), "123456", new NetCallBack<BaseResult>() {
+                    @Override
+                    public void onRequestState(int state) {
+                        if (state == HttpConn.ON_START) {
+                            QMUITipDialogUtil.loadingDialog(me, "修改中", true);
+                        }
+                    }
+
+                    @Override
+                    public void onSuccess(BaseResult data) {
+                        QMUITipDialogUtil.successDialog(me, data.getMessage(), 5);
+                    }
+
+                    @Override
+                    public void onFailure(String errCode, String errMsg) {
+                        QMUITipDialogUtil.failedDialog(me, errMsg, 3);
+                    }
+                });
+            }
+        });
     }
     @Override
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.cnlive.strike.MyActivity">
+<layout>
-    <RelativeLayout
-        android:id="@+id/fragment_container"
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        tools:context="com.cnlive.strike.MyActivity">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="sfwerfwef" />
+        <RelativeLayout
+            android:id="@+id/fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="sfwerfwef" />
+
+            <Button
+                android:id="@+id/btn_change"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="修改支付密码" />
+        </RelativeLayout>
     </RelativeLayout>
-</RelativeLayout>
+</layout>
 \ No newline at end of file
 package com.cnlive.core.network;
+import com.cnlive.core.network.interceptor.NetPPEncryptInterceptor;
+import com.cnlive.core.network.interceptor.NetPPPayEncryptInterceptor;
 import com.cnlive.core.network.interceptor.SignEncryptInterceptor;
 import com.cnlive.core.network.request.HttpConfig;
@@ -65,6 +67,12 @@ public class NetBuilder&lt;NetService&gt; {
                 if (interceptor instanceof SignEncryptInterceptor) {
                     isAdd = true;
                     break;
+                } else if (interceptor instanceof NetPPEncryptInterceptor) {
+                    isAdd = true;
+                    break;
+                } else if (interceptor instanceof NetPPPayEncryptInterceptor) {
+                    isAdd = true;
+                    break;
                 }
             }
             if (!isAdd) {
 package com.cnlive.core.network.interceptor;
-import com.cnlive.core.network.util.SignUtil;
 import com.cnlive.core.libs.base.application.AppConfig;
+import com.cnlive.core.network.util.SignUtil;
 import com.cnlive.libs.encipher.CNLiveEncipher;
 import java.io.IOException;
@@ -6,99 +6,97 @@ import com.cnlive.core.network.util.SignUtil;
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 import okhttp3.FormBody;
-import okhttp3.HttpUrl;
 import okhttp3.Interceptor;
 import okhttp3.MultipartBody;
 import okhttp3.Request;
-import okhttp3.RequestBody;
 import okhttp3.Response;
 public class NetPPPayEncryptInterceptor implements Interceptor {
-    @Override
-    public Response intercept(Chain chain) throws IOException {
-        Request request = chain.request();
-
-        if (request.body() instanceof FormBody) {
-            //处理方式 1
-            Map<String, String> parameter = new HashMap<>();
-
-            FormBody body = ((FormBody) request.body());
-            FormBody.Builder builder = new FormBody.Builder();
+    public NetPPPayEncryptInterceptor() {
+    }
-            for (int i = 0; i < body.size(); i++) {
-                parameter.put(body.name(i), body.value(i));
+    public Response intercept(Chain var1) throws IOException {
+        Request var2 = var1.request();
+        Map.Entry var7;
+        FormBody.Builder var11;
+        Iterator var13;
+        FormBody var14;
+        Request var15;
+        if (var2.body() instanceof FormBody) {
+            HashMap var8 = new HashMap();
+            FormBody var9 = (FormBody)var2.body();
+            var11 = new FormBody.Builder();
+
+            for(int var16 = 0; var16 < var9.size(); ++var16) {
+                var8.put(var9.name(var16), var9.value(var16));
             }
-            for (Map.Entry<String, String> entity : SignUtil.getNetPPPaySignString(parameter).entrySet()) {
-                builder.addEncoded(entity.getKey(), entity.getValue());
-            }
+            var13 = SignUtil.getNetPPPaySignString(var8).entrySet().iterator();
-            RequestBody newBody = builder.build();
+            while(var13.hasNext()) {
+                var7 = (Map.Entry)var13.next();
+                var11.addEncoded((String)var7.getKey(), (String)var7.getValue());
+            }
-            Request newRequest = request.newBuilder()
-                    .method(request.method(), newBody)
-                    .url(request.url())
-                    .build();
-            return chain.proceed(newRequest);
-        } else if (request.body() instanceof MultipartBody) {
-            //处理方式 2 (暂时不签名)
+            var14 = var11.build();
+            var15 = var2.newBuilder().method(var2.method(), var14).url(var2.url()).build();
+            return var1.proceed(var15);
+        } else if (var2.body() instanceof MultipartBody) {
+            return var1.proceed(var2);
         } else {
-            if ("POST".equals(request.method())) {
-                //处理方式 3
-                HttpUrl.Builder authorizedUrlBuilder = request.url().newBuilder();
-
-                Map<String, String> parameter = new HashMap<>();
-
-                for (String key : request.url().queryParameterNames()) {
-                    parameter.put(key, request.url().queryParameter(key));
-                    authorizedUrlBuilder.removeAllQueryParameters(key);
+            okhttp3.HttpUrl.Builder var3;
+            HashMap var4;
+            Iterator var5;
+            String var6;
+            if ("POST".equals(var2.method())) {
+                var3 = var2.url().newBuilder();
+                var4 = new HashMap();
+                var5 = var2.url().queryParameterNames().iterator();
+
+                while(var5.hasNext()) {
+                    var6 = (String)var5.next();
+                    var4.put(var6, var2.url().queryParameter(var6));
+                    var3.removeAllQueryParameters(var6);
                 }
-                FormBody.Builder builder = new FormBody.Builder();
+                var11 = new FormBody.Builder();
+                var13 = SignUtil.getNetPPPaySignString(var4).entrySet().iterator();
-                for (Map.Entry<String, String> entity : SignUtil.getNetPPPaySignString(parameter).entrySet()) {
-                    builder.add(entity.getKey(), entity.getValue());
+                while(var13.hasNext()) {
+                    var7 = (Map.Entry)var13.next();
+                    var11.add((String)var7.getKey(), (String)var7.getValue());
                 }
-                RequestBody newBody = builder.build();
-
-                Request newRequest = request.newBuilder()
-                        .method(request.method(), newBody)
-                        .url(authorizedUrlBuilder.build())
-                        .build();
-                return chain.proceed(newRequest);
-            }else{
-                //处理方式 3
-                HttpUrl.Builder authorizedUrlBuilder = request.url().newBuilder();
-
-                Map<String, String> parameter = new HashMap<>();
-
-                for (String key : request.url().queryParameterNames()) {
-                    parameter.put(key, request.url().queryParameter(key));
-                    authorizedUrlBuilder.removeAllQueryParameters(key);
+                var14 = var11.build();
+                var15 = var2.newBuilder().method(var2.method(), var14).url(var3.build()).build();
+                return var1.proceed(var15);
+            } else {
+                var3 = var2.url().newBuilder();
+                var4 = new HashMap();
+                var5 = var2.url().queryParameterNames().iterator();
+
+                while(var5.hasNext()) {
+                    var6 = (String)var5.next();
+                    var4.put(var6, var2.url().queryParameter(var6));
+                    var3.removeAllQueryParameters(var6);
                 }
-                for (Map.Entry<String, String> entity : SignUtil.getNetPPPaySignString(parameter).entrySet()) {
-                    authorizedUrlBuilder.addQueryParameter(entity.getKey(), entity.getValue());
-                }
+                var5 = SignUtil.getNetPPPaySignString(var4).entrySet().iterator();
-                authorizedUrlBuilder.scheme(request.url().scheme());
-                authorizedUrlBuilder.host(request.url().host());
+                while(var5.hasNext()) {
+                    Map.Entry var12 = (Map.Entry)var5.next();
+                    var3.addQueryParameter((String)var12.getKey(), (String)var12.getValue());
+                }
-                Request newRequest = request.newBuilder()
-                        .method(request.method(), request.body())
-                        .url(authorizedUrlBuilder.build())
-                        .build();
-                return chain.proceed(newRequest);
+                var3.scheme(var2.url().scheme());
+                var3.host(var2.url().host());
+                Request var10 = var2.newBuilder().method(var2.method(), var2.body()).url(var3.build()).build();
+                return var1.proceed(var10);
             }
         }
-
-
-        return chain.proceed(request);
     }
-
-
 }
 \ No newline at end of file