Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/newModuleStrike

YangShuai
2 parents 127dc63d cb7ee015
Showing 86 changed files with 3152 additions and 106 deletions
app/strike/build.gradle
app/strike/src/main/AndroidManifest.xml
app/strike/src/main/java/com/cnlive/strike/demo/activity/DemoMvpActivity.java
app/strike/src/main/java/com/cnlive/strike/demo/activity/HappyChinaActivity.java
app/strike/src/main/res/layout/activity_demo_mvp_main.xml
app/strike/src/main/res/layout/activity_happy_china.xml
app/strike/src/main/res/values/strings.xml
build.gradle
cloud/app_pay/.gitignore
cloud/app_pay/build.gradle
cloud/app_pay/consumer-rules.pro
cloud/app_pay/libs/UPPayAssistEx.jar
cloud/app_pay/libs/UPPayPluginExPro.jar
cloud/app_pay/libs/alipaySdk-20180601.jar
cloud/app_pay/proguard-rules.pro
cloud/app_pay/src/androidTest/java/com/cnlive/strike/pay/ExampleInstrumentedTest.java
cloud/app_pay/src/main/AndroidManifest.xml
cloud/app_pay/src/main/assets/data.bin
cloud/app_pay/src/main/java/com/cnlive/strike/pay/IPay.java
cloud/app_pay/src/main/java/com/cnlive/strike/pay/PayStatusCallback.java
@@ -179,6 +179,7 @@ dependencies {
     implementation project(path: ':core:imageload')
     implementation project(path: ':module:xiaojiasoundbox')
     implementation project(path: ':module:pedometer')
+    implementation project(path: ':module:shopcity')
 //    implementation project(path: ':module:shanghaishop')
     implementation project(path: ':library_baidumap')
     implementation 'com.jakewharton.rxbinding3:rxbinding:3.1.0'
@@ -17,6 +17,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+        <activity android:name="com.cnlive.strike.demo.activity.HappyChinaActivity"></activity>
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
@@ -44,7 +46,6 @@
         <activity android:name="com.cnlive.strike.demo.activity.DemoActivity" />
         <activity android:name="com.cnlive.strike.imgutil.ImgActivity" />
         <activity android:name="com.cnlive.strike.MainActivity">
-
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -8,13 +8,13 @@ import android.text.TextUtils;
 import android.view.View;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.databinding.ViewDataBinding;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cnlive.cloud.R;
 import com.cnlive.cloud.databinding.ActivityDemoMvpMainBinding;
 import com.cnlive.cloud.user.auth.UserService;
+import com.cnlive.cloud.user.ui.activity.BindPhoneMangerActivity;
 import com.cnlive.cloud.user.ui.activity.FirstLoginActivity;
 import com.cnlive.cloud.user.ui.activity.LoginActivity;
 import com.cnlive.cloud.user.ui.activity.LoginDialogActivity;
@@ -29,15 +29,16 @@ import com.cnlive.core.libs.base.util.AlertUtil;
 import com.cnlive.core.libs.base.util.OpenServiceHelpUtil;
 import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
 import com.cnlive.core.libs.base.util.StatusBarConfig;
+import com.cnlive.core.libs.base.util.ToastUtil;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.request.BaseRequest;
+import com.cnlive.module.shop.ui.activity.ShopHomeActivity;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
 import com.cnlive.strike.demo.activity.presenter.DemoActivityPresenter;
 import com.cnlive.strike.demo.activity.view.DemoActivityView;
-import com.cnlive.strike.demo.exoplayer.demo.PlayerActivity;
 import com.cnlive.strike.demo.exoplayer.demo.SampleChooserActivity;
 import com.cnlive.strike.network.api.ApiService;
 import com.cnlive.strike.network.api.ApiTimeService;
@@ -87,6 +88,10 @@ public class DemoMvpActivity extends BaseActivity&lt;DemoActivityView, DemoActivity
                 overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
             }
         });
+
+        //绑定管理
+        binding.btnLoginBingding.setOnClickListener(view -> BindPhoneMangerActivity.startActivity(DemoMvpActivity.this));
+
         //新用户头像设置
         binding.btnNewUserFace.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -145,6 +150,13 @@ public class DemoMvpActivity extends BaseActivity&lt;DemoActivityView, DemoActivity
 //                        UserService.getInstance(me).getAppAccount().getFaceUrl());
             }
         });
+
+        //二部电商首页
+        binding.btnShopcity.setOnClickListener(view -> {
+            AlertUtil.showDeftToast(DemoMvpActivity.this,"商城部分版本待升级适配");
+//            startActivity(new Intent(DemoMvpActivity.this, ShopHomeActivity.class));
+            });
+
         //获取Handler,onDestory自动解除
         binding.btnHandler.setOnClickListener(new View.OnClickListener() {
             @Override
+package com.cnlive.strike.demo.activity;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.graphics.Color;
+import android.os.Bundle;
+
+import com.cnlive.cloud.R;
+import com.cnlive.core.libs.base.util.StatusBarUtil;
+import com.cnlive.module.common.utils.SystemBarUtils;
+import com.cnlive.strike.happychina.event.HappyChinaColorChangeEvent;
+import com.cnlive.strike.happychina.ui.fragment.HappyChinaFragment;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+public class HappyChinaActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_happy_china);
+        SystemBarUtils.setStatusBarColor(this, Color.WHITE);
+        StatusBarUtil.setStatusBarWrite(this);
+        EventBus.getDefault().register(this);
+
+        getSupportFragmentManager().beginTransaction().replace(R.id.mFrameLayout, HappyChinaFragment.newInstance(false)).commit();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onHappyChinaColorChange(HappyChinaColorChangeEvent event) {
+        // 字段说明：
+        // backgroundColor：背景颜色，可能为null
+        // statusBarMode：状态栏文字颜色，可能为null
+        // selectedTextColor：选中的文字颜色，可能为null
+        // otherTextColor：未选中的文字颜色，可能为null
+    }
+}
@@ -30,6 +30,12 @@
                     android:text="登录对话框" />
                 <Button
+                    android:id="@+id/btn_login_bingding"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="账号三方绑定管理"/>
+
+                <Button
                     android:id="@+id/btn_new_user_face"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -65,6 +71,13 @@
                     android:text="路径工具" />
                 <Button
+                    android:id="@+id/btn_shopcity"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dp"
+                    android:text="二部商城首页" />
+
+                <Button
                     android:id="@+id/btn_handler"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/mFrameLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"/>
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2016 The Android Open Source Project
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,62 +14,62 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="application_name">ExoPlayer</string>
+    <string name="application_name">ExoPlayer</string>
-  <string name="track_selection_title">Select tracks</string>
+    <string name="track_selection_title">Select tracks</string>
-  <string name="unexpected_intent_action">Unexpected intent action: <xliff:g id="action">%1$s</xliff:g></string>
+    <string name="unexpected_intent_action">Unexpected intent action: <xliff:g id="action">%1$s</xliff:g></string>
-  <string name="error_cleartext_not_permitted">Cleartext traffic not permitted</string>
+    <string name="error_cleartext_not_permitted">Cleartext traffic not permitted</string>
-  <string name="error_generic">Playback failed</string>
+    <string name="error_generic">Playback failed</string>
-  <string name="error_unrecognized_abr_algorithm">Unrecognized ABR algorithm</string>
+    <string name="error_unrecognized_abr_algorithm">Unrecognized ABR algorithm</string>
-  <string name="error_unrecognized_stereo_mode">Unrecognized stereo mode</string>
+    <string name="error_unrecognized_stereo_mode">Unrecognized stereo mode</string>
-  <string name="error_drm_unsupported_before_api_18">Protected content not supported on API levels below 18</string>
+    <string name="error_drm_unsupported_before_api_18">Protected content not supported on API levels below 18</string>
-  <string name="error_drm_unsupported_scheme">This device does not support the required DRM scheme</string>
+    <string name="error_drm_unsupported_scheme">This device does not support the required DRM scheme</string>
-  <string name="error_drm_unknown">An unknown DRM error occurred</string>
+    <string name="error_drm_unknown">An unknown DRM error occurred</string>
-  <string name="error_no_decoder">This device does not provide a decoder for <xliff:g id="mime_type">%1$s</xliff:g></string>
+    <string name="error_no_decoder">This device does not provide a decoder for <xliff:g id="mime_type">%1$s</xliff:g></string>
-  <string name="error_no_secure_decoder">This device does not provide a secure decoder for <xliff:g id="mime_type">%1$s</xliff:g></string>
+    <string name="error_no_secure_decoder">This device does not provide a secure decoder for <xliff:g id="mime_type">%1$s</xliff:g></string>
-  <string name="error_querying_decoders">Unable to query device decoders</string>
+    <string name="error_querying_decoders">Unable to query device decoders</string>
-  <string name="error_instantiating_decoder">Unable to instantiate decoder <xliff:g id="decoder_name">%1$s</xliff:g></string>
+    <string name="error_instantiating_decoder">Unable to instantiate decoder <xliff:g id="decoder_name">%1$s</xliff:g></string>
-  <string name="error_unsupported_video">Media includes video tracks, but none are playable by this device</string>
+    <string name="error_unsupported_video">Media includes video tracks, but none are playable by this device</string>
-  <string name="error_unsupported_audio">Media includes audio tracks, but none are playable by this device</string>
+    <string name="error_unsupported_audio">Media includes audio tracks, but none are playable by this device</string>
-  <string name="storage_permission_denied">Permission to access storage was denied</string>
+    <string name="storage_permission_denied">Permission to access storage was denied</string>
-  <string name="sample_list_load_error">One or more sample lists failed to load</string>
+    <string name="sample_list_load_error">One or more sample lists failed to load</string>
-  <string name="ima_not_loaded">Playing sample without ads, as the IMA extension was not loaded</string>
+    <string name="ima_not_loaded">Playing sample without ads, as the IMA extension was not loaded</string>
-  <string name="unsupported_ads_in_concatenation">Playing sample without ads, as ads are not supported in concatenations</string>
+    <string name="unsupported_ads_in_concatenation">Playing sample without ads, as ads are not supported in concatenations</string>
-  <string name="download_start_error">Failed to start download</string>
+    <string name="download_start_error">Failed to start download</string>
-  <string name="download_playlist_unsupported">This demo app does not support downloading playlists</string>
+    <string name="download_playlist_unsupported">This demo app does not support downloading playlists</string>
-  <string name="download_drm_unsupported">This demo app does not support downloading protected content</string>
+    <string name="download_drm_unsupported">This demo app does not support downloading protected content</string>
-  <string name="download_scheme_unsupported">This demo app only supports downloading http streams</string>
+    <string name="download_scheme_unsupported">This demo app only supports downloading http streams</string>
-  <string name="download_live_unsupported">This demo app does not support downloading live content</string>
+    <string name="download_live_unsupported">This demo app does not support downloading live content</string>
-  <string name="download_ads_unsupported">IMA does not support offline ads</string>
+    <string name="download_ads_unsupported">IMA does not support offline ads</string>
-  <string name="prefer_extension_decoders">Prefer extension decoders</string>
+    <string name="prefer_extension_decoders">Prefer extension decoders</string>
-  <string name="random_abr">Enable random ABR</string>
+    <string name="random_abr">Enable random ABR</string>
-  <string name="tunneling">Request multimedia tunneling</string>
+    <string name="tunneling">Request multimedia tunneling</string>
 </resources>
@@ -139,7 +139,15 @@ allprojects {
             url 'http://android.nexus.cnlive.com/repository/cnlive-shop/'
             credentials { username = 'shop'; password = 'ShangHa1' }
         }
-        //------------------ 资源库配置 END------------------
+
+        // 技术2部仓库地址
+        maven {
+            url 'http://wjjshop.cnlive.com:9188/repository/cnlive-modules/'
+            credentials { username = "cnlive-android"; password = "cnlive123" }
+        }
+
+        maven { url 'https://dl.bintray.com/granzon/cnliveLibs' }// 技术2部幸福中国依赖
+        //------------------ 资源库配置 recyclerviewAnimatorsEND------------------
         maven { url 'https://dl.bintray.com/umsdk/release' }
         //关联微博
         maven { url "https://dl.bintray.com/thelasterstar/maven/" }
@@ -183,4 +191,14 @@ ext {
     //七牛
     qiniuAndroidSdk = '7.3.11'
     libUpload = '2.0.6'
+    circleimageview = '3.0.1'
+    libMenu = '1.0.8'
+    appArch = '1.2.8'
+    imsdk = '3.3.2.14394.14395'
+    recyclerviewAnimators = '2.2.6'
+
+    //视讯云相关
+    libCnUtil = '3.1.5'
 }
+
+
+/build
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 29
+    buildToolsVersion "29.0.2"
+
+
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion 29
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    //视讯云SDK
+    implementation "com.cnlive:lib_cnutil:$rootProject.libCnUtil"
+    implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:5.3.1'
+    implementation files('libs/alipaySdk-20180601.jar')
+    implementation files('libs/UPPayAssistEx.jar')
+}
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+package com.cnlive.strike.pay;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+
+        assertEquals("com.cnlive.strike.pay.test", appContext.getPackageName());
+    }
+}
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.cnlive.strike.pay">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+    <!--union pay permission start-->
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.NFC" />
+
+    <uses-feature android:name="android.hardware.nfc.hce" />
+    <uses-permission android:name="org.simalliance.openmobileapi.SMARTCARD" />
+    <!--union pay permission end-->
+
+    <application>
+
+        <!--支付宝支付 -->
+        <activity
+            android:name="com.alipay.sdk.app.H5PayActivity"
+            android:screenOrientation="portrait" />
+
+
+        <!--union pay start-->
+        <uses-library
+            android:name="org.simalliance.openmobileapi"
+            android:required="false" />
+
+        <activity
+            android:name="com.unionpay.uppay.PayActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:excludeFromRecents="true"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
+
+        <activity
+            android:name="com.unionpay.UPPayWapActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
+        <!--union pay end-->
+
+    </application>
+
+</manifest>
 \ No newline at end of file
+package com.cnlive.strike.pay;
+
+/**
+ * Created by gujun on 2017/5/2.
+ */
+
+public interface IPay {
+    int PAY_TYPE_ALI = 3;
+    int PAY_TYPE_WX = 1;
+    int PAY_TYPE_UNION = 9;
+
+    int ERR_WX_UNKNOWN = 0;
+    int ERR_WX_COMM = -1;
+    int ERR_WX_USER_CANCEL = -2;
+    int ERR_WX_SENT_FAILED = -3;
+    int ERR_WX_AUTH_DENIED = -4;
+    int ERR_WX_UNSUPPORT = -5;
+    int ERR_WX_NOT_INSTALLED = -6;
+
+    String ERR_MSG_WX_UNKNOWN = "未知错误";
+    String ERR_MSG_WX_COMM = "支付失败，可能的原因：签名错误、未注册APPID、项目设置APPID不正确、注册的APPID与设置的不匹配、其他异常等。";
+    String ERR_MSG_WX_USER_CANCEL = "用户取消，无需处理。发生场景：用户不支付了，点击取消，返回APP。";
+    String ERR_MSG_WX_SENT_FAILED = "发送失败";
+    String ERR_MSG_WX_AUTH_DENIED = "鉴权失败";
+    String ERR_MSG_WX_UNSUPPORT = "不支持错误";
+    String ERR_MSG_WX_NOT_INSTALLED = "未发现微信客户端";
+
+    int ERR_ALI_RESULT_DOING = -10;
+    int ERR_ALI_FAIL = -11;
+    int ERR_ALI_CANCEL = -12;
+    int ERR_ALI_NET = -13;
+    int ERR_ALI_UNKNOWN = -14;
+    int ERR_ALI_OTHER = -15;
+
+    String ERR_MSG_ALI_RESULT_DOING = "正在处理中，支付结果未知（有可能已经支付成功），请查询商户订单列表中订单的支付状态";
+    String ERR_MSG_ALI_FAIL = "订单支付失败";
+    String ERR_MSG_ALI_CANCEL = "用户中途取消";
+    String ERR_MSG_ALI_NET = "网络连接出错";
+    String ERR_MSG_ALI_UNKNOWN = "支付结果未知（有可能已经支付成功），请查询商户订单列表中订单的支付状态";
+    String ERR_MSG_ALI_OTHER = " 其它支付错误";
+
+    int ERR_UNION_FAIL = -31;
+    int ERR_UNION_CANCEL = -32;
+    String ERR_MSG_UNION_FAIL = "订单支付失败";
+    String ERR_MSG_UNION_CANCEL = "用户中途取消";
+    String ERR_MSG_UNION_PAY_DATA_NULL = "银联支付回调的data异常";
+
+    int ERR_UNSUPPORT = -20;
+    int ERR_PREPAY = -21;
+    int ERR_PREPAY_RESULT = -22;
+    int ERR_PREPAY_NET = -23;
+
+    String ERR_MSG_UNSUPPORT = "暂不支持此支付方式";
+    String ERR_MSG_PREPAY = "预支付接口请求失败";
+    String ERR_MSG_PREPAY_RESULT = "预支付接口返回错误信息";
+    String ERR_MSG_PREPAY_NET = "网络连接出错";
+
+    String PROBE_WX = "weixin";
+    String PROBE_ALI = "ali";
+    String PROBE_UNION = "union";
+    String PROBE_PAY_STATE_SUCCESS = "success";
+    String PROBE_PAY_STATE_FAIL = "fail";
+    String PROBE_PAY_STATE_CANCEL = "cancel";
+
+}
+package com.cnlive.strike.pay;
+
+/**
+ * Created by gujun on 2017/5/2.
+ * 支付sdk回调
+ */
+
+public interface PayStatusCallback {
+    void onStartCallPayPage(int payType);
+
+    void onSuccess(int payType);
+
+    void onFail(int payType, int errorCode, String errorMsg);
+}
+package com.cnlive.strike.pay;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.os.Handler;
+import android.os.Message;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.alipay.sdk.app.PayTask;
+import com.cnlive.strike.pay.model.AliPayResult;
+import com.cnlive.strike.pay.model.PayCloudResponse;
+import com.cnlive.strike.pay.model.Result;
+
+/**
+ * Created by gujun on 2017/5/2.
+ */
+public class PayToALi {
+    private static final String TAG = "PayToALi";
+
+    private static final int SDK_PAY_FLAG = 1;
+
+    public static void startPay(final Activity activity, final PayCloudResponse payCloudResponse, final String appOrderId) {
+
+        PayStatusCallback payStatusCallback = PayUtil.getPayCallback(appOrderId);
+
+        if (payCloudResponse == null || payCloudResponse.getData() == null || TextUtils.isEmpty(payCloudResponse.getData().getAlipay_app())) {
+            if (payStatusCallback != null)
+                payStatusCallback.onFail(IPay.PAY_TYPE_ALI, IPay.ERR_PREPAY_RESULT, IPay.ERR_MSG_PREPAY_RESULT + payCloudResponse.toString());
+
+            PayUtil.probeApp(appOrderId, IPay.PAY_TYPE_ALI, IPay.PROBE_PAY_STATE_FAIL);
+            return;
+        }
+
+        if (payStatusCallback != null)
+            payStatusCallback.onStartCallPayPage(IPay.PAY_TYPE_ALI);
+
+        try {
+            //签名拼接支付信息操作交由后台
+            Log.d(TAG, "ExternalPartner start pay ");
+
+            // start the pay.
+            Runnable payRunnable = new Runnable() {
+                @Override
+                public void run() {
+                    PayTask alipay = new PayTask(activity);
+                    String result = alipay.pay(payCloudResponse.getData().getAlipay_app(), true);
+
+                    Message msg = new Message();
+                    msg.what = SDK_PAY_FLAG;
+                    msg.obj = new AliPayResult(appOrderId, result);
+                    alipayHandler.sendMessage(msg);
+                }
+            };
+
+            Thread payThread = new Thread(payRunnable);
+            payThread.start();
+
+        } catch (Exception ex) {
+
+            if (payStatusCallback != null)
+                payStatusCallback.onFail(IPay.PAY_TYPE_ALI, IPay.ERR_ALI_OTHER, IPay.ERR_MSG_ALI_OTHER + (ex != null ? ex.getMessage() : "调用支付宝支付方法异常"));
+            PayUtil.probeApp(appOrderId, IPay.PAY_TYPE_ALI, IPay.PROBE_PAY_STATE_FAIL);
+            if (ex!=null)
+            Log.e(TAG, "alipay error".concat(ex.getMessage()), ex);
+        }
+
+    }
+
+    // ============================================================================================
+    // 支付宝不用动的
+    // ============================================================================================
+    @SuppressLint("HandlerLeak")
+    private static Handler alipayHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case SDK_PAY_FLAG:
+                    AliPayResult aliPayResult = (AliPayResult) msg.obj;
+                    String orderId = aliPayResult.getOrderId();
+
+                    Result resultObj = new Result(aliPayResult.getResult());
+                    String resultStatus = resultObj.resultStatus;
+
+                    PayStatusCallback payStatusCallback = PayUtil.getPayCallback(orderId);
+
+                    // 判断resultStatus 为“9000”则代表支付成功，具体状态码代表含义可参考接口文档
+                    if (resultStatus.equals("9000")) {
+                        if (payStatusCallback != null)
+                            payStatusCallback.onSuccess(IPay.PAY_TYPE_ALI);
+                        PayUtil.probeApp(orderId, IPay.PAY_TYPE_ALI, IPay.PROBE_PAY_STATE_SUCCESS);
+                    } else {
+                        if (resultStatus.equals("8000")) {
+                            //正在处理中，支付结果未知（有可能已经支付成功），请查询商户订单列表中订单的支付状态
+                            if (payStatusCallback != null)
+                                payStatusCallback.onFail(IPay.PAY_TYPE_ALI, IPay.ERR_ALI_RESULT_DOING, IPay.ERR_MSG_ALI_RESULT_DOING);
+                            PayUtil.probeApp(orderId, IPay.PAY_TYPE_ALI, IPay.PROBE_PAY_STATE_FAIL);
+                        } else if (resultStatus.equals("4000")) {
+                            //订单支付失败
+                            if (payStatusCallback != null)
+                                payStatusCallback.onFail(IPay.PAY_TYPE_ALI, IPay.ERR_ALI_FAIL, IPay.ERR_MSG_ALI_FAIL);
+                            PayUtil.probeApp(orderId, IPay.PAY_TYPE_ALI, IPay.PROBE_PAY_STATE_FAIL);
+                        } else if (resultStatus.equals("6001")) {
+                            //用户中途取消
+                            if (payStatusCallback != null)
+                                payStatusCallback.onFail(IPay.PAY_TYPE_ALI, IPay.ERR_ALI_CANCEL, IPay.ERR_MSG_ALI_CANCEL);
+                            PayUtil.probeApp(orderId, IPay.PAY_TYPE_ALI, IPay.PROBE_PAY_STATE_CANCEL);
+                        } else if (resultStatus.equals("6002")) {
+                            //网络连接出错
+                            if (payStatusCallback != null)
+                                payStatusCallback.onFail(IPay.PAY_TYPE_ALI, IPay.ERR_ALI_NET, IPay.ERR_MSG_ALI_NET);
+                            PayUtil.probeApp(orderId, IPay.PAY_TYPE_ALI, IPay.PROBE_PAY_STATE_FAIL);
+                        } else if (resultStatus.equals("6004")) {
+                            //支付结果未知（有可能已经支付成功），请查询商户订单列表中订单的支付状态
+                            if (payStatusCallback != null)
+                                payStatusCallback.onFail(IPay.PAY_TYPE_ALI, IPay.ERR_ALI_UNKNOWN, IPay.ERR_MSG_ALI_UNKNOWN);
+                            PayUtil.probeApp(orderId, IPay.PAY_TYPE_ALI, IPay.PROBE_PAY_STATE_FAIL);
+                        } else {
+                            //其它支付错误
+                            if (payStatusCallback != null)
+                                payStatusCallback.onFail(IPay.PAY_TYPE_ALI, IPay.ERR_ALI_OTHER, IPay.ERR_MSG_ALI_OTHER);
+                            PayUtil.probeApp(orderId, IPay.PAY_TYPE_ALI, IPay.PROBE_PAY_STATE_FAIL);
+                        }
+                    }
+                    PayUtil.removePayCallback(orderId);
+                    break;
+                default:
+                    break;
+            }
+        }
+    };
+
+
+}
+package com.cnlive.strike.pay;
+
+import android.content.Context;
+import android.content.Intent;
+
+import com.cnlive.strike.pay.model.PayCloudResponse;
+import com.unionpay.UPPayAssistEx;
+
+
+public class PayToUnion {
+
+    public static void startPay(Context context, PayCloudResponse payCloudResponse, final String appOrderId) {
+        startPay(context, payCloudResponse, appOrderId, false);
+    }
+
+    public static void startPay(Context context, PayCloudResponse payCloudResponse, final String appOrderId, boolean isDebug) {
+        PayStatusCallback payStatusCallback = PayUtil.getPayCallback(appOrderId);
+
+        if (payCloudResponse == null || payCloudResponse.getData() == null || payCloudResponse.getData().getUnion_app() == null) {
+            if (payStatusCallback != null)
+                payStatusCallback.onFail(IPay.PAY_TYPE_UNION, IPay.ERR_PREPAY_RESULT, IPay.ERR_MSG_PREPAY_RESULT + payCloudResponse.toString());
+
+            PayUtil.probeApp(appOrderId, IPay.PAY_TYPE_UNION, IPay.PROBE_PAY_STATE_FAIL);
+            return;
+        }
+
+        if (payStatusCallback != null)
+            payStatusCallback.onStartCallPayPage(IPay.PAY_TYPE_UNION);
+
+
+        UPPayAssistEx.startPay(context, null, null, payCloudResponse.getData().getUnion_app(), getPayMode(isDebug));
+
+    }
+
+    public static void unionPayOnActivityResult(String appOrderId, Intent data) {
+        PayStatusCallback payStatusCallback = PayUtil.getPayCallback(appOrderId);
+        if (payStatusCallback == null) return;
+
+        if (data == null || data.getExtras() == null) {
+            payStatusCallback.onFail(IPay.PAY_TYPE_UNION, IPay.ERR_UNION_CANCEL, IPay.ERR_MSG_UNION_CANCEL);
+            PayUtil.probeApp(appOrderId, IPay.PAY_TYPE_UNION, IPay.PROBE_PAY_STATE_CANCEL);
+            return;
+        }
+
+        String str = data.getExtras().getString("pay_result");
+
+        if ("success".equalsIgnoreCase(str)) {
+            payStatusCallback.onSuccess(IPay.PAY_TYPE_UNION);
+            PayUtil.probeApp(appOrderId, IPay.PAY_TYPE_UNION, IPay.PROBE_PAY_STATE_SUCCESS);
+        } else if ("fail".equalsIgnoreCase(str)) {
+            payStatusCallback.onFail(IPay.PAY_TYPE_UNION, IPay.ERR_UNION_FAIL, IPay.ERR_MSG_UNION_FAIL);
+            PayUtil.probeApp(appOrderId, IPay.PAY_TYPE_UNION, IPay.PROBE_PAY_STATE_FAIL);
+        } else if ("cancel".equalsIgnoreCase(str)) {
+            payStatusCallback.onFail(IPay.PAY_TYPE_UNION, IPay.ERR_UNION_CANCEL, IPay.ERR_MSG_UNION_CANCEL);
+            PayUtil.probeApp(appOrderId, IPay.PAY_TYPE_UNION, IPay.PROBE_PAY_STATE_CANCEL);
+        }
+
+        PayUtil.removePayCallback(appOrderId);
+    }
+
+    /*****************************************************************
+     * mMode参数解释： "00" - 启动银联正式环境 "01" - 连接银联测试环境
+     *****************************************************************/
+    private static String getPayMode(boolean isDebug) {
+        return isDebug ? "01" : "00";
+    }
+}
+package com.cnlive.strike.pay;
+
+import android.content.Context;
+
+import com.cnlive.strike.pay.model.PayCloudResponse;
+import com.tencent.mm.opensdk.modelpay.PayReq;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
+
+/**
+ * Created by gujun on 2017/5/2.
+ */
+public class PayToWX {
+
+    private static IWXAPI api;
+
+    /**
+     * 判断是否安装了微信客户端
+     */
+    public static boolean isWXAppInstalledAndSupported(Context context) {
+        if (api == null)
+            api = WXAPIFactory.createWXAPI(context, PayUtil.getWxAppId());
+
+        return api.isWXAppInstalled();
+    }
+
+    public static void startPay(Context context, PayCloudResponse payCloudResponse, final String appOrderId) {
+
+        PayStatusCallback payStatusCallback = PayUtil.getPayCallback(appOrderId);
+
+        if (payCloudResponse == null || payCloudResponse.getData() == null || payCloudResponse.getData().getWx_app() == null) {
+            if (payStatusCallback != null)
+                payStatusCallback.onFail(IPay.PAY_TYPE_WX, IPay.ERR_PREPAY_RESULT, IPay.ERR_MSG_PREPAY_RESULT + payCloudResponse.toString());
+
+            PayUtil.probeApp(appOrderId, IPay.PAY_TYPE_WX, IPay.PROBE_PAY_STATE_FAIL);
+            return;
+        }
+
+        if (isWXAppInstalledAndSupported(context)) {
+            if (payStatusCallback != null)
+                payStatusCallback.onStartCallPayPage(IPay.PAY_TYPE_WX);
+
+            genPayReq(api, payCloudResponse, appOrderId);
+
+        } else {
+            if (payStatusCallback != null)
+                payStatusCallback.onFail(IPay.PAY_TYPE_WX, IPay.ERR_WX_NOT_INSTALLED, IPay.ERR_MSG_WX_NOT_INSTALLED);
+
+            PayUtil.probeApp(appOrderId, IPay.PAY_TYPE_WX, IPay.PROBE_PAY_STATE_FAIL);
+        }
+
+    }
+
+    /**
+     * 生成签名参数
+     *
+     * @param payCloudResponse
+     */
+    private static void genPayReq(IWXAPI msgApi, PayCloudResponse payCloudResponse, String appOrderId) {
+        PayReq req = new PayReq();
+        req.appId = payCloudResponse.getData().getWx_app().getAppid();
+        req.partnerId = payCloudResponse.getData().getWx_app().getPartnerid();
+        req.prepayId = payCloudResponse.getData().getWx_app().getPrepayid();
+        req.packageValue = "Sign=WXPay";
+        req.nonceStr = payCloudResponse.getData().getWx_app().getNoncestr();
+        req.timeStamp = payCloudResponse.getData().getWx_app().getTimestamp();
+        req.sign = payCloudResponse.getData().getWx_app().getSign();
+        req.extData = appOrderId;
+
+        // 发起支付请求
+        msgApi.registerApp(PayUtil.getWxAppId());
+        msgApi.sendReq(req);
+    }
+
+}
+package com.cnlive.strike.pay;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.text.TextUtils;
+import android.util.Log;
+
+
+import com.cnlive.libs.util.Config;
+import com.cnlive.libs.util.NetUtil;
+import com.cnlive.libs.util.ProbeUtil;
+import com.cnlive.libs.util.b;
+import com.cnlive.libs.util.data.okhttp3.Call;
+import com.cnlive.libs.util.data.okhttp3.Response;
+import com.cnlive.libs.util.data.okhttpUtil.callback.GenericsCallback;
+import com.cnlive.strike.pay.model.PayCloudResponse;
+import com.cnlive.strike.pay.network.HttpRequest;
+
+import java.lang.reflect.ParameterizedType;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by gujun on 2017/5/2.
+ */
+
+public class PayUtil {
+
+    private static String wxAppId;
+    //标记对应的订单回调
+    public static Map<String, PayStatusCallback> callbackMap = new HashMap<>();
+
+    public static void init(String weixinAppId) {
+        wxAppId = weixinAppId;
+    }
+
+    public static String getWxAppId() {
+        return wxAppId;
+    }
+
+    public static void startPay(final Context context,
+                                final int payType,
+                                final String orderId,
+                                String body,
+                                int totalMoney,
+                                String notify_url,
+                                String account,
+                                String user_id,
+                                String frmId,
+                                Map<String, String> extraParams,
+                                final PayStatusCallback callback) {
+        //初始化统计
+        ProbeUtil.probeApp(Config.SDK_PAY, Config.SDK_PAY_VERSION, Config.EVENT_PAY, "", "", "");
+
+        HttpRequest.prePay(payType, orderId, body, totalMoney, notify_url, account, user_id,frmId,extraParams, new TestCallback<PayCloudResponse>() {
+            @Override
+            public void onError(Call call, Exception e) {
+                Log.e("PayUtil", "异常 : ", e);
+                if (callback != null) {
+                    if (!NetUtil.checkNetwork(context)) {
+                        callback.onFail(getCallbackPayType(payType), IPay.ERR_PREPAY_NET, IPay.ERR_MSG_PREPAY_NET);
+                    } else {
+                        callback.onFail(getCallbackPayType(payType), IPay.ERR_PREPAY, IPay.ERR_MSG_PREPAY + ":" + e.getMessage());
+                    }
+                }
+                probeApp(orderId, payType, IPay.PROBE_PAY_STATE_FAIL);
+            }
+
+            @Override
+            public void onResponse(PayCloudResponse response, Exception e) {
+                if (response != null) {
+                    if ("0".equals(response.getErrorCode())) {
+
+                        if (!TextUtils.isEmpty(orderId) && callback != null)
+                            callbackMap.put(orderId, callback);
+
+                        if (payType == IPay.PAY_TYPE_WX) {
+                            PayToWX.startPay(context, response, orderId);
+                        } else if (payType == IPay.PAY_TYPE_ALI) {
+                            PayToALi.startPay((Activity) context, response, orderId);
+                        } else if (payType == IPay.PAY_TYPE_UNION) {
+                            PayToUnion.startPay(context, response, orderId);
+                        } else {
+                            if (callback != null)
+                                callback.onFail(getCallbackPayType(payType), IPay.ERR_UNSUPPORT, IPay.ERR_MSG_UNSUPPORT);
+                            probeApp(orderId, payType, IPay.PROBE_PAY_STATE_FAIL);
+                        }
+                    } else {
+                        int errorCodeOpen;
+                        try {
+                            errorCodeOpen = Integer.valueOf(response.getErrorCode());
+                        } catch (Exception e1) {
+                            errorCodeOpen = IPay.ERR_PREPAY_RESULT;
+                        }
+                        if (callback != null)
+                            callback.onFail(getCallbackPayType(payType), errorCodeOpen, response.getErrorMessage());
+                        probeApp(orderId, payType, IPay.PROBE_PAY_STATE_FAIL);
+                    }
+                } else {
+                    if (callback != null)
+                        callback.onFail(getCallbackPayType(payType), IPay.ERR_PREPAY, IPay.ERR_MSG_PREPAY + ":" + e.getMessage());
+                    probeApp(orderId, payType, IPay.PROBE_PAY_STATE_FAIL);
+                }
+            }
+        });
+    }
+
+    //电商调用
+    public static void startPay(final Context context,
+                                final int payType,
+                                final String orderId,
+                                String body,
+                                int totalMoney,
+                                String notify_url,
+                                String account,
+                                String user_id,
+                                Map<String, String> extraParams,
+                                final PayStatusCallback callback) {
+      startPay(context,payType,orderId,body,totalMoney,notify_url,account,user_id,null,extraParams,callback);
+    }
+
+    /**
+     * 银联的callback走的是OnActivityResult，所以使用银联的话再Activity的OnActivityResult（）方法中调用一下此方法，通过PayStatusCallback进行回调
+     *
+     * @param appOrderId
+     * @param data
+     */
+    public static void unionPayOnActivityResult(String appOrderId, Intent data) {
+        PayToUnion.unionPayOnActivityResult(appOrderId, data);
+    }
+
+    public abstract static class TestCallback<T> extends GenericsCallback<T> {
+        b mGenericsSerializator = new b();
+
+        public TestCallback() {
+        }
+
+        public T parseNetworkResponse(Response var1, Exception var2) throws Exception {
+            String var3 = var1.body().string();
+            Class var4 = (Class) ((ParameterizedType) this.getClass().getGenericSuperclass()).getActualTypeArguments()[0];
+            if (var4 == String.class) {
+                return (T) var3;
+            } else {
+                T var5 = (T) this.mGenericsSerializator.transform(var3, var4);
+                return var5;
+            }
+        }
+    }
+
+    private static int getCallbackPayType(int payType) {
+        return payType;
+    }
+
+    private static String getProbePayType(int payType) {
+        return payType == IPay.PAY_TYPE_WX ? IPay.PROBE_WX : (payType == IPay.PAY_TYPE_ALI ? IPay.PROBE_ALI : (payType == IPay.PAY_TYPE_UNION ? IPay.PROBE_UNION : ""));
+    }
+
+    public static void probeApp(String orderId, int payType, String payState) {
+        ProbeUtil.probeApp(Config.SDK_PAY, Config.SDK_PAY_VERSION, Config.EVENT_PAY_STATE, orderId, getProbePayType(payType), payState);
+    }
+
+    public static PayStatusCallback getPayCallback(String orderId) {
+        if (TextUtils.isEmpty(orderId)) return null;
+        if (callbackMap != null && callbackMap.containsKey(orderId)) {
+            return callbackMap.get(orderId);
+        }
+        return null;
+    }
+
+    public static void removePayCallback(String orderId) {
+        if (TextUtils.isEmpty(orderId)) return;
+        if (callbackMap != null && callbackMap.containsKey(orderId)) {
+            callbackMap.remove(orderId);
+        }
+    }
+
+}
+package com.cnlive.strike.pay.model;

/**
 * Created by gujun on 2017/5/2.
 * 支付handler传递的数据封装对象
 */
public class AliPayResult {
    private String orderId;
    private String result;

    public String getOrderId() {
        return orderId;
    }

    public void setOrderId(String orderId) {
        this.orderId = orderId;
    }

    public String getResult() {
        return result;
    }

    public void setResult(String result) {
        this.result = result;
    }

    public AliPayResult(String orderId, String result) {
        this.orderId = orderId;
        this.result = result;
    }
}
 \ No newline at end of file
+package com.cnlive.strike.pay.model;
+
+
+import com.cnlive.libs.util.comment.model.ErrorMessage;
+
+/**
+ * Created by gujun on 2017/4/10.
+ * 支付云返回的数据
+ */
+
+public class PayCloudResponse extends ErrorMessage {
+
+    private PayCloudResponseData data;
+
+    public PayCloudResponseData getData() {
+        return data;
+    }
+
+    public void setData(PayCloudResponseData data) {
+        this.data = data;
+    }
+
+    @Override
+    public String toString() {
+        return "PayCloudResponse{" +
+                "data=" + data +
+                '}';
+    }
+}
+package com.cnlive.strike.pay.model;
+
+
+import com.cnlive.libs.util.model.BaseData;
+
+/**
+ * Created by gujun on 2017/4/10.
+ * 支付云返回的数据
+ */
+
+public class PayCloudResponseData extends BaseData {
+
+    private String notify_url;
+    private String order_id;
+    private String alipay_app;
+    private WxApp wx_app;
+    private String union_app;
+
+    public String getNotify_url() {
+        return notify_url;
+    }
+
+    public void setNotify_url(String notify_url) {
+        this.notify_url = notify_url;
+    }
+
+    public String getOrder_id() {
+        return order_id;
+    }
+
+    public void setOrder_id(String order_id) {
+        this.order_id = order_id;
+    }
+
+    public String getAlipay_app() {
+        return alipay_app;
+    }
+
+    public void setAlipay_app(String alipay_app) {
+        this.alipay_app = alipay_app;
+    }
+
+    public WxApp getWx_app() {
+        return wx_app;
+    }
+
+    public void setWx_app(WxApp wx_app) {
+        this.wx_app = wx_app;
+    }
+
+    public String getUnion_app() {
+        return union_app;
+    }
+
+    public void setUnion_app(String union_app) {
+        this.union_app = union_app;
+    }
+
+    @Override
+    public String toString() {
+        return "PayCloudResponseData{" +
+                "notify_url='" + notify_url + '\'' +
+                ", order_id='" + order_id + '\'' +
+                ", alipay_app='" + alipay_app + '\'' +
+                ", wx_app=" + wx_app +
+                ", union_app='" + union_app + '\'' +
+                '}';
+    }
+}
+package com.cnlive.strike.pay.model;

/**
 * Created by gujun on 2017/5/2.
 * 支付宝返回的支付result对象转换
 */
public class Result {
    public String resultStatus;
    public String result;
    public String memo;

    public Result(String rawResult) {
        try {
            String[] resultParams = rawResult.split(";");
            for (String resultParam : resultParams) {
                if (resultParam.startsWith("resultStatus")) {
                    resultStatus = gatValue(resultParam, "resultStatus");
                }
                if (resultParam.startsWith("result")) {
                    result = gatValue(resultParam, "result");
                }
                if (resultParam.startsWith("memo")) {
                    memo = gatValue(resultParam, "memo");
                }
            }
        } catch (Exception e) {
            if (e!=null)
            e.printStackTrace();
        }
    }

    @Override
    public String toString() {
        return "resultStatus={" + resultStatus + "};memo={" + memo
                + "};result={" + result + "}";
    }

    private String gatValue(String content, String key) {
        String prefix = key + "={";
        return content.substring(content.indexOf(prefix) + prefix.length(),
                content.lastIndexOf("}"));
    }
}
 \ No newline at end of file
+package com.cnlive.strike.pay.model;
+
+
+import com.cnlive.libs.util.model.BaseData;
+
+/**
+ * Created by gujun on 2017/5/2.
+ */
+
+public class WxApp extends BaseData {
+    private String appid;
+    private String partnerid;
+    private String prepayid;
+    private String noncestr;
+    private String timestamp;
+    private String sign;
+
+    public String getAppid() {
+        return appid;
+    }
+
+    public void setAppid(String appid) {
+        this.appid = appid;
+    }
+
+    public String getPartnerid() {
+        return partnerid;
+    }
+
+    public void setPartnerid(String partnerid) {
+        this.partnerid = partnerid;
+    }
+
+    public String getPrepayid() {
+        return prepayid;
+    }
+
+    public void setPrepayid(String prepayid) {
+        this.prepayid = prepayid;
+    }
+
+    public String getNoncestr() {
+        return noncestr;
+    }
+
+    public void setNoncestr(String noncestr) {
+        this.noncestr = noncestr;
+    }
+
+    public String getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(String timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getSign() {
+        return sign;
+    }
+
+    public void setSign(String sign) {
+        this.sign = sign;
+    }
+
+    @Override
+    public String toString() {
+        return "WxApp{" +
+                "appid='" + appid + '\'' +
+                ", partnerid='" + partnerid + '\'' +
+                ", prepayid='" + prepayid + '\'' +
+                ", noncestr='" + noncestr + '\'' +
+                ", timestamp='" + timestamp + '\'' +
+                ", sign='" + sign + '\'' +
+                '}';
+    }
+}
+package com.cnlive.strike.pay.network;
+
+import android.text.TextUtils;
+
+import com.cnlive.libs.util.Config;
+import com.cnlive.libs.util.HttpUtils;
+import com.cnlive.libs.util.data.okhttpUtil.callback.GenericsCallback;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * Created by gujun on 2017/5/2.
+ */
+
+public class HttpRequest {
+
+    private static final String PREPAY_URL_RELEASE = "https://api.cnlive.com/open/api2/unifypay/prepay";
+
+    private static final String PREPAY_URL = PREPAY_URL_RELEASE;
+
+    /**
+     * 调支付云预支付接口
+     *
+     * @param payType     微信 1  支付宝 3
+     * @param orderId     订单号
+     * @param body        订单简介
+     * @param totalMoney  订单总额 （分）单位
+     * @param notify_url  支付成功的回调地址
+     * @param account     微信支付需要的
+     * @param user_id     业务系统用户ID
+     * @param extraParams 业务回传参数可以使用多个参数,由业务系统自行使用。但有长度限制，
+     *                    所有attach 的总字符长度不能超过300。 例如： attach.phone=13523455432
+     */
+    public static void prePay(final int payType,
+                              String orderId,
+                              String body,
+                              int totalMoney,
+                              String notify_url,
+                              String account,
+                              String user_id,
+                              String frmId,
+                              Map<String, String> extraParams,
+                              GenericsCallback callback) {
+
+        Map<String, String> params = new HashMap<>();
+
+        if (!TextUtils.isEmpty(account))
+            params.put("account", account);
+
+        if (!TextUtils.isEmpty(user_id))
+            params.put("user_id", user_id);
+
+        if (extraParams != null && extraParams.size() > 0) {
+            Iterator<Map.Entry<String, String>> it = extraParams.entrySet().iterator();
+            while (it.hasNext()) {
+                Map.Entry<String, String> entry = it.next();
+                params.put("attach.".concat(entry.getKey()), entry.getValue());
+            }
+        }
+//        params.put("timestamp",time);lib_util里面添加了
+        params.put("appId", Config.getAppId());
+        params.put("out_trade_no", orderId);
+        params.put("body", body);
+        params.put("total_fee", totalMoney + "");
+        params.put("notify_url", notify_url);
+        params.put("type", payType + "");
+        if(frmId != null)params.put("frmId", frmId);
+
+        HttpUtils.doPostAsyn(PREPAY_URL, params, callback);
+
+    }
+
+
+}
+package com.cnlive.strike.pay.ui;
+
+import android.app.Activity;
+
+import com.cnlive.strike.pay.IPay;
+import com.cnlive.strike.pay.PayStatusCallback;
+import com.cnlive.strike.pay.PayUtil;
+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.modelpay.PayResp;
+import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler;
+
+/**
+ * Created by gujun on 2017/5/4.
+ */
+
+public class WXPayActivity extends Activity implements IWXAPIEventHandler {
+
+    @Override
+    public void onReq(BaseReq baseReq) {
+
+    }
+
+    @Override
+    public void onResp(BaseResp baseResp) {
+        PayResp payResp = (PayResp) baseResp;
+
+        String orderId = payResp.extData;
+        PayStatusCallback payStatusCallback = PayUtil.getPayCallback(orderId);
+        if (payStatusCallback == null) {
+            this.finish();
+            return;
+        }
+
+        if (baseResp.getType() == ConstantsAPI.COMMAND_PAY_BY_WX) {
+            if (baseResp.errCode == BaseResp.ErrCode.ERR_OK) {
+                payStatusCallback.onSuccess(IPay.PAY_TYPE_WX);
+                PayUtil.probeApp(orderId, IPay.PAY_TYPE_WX, IPay.PROBE_PAY_STATE_SUCCESS);
+            } else {
+                if (baseResp.errCode == BaseResp.ErrCode.ERR_COMM) {
+                    payStatusCallback.onFail(IPay.PAY_TYPE_WX, IPay.ERR_WX_COMM, IPay.ERR_MSG_WX_COMM);
+                    PayUtil.probeApp(orderId, IPay.PAY_TYPE_WX, IPay.PROBE_PAY_STATE_FAIL);
+                } else if (baseResp.errCode == BaseResp.ErrCode.ERR_USER_CANCEL) {
+                    payStatusCallback.onFail(IPay.PAY_TYPE_WX, IPay.ERR_WX_USER_CANCEL, IPay.ERR_MSG_WX_USER_CANCEL);
+                    PayUtil.probeApp(orderId, IPay.PAY_TYPE_WX, IPay.PROBE_PAY_STATE_CANCEL);
+                } else if (baseResp.errCode == BaseResp.ErrCode.ERR_SENT_FAILED) {
+                    payStatusCallback.onFail(IPay.PAY_TYPE_WX, IPay.ERR_WX_SENT_FAILED, IPay.ERR_MSG_WX_SENT_FAILED);
+                    PayUtil.probeApp(orderId, IPay.PAY_TYPE_WX, IPay.PROBE_PAY_STATE_FAIL);
+                } else if (baseResp.errCode == BaseResp.ErrCode.ERR_AUTH_DENIED) {
+                    payStatusCallback.onFail(IPay.PAY_TYPE_WX, IPay.ERR_WX_AUTH_DENIED, IPay.ERR_MSG_WX_AUTH_DENIED);
+                    PayUtil.probeApp(orderId, IPay.PAY_TYPE_WX, IPay.PROBE_PAY_STATE_FAIL);
+                } else if (baseResp.errCode == BaseResp.ErrCode.ERR_UNSUPPORT) {
+                    payStatusCallback.onFail(IPay.PAY_TYPE_WX, IPay.ERR_WX_UNSUPPORT, IPay.ERR_MSG_WX_UNSUPPORT);
+                    PayUtil.probeApp(orderId, IPay.PAY_TYPE_WX, IPay.PROBE_PAY_STATE_FAIL);
+                } else {
+                    payStatusCallback.onFail(IPay.PAY_TYPE_WX, IPay.ERR_WX_UNKNOWN, IPay.ERR_MSG_WX_UNKNOWN);
+                    PayUtil.probeApp(orderId, IPay.PAY_TYPE_WX, IPay.PROBE_PAY_STATE_FAIL);
+                }
+            }
+        }
+        this.finish();
+    }
+}
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
+    style="@style/NavPage">
+    
+	<TextView
+	    android:layout_width="fill_parent"
+	 	android:layout_height="fill_parent"
+		android:gravity="center"
+	 	android:textColor="#ff000000"
+	 	android:textSize="20sp"
+	 	android:text="@string/pay_result_tip"/>
+	
+</LinearLayout>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- WXPayEntryActivity -->
+    <string name="pay_result_tip">这个界面用于显示第三方app通过微信支付的结果</string>
+    <string name="pay_result_callback_msg" formatted="false">微信支付结果：%s</string>
+</resources>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- 微信支付布局用到的 -->
+    <style name="NavPage">
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">fill_parent</item>
+        <item name="android:orientation">vertical</item>
+        <item name="android:gravity">center_horizontal</item>
+        <item name="android:background">#FFE1E8EB</item>
+    </style>
+</resources>
 \ No newline at end of file
+<resources>
+    <string name="app_name">app_pay</string>
+</resources>
+package com.cnlive.strike.pay;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
 \ No newline at end of file
@@ -5,7 +5,7 @@
         <activity
-            android:name="com.cnlive.cloud.debug.wxapi.WXEntryActivity"
+            android:name="com.cnlive.strike.debug.wxapi.WXEntryActivity"
             android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
             android:label="@string/app_name"
             android:exported="true"
@@ -12,6 +12,7 @@ import com.cnlive.login.model.OtherUserInfo;
 import com.cnlive.login.model.ThirdLoginInfo;
 import com.cnlive.login.observer.ThirdLoginObservable;
 import com.cnlive.share.BuildConfig;
+import com.cnlive.share.util.Util;
 import com.sina.weibo.sdk.auth.Oauth2AccessToken;
 import com.sina.weibo.sdk.auth.WbAuthListener;
 import com.sina.weibo.sdk.auth.WbConnectErrorMessage;
@@ -71,11 +72,30 @@ public class ThirdLoginUtil {
      * @param context
      * @return
      */
-    public static boolean isQQInstalled(Activity context){
+    public static boolean isQQInstalled(Activity context,boolean isLogin){
         boolean isInstall = false;
         mContext = context;
-        isInstall = mTencent.isQQInstalled(context);
-        if(isInstall) mTencent.login(context, ACOPE_ALL, listener);
+        isInstall = (Util.checkQQ(context) || Util.isQQClientAvailable(context) || mTencent.isQQInstalled(context));
+        if(isInstall) mTencent.login(context, ACOPE_ALL, new IUiListener() {
+            @Override
+            public void onComplete(Object o) {
+                getQQInfo(mContext, mTencent, o);
+            }
+
+            @Override
+            public void onError(UiError uiError) {
+                String msg = "登录失败";
+                if(!isLogin) msg = "绑定失败";
+                AlertUtil.showDeftToast(mContext, msg);
+            }
+
+            @Override
+            public void onCancel() {
+                String msg = "取消登录";
+                if(!isLogin) msg = "取消绑定";
+                AlertUtil.showDeftToast(mContext, msg);
+            }
+        });
         return isInstall;
     }
@@ -85,8 +105,27 @@ public class ThirdLoginUtil {
      * @param resultCode
      * @param data
      */
-    public static void getQQResult(int requestCode, int resultCode, Intent data){
-        Tencent.onActivityResultData(requestCode, resultCode, data, listener);
+    public static void getQQResult(int requestCode, int resultCode, Intent data,boolean isLogin){
+        Tencent.onActivityResultData(requestCode, resultCode, data, new IUiListener() {
+            @Override
+            public void onComplete(Object o) {
+                getQQInfo(mContext, mTencent, o);
+            }
+
+            @Override
+            public void onError(UiError uiError) {
+                String msg = "登录失败";
+                if(!isLogin) msg = "绑定失败";
+                AlertUtil.showDeftToast(mContext, msg);
+            }
+
+            @Override
+            public void onCancel() {
+                String msg = "取消登录";
+                if(!isLogin) msg = "取消绑定";
+                AlertUtil.showDeftToast(mContext, msg);
+            }
+        });
     }
@@ -94,7 +133,7 @@ public class ThirdLoginUtil {
      * 微博登录
      * @param activity
      */
-    public static void loginWeibo(Activity activity){
+    public static void loginWeibo(Activity activity,boolean isLogin){
         if(mSsoHandler == null)mSsoHandler = new SsoHandler(activity);
         mSsoHandler.authorize(new WbAuthListener() {
             @Override
@@ -104,12 +143,16 @@ public class ThirdLoginUtil {
             @Override
             public void cancel() {
-                AlertUtil.showDeftToast(activity, "取消登录");
+                String msg = "取消登录";
+                if(!isLogin) msg = "取消绑定";
+                AlertUtil.showDeftToast(activity, msg);
             }
             @Override
             public void onFailure(WbConnectErrorMessage wbConnectErrorMessage) {
-                AlertUtil.showDeftToast(activity, "登录失败");
+                String msg = "登录失败";
+                if(!isLogin) msg = "绑定失败";
+                AlertUtil.showDeftToast(activity, msg);
             }
         });
     }
@@ -4,7 +4,7 @@
     <application>
         <activity
-            android:name="com.cnlive.cloud.wxapi.WXEntryActivity"
+            android:name="com.cnlive.strike.debug.wxapi.WXEntryActivity"
             android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
             android:exported="true"
             android:launchMode="singleTop">
+<?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.cnlive.cloud.user">
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <!-- for mta statistics, not necessary-->
+    <uses-permission android:name="android.permission.INTERNET" /> <!-- for mta statistics, not necessary -->
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -32,44 +31,44 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <application android:largeHeap="true">
+        <activity android:name=".ui.activity.UnBindThreeLoginCheckActivity"></activity>
+        <activity android:name=".ui.activity.BindPhoneMangerActivity" />
+        <activity android:name=".ui.activity.BindPhoneNumberActivity" />
+
         <meta-data
             android:name="WEIBO_APPKEY"
             android:value="3884700821" />
         <meta-data
             android:name="WEIBO_CHANNEL"
-            android:value="weibo" />
-        <!--        个人签名-->
+            android:value="weibo" /> <!-- 个人签名 -->
         <activity
-            android:name="com.cnlive.cloud.user.ui.activity.SignatureActivity"
+            android:name=".ui.activity.SignatureActivity"
             android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateVisible|adjustPan" />
-        <!-- 个人资料姓名-->
+            android:windowSoftInputMode="stateVisible|adjustPan" /> <!-- 个人资料姓名 -->
         <activity
-            android:name="com.cnlive.cloud.user.ui.activity.UpdateContentActivity"
+            android:name=".ui.activity.UpdateContentActivity"
             android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
-        <!--预览头像-->
+            android:screenOrientation="portrait" /> <!-- 预览头像 -->
         <activity
-            android:name="com.cnlive.cloud.user.ui.activity.PersonalImageActivity"
+            android:name=".ui.activity.PersonalImageActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
-        <!-- 个人资料页-->
+            android:screenOrientation="portrait" /> <!-- 个人资料页 -->
         <activity
-            android:name="com.cnlive.cloud.user.ui.activity.PersonalDataActivity"
+            android:name=".ui.activity.PersonalDataActivity"
             android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.cnlive.cloud.user.ui.activity.LoginDialogActivity"
+            android:name=".ui.activity.LoginDialogActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
             android:launchMode="singleTop"
             android:theme="@style/ProcessHtmlDialogActivityTheme" />
         <activity
-            android:name="com.cnlive.cloud.user.ui.activity.LoginActivity"
+            android:name=".ui.activity.LoginActivity"
             android:configChanges="keyboardHidden|screenSize|orientation|smallestScreenSize|screenLayout"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
@@ -79,19 +78,19 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.cnlive.cloud.user.ui.activity.FirstLoginActivity"
+            android:name=".ui.activity.FirstLoginActivity"
             android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.cnlive.cloud.user.ui.activity.SelectCountryActivity"
+            android:name=".ui.activity.SelectCountryActivity"
             android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize" />
         <service
-            android:name="com.cnlive.cloud.user.auth.UserAccountService"
+            android:name=".auth.UserAccountService"
             tools:ignore="ExportedService">
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator" />
@@ -101,9 +100,8 @@
                 android:name="android.accounts.AccountAuthenticator"
                 android:resource="@xml/authenticator" />
         </service>
-
         <service
-            android:name="com.cnlive.cloud.user.auth.UserSyncService"
+            android:name=".auth.UserSyncService"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.content.SyncAdapter" />
@@ -115,9 +113,10 @@
         </service>
         <provider
-            android:name="com.cnlive.cloud.user.auth.UserAccountProvider"
+            android:name=".auth.UserAccountProvider"
             android:authorities="@string/ACCOUNT_PROVIDE"
             android:exported="false"
             android:syncable="true" />
     </application>
-</manifest>
+
+</manifest>
 \ No newline at end of file
+package com.cnlive.cloud.user.frame.presenter;
+
+import com.cnlive.cloud.user.auth.UserService;
+import com.cnlive.cloud.user.frame.view.BindPhoneMangerView;
+import com.cnlive.cloud.user.model.BindPhoneNumberInfo;
+import com.cnlive.cloud.user.ui.activity.BindPhoneMangerActivity;
+import com.cnlive.core.libs.base.application.AppConfig;
+import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
+import com.cnlive.core.network.HttpConn;
+import com.cnlive.core.network.NetCallBack;
+import com.cnlive.core.network.api.ApiBaseServiceOpen;
+import com.cnlive.core.network.model.BaseResult;
+import com.cnlive.core.network.request.BaseRequest;
+import com.cnlive.login.model.OtherUserInfo;
+
+import java.util.HashMap;
+
+
+/**
+ * 作者: 吴奎庆
+ * <p>
+ * 时间: 2019/9/9
+ * <p>
+ * 简介:
+ */
+public class BindPhoneMangerPresenter extends BasePresenter<BindPhoneMangerView> {
+
+    public void unBindLogin(BindPhoneMangerActivity mangerActivity, BindPhoneNumberInfo info) {
+        if (mangerActivity == null) return;
+        UserService userService = UserService.getInstance(mangerActivity);
+        if (userService == null) return;
+        HashMap<String, String> requestMap = new HashMap<>();
+        requestMap.put("appId", AppConfig.getAppId());
+
+        requestMap.put("uid", userService.getAppAccount().getUid());
+
+        switch (info.getType()) {
+            case 1:
+                requestMap.put("thirdPartyId", userService.getAppAccount().getSinaUid());
+                break;
+            case 2:
+
+                requestMap.put("thirdPartyId", userService.getAppAccount().getQqUid());
+                break;
+            case 3:
+                requestMap.put("thirdPartyId", userService.getAppAccount().getWxUid());
+                break;
+        }
+        requestMap.put("thirdPartyPlat", info.getType() + "");
+        requestMap.put("token", userService.getAppAccount().getToken());
+        requestMap.put("clientPlat", "a");
+
+        HttpConn.action(BaseRequest.init().service(ApiBaseServiceOpen.class).unBind3rd(requestMap), new NetCallBack<BaseResult>() {
+            @Override
+            public void onRequestState(int state) {
+
+            }
+
+            @Override
+            public void onSuccess(BaseResult data) {
+                if ("0".equals(data.getCode())) {
+                    //接触绑定成功
+                    ifViewAttached(view -> view.unBindSuccess());
+
+                }
+            }
+
+            @Override
+            public void onFailure(String errCode, String errMsg, Exception e) {
+                ifViewAttached(view -> view.showMessage(errMsg));
+            }
+        });
+    }
+
+    public void bindLogin(BindPhoneMangerActivity mangerActivity, OtherUserInfo info) {
+        if (mangerActivity == null) return;
+        UserService userService = UserService.getInstance(mangerActivity);
+        if (userService == null) return;
+        HashMap<String, String> requestMap = new HashMap<>();
+        requestMap.put("appId", AppConfig.getAppId());
+
+        requestMap.put("uid", userService.getAppAccount().getUid());
+        requestMap.put("thirdPartyId", info.getThirdPartyId());
+        requestMap.put("thirdPartyPlat", info.getLoginType() + "");
+        requestMap.put("token", userService.getAppAccount().getToken());
+        requestMap.put("clientPlat", "a");
+
+        HttpConn.action(BaseRequest.init().service(ApiBaseServiceOpen.class).bind3rd(requestMap), new NetCallBack<BaseResult>() {
+            @Override
+            public void onRequestState(int state) {
+
+            }
+
+            @Override
+            public void onSuccess(BaseResult data) {
+                if ("0".equals(data.getCode())) {
+                    //接触绑定成功
+                    ifViewAttached(view -> view.bindSuccess(info));
+                }
+            }
+
+            @Override
+            public void onFailure(String errCode, String errMsg, Exception e) {
+                ifViewAttached(view -> view.showMessage(errMsg));
+            }
+        });
+    }
+
+    //绑定
+    public void otherLogin(BindPhoneMangerActivity mangerActivity, OtherUserInfo otherUserInfo) {
+
+    }
+}
+package com.cnlive.cloud.user.frame.presenter;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import com.cnlive.cloud.user.R;
+import com.cnlive.cloud.user.UserUtilAction;
+import com.cnlive.cloud.user.auth.UserService;
+import com.cnlive.cloud.user.frame.view.BindPhoneNumberView;
+import com.cnlive.cloud.user.model.CNLiveUserInfo;
+import com.cnlive.cloud.user.router.user.UserAction;
+import com.cnlive.cloud.user.ui.activity.BindPhoneNumberActivity;
+import com.cnlive.cloud.user.util.RegexUtils;
+import com.cnlive.cloud.user.util.TimeEvent;
+import com.cnlive.core.libs.base.application.AppConfig;
+import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
+import com.cnlive.core.libs.base.util.TimerWaitUtil;
+import com.cnlive.core.network.HttpConn;
+import com.cnlive.core.network.NetCallBack;
+import com.cnlive.core.network.model.BaseResult;
+import com.cnlive.login.model.OtherUserInfo;
+
+import java.util.HashMap;
+
+
+/**
+ * 作者: 吴奎庆
+ * <p>
+ * 时间: 2019/9/9
+ * <p>
+ * 简介:
+ */
+public class BindPhoneNumberPresenter extends BasePresenter<BindPhoneNumberView> {
+
+    private TimerWaitUtil timerUtil;
+    private long currentTime = 0;
+
+    private void startTimer() {
+        if (timerUtil != null) timerUtil.cancel();
+
+        timerUtil = new TimerWaitUtil();
+        timerUtil.setTotalTime(60_000);//设置毫秒数
+        timerUtil.setIntervalTime(500);//设置间隔数
+        timerUtil.start();
+        timerUtil.setTimerLiener(new TimerWaitUtil.TimeListener() {
+            @Override
+            public void onFinish() {
+                currentTime = 0;
+                ifViewAttached(view -> view.onTimerFinish());
+            }
+
+            @Override
+            public void onInterval(long remainTime) {
+                currentTime = remainTime;
+                ifViewAttached(view -> view.onTimerInterval(remainTime / 1000));
+            }
+        });
+    }
+
+    public void sendCode(Context context, String phone, String countryCode) {
+        if (getView() == null) return;
+        if (TimeEvent.debounce(2_000)) return;
+        if (TextUtils.isEmpty(phone)) {
+            getView().showMessage(context.getString(R.string.user_toast_quick_login_empty_phone));
+            return;
+        }
+        if ("86".equals(countryCode) && !RegexUtils.isMobileSimple(phone)) {
+            getView().showMessage(context.getString(R.string.user_toast_quick_login_error_phone));
+            return;
+        }
+        if (currentTime != 0) {
+            ifViewAttached(view -> view.showMessage("处理中请稍后..."));
+            return;
+        }
+        HttpConn.action(UserUtilAction.sendMsgBefQuickLoginAction(context, phone, countryCode), new NetCallBack<BaseResult>() {
+            @Override
+            public void onRequestState(int state) {
+
+            }
+
+            @Override
+            public void onSuccess(BaseResult data) {
+                startTimer();
+                ifViewAttached(view -> view.showMessage("验证码已发送"));
+            }
+
+            @Override
+            public void onFailure(String errCode, String errMsg, Exception e) {
+                ifViewAttached(view -> {
+                            view.cancelLoading();
+                            view.showMessage(errMsg);
+                        }
+                );
+            }
+        });
+    }
+
+    public void cancle() {
+        if (timerUtil != null) {
+            timerUtil.cancel();
+        }
+    }
+
+    public void bindOther(BindPhoneNumberActivity activity, OtherUserInfo otherUserInfo, String phone, String ems) {
+        HashMap<String, String> requestMap = new HashMap<>();
+        requestMap.put("appId", AppConfig.getAppId());
+        requestMap.put("mobile", phone);
+        requestMap.put("countryCode", activity.countryCode);
+        requestMap.put("frmId", AppConfig.getAppChannel());
+        requestMap.put("verificationCode", ems);
+
+        requestMap.put("thirdPartyPlat", otherUserInfo.getLoginType());
+        requestMap.put("thirdPartyId", otherUserInfo.getThirdPartyId());
+        requestMap.put("uuid", AppConfig.getAppUUID());
+        requestMap.put("clientPlat", "a");
+        requestMap.put("nickName", otherUserInfo.getNickName());
+        requestMap.put("gender", otherUserInfo.getGender());
+        requestMap.put("location", otherUserInfo.getLocation());
+        requestMap.put("faceUrl", otherUserInfo.getFaceUrl());
+        UserAction.otherLoginBindMobile(activity, phone, activity.countryCode, ems,
+                otherUserInfo.getLoginType(), otherUserInfo.getThirdPartyId(),
+                otherUserInfo.getNickName(), otherUserInfo.getGender(), otherUserInfo.getLocation(),
+                otherUserInfo.getFaceUrl(), new UserAction.CallBack() {
+                    @Override
+                    public void callback(int state, String msg, Object object) {
+                        initLoginEvent(activity, state, msg, false, otherUserInfo);
+                    }
+                });
+    }
+
+    public void initLoginEvent(BindPhoneNumberActivity context, int state, String message, Boolean retry, OtherUserInfo otherUserInfo) {
+        switch (state) {
+            case 0:
+                CNLiveUserInfo user = UserService.getInstance(context).getAppAccount();
+                if (user == null || (user != null && TextUtils.isEmpty(user.getToken()))) {
+                    ifViewAttached(view -> view.showMessage("用户登陆失败,再试一次吧."));
+                } else if (user.isNewUser()) {
+                    //TODO 必须设置用户头像
+                    //OpenInstall用户注册统计
+//                    OpenInstall.reportRegister();
+                    //友盟账号登录统计,暂时只有平台登录，后续对接三方登录
+//                    MobclickAgent.onProfileSignIn("CNLive", user.getUid());
+                    if (otherUserInfo != null) {
+                        ifViewAttached(view -> view.showMainView());
+                    } else {
+                        ifViewAttached(view -> view.showEditView());
+                    }
+                } else {
+                    //友盟账号登录统计,暂时只有平台登录，后续对接三方登录
+//                    MobclickAgent.onProfileSignIn("CNLive", user.getUid());
+                    ifViewAttached(view -> view.showMainView());
+                }
+                AppConfig.setCountryCode("");
+                AppConfig.setCountryName("");
+                AppConfig.setVerificationCode("");
+                AppConfig.setUserPhone("");
+                break;
+            case HttpConn.ON_START:
+                ifViewAttached(view -> view.showLoading());
+                break;
+            case HttpConn.ON_END:
+                ifViewAttached(view -> view.cancelLoading());
+                break;
+            case 41010: //手机号无效
+                ifViewAttached(view -> view.showMessage(message));
+                break;
+            case 41002: //验证码为6位数字
+                ifViewAttached(view -> view.showMessage(message));
+                break;
+            case 41009: //验证码错误
+                ifViewAttached(view -> view.showMessage(message));
+                break;
+            case 41006: //手机号已存在
+                ifViewAttached(view -> view.showMessage(message));
+                break;
+            case 6208:  //当前用户在其他地点登陆
+                if (retry) {
+                    UserAction.otherLoginBindMobile(context, context.phoneNum, context.countryCode, context.phoneEms,
+                            otherUserInfo.getLoginType(), otherUserInfo.getThirdPartyId(),
+                            otherUserInfo.getNickName(), otherUserInfo.getGender(), otherUserInfo.getLocation(),
+                            otherUserInfo.getFaceUrl(), new UserAction.CallBack() {
+                                @Override
+                                public void callback(int state, String msg, Object object) {
+                                    initLoginEvent(context, state, msg, false, otherUserInfo);
+                                }
+                            }
+                    );
+                    return;
+                } else {
+                    ifViewAttached(view -> view.showMessage("用户登录失败,再试一次吧."));
+                }
+                break;
+            default: //其他错误
+                ifViewAttached(view -> view.showMessage(message));
+                break;
+        }
+    }
+
+}
+package com.cnlive.cloud.user.frame.view;
+
+import android.text.TextUtils;
+import android.view.View;
+
+import com.cnlive.cloud.user.R;
+import com.cnlive.cloud.user.auth.UserService;
+import com.cnlive.cloud.user.model.BindPhoneNumberInfo;
+import com.cnlive.cloud.user.model.CNLiveUserInfo;
+import com.cnlive.cloud.user.ui.activity.BindPhoneMangerActivity;
+import com.cnlive.cloud.user.ui.activity.LoginDialogActivity;
+import com.cnlive.cloud.user.ui.activity.UnBindThreeLoginCheckActivity;
+import com.cnlive.cloud.user.ui.adapter.BindPhoneNumberAdapter;
+import com.cnlive.core.libs.base.application.AppConfig;
+import com.cnlive.core.libs.base.frame.view.BaseView;
+import com.cnlive.core.libs.base.util.AlertUtil;
+import com.cnlive.core.libs.base.util.DoublePressed;
+import com.cnlive.login.model.OtherUserInfo;
+import com.cnlive.login.utils.ThirdLoginUtil;
+import com.cnlive.share.util.Util;
+import com.qmuiteam.qmui.widget.QMUITopBar;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+/**
+ * 作者: 吴奎庆
+ * <p>
+ * 时间: 2019/9/9
+ * <p>
+ * 简介:
+ */
+public class BindPhoneMangerView extends BaseView {
+
+    BindPhoneMangerActivity mangerActivity;
+    private BindPhoneNumberAdapter mAdapter;
+    int curPosition = -1;
+
+    public BindPhoneMangerView(BindPhoneMangerActivity activity) {
+        mangerActivity = activity;
+    }
+
+    public void initView() {
+        QMUITopBar toolbar = (QMUITopBar) mangerActivity.binding.includeToolbar;
+        toolbar.setTitle("绑定管理");
+        toolbar.setBackgroundColor(mangerActivity.getResources().getColor(R.color.white));
+        toolbar.addLeftImageButton(R.drawable.back_black, R.id.qmui_topbar_item_left_back).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mangerActivity.finish();
+            }
+        });
+        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(mangerActivity);
+
+        mAdapter = new BindPhoneNumberAdapter(mangerActivity);
+        mangerActivity.binding.rvContent.setLayoutManager(linearLayoutManager);
+        mangerActivity.binding.rvContent.setAdapter(mAdapter);
+        CNLiveUserInfo userInfo = UserService.getInstance(mangerActivity).getAppAccount();
+
+        List<BindPhoneNumberInfo> list = new ArrayList<>();
+
+        BindPhoneNumberInfo infoTitle = new BindPhoneNumberInfo();
+        infoTitle.setItemType(BindPhoneNumberInfo.TYPE_TITLE);
+        infoTitle.setItemName("您已绑定网家家手机号账号");
+        list.add(infoTitle);
+
+        BindPhoneNumberInfo infophone = new BindPhoneNumberInfo();
+        infophone.setTypeName("手机号");
+        String outMobile = userInfo.getMobile().replaceAll("(?<=\\d{3})\\d(?=\\d{4})", "*");
+        infophone.setType(0);
+        infophone.setUserName(outMobile);
+        infophone.setItemType(BindPhoneNumberInfo.TYPE_LOGIN);
+        infophone.setBind(true);
+        infophone.setTypeIcon(mangerActivity.getResources().getDrawable(R.drawable.bind_phone));
+        list.add(infophone);
+
+        BindPhoneNumberInfo infoTitle2 = new BindPhoneNumberInfo();
+        infoTitle2.setItemType(BindPhoneNumberInfo.TYPE_TITLE);
+        infoTitle2.setItemName("其他绑定方式");
+        list.add(infoTitle2);
+
+        BindPhoneNumberInfo infoWc = new BindPhoneNumberInfo();
+        infoWc.setTypeName("微信");
+        infoWc.setType(3);
+        if (userInfo != null && !TextUtils.isEmpty(userInfo.getWxUid())) {
+            infoWc.setBind(true);
+            infoWc.setUserName(userInfo.getNickName());
+        } else {
+            infoWc.setBind(false);
+            infoWc.setUserName("未绑定微信");
+        }
+        infoWc.setItemType(BindPhoneNumberInfo.TYPE_LOGIN);
+        infoWc.setTypeIcon(mangerActivity.getResources().getDrawable(R.drawable.wechat));
+        list.add(infoWc);
+
+        BindPhoneNumberInfo infoQq = new BindPhoneNumberInfo();
+        infoQq.setTypeName("QQ");
+        infoQq.setType(2);
+        if (userInfo != null && !TextUtils.isEmpty(userInfo.getQqUid())) {
+            infoQq.setBind(true);
+            infoQq.setUserName(userInfo.getNickName());
+        } else {
+            infoQq.setBind(false);
+            infoQq.setUserName("未绑定QQ");
+        }
+        infoQq.setItemType(BindPhoneNumberInfo.TYPE_LOGIN);
+        infoQq.setTypeIcon(mangerActivity.getResources().getDrawable(R.drawable.qq));
+        list.add(infoQq);
+
+        BindPhoneNumberInfo infoWb = new BindPhoneNumberInfo();
+        infoWb.setTypeName("微博");
+        if (userInfo != null && !TextUtils.isEmpty(userInfo.getSinaUid())) {
+            infoWb.setBind(true);
+            infoWb.setUserName(userInfo.getNickName());
+        } else {
+            infoWb.setBind(false);
+            infoWb.setUserName("未绑定微博");
+        }
+        infoWb.setItemType(BindPhoneNumberInfo.TYPE_LOGIN);
+        infoWb.setTypeIcon(mangerActivity.getResources().getDrawable(R.drawable.weibo));
+        infoWb.setType(1);
+        list.add(infoWb);
+        mAdapter.addItems(list);
+        mAdapter.setItemClickListener(new BindPhoneNumberAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BindPhoneNumberInfo info, View view, int position) {
+
+                if (info.getType()==0|| DoublePressed.onDoublePressed()) return;
+                curPosition = position;
+                processClick(info, view);
+            }
+        });
+    }
+
+    private void processClick(BindPhoneNumberInfo info, View view) {
+        //类型  0手机号  3 微信  2 qq  1  微博
+        if (view.getId() == R.id.tv_bind) {
+            switch (info.getType()) {
+                case 0:
+//                    showMessage("解绑手机号");
+                    break;
+                case 1:
+                    if (info.isBind()) {
+                        processUnBind(info);
+                    } else {
+                        if (Util.isWeiboInstallAndInit(mangerActivity)) {
+                            ThirdLoginUtil.loginWeibo(mangerActivity,false);
+                        } else {
+                            showMessage("您未安装该第三方应用，无法获取用户信息！");
+                        }
+
+                    }
+                    break;
+                case 2:
+                    if (info.isBind()) {
+                        processUnBind(info);
+                    } else {
+                        if (!ThirdLoginUtil.isQQInstalled(mangerActivity,false))
+                            showMessage("您未安装该第三方应用，无法获取用户信息！");
+                    }
+                    break;
+                case 3:
+                    if (info.isBind()) {
+                        processUnBind(info);
+                    } else {
+
+                        if (Util.isWXAppInstalledAndSupported(mangerActivity)) {
+                            new Thread(() -> {
+                                ThirdLoginUtil.loginWechat(mangerActivity, AppConfig.getWechatAppid());
+                            }).start();
+                        } else {
+                            showMessage("您未安装该第三方应用，无法获取用户信息！");
+                        }
+                    }
+                    break;
+            }
+        }
+    }
+
+    private void processUnBind(BindPhoneNumberInfo info) {
+        if (mangerActivity == null || info == null) return;
+        mangerActivity.checkInfo = info;
+        UnBindThreeLoginCheckActivity.startUnBindThreeLoginCheckActivity(mangerActivity, mangerActivity.openCode);
+    }
+
+    public void showMessage(String message) {
+        if (mangerActivity == null) return;
+        AlertUtil.showDeftToast(mangerActivity, message);
+    }
+
+    //类型  0手机号  3 微信  2 qq  1  微博
+    public void bindSuccess(OtherUserInfo info) {
+        if (curPosition == -1 || mAdapter == null) return;
+        BindPhoneNumberInfo infos = mAdapter.getItem(curPosition);
+        switch (infos.getType()) {
+            case 1:
+                UserService.getInstance(mangerActivity).setUserWBUID(info.getThirdPartyId());
+                break;
+            case 2:
+                UserService.getInstance(mangerActivity).setUserQQUID(info.getThirdPartyId());
+                break;
+            case 3:
+                UserService.getInstance(mangerActivity).setUserWXUID(info.getThirdPartyId());
+                break;
+        }
+        infos.setUserName(info.getNickName());
+        infos.setBind(!infos.isBind());
+        mAdapter.notifyItemChanged(curPosition, info);
+    }
+
+    //类型  0手机号  3 微信  2 qq  1  微博
+    public void unBindSuccess() {
+        if (curPosition == -1 || mAdapter == null) return;
+        BindPhoneNumberInfo info = mAdapter.getItem(curPosition);
+        switch (info.getType()) {
+            case 1:
+                info.setUserName("未绑定微博");
+                UserService.getInstance(mangerActivity).setUserWBUID("");
+                break;
+            case 2:
+                info.setUserName("未绑定QQ");
+                UserService.getInstance(mangerActivity).setUserQQUID("");
+                break;
+            case 3:
+                info.setUserName("未绑定微信");
+                UserService.getInstance(mangerActivity).setUserWXUID("");
+                break;
+        }
+
+        info.setBind(!info.isBind());
+        mAdapter.notifyItemChanged(curPosition, info);
+        showMessage("解绑成功");
+    }
+
+}
+package com.cnlive.cloud.user.frame.view;
+
+import android.app.Dialog;
+import android.content.Intent;
+import android.net.Uri;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.TextPaint;
+import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.text.style.ForegroundColorSpan;
+import android.view.View;
+
+import com.cnlive.cloud.user.R;
+import com.cnlive.cloud.user.router.user.UserAction;
+import com.cnlive.cloud.user.ui.activity.BindPhoneNumberActivity;
+import com.cnlive.cloud.user.ui.activity.FirstLoginActivity;
+import com.cnlive.cloud.user.ui.activity.LoginActivity;
+import com.cnlive.core.libs.base.frame.view.BaseView;
+import com.cnlive.core.libs.base.util.AlertUtil;
+import com.cnlive.core.libs.base.util.DoublePressed;
+import com.qmuiteam.qmui.widget.QMUITopBar;
+import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
+
+/**
+ * 作者: 吴奎庆
+ * <p>
+ * 时间: 2019/9/9
+ * <p>
+ * 简介:
+ */
+public class BindPhoneNumberView extends BaseView {
+    BindPhoneNumberActivity mActivity;
+    private Dialog loadingDiaog;
+
+    public BindPhoneNumberView(BindPhoneNumberActivity activity) {
+        mActivity = activity;
+    }
+
+    String al = "确定后，此%s将与网家家账号绑定";
+
+    public void initViews() {
+        QMUITopBar toolbar = (QMUITopBar) mActivity.binding.includeToolbar;
+        toolbar.setTitle("绑定手机号");
+        toolbar.setBackgroundColor(mActivity.getResources().getColor(R.color.white));
+        toolbar.addLeftImageButton(R.drawable.back_black, R.id.qmui_topbar_item_left_back).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mActivity.finish();
+            }
+        });
+        switch (mActivity.otherUserInfo.getLoginType()) {
+
+            case "1":
+                //sina
+                mActivity.binding.ivThree.setBackgroundResource(R.drawable.iv_bind_wb);
+                mActivity.binding.tvThree.setText("微博");
+
+                String weibos = String.format(al, "微博账号");
+                mActivity.binding.tvBind.setText(weibos);
+
+//                微博账号
+                break;
+            case "2":
+                //qq
+                mActivity.binding.ivThree.setBackgroundResource(R.drawable.iv_bind_qq);
+                mActivity.binding.tvThree.setText("QQ");
+                String qqs = String.format(al, "QQ账号");
+                mActivity.binding.tvBind.setText(qqs);
+                break;
+            case "3":
+                //wechat
+                mActivity.binding.ivThree.setBackgroundResource(R.drawable.iv_bind_wechat);
+                mActivity.binding.tvThree.setText("微信");
+
+                String wechats = String.format(al, "微信账号");
+                mActivity.binding.tvBind.setText(wechats);
+                break;
+
+        }
+        String textContent = "已阅读并同意《账户绑定确认书(网家家)》";
+        SpannableStringBuilder ssb = new SpannableStringBuilder(textContent);
+        ssb.setSpan(new ClickableSpan() {
+            @Override
+            public void onClick(View widget) {
+                if (DoublePressed.onDoublePressed())return;
+                if (mActivity != null ) {
+                    startWebView("sfdlxy");
+                }
+            }
+
+            @Override
+            public void updateDrawState(TextPaint ds) {
+                ds.setUnderlineText(false);
+            }
+        }, 7, 19, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+        ssb.setSpan(new ForegroundColorSpan(mActivity.getResources().getColor(R.color.color_23d41e)), 7, 19, Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+        mActivity.binding.tvAgreement.setMovementMethod(LinkMovementMethod.getInstance());
+        mActivity.binding.tvAgreement.setText(ssb);
+        mActivity.binding.tvVc.setOnClickListener(mActivity);
+        mActivity.binding.llCountry.setOnClickListener(mActivity);
+        mActivity.binding.login.setOnClickListener(mActivity);
+        mActivity.binding.tvCountry.setText("+ " + mActivity.countryCode);
+        mActivity.binding.tvCountryName.setText(mActivity.countryName);
+    }
+
+    private void startWebView(String type) {
+//        WWebView wWebView = new WWebView.Builder()
+//                .urlType(type)
+//                .isOther(false)
+//                .enableTitle(false)
+//                .enableJump(true)
+//                .enableRefresh(false)
+//                .enableImageLongClick(false)
+//                .builder();
+//        wWebView.startWebViewActivity(mActivity);
+    }
+
+
+    public void showMessage(String message) {
+        if (mActivity == null || TextUtils.isEmpty(message)) return;
+        AlertUtil.showDeftToast(mActivity, message);
+    }
+
+    public void onTimerFinish() {
+        mActivity.binding.tvVc.setText("获取验证码");
+        mActivity.binding.tvVc.setTextColor(mActivity.getResources().getColor(R.color.color_23d41e));
+    }
+
+    private static final String time_format = "已发送 | %ss";
+
+    public void onTimerInterval(long l) {
+        String text = String.format(time_format, (int) l);
+        mActivity.binding.tvVc.setText(text);
+        mActivity.binding.tvVc.setTextColor(mActivity.getResources().getColor(R.color.color_999));
+    }
+
+    public void showEditView() {
+        if (mActivity == null) return;
+        Intent intent = new Intent(mActivity, FirstLoginActivity.class);
+        intent.putExtra(mActivity.TAG_CLICK_AD, mActivity.clickAd);
+        intent.putExtra(LoginActivity.TAG_MSG, TextUtils.isEmpty(mActivity.tagMsg) ? "" : mActivity.tagMsg);
+        mActivity.startActivity(intent);
+        mActivity.finish();
+    }
+
+    public void showMainView() {
+        //TODO 记得放开首页
+//        if (mActivity == null) return;
+//        //判断如果是因为token为空跳转到的登录页面则不需要跳转到MainActivity，直接关闭登录页面即可
+//        if (mActivity.fromTokenError) {
+//            mActivity.finish();
+//            return;
+//        }
+//        Uri uri = UserAction.getUri(mActivity);
+//        Intent intent = new Intent(mActivity, MainActivity.class);
+//        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+//        intent.putExtra("type", "login");
+//        intent.putExtra("uri", uri);
+//        intent.putExtra("sharetype", mActivity.tagShare);
+//        intent.putExtra(mActivity.TAG_CLICK_AD, mActivity.clickAd);
+//        if (!TextUtils.isEmpty(mActivity.tagMsg))
+//            intent.putExtra("classifyTagMsg", mActivity.tagMsg);
+//        mActivity.startActivity(intent);
+    }
+
+    public void showLoading() {
+        if (mActivity == null) return;
+        if (loadingDiaog == null) {
+            loadingDiaog = new QMUITipDialog.Builder(mActivity)
+                    .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
+                    .setTipWord("请稍后")
+                    .create();
+        }
+        loadingDiaog.show();
+    }
+
+    public void cancelLoading() {
+        if (mActivity == null) return;
+        if (loadingDiaog != null) {
+            loadingDiaog.dismiss();
+        }
+    }
+}
@@ -14,6 +14,7 @@ import android.text.style.ClickableSpan;
 import android.text.style.ForegroundColorSpan;
 import android.view.View;
+import com.cnlive.cloud.user.ui.activity.BindPhoneNumberActivity;
 import com.cnlive.core.libs.base.application.AppConfig;
 import com.cnlive.core.libs.base.frame.view.BaseView;
 import com.cnlive.core.libs.base.util.AlertUtil;
@@ -307,7 +308,7 @@ public class LoginDialogView extends BaseView {
     public void bindPhone(OtherUserInfo otherUserInfo) {
         if (mActivity == null) return;
-//        BindPhoneNumberActivity.startActivity(mActivity,
-//                otherUserInfo, mActivity.fromTokenError, mActivity.tagMsg, mActivity.tagShare, mActivity.clickAd);
+        BindPhoneNumberActivity.startActivity(mActivity,
+                otherUserInfo, mActivity.fromTokenError, mActivity.tagMsg, mActivity.tagShare, mActivity.clickAd);
     }
 }
@@ -20,6 +20,7 @@ import com.cnlive.cloud.user.R;
 import com.cnlive.cloud.user.model.LoginSuccessInfo;
 import com.cnlive.cloud.user.sms.OnSmsCatchListener;
 import com.cnlive.cloud.user.sms.SmsVerifyCatcher;
+import com.cnlive.cloud.user.ui.activity.BindPhoneNumberActivity;
 import com.cnlive.cloud.user.ui.activity.FirstLoginActivity;
 import com.cnlive.cloud.user.ui.activity.LoginActivity;
 import com.cnlive.cloud.user.ui.fragment.QuickLoginFragment;
@@ -351,8 +352,8 @@ public class QuickLoginView extends BaseView {
     public void bindPhone(OtherUserInfo otherUserInfo) {
         if (fragment == null) return;
-//        BindPhoneNumberActivity.startActivity(fragment.getActivity(),
-//                otherUserInfo, fragment.fromTokenError, fragment.tagMsg, fragment.tagShare, fragment.clickAd);
+        BindPhoneNumberActivity.startActivity(fragment.getActivity(),
+                otherUserInfo, fragment.fromTokenError, fragment.tagMsg, fragment.tagShare, fragment.clickAd);
     }
 }
+package com.cnlive.cloud.user.ui.activity;
+
+
+import android.app.Activity;
+import android.content.Intent;
+import android.text.TextUtils;
+
+import com.cnlive.cloud.user.R;
+import com.cnlive.cloud.user.databinding.ActivityBindPhoneMangerBinding;
+import com.cnlive.cloud.user.databinding.ActivityBindPhoneNumberBinding;
+import com.cnlive.cloud.user.frame.presenter.BindPhoneMangerPresenter;
+import com.cnlive.cloud.user.frame.view.BindPhoneMangerView;
+import com.cnlive.cloud.user.model.BindPhoneNumberInfo;
+import com.cnlive.core.libs.base.frame.activity.BaseActivity;
+import com.cnlive.login.model.OtherUserInfo;
+import com.cnlive.login.model.ThirdLoginInfo;
+import com.cnlive.login.observer.ThirdLoginObservable;
+import com.cnlive.login.observer.WechatLoginObservable;
+import com.cnlive.login.utils.ThirdLoginUtil;
+import com.cnlive.share.data.WeChatInfo;
+
+import java.util.Observable;
+import java.util.Observer;
+
+import androidx.annotation.Nullable;
+import androidx.databinding.ViewDataBinding;
+
+public class BindPhoneMangerActivity extends BaseActivity<BindPhoneMangerView, BindPhoneMangerPresenter> implements Observer {
+    //三方登陆的信息
+    public OtherUserInfo otherUserInfo;
+    //qq的权限
+    public final String ACOPE_ALL = "all";
+    public BindPhoneNumberInfo checkInfo;
+    public int openCode = 10010;
+    public ActivityBindPhoneMangerBinding binding;
+
+    public static void startActivity(Activity context) {
+        Intent intent = new Intent();
+        intent.setClass(context, BindPhoneMangerActivity.class);
+        context.startActivity(intent);
+    }
+
+    @Override
+    protected int getBindLayoutId() {
+        return R.layout.activity_bind_phone_manger;
+    }
+
+    @Override
+    protected void initBindingLayoutData(ViewDataBinding baseBinding) {
+        binding = (ActivityBindPhoneMangerBinding) baseBinding;
+    }
+
+    @Override
+    protected void initView() {
+        showDefaultWhiteStatusBar();
+        if (getMvpView() != null) getMvpView().initView();
+        initThreeLogin();
+    }
+
+    /**
+     * 初始化第三方
+     */
+    private void initThreeLogin() {
+        ThirdLoginUtil.init(this);
+        WechatLoginObservable.getInstance().addObserver(this);
+        ThirdLoginObservable.getInstance().addObserver(this);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        showDefaultWhiteStatusBar();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        WechatLoginObservable.getInstance().deleteObserver(this);
+        ThirdLoginObservable.getInstance().deleteObserver(this);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == 10086 && requestCode == openCode && checkInfo != null) {
+            getPresenter().unBindLogin(this, checkInfo);
+            return;
+        } else if (resultCode == 10010 && requestCode == openCode) {
+            return;
+        }
+
+        ThirdLoginUtil.getQQResult(requestCode, resultCode, data,false);
+        ThirdLoginUtil.getWeiboResult(requestCode, resultCode, data);
+    }
+
+
+    //微信登录回调接口
+    @Override
+    public void update(Observable observable, Object o) {
+        if (observable instanceof WechatLoginObservable && null != o) {
+            WeChatInfo weChatInfo = (WeChatInfo) o;
+            if (weChatInfo != null) {
+                otherUserInfo = new OtherUserInfo();
+                otherUserInfo.setFaceUrl(weChatInfo.getHeadimgurl());
+                if ("1".equals(weChatInfo.getSex())) {
+                    otherUserInfo.setGender("m");
+                } else if ("2".equals(weChatInfo.getSex())) {
+                    otherUserInfo.setGender("f");
+                } else {
+                    otherUserInfo.setGender("n");
+                }
+
+                otherUserInfo.setNickName(weChatInfo.getNickname());
+                if (!TextUtils.isEmpty(weChatInfo.getProvince())) {
+                    otherUserInfo.setLocation(weChatInfo.getProvince());
+                } else {
+                    otherUserInfo.setLocation(weChatInfo.getCountry());
+                }
+
+                otherUserInfo.setThirdPartyId(weChatInfo.getUnionid());
+                otherUserInfo.setLoginType("3");
+            }
+            if (otherUserInfo != null && getPresenter() != null)
+                getPresenter().bindLogin(this, otherUserInfo);
+        } else if (observable instanceof ThirdLoginObservable) {
+            ThirdLoginInfo info = (ThirdLoginInfo) o;
+            if (info != null) {
+                if (info.getType() == 1) {
+                    if (info.getOtherUserInfo() != null) otherUserInfo = info.getOtherUserInfo();
+                    getPresenter().bindLogin(this, otherUserInfo);
+                } else if (info.getType() == 2) {
+                    if (getMvpView() != null) getMvpView().showMessage(info.getMessage());
+                }
+            }
+
+        }
+    }
+}
+package com.cnlive.cloud.user.ui.activity;
+
+
+import android.app.Activity;
+import android.content.Intent;
+import android.text.TextUtils;
+import android.view.View;
+
+import com.cnlive.cloud.user.R;
+import com.cnlive.cloud.user.databinding.ActivityBindPhoneNumberBinding;
+import com.cnlive.cloud.user.frame.presenter.BindPhoneNumberPresenter;
+import com.cnlive.cloud.user.frame.view.BindPhoneNumberView;
+import com.cnlive.core.libs.base.application.AppConfig;
+import com.cnlive.core.libs.base.frame.activity.BaseActivity;
+import com.cnlive.core.libs.base.util.DoublePressed;
+import com.cnlive.login.model.OtherUserInfo;
+
+import androidx.databinding.ViewDataBinding;
+
+public class BindPhoneNumberActivity extends BaseActivity<BindPhoneNumberView, BindPhoneNumberPresenter> implements View.OnClickListener {
+    public OtherUserInfo otherUserInfo;
+    public String countryCode = "86";
+    public String countryName = "中国";
+    public String phoneNum;
+    public String phoneEms;
+    public static String FROM_TOKEN_ERROR = "from_token_error";
+    public static String TAG_MSG = "tagMsg";
+    public static String TAG_SHARE = "";
+    public static String TAG_CLICK_AD = "clickAd";
+
+    public String tagMsg;
+    public String tagShare;
+    public boolean fromTokenError;
+    public boolean clickAd;
+    public ActivityBindPhoneNumberBinding binding;
+
+    public static void startActivity(Activity context, OtherUserInfo info, boolean fromTokenError, String tagMsg, String shareType, boolean clickAd) {
+        Intent intent = new Intent();
+        intent.putExtra(FROM_TOKEN_ERROR, fromTokenError);
+        intent.putExtra(TAG_MSG, tagMsg);
+        intent.putExtra(TAG_SHARE, shareType);
+        intent.putExtra(TAG_CLICK_AD, clickAd);
+        intent.setClass(context, BindPhoneNumberActivity.class);
+        intent.putExtra("info", info);
+        context.startActivity(intent);
+    }
+
+    @Override
+    protected int getBindLayoutId() {
+        return R.layout.activity_bind_phone_number;
+    }
+
+    @Override
+    protected void initBindingLayoutData(ViewDataBinding baseBinding) {
+        super.initBindingLayoutData(baseBinding);
+        binding = (ActivityBindPhoneNumberBinding) baseBinding;
+    }
+
+    @Override
+    protected void initView() {
+        showDefaultWhiteStatusBar();
+        otherUserInfo = (OtherUserInfo) getIntent().getSerializableExtra("info");
+        fromTokenError = (boolean) getIntent().getBooleanExtra(FROM_TOKEN_ERROR, false);
+        tagMsg = (String) getIntent().getStringExtra(TAG_MSG);
+        tagShare = (String) getIntent().getStringExtra(TAG_SHARE);
+        clickAd = getIntent().getBooleanExtra(TAG_CLICK_AD, false);
+        if (!TextUtils.isEmpty(AppConfig.getCountryCode())) {
+            countryCode = AppConfig.getCountryCode();
+        }
+        if (!TextUtils.isEmpty(AppConfig.getCountryName())) {
+            countryName = AppConfig.getCountryName();
+        }
+        if (otherUserInfo == null) {
+            getMvpView().showMessage("数据异常");
+            finish();
+        }
+        if (getMvpView() != null) getMvpView().initViews();
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view.getId() == R.id.tv_vc) {
+            if (DoublePressed.onDoublePressed()) return;
+            if (!TextUtils.isEmpty(binding.etPhone.getText())) {
+                phoneNum = binding.etPhone.getText().toString();
+                if (getPresenter() != null)
+                    getPresenter().sendCode(this, phoneNum, countryCode);
+            } else {
+                if (getMvpView() != null) getMvpView().showMessage("请输入手机号");
+            }
+
+        } else if (view.getId() == R.id.login) {
+            if (DoublePressed.onDoublePressed()) return;
+            if (!TextUtils.isEmpty(binding.etPhone.getText()) && !TextUtils.isEmpty(binding.etEms.getText()) && getPresenter() != null) {
+                phoneNum = binding.etPhone.getText().toString();
+                phoneEms = binding.etEms.getText().toString();
+                getPresenter().bindOther(this, otherUserInfo, phoneNum, phoneEms);
+            } else {
+                if (getMvpView() != null) getMvpView().showMessage("请输入手机号和验证码");
+            }
+        } else if (view.getId() == R.id.ll_country) {
+            if (DoublePressed.onDoublePressed()) return;
+            if (AppConfig.getCountryCode() != null) {
+                SelectCountryActivity.startSelectCountryActivity(this, SelectCountryActivity.ACTIVITY_RESULT_CODE, AppConfig.getCountryCode());
+            } else {
+                SelectCountryActivity.startSelectCountryActivity(this, SelectCountryActivity.ACTIVITY_RESULT_CODE, countryCode);
+            }
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        showDefaultWhiteStatusBar();
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == SelectCountryActivity.ACTIVITY_RESULT_CODE) {
+            countryCode = data.getStringExtra("countryCode");
+            countryName = data.getStringExtra("country");
+            if (!TextUtils.isEmpty(countryCode)) {
+                AppConfig.setCountryCode(countryCode);
+                binding.tvCountry.setText("+ " + countryCode);
+            }
+            if (!TextUtils.isEmpty(countryName)) {
+                AppConfig.setCountryName(countryName);
+                binding.tvCountryName.setText(countryName);
+            }
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (getMvpView() != null) getMvpView().cancelLoading();
+    }
+}
@@ -171,12 +171,12 @@ public class LoginDialogActivity extends BaseActivity&lt;LoginDialogView, LoginDial
 //        }
         else if (id == R.id.iv_qq) {
             if (DoublePressed.onDoublePressed()) return;
-            if (!ThirdLoginUtil.isQQInstalled(LoginDialogActivity.this) && getMvpView() != null)
+            if (!ThirdLoginUtil.isQQInstalled(LoginDialogActivity.this,true) && getMvpView() != null)
                 getMvpView().showToast("您未安装该第三方应用，无法获取用户信息！");
         } else if (id == R.id.iv_wb) {
             if (DoublePressed.onDoublePressed()) return;
             if (Util.isWeiboInstallAndInit(this)) {
-                ThirdLoginUtil.loginWeibo(LoginDialogActivity.this);
+                ThirdLoginUtil.loginWeibo(LoginDialogActivity.this,true);
             } else {
                 if (getMvpView() != null) getMvpView().showToast("您未安装该第三方应用，无法获取用户信息！");
             }
@@ -251,7 +251,7 @@ public class LoginDialogActivity extends BaseActivity&lt;LoginDialogView, LoginDial
             }
         }
-        ThirdLoginUtil.getQQResult(requestCode, resultCode, data);
+        ThirdLoginUtil.getQQResult(requestCode, resultCode, data,true);
         ThirdLoginUtil.getWeiboResult(requestCode, resultCode, data);
     }
+package com.cnlive.cloud.user.ui.activity;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.databinding.DataBindingUtil;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import com.cnlive.cloud.user.R;
+import com.cnlive.cloud.user.databinding.ActivityUnBindThreeLoginCheckBinding;
+
+public class UnBindThreeLoginCheckActivity extends AppCompatActivity implements View.OnClickListener {
+
+    private ActivityUnBindThreeLoginCheckBinding binding;
+
+    public static void startUnBindThreeLoginCheckActivity(Context context, int openCode) {
+        Intent intent = new Intent(context, UnBindThreeLoginCheckActivity.class);
+        Activity activity = (Activity) context;
+        activity.startActivityForResult(intent,openCode);
+        activity.overridePendingTransition(R.anim.activity_trans, R.anim.activity_out);
+    }
+
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_un_bind_three_login_check);
+        binding.tvOk.setOnClickListener(this);
+        binding.tvCancle.setOnClickListener(this);
+    }
+
+
+    @Override
+    public void finish() {
+        super.finish();
+        overridePendingTransition(R.anim.activity_trans, R.anim.fade_out);
+    }
+
+
+    @Override
+    public void onClick(View view) {
+        Intent intent=new Intent();
+        if (view.getId() == R.id.tv_ok) {
+            setResult(10086, intent);
+            finish();
+        } else if (view.getId() == R.id.tv_cancle) {
+            setResult(10010, intent);
+            finish();
+            finish();
+        }
+
+    }
+}
+package com.cnlive.cloud.user.ui.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.cnlive.cloud.user.R;
+import com.cnlive.cloud.user.databinding.ItemBindTitleBinding;
+import com.cnlive.cloud.user.databinding.ItemBindUserBinding;
+import com.cnlive.cloud.user.model.BindPhoneNumberInfo;
+import com.cnlive.core.libs.base.frame.adapter.DataBindingAdapter;
+import com.cnlive.core.libs.base.frame.adapter.holder.DataBindingViewHolder;
+
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ViewDataBinding;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * 作者: 吴奎庆
+ * <p>
+ * 时间: 2019/9/9
+ * <p>
+ * 简介:
+ */
+public class BindPhoneNumberAdapter extends DataBindingAdapter<BindPhoneNumberInfo> {
+    Context mContext;
+    OnItemClickListener listener;
+
+    public BindPhoneNumberAdapter(Context context) {
+        super(context);
+        mContext = context;
+    }
+
+    public void setItemClickListener(OnItemClickListener listener) {
+        this.listener = listener;
+
+    }
+
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+
+        switch (viewType) {
+            case BindPhoneNumberInfo.TYPE_TITLE:
+                ViewDataBinding titleDataBinding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.item_bind_title, parent, false);
+                DataBindingViewHolder titleViewHolder = new DataBindingViewHolder(titleDataBinding.getRoot());
+                titleViewHolder.setBinding(titleDataBinding);
+                return titleViewHolder;
+
+            case BindPhoneNumberInfo.TYPE_LOGIN:
+                ViewDataBinding titlelogin = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.item_bind_user, parent, false);
+                DataBindingViewHolder loginHolder = new DataBindingViewHolder(titlelogin.getRoot());
+                loginHolder.setBinding(titlelogin);
+                return loginHolder;
+
+        }
+        return null;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return mItems.get(position).getItemType();
+    }
+
+    @Override
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+        super.onBindViewHolder(holder, position);
+        int itemType = getItem(position).getItemType();
+        DataBindingViewHolder bindingViewHolder = (DataBindingViewHolder) holder;
+        switch (itemType) {
+            case BindPhoneNumberInfo.TYPE_TITLE:
+                ItemBindTitleBinding bindTitleBinding = (ItemBindTitleBinding) bindingViewHolder.getBinding();
+                bindTitleBinding.setData(getItem(position));
+                break;
+            case BindPhoneNumberInfo.TYPE_LOGIN:
+                ItemBindUserBinding bindUserBinding = (ItemBindUserBinding) bindingViewHolder.getBinding();
+                bindUserBinding.setData(getItem(position));
+                bindUserBinding.tvBind.setOnClickListener(view -> {
+                    listener.onItemClick(getItem(position), bindUserBinding.tvBind,position);
+                });
+                break;
+        }
+    }
+
+
+   public  interface OnItemClickListener {
+        void onItemClick(BindPhoneNumberInfo info, View view, int position);
+    }
+}
@@ -186,12 +186,12 @@ public class QuickLoginFragment extends BaseFragment&lt;QuickLoginView, QuickLoginP
         }else if (id == R.id.iv_qq) {
             if (DoublePressed.onDoublePressed()) return;
-            if (!ThirdLoginUtil.isQQInstalled(getActivity()) && getMvpView() != null)
+            if (!ThirdLoginUtil.isQQInstalled(getActivity(),true) && getMvpView() != null)
                 getMvpView().showToast("您未安装该第三方应用，无法获取用户信息！");
         } else if (id == R.id.iv_wb) {
             if (DoublePressed.onDoublePressed()) return;
             if (Util.isWeiboInstallAndInit(getActivity())) {
-                ThirdLoginUtil.loginWeibo(getActivity());
+                ThirdLoginUtil.loginWeibo(getActivity(),true);
             } else {
                 if (getMvpView() != null) getMvpView().showToast("您未安装该第三方应用，无法获取用户信息！");
             }
@@ -265,7 +265,7 @@ public class QuickLoginFragment extends BaseFragment&lt;QuickLoginView, QuickLoginP
             }
         }
-        ThirdLoginUtil.getQQResult(requestCode, resultCode, data);
+        ThirdLoginUtil.getQQResult(requestCode, resultCode, data,true);
         ThirdLoginUtil.getWeiboResult(requestCode, resultCode, data);
     }
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#D9D9D9" />
+    <corners android:topLeftRadius="15dp" android:topRightRadius="15dp" android:bottomLeftRadius="15dp" android:bottomRightRadius="15dp" />
+</shape>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#ff23d41e" />
+    <corners android:topLeftRadius="15dp" android:topRightRadius="15dp" android:bottomLeftRadius="15dp" android:bottomRightRadius="15dp" />
+</shape>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white" />
+    <corners android:topLeftRadius="10dp"
+        android:topRightRadius="10dp"
+        android:bottomRightRadius="10dp"
+        android:bottomLeftRadius="10dp"/>
+
+    <!-- 间隔 -->
+    <!--<padding-->
+        <!--android:left="10dp"-->
+        <!--android:top="3dp"-->
+        <!--android:right="10dp"-->
+        <!--android:bottom="3dp"/>&lt;!&ndash; 各方向的间隔 &ndash;&gt;-->
+    <stroke android:width="1dp" android:color="@color/white" />
+</shape>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/includeToolbar"
+            layout="@layout/layout_title_toolbar" />
+
+        <View
+            android:id="@+id/line"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/includeToolbar"
+            android:background="@color/whiteGary" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:background="#F4F4F4"
+            android:id="@+id/rv_content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+
+    </LinearLayout>
+
+</layout>
@@ -118,38 +118,38 @@
                 android:layout_height="wrap_content">
-            <TextView
-                android:layout_marginLeft="15dp"
-                android:id="@+id/tv_country_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:text="手机号归属地"
-                android:textColor="@color/color_333"
-                android:textSize="14sp" />
-
-            <LinearLayout
-                android:layout_marginRight="12dp"
-                android:id="@+id/ll_country"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:padding="13dp">
-
                 <TextView
-                    android:id="@+id/tv_country"
+                    android:layout_marginLeft="15dp"
+                    android:id="@+id/tv_country_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:text="手机号归属地"
                     android:textColor="@color/color_333"
                     android:textSize="14sp" />
-                <ImageView
+                <LinearLayout
+                    android:layout_marginRight="12dp"
+                    android:id="@+id/ll_country"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="9dp"
-                    android:background="@drawable/dl_xl" />
-            </LinearLayout>
+                    android:layout_alignParentRight="true"
+                    android:padding="13dp">
+
+                    <TextView
+                        android:id="@+id/tv_country"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/color_333"
+                        android:textSize="14sp" />
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="9dp"
+                        android:background="@drawable/dl_xl" />
+                </LinearLayout>
             </RelativeLayout>
             <LinearLayout
                 android:layout_width="match_parent"
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <RelativeLayout
+        android:id="@+id/root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:background="@color/transparent">
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_margin="20dp"
+            android:layout_marginLeft="2dp"
+            android:layout_marginRight="2dp"
+            android:background="@drawable/shape_update"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="48dp"
+                android:layout_marginRight="10dp"
+                android:background="@null"
+                android:text="确定解除绑定？ "
+                android:textColor="@color/black"
+                android:textSize="18sp" />
+
+
+            <View
+                android:layout_marginTop="30dp"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/driver_list" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="44dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/tv_cancle"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:padding="10dp"
+                        android:singleLine="true"
+                        android:text="取消"
+                        android:textColor="@color/color_23d41e"
+                        android:textSize="17sp" />
+
+                    <View
+                        android:layout_width="1dp"
+                        android:layout_height="match_parent"
+                        android:background="@color/driver_list" />
+
+                    <TextView
+                        android:id="@+id/tv_ok"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:padding="10dp"
+                        android:singleLine="true"
+                        android:text="确定"
+                        android:textColor="@color/color_23d41e"
+                        android:textSize="17sp" />
+
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+
+    </RelativeLayout>
+
+
+</layout>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <data>
+
+        <variable
+            name="data"
+            type="com.cnlive.cloud.user.model.BindPhoneNumberInfo" />
+
+    </data>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:background="#F4F4F4"
+        android:layout_height="38dp">
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_marginLeft="15.5dp"
+            android:layout_gravity="center_vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@{data.itemName}"
+            android:textColor="#ff999999"
+            android:textSize="14sp"
+            />
+    </LinearLayout>
+</layout>
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <data>
+        <variable
+            name="data"
+            type="com.cnlive.cloud.user.model.BindPhoneNumberInfo" />
+
+    </data>
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="77dp"
+        android:background="@color/white">
+
+        <ImageView
+            android:id="@+id/iv_login"
+            android:layout_width="47dp"
+            android:layout_height="47dp"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="15dp"
+            android:src="@{data.typeIcon}" />
+
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="11.5dp"
+            android:layout_toRightOf="@+id/iv_login"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@{data.typeName}"
+                android:textColor="#ff333333"
+                android:textSize="16sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@{data.userName}"
+                android:textColor="#ff999999"
+                android:textSize="12sp" />
+        </LinearLayout>
+
+
+        <TextView
+            android:id="@+id/tv_bind"
+            android:layout_width="68dp"
+            android:layout_height="30dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="15dp"
+            android:background="@{data.bind?@drawable/shape_bind_black_bg:@drawable/shape_bind_green_bg}"
+            android:gravity="center"
+            android:text="@{data.bind?@string/three_login_bind:@string/three_login_bind_un}"
+            android:textColor="@color/white" />
+
+    </RelativeLayout>
+</layout>
@@ -20,4 +20,6 @@
     <string name="msg_exit">再次点击退出网家家</string>
     <string name="msg_exit_login">再次点击返回登录</string>
+    <string name="three_login_bind">已绑定</string>
+    <string name="three_login_bind_un">未绑定</string>
 </resources>
@@ -14,6 +14,7 @@ import java.util.Map;
 import io.reactivex.Observable;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
+import retrofit2.adapter.rxjava2.Result;
 import retrofit2.http.Multipart;
 import retrofit2.http.POST;
 import retrofit2.http.Part;
@@ -177,4 +178,20 @@ public interface ApiBaseServiceOpen {
     @POST("open/api2/user/loginIn3rdAndMobileForWJJ")
     Observable<BaseResult<UserData>> loginIn3rdAndMobileForWJJ(@QueryMap Map<String, String> map);
+
+    /**
+     * 解除绑定
+     * @param map
+     * @return
+     */
+    @POST("open/api2/user/unBind3rd")
+    Observable<BaseResult> unBind3rd(@QueryMap Map<String, String> map);
+
+    /**
+     * 绑定
+     * @param map
+     * @return
+     */
+    @POST("open/api2/user/bind3rd")
+    Observable<BaseResult> bind3rd(@QueryMap Map<String, String> map);
 }
@@ -27,7 +27,7 @@ dependencies {
     /** 圆形图片处理  androidx  **/
-    implementation 'de.hdodenhof:circleimageview:3.0.1'
+    implementation "de.hdodenhof:circleimageview:$rootProject.circleimageview"
     /*下拉刷新 上拉加载更多*/
     implementation 'com.github.Aspsine:SwipeToLoadLayout:1.0.4'
+/build
+apply plugin: 'com.android.library'
+
+android {
+//    compileSdkVersion 29
+//    buildToolsVersion "29.0.2"
+//
+//
+//    defaultConfig {
+//        minSdkVersion 16
+//        targetSdkVersion 29
+//        versionCode 1
+//        versionName "1.0"
+//
+//        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+//        consumerProguardFiles 'consumer-rules.pro'
+//    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+
+
+    def moduleVersion = "0.3.7-alpha01"
+
+
+    annotationProcessor "com.google.dagger:dagger-android-processor:2.16"
+    // 刷新控件
+    implementation "com.scwang.smartrefresh:SmartRefreshLayout:$rootProject.SmartRefreshLayout"
+    implementation "com.scwang.smartrefresh:SmartRefreshHeader:$rootProject.SmartRefreshHeader"
+    // 圆形图片
+    implementation "de.hdodenhof:circleimageview:$rootProject.circleimageview"
+    // MagicIndicator
+    implementation("com.github.SherlockGougou:MagicIndicator:1.6.0") {
+        exclude group: 'com.android.support'
+    }
+    // recyclerview-animators
+    implementation("jp.wasabeef:recyclerview-animators:$rootProject.recyclerviewAnimators") {
+        exclude group: 'com.android.support'// 内部引入了27.1.1的appcompat-v7包和support-annotations
+    }
+    // 视讯云支付sdk
+//    implementation 'com.cnlive:lib_cnpay:1.0.9'
+    // span
+    api 'com.zrq:spanbuilder:1.0.5'
+    // 选择的dialog（版本升级了）
+    api 'com.contrarywind:Android-PickerView:4.1.6'
+    // shape button
+    api 'com.github.medyo:fancybuttons:1.9.0'
+    // 高德定位
+    implementation "com.amap.api:location:latest.integration"
+    // 高德地图3D
+    api 'com.amap.api:3dmap:6.6.0'
+    // 搜索功能
+    api 'com.amap.api:search:6.5.0.1'
+    // 轮播图
+    api 'com.youth.banner:banner:1.4.10'
+    // 圆角图片
+    implementation 'com.makeramen:roundedimageview:2.3.0'
+    // 图片选择
+    api 'com.cnlive.module:matisse:0.0.1'
+    // divider
+    api('com.zrq:divider:1.0.1') {
+        exclude group: 'com.android.support'
+    }
+    // PhotoView
+    api('com.github.chrisbanes:PhotoView:2.1.4') {
+        exclude group: 'com.android.support'
+    }
+    // DiscreteScrollView
+    api('com.yarolegovich:discrete-scrollview:1.4.9') {
+        exclude group: 'com.android.support'
+    }
+    // baseAdapter
+    api "com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.42"
+    // 状态栏
+    api "com.jaeger.statusbarutil:library:1.5.1"
+    // EventBus
+    api "org.greenrobot:eventbus:3.1.1"
+    // RxLifecycle
+    api("com.trello.rxlifecycle2:rxlifecycle:2.2.2") {
+        exclude module: 'rxjava'// rxJava
+    }
+    //没有
+    api("com.trello.rxlifecycle2:rxlifecycle-components:2.2.2") {
+        exclude group: 'com.android.support'// 内部引入了27.1.1的appcompat-v7包和support-annotations
+        exclude module: 'rxjava'// rxJava
+    }
+    // Anko Commons
+    api "org.jetbrains.anko:anko-commons:0.10.5"
+    api "org.jetbrains.anko:anko-support-v4-commons:0.10.5"// Support-v4 (only Anko Commons)
+    // Dagger2
+    api "com.google.dagger:dagger:2.16"
+    annotationProcessor "com.google.dagger:dagger-compiler:2.16"
+    // dagger-android
+    api "com.google.dagger:dagger-android:2.16"
+    api "com.google.dagger:dagger-android-support:2.16"
+    api("com.cnlive.module:shop:$moduleVersion") {
+        transitive = false
+    }
+    api("com.cnlive.module:base:$moduleVersion") {
+        transitive = false
+    }
+    api("com.cnlive.module:common:$moduleVersion") {
+        transitive = false
+    }
+    api("com.cnlive.module:repast:$moduleVersion") {
+        transitive = false
+    }
+    api("com.cnlive.module:ar:$moduleVersion") {
+        transitive = false
+    }
+    // happy-china
+    api("com.cnlive.module:happy-china:$moduleVersion") {
+        transitive = false
+    }
+
+    api("com.cnlive.module:local-life:$moduleVersion") {
+        transitive = false
+    }
+    // ********  工具  ********
+    // kotlin环境
+    api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.21"
+    // systembartint
+    api 'com.readystatesoftware.systembartint:systembartint:1.0.4'
+
+    // 文字垂直滚动
+    api 'com.sunfusheng:marqueeview:1.2.0'
+    // 流式布局
+    api 'com.hyman:flowlayout-lib:1.1.2'
+    // gif //没有
+    api 'pl.droidsonroids.gif:android-gif-drawable:1.2.8'
+    // 网家家支付
+    api "com.cnlive.libs:wjjpay:1.0.5"
+
+    api "com.oushangfeng:PinnedSectionItemDecoration:1.3.2"
+
+    // snap
+    implementation 'com.github.rubensousa:gravitysnaphelper-compat:2.0'
+    // 模糊
+    implementation "com.wonderkiln:blurkit:1.0.0"
+    // LayoutManager
+    implementation "com.beloo.widget:ChipsLayoutManager:0.3.7@aar"
+
+    //CNLiveLibs
+    implementation "com.cnlive.libs:base:1.7.6.18"
+    implementation "com.cnlive.libs:emoj:$rootProject.libEmoj"
+    implementation "com.cnlive.libs:noober_menu:$rootProject.libMenu"
+//    implementation "com.cnlive.libs:arch:$rootProject.appArch"
+    //七牛上传
+    implementation "com.qiniu:qiniu-android-sdk:$rootProject.qiniuAndroidSdk"
+    // 阴影布局
+    api 'com.github.lihangleo2:ShadowLayout:2.0.1'
+
+    api 'com.github.lihangleo2:ShadowLayout:2.0.1'
+
+    api "com.tencent.imsdk:imsdk:$rootProject.imsdk"
+
+    implementation project(path: ':cloud:user')
+    implementation project(path: ':cloud:app_pay')
+    implementation project(path: ':module:shanghaishop')
+    implementation project(path: ':core:base')
+}
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+package com.clive.happychina.shopcity;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+
+        assertEquals("com.clive.happychina.shopcity.test", appContext.getPackageName());
+    }
+}
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.clive.happychina.shopcity" >
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+    <application
+        android:allowBackup="true"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:vmSafeMode="true">
+        <activity
+            android:name=".OrderListShopActivity"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:screenOrientation="portrait" />
+        <activity android:name=".ShopWebActivity"></activity>
+    </application>
+
+</manifest>
+package com.clive.happychina.shopcity;
+
+import android.graphics.Color;
+import android.os.Bundle;
+
+import com.cnlive.libs.base.util.StatusBarUtil;
+import com.cnlive.module.common.utils.SystemBarUtils;
+import com.cnlive.module.shop.ui.fragment.OrderListFragment;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class OrderListShopActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_order_list_shop);
+        SystemBarUtils.setStatusBarColor(this, Color.WHITE);
+        StatusBarUtil.setStatusBarWrite(this);
+        getSupportFragmentManager().beginTransaction().add(R.id.containers, new OrderListFragment()).commit();
+    }
+}
+package com.clive.happychina.shopcity;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.text.TextUtils;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.cnlive.cloud.user.auth.UserService;
+import com.cnlive.libs.base.application.AppConfig;
+import com.cnlive.libs.base.arouter.user.OpenUserService;
+import com.cnlive.module.common.router.ShopService;
+import com.cnlive.strike.pay.IPay;
+
+import org.jetbrains.annotations.NotNull;
+
+import androidx.annotation.Nullable;
+
+
+/**
+ * 描述:
+ *
+ * @author zhangrq
+ * 2018/10/23 11:27
+ */
+@Route(path = "/service/shop")
+public class ShopServiceImpl implements ShopService {
+    private Context context;
+
+    @Override
+    public void init(Context context) {
+        this.context = context;
+    }
+
+    @Nullable
+    @Override
+    public String getUid() {
+        // TODO 传入你们的用户id，可以传null
+        if(context == null || UserService.getUid(context) == null) return null;
+        return UserService.getUid(context);
+    }
+
+    @Nullable
+    @Override
+    public String getAccount(int payType) {
+        // TODO 传入你们支付时用的Account
+        if (payType == IPay.PAY_TYPE_ALI) {
+            // 支付宝
+            return "";
+        } else if (payType == IPay.PAY_TYPE_WX) {
+            // 微信
+            // TODO 改成正式Account
+            return AppConfig.getPayAccount();
+        } else if (payType == IPay.PAY_TYPE_UNION) {
+            // 银联
+            return "ztyl";
+        }
+        return "";
+    }
+
+    @Override
+    public void jumpToScanActivity(Activity activity, int i) {
+        // TODO 跳到扫码页面，这个目前没对接不用处理
+    }
+
+    @Override
+    public boolean checkUserLogin(@NotNull Context context) {
+        OpenUserService service = (OpenUserService) ARouter.getInstance().build("/cnCheckUser/cnCheckUserService").navigation(context);
+        if (service != null) {
+            return service.userHasLogin(UserService.getUid(context));
+        }
+        return !TextUtils.isEmpty(UserService.getUid(context));
+    }
+
+    @Override
+    public void jumpToActivityByUri(@NotNull Activity activity, @NotNull Uri uri) {
+        //web页面直接跳转点播视频等
+//        UriJump.jumpToView(activity, uri);
+    }
+
+    @Override
+    public void jumpToHQYWShopHomeActivity(@NotNull Activity activity) {
+        //跳转环球优物 ---商城首页
+        Intent intent = new Intent(activity, cn.cnlive.b2c.MainActivity.class);
+        activity.startActivity(intent);
+    }
+
+    @Override
+    public void jumpWJJLoginProcess(@NotNull Activity activity, @NotNull String s) {
+        //检测是否登录并跳转
+        OpenUserService service = (OpenUserService) ARouter.getInstance().build("/cnCheckUser/cnCheckUserService").navigation(context);
+        if (service != null) {
+            service.userHasLogin(UserService.getUid(context), s, false);
+        }
+    }
+}
+package com.clive.happychina.shopcity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.cnlive.module.common.utils.JumpToActivityUtils;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+@Route(path = "/cnshopCity/ShopWebActivity")
+public class ShopWebActivity extends AppCompatActivity {
+
+    public static void startActivity(Context context,String type,String to,String shop_type) {
+        Intent intent = new Intent(context, ShopWebActivity.class);
+        intent.putExtra("type",type);
+        intent.putExtra("to",to);
+        intent.putExtra("shop_type",shop_type);
+        context.startActivity(intent);
+    }
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_shop_web);
+        Intent intent = getIntent();
+        JumpToActivityUtils.jumpToActivityByType(this,
+                intent.getStringExtra("type"), intent.getStringExtra("to"), intent.getStringExtra("shop_type"));
+        finish();
+    }
+}
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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:orientation="vertical"
+    tools:context="com.clive.happychina.shopcity.OrderListShopActivity">
+
+    <com.cnlive.module.base.widgets.HeaderBar
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        app:titleText="我的订单" />
+
+    <View style="@style/horizontallLine" />
+
+    <FrameLayout
+        android:id="@+id/containers"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white" />
+</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout 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.clive.happychina.shopcity.ShopWebActivity">
+
+</android.support.constraint.ConstraintLayout>
+<resources>
+    <string name="app_name">shopcity</string>
+</resources>
+package com.clive.happychina.shopcity;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
 \ No newline at end of file
 include ':app:strike'
 //基础库
 include ':core:base',':core:network',':core:imageload' ,':core:app_qr',':core:database'
-include ':cloud:user',':cloud:pay',':cloud:third_tool',':cloud:video'
-include ':module:xiaojiasoundbox',':module:pedometer',':module:shanghaishop'
+include ':cloud:user',':cloud:pay',':cloud:third_tool',':cloud:video',':cloud:app_pay'
+include ':module:xiaojiasoundbox',':module:pedometer',':module:shanghaishop',':module:shopcity'
 include ':library_baidumap'
 rootProject.name='ModuleStrike'