Skip to content

Y
YDL-Component-Medical
Commit 1847e95e by ydl
Options

mine组件化自测完成

parents e20bdb06 e06539f9
Showing with 1734 additions and 174 deletions
app/src/main/java/com/ydl/component/TestAppActivity.kt
......@@ -6,6 +6,7 @@ import android.support.v4.app.FragmentPagerAdapter
import android.support.v7.app.AppCompatActivity
import com.yidianling.dynamic.trendsHome.TrendsHomeFragment
import com.yidianling.home.ui.fragment.YdlHomeFragment
import com.yidianling.user.MineFragment
import kotlinx.android.synthetic.main.activity_test_app.*
import java.util.*
......@@ -26,6 +27,7 @@ class TestAppActivity : AppCompatActivity() {
fragments.add(YdlHomeFragment())
fragments.add(TrendsHomeFragment().setTab("trend_tap"))
fragments.add(MineFragment())
val adapter: FragmentPagerAdapter =
object : FragmentPagerAdapter(supportFragmentManager) {
override fun getItem(position: Int): Fragment {
......
app/src/main/java/com/ydl/component/base/DemoAppLifecycles.java
......@@ -7,7 +7,6 @@ import android.content.Intent;
import android.os.Build;
import android.os.Process;
import android.support.annotation.RequiresApi;
import com.facebook.stetho.Stetho;
import com.meituan.android.walle.WalleChannelReader;
import com.tencent.bugly.crashreport.CrashReport;
......@@ -23,14 +22,13 @@ import com.ydl.media.audio.PlayService;
import com.ydl.ydlcommon.base.config.HttpConfig;
import com.ydl.ydlcommon.base.config.YDLConstants;
import com.ydl.ydlcommon.base.delegate.IAppLifecycles;
import com.ydl.ydlcommon.utils.AppProgressUtils;
import com.ydl.ydlcommon.utils.LogUtil;
import com.ydl.ydlcommon.utils.YdlBuryPointUtil;
import com.yidianling.course.lifeCallback.CoursePlayLifecycle;
import com.yidianling.im.config.NimApplication;
import org.jetbrains.annotations.NotNull;
import io.flutter.view.FlutterMain;
import org.jetbrains.annotations.NotNull;
/**
* Created by haorui on 2019-09-02.
......@@ -48,7 +46,7 @@ public class DemoAppLifecycles implements IAppLifecycles {
public void onCreate(@NotNull Application application) {
//模块初始化
moduleInit(application);
if (UMUtils.isMainProgress(application)) {
if (AppProgressUtils.isMainProcess(application)) {
//第三方SDK初始化
initThirdServiceSDK(application);
//Flutter 初始化需要在主线程中执行
......@@ -88,9 +86,9 @@ public class DemoAppLifecycles implements IAppLifecycles {
//子线程中初始化X5内核，防止ANR问题
initX5(application);
if (DemoGlobalConfig.appEnv.equals(YDLConstants.ENV_PROD)){
if (DemoGlobalConfig.appEnv.equals(YDLConstants.ENV_PROD)) {
// YDLavManager.Companion.getInstances().init(application, "3387e9b251f3491e9221a9877e8f7830");
}else {
} else {
// YDLavManager.Companion.getInstances().init(application, "13b1536698f64905a1e7e5bb978ba821");
}
......@@ -110,13 +108,13 @@ public class DemoAppLifecycles implements IAppLifecycles {
if (BuildConfig.FLAVOR.endsWith("ydl")) {
umAppkey = "56970affe0f55a9cda001e24";
channel = "android_" + channel;
initUM(umAppkey, channel,application);
initUM(umAppkey, channel, application);
PlatformConfig.setWeixin("wx57a9d930270498c7", "17c031f02500ded3457a80e69d8e5e45");
PlatformConfig.setQQZone("1105070461", "6BvkUnk6wXJekcgR");
}else if (BuildConfig.FLAVOR.endsWith("xlzx")) {
} else if (BuildConfig.FLAVOR.endsWith("xlzx")) {
umAppkey = "5859e1656e27a42fa400021f";
channel = "ATK_7_android_" + channel;
initUM(umAppkey, channel,application);
initUM(umAppkey, channel, application);
PlatformConfig.setWeixin("wx1c6af5a11b5f531f", "1ddb93abbb2d81e604657d38e94a5720");
PlatformConfig.setQQZone("1107931541", "8dCvxUpi525uPGTJ");
}
......@@ -139,7 +137,6 @@ public class DemoAppLifecycles implements IAppLifecycles {
}
private void initUM(String umAppKey, String channel, Application application) {
/**
* 初始化common库
......@@ -156,6 +153,7 @@ public class DemoAppLifecycles implements IAppLifecycles {
/**
* 初始化X5内核
*
* @param application
*/
private void initX5(Application application) {
......@@ -173,7 +171,7 @@ public class DemoAppLifecycles implements IAppLifecycles {
@Override
public void onViewInitFinished(boolean arg0) {
//初始化完成回调
LogUtil.i("QbSdk onViewInitFinished："+arg0);
LogUtil.i("QbSdk onViewInitFinished：" + arg0);
}
@Override
......
build.gradle
......@@ -16,6 +16,8 @@ buildscript {
constrait_support_version = '1.0.2'
}
repositories {
google()
//壹点灵android maven私服 开发版
maven{
url 'http://nexus.yidianling.com/repository/AndroidRepository/'
......
config.gradle
......@@ -74,7 +74,7 @@ ext {
"ydl-webview" : "0.0.37.2",
"ydl-media" : "0.0.20",
"ydl-pay" : "0.0.17",
"ydl-pay" : "0.0.17.2",
"m-audioim" : "0.0.46.2",
"ydl-flutter-base": "0.0.10",
......
m-audioim/src/main/res/drawable/audioim_home_button_autoaxb_background.xml
......@@ -3,7 +3,7 @@
<corners android:radius="20dp" />
<gradient android:startColor="#1DA1F2"
android:endColor="@color/confide_main_theme_light"
android:endColor="#1DA1F2"
android:angle="180"/>
</shape>
\ No newline at end of file
m-audioim/src/main/res/values/colors.xml
......@@ -5,4 +5,5 @@
<color name="audioim_color_50ffffff">#B3ffffff</color>
<color name="audioim_color_30FFFFFF">#4DFFFFFF</color>
<color name="audioim_color_70FFFFFF">#B3FFFFFF</color>
<color name="audioim_ydl_color">#1da1f2</color>
</resources>
m-course/src/main/java/com/yidianling/course/coursePlay/CoursePlayActivity.kt
......@@ -50,7 +50,7 @@ import com.yidianling.course.bean.CourseMediaDetailBean
import com.yidianling.course.coursePlay.presenter.CoursePlayPresenter
import com.yidianling.course.router.CourseIn
import com.yidianling.course.widget.VideoFloatHelper
import com.yidianling.ydl_pay.CommonPayDialog
import com.yidianling.ydl_pay.common.CommonPayDialog
import kotlinx.android.synthetic.main.activity_course_play.*
import org.json.JSONException
import org.json.JSONObject
......
m-dynamic/src/main/java/com/yidianling/dynamic/thank/view/ThankHeadView.kt
......@@ -22,7 +22,7 @@ import com.yidianling.dynamic.thank.ShowIntroduceDialogFragment
import com.yidianling.dynamic.thank.ThankActivity
import com.yidianling.dynamic.thank.WorryDetailAnswer
import com.yidianling.dynamic.thank.data.ThxData
import com.yidianling.ydl_pay.CommonPayDialog
import com.yidianling.ydl_pay.common.CommonPayDialog
import de.greenrobot.event.EventBus
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
......
m-user/build.gradle
......@@ -86,6 +86,7 @@ dependencies {
api project(':ydl-webview')
api project(':ydl-platform')
api project(':m-audioim')
api project(":ydl-pay")
implementation modularPublication('com.ydl:m-user-api')
implementation modularPublication('com.ydl:m-audioim-api')
implementation modularPublication('com.ydl:m-home-api')
......@@ -104,6 +105,7 @@ dependencies {
compileOnly rootProject.ext.dependencies["ydl-m-dynamic-api"]
api rootProject.ext.dependencies["m-audioim"]
api rootProject.ext.dependencies["ydl-webview"]
api rootProject.ext.dependencies["ydl-pay"]
api(rootProject.ext.dependencies["ydl-platform"]) {
transitive = true
}
......
m-user/src/main/AndroidManifest.xml
......@@ -90,6 +90,72 @@
android:exported="true"
android:launchMode="singleTop" />
<activity
android:name="com.yidianling.user.mine.AboutUsActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yidianling.user.mine.AccountHistoryActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yidianling.user.mine.AccountSettingActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yidianling.user.mine.ContactCustomerServiceActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yidianling.user.mine.FeedBackActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateUnspecified" />
<activity
android:name="com.yidianling.user.mine.MyFeedBackActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yidianling.user.mine.FeedBackSuccessActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yidianling.user.mine.HelpActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yidianling.user.mine.NotificationsSettingActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yidianling.user.mine.PersonalDesActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yidianling.user.mine.PersonalInfoActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yidianling.user.mine.RechargeActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yidianling.user.mine.SetInfoActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yidianling.user.mine.WithDrawActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yidianling.user.mine.WithDrawSuccessActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yidianling.user.mine.ChooseAccountActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yidianling.user.mine.EditAccountActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yidianling.user.mine.AddAccountActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yidianling.user.mine.RechargeResultActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yidianling.user.mine.PwdCheckActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.yidianling.user.mine.PhoneChangeActivity"
android:screenOrientation="portrait" />
</application>
</manifest>
\ No newline at end of file
m-user/src/main/java/com/yidianling/user/mine/NotificationsSettingActivity.java
......@@ -60,7 +60,7 @@ public class NotificationsSettingActivity extends BaseActivity {
try {
ModularServiceManager.INSTANCE.provide(IImService.class).imInSetRing(isChecked);
} catch (Exception e) {}
JPushManager.INSTANCE.updateConfig(getApplicationContext());
// JPushManager.INSTANCE.updateConfig(getApplicationContext());
}
});
......@@ -74,7 +74,7 @@ public class NotificationsSettingActivity extends BaseActivity {
try {
ModularServiceManager.INSTANCE.provide(IImService.class).imInSetVibrate(isChecked);
} catch (Exception e) {}
JPushManager.INSTANCE.updateConfig(getApplicationContext());
// JPushManager.INSTANCE.updateConfig(getApplicationContext());
}
});
......
m-user/src/main/java/com/yidianling/user/mine/RechargeActivity.java
......@@ -14,8 +14,6 @@ import android.widget.EditText;
import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.cxzapp.yidianling.pay.PayActivity;
import com.cxzapp.yidianling.pay.PayParams;
import com.ydl.ydlcommon.base.BaseActivity;
import com.ydl.ydlcommon.data.http.RxUtils;
import com.ydl.ydlcommon.data.http.ThrowableConsumer;
......@@ -24,6 +22,8 @@ import com.ydl.ydlcommon.view.RoundCornerButton;
import com.yidianling.common.tools.ToastUtil;
import com.yidianling.user.R;
import com.yidianling.user.mine.data.AppDataManager;
import com.yidianling.ydl_pay.pay.PayActivity;
import com.yidianling.ydl_pay.pay.PayParams;
import org.jetbrains.annotations.NotNull;
......
m-user/src/main/java/com/yidianling/user/mine/fragment/AddBankAccountFragment.kt
package com.yidianling.user.mine.fragment
import com.cxzapp.yidianling.R
import com.ydl.ydlcommon.base.BaseFragment
import com.yidianling.user.R
/**
......@@ -10,7 +10,7 @@ import com.ydl.ydlcommon.base.BaseFragment
*/
class AddBankAccountFragment : BaseFragment() {
override fun layoutResId(): Int {
return R.layout.fragment_add_bank_account
return R.layout.user_mine_fragment_add_bank_account
}
override fun initDataAndEvent() {
......
m-user/src/main/res/drawable/user_mine_app_shape_red_bg.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
tools:ignore="MissingDefaultResource">
<!-- 圆角 -->
<corners android:radius="10dp" />
<solid android:color="#EB5835" />
</shape>
\ No newline at end of file
m-user/src/main/res/drawable/user_mine_notify_bg.xml
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true"
android:drawable="@drawable/tb_open" /> <!-- pressed -->
<item android:drawable="@drawable/tb_close" /> <!-- default/unchecked -->
android:drawable="@drawable/user_mine_tb_open" /> <!-- pressed -->
<item android:drawable="@drawable/user_mine_tb_close" /> <!-- default/unchecked -->
</selector>
\ No newline at end of file
m-user/src/main/res/layout/user_mine_activity_about_us.xml
......@@ -141,7 +141,7 @@
android:layout_height="18dp"
android:layout_centerVertical="true"
android:layout_marginLeft="80dp"
android:background="@drawable/app_shape_red_bg"
android:background="@drawable/user_mine_app_shape_red_bg"
android:gravity="center"
android:text="New"
android:textColor="@color/white"
......
m-user/src/main/res/layout/user_mine_fragment_add_bank_account.xml 0 → 100644
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical"
tools:context="com.yidianling.user.mine.fragment.AddBankAccountFragment">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:src="@drawable/user_mine_img_yhk" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="26dp"
android:text="近期会持续开通提现到银行卡，敬请期待......"
android:textColor="@color/platform_color_999999"
android:textSize="15sp" />
</LinearLayout>
ydl-pay/build.gradle
......@@ -44,7 +44,9 @@ dependencies {
if (rootProject.ext.dev_mode){
//开发时使用
api project(':ydl-platform')
implementation modularPublication('com.ydl:m-im-api')
}else {
compileOnly rootProject.ext.dependencies["ydl-m-im-api"]
//发布时使用
api(rootProject.ext.dependencies["ydl-platform"]) {
transitive = true
......
ydl-pay/src/main/AndroidManifest.xml
......@@ -3,4 +3,10 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<application>
<activity
android:name=".pay.PayActivity"
android:screenOrientation="portrait" />
</application>
</manifest>
ydl-pay/src/main/java/com/yidianling/ydl_pay/bean/PayResult.java deleted 100644 → 0
package com.yidianling.ydl_pay.bean; import android.text.TextUtils; import java.util.Map; public class PayResult { private String resultStatus; private String result; private String memo; public PayResult(Map<String, String> rawResult) { if (rawResult == null) { return; } for (String key : rawResult.keySet()) { if (TextUtils.equals(key, "resultStatus")) { resultStatus = rawResult.get(key); } else if (TextUtils.equals(key, "result")) { result = rawResult.get(key); } else if (TextUtils.equals(key, "memo")) { memo = rawResult.get(key); } } } @Override public String toString() { return "resultStatus={" + resultStatus + "};memo={" + memo + "};result={" + result + "}"; } /** * @return the resultStatus */ public String getResultStatus() { return resultStatus; } /** * @return the memo */ public String getMemo() { return memo; } /** * @return the result */ public String getResult() { return result; }}
\ No newline at end of file
ydl-pay/src/main/java/com/yidianling/ydl_pay/CommonPayDialog.kt → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/CommonPayDialog.kt
package com.yidianling.ydl_pay
package com.yidianling.ydl_pay.common
import android.annotation.SuppressLint
import android.app.Activity
......@@ -15,14 +15,15 @@ import com.alipay.sdk.app.PayTask
import com.tencent.mm.opensdk.modelpay.PayReq
import com.tencent.mm.opensdk.openapi.WXAPIFactory
import com.yidianling.common.tools.RxImageTool
import com.yidianling.ydl_pay.bean.*
import com.yidianling.ydl_pay.bean.params.*
import com.yidianling.ydl_pay.http.HttpUtils
import com.yidianling.ydl_pay.http.utils.NetUtils
import com.yidianling.ydl_pay.http.utils.RxDeviceTool
import com.yidianling.ydl_pay.toast.ToastHelper
import com.yidianling.ydl_pay.widget.PayCouponView
import com.yidianling.ydl_pay.widget.PayInfoDetailView
import com.yidianling.ydl_pay.R
import com.yidianling.ydl_pay.common.bean.*
import com.yidianling.ydl_pay.common.bean.params.*
import com.yidianling.ydl_pay.common.http.HttpUtils
import com.yidianling.ydl_pay.common.http.utils.NetUtils
import com.yidianling.ydl_pay.common.http.utils.RxDeviceTool
import com.yidianling.ydl_pay.common.toast.ToastHelper
import com.yidianling.ydl_pay.common.widget.PayCouponView
import com.yidianling.ydl_pay.common.widget.PayInfoDetailView
import de.greenrobot.event.EventBus
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
......@@ -135,39 +136,41 @@ class CommonPayDialog : Dialog {
private fun initThanksPayInfoDetailView(bean: OrderInfoBean) {
view_pager.setScanScroll(false)
detailView =
PayInfoDetailView(activity, object : PayInfoDetailView.OnCouponDetailClickListener {
override fun selectCoupon(couponId: String) {
}
PayInfoDetailView(
activity,
object : PayInfoDetailView.OnCouponDetailClickListener {
override fun selectCoupon(couponId: String) {
}
override fun ensurePay(
payWay: Int,
payMoney: Float,
useMoneyType: Int,
code: String,
couponType: String
) {
//感谢的时候比较暴力：payid是外部传过来的、余额一定会被扣掉
if (payBusinessType == TYPE_TRENDS_THANKS) {
showProgressDialog()
if (payMoney > 0) {
when (payWay) {
PAY_WECHAT -> {
getWeiXinPayOrderId(
thankPayId!!,
if (useMoneyType == 2) 1 else 0
)
}
else -> {
getAliPayOrderId(thankPayId!!, if (useMoneyType == 2) 1 else 0)
override fun ensurePay(
payWay: Int,
payMoney: Float,
useMoneyType: Int,
code: String,
couponType: String
) {
//感谢的时候比较暴力：payid是外部传过来的、余额一定会被扣掉
if (payBusinessType == TYPE_TRENDS_THANKS) {
showProgressDialog()
if (payMoney > 0) {
when (payWay) {
PAY_WECHAT -> {
getWeiXinPayOrderId(
thankPayId!!,
if (useMoneyType == 2) 1 else 0
)
}
else -> {
getAliPayOrderId(thankPayId!!, if (useMoneyType == 2) 1 else 0)
}
}
} else {
//余额支付
payByCharge()
}
} else {
//余额支付
payByCharge()
}
}
}
})
})
if (bean.maxCoupon != null) {
//最优的优惠券id为0时，把最优优惠券对象置为null，因为正常的可用的优惠券id一定不为0，这里接口为了前端页面展示，返回的maxCoupon对象不为null，
//但maxCoupon的属性均为null或初始值
......@@ -262,25 +265,27 @@ class CommonPayDialog : Dialog {
private fun updateDataOnView(bean: OrderInfoBean) {
view_pager.setScanScroll(false)
detailView =
PayInfoDetailView(activity, object : PayInfoDetailView.OnCouponDetailClickListener {
override fun selectCoupon(couponId: String) {
if (couponListBean != null) {
view_pager.currentItem = 1
} else {
getAllCoupon()
PayInfoDetailView(
activity,
object : PayInfoDetailView.OnCouponDetailClickListener {
override fun selectCoupon(couponId: String) {
if (couponListBean != null) {
view_pager.currentItem = 1
} else {
getAllCoupon()
}
}
}
override fun ensurePay(
payWay: Int,
payMoney: Float,
useMoneyType: Int,
code: String,
couponType: String
) {
createOrder(payWay, payMoney, useMoneyType, code, couponType)
}
})
override fun ensurePay(
payWay: Int,
payMoney: Float,
useMoneyType: Int,
code: String,
couponType: String
) {
createOrder(payWay, payMoney, useMoneyType, code, couponType)
}
})
if (bean.maxCoupon != null) {
//最优的优惠券id为0时，把最优优惠券对象置为null，因为正常的可用的优惠券id一定不为0，这里接口为了前端页面展示，返回的maxCoupon对象不为null，
//但maxCoupon的属性均为null或初始值
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/actionpoint/ActionCountUtils.kt → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/actionpoint/ActionCountUtils.kt
package com.yidianling.ydl_pay.actionpoint
package com.yidianling.ydl_pay.common.actionpoint
import android.content.Context
import android.net.ConnectivityManager
import android.net.NetworkInfo
import com.yidianling.ydl_pay.http.HttpUtils
import com.yidianling.ydl_pay.http.utils.RxDeviceTool
import com.yidianling.ydl_pay.common.http.HttpUtils
import com.yidianling.ydl_pay.common.http.utils.RxDeviceTool
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/actionpoint/ActionDataBean.kt → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/actionpoint/ActionDataBean.kt
package com.yidianling.ydl_pay.actionpoint
package com.yidianling.ydl_pay.common.actionpoint
/**
* Created by xj on 2019/6/22.
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/actionpoint/BIConstants.kt → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/actionpoint/BIConstants.kt
package com.yidianling.ydl_pay.actionpoint
package com.yidianling.ydl_pay.common.actionpoint
/**
* Created by xj on 2019/7/1.
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/adapter/SelectCouponAdapter.kt → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/adapter/SelectCouponAdapter.kt
package com.yidianling.ydl_pay.adapter
package com.yidianling.ydl_pay.common.adapter
import android.annotation.SuppressLint
import android.content.Context
......@@ -7,13 +7,13 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import com.yidianling.ydl_pay.actionpoint.ActionCountUtils
import com.yidianling.ydl_pay.actionpoint.BIConstants
import com.yidianling.ydl_pay.http.HttpConfig
import com.yidianling.ydl_pay.widget.CouponInfoDetailView
import com.yidianling.ydl_pay.common.actionpoint.ActionCountUtils
import com.yidianling.ydl_pay.common.actionpoint.BIConstants
import com.yidianling.ydl_pay.common.http.HttpConfig
import com.yidianling.ydl_pay.common.widget.CouponInfoDetailView
import com.yidianling.ydl_pay.R
import com.yidianling.ydl_pay.bean.AllCouponListBean
import com.yidianling.ydl_pay.bean.CommonCouponBean
import com.yidianling.ydl_pay.common.bean.AllCouponListBean
import com.yidianling.ydl_pay.common.bean.CommonCouponBean
import kotlinx.android.synthetic.main.item_coupon_title.view.*
/**
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/bean/AllCouponListBean.java → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/bean/AllCouponListBean.java
package com.yidianling.ydl_pay.bean;
package com.yidianling.ydl_pay.common.bean;
import java.util.ArrayList;
import java.util.List;
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/bean/BalanceBean.kt → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/bean/BalanceBean.kt
package com.yidianling.ydl_pay.bean
package com.yidianling.ydl_pay.common.bean
/**
* @author jiucheng
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/bean/CommonWXPayBean.kt → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/bean/CommonWXPayBean.kt
package com.yidianling.ydl_pay.bean
package com.yidianling.ydl_pay.common.bean
/**
* author : Zhangwenchao
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/common/bean/PayResult.java 0 → 100644
package com.yidianling.ydl_pay.common.bean; import android.text.TextUtils; import java.util.Map; public class PayResult { private String resultStatus; private String result; private String memo; public PayResult(Map<String, String> rawResult) { if (rawResult == null) { return; } for (String key : rawResult.keySet()) { if (TextUtils.equals(key, "resultStatus")) { resultStatus = rawResult.get(key); } else if (TextUtils.equals(key, "result")) { result = rawResult.get(key); } else if (TextUtils.equals(key, "memo")) { memo = rawResult.get(key); } } } @Override public String toString() { return "resultStatus={" + resultStatus + "};memo={" + memo + "};result={" + result + "}"; } /** * @return the resultStatus */ public String getResultStatus() { return resultStatus; } /** * @return the memo */ public String getMemo() { return memo; } /** * @return the result */ public String getResult() { return result; }}
\ No newline at end of file
ydl-pay/src/main/java/com/yidianling/ydl_pay/bean/params/AliPayParam.java → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/bean/params/AliPayParam.java
package com.yidianling.ydl_pay.bean.params;
package com.yidianling.ydl_pay.common.bean.params;
/**
* @author jiucheng
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/bean/params/BalanceParam.java → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/bean/params/BalanceParam.java
package com.yidianling.ydl_pay.bean.params;
package com.yidianling.ydl_pay.common.bean.params;
import com.ydl.ydlcommon.data.http.BaseCommand;
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/bean/params/BalancePayParam.java → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/bean/params/BalancePayParam.java
package com.yidianling.ydl_pay.bean.params;
package com.yidianling.ydl_pay.common.bean.params;
import com.ydl.ydlcommon.data.http.BaseCommand;
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/bean/params/ChargePayParam.java → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/bean/params/ChargePayParam.java
package com.yidianling.ydl_pay.bean.params;
package com.yidianling.ydl_pay.common.bean.params;
import com.ydl.ydlcommon.data.http.BaseCommand;
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/bean/params/CommonPayParam.java → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/bean/params/CommonPayParam.java
package com.yidianling.ydl_pay.bean.params;
package com.yidianling.ydl_pay.common.bean.params;
import com.ydl.ydlcommon.data.http.BaseCommand;
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/bean/params/WxPayParam.java → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/bean/params/WxPayParam.java
package com.yidianling.ydl_pay.bean.params;
package com.yidianling.ydl_pay.common.bean.params;
import com.ydl.ydlcommon.base.BaseApp;
import com.ydl.ydlcommon.base.config.YDLConstants;
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/http/HttpConfig.kt → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/http/HttpConfig.kt
package com.yidianling.ydl_pay.http
package com.yidianling.ydl_pay.common.http
/**
* @author jiucheng
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/http/HttpUtils.kt → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/http/HttpUtils.kt
package com.yidianling.ydl_pay.http
package com.yidianling.ydl_pay.common.http
import com.google.gson.Gson
import com.ydl.ydlcommon.data.http.BaseCommand
import com.ydl.ydlcommon.data.http.BaseResponse
import com.ydl.ydlcommon.utils.NetworkParamsUtils
import com.ydl.ydlnet.YDLHttpUtils
import com.yidianling.ydl_pay.actionpoint.ActionDataBean
import com.yidianling.ydl_pay.bean.*
import com.yidianling.ydl_pay.bean.params.CheckRequestCouponBean
import com.yidianling.ydl_pay.bean.params.CreateOrderRequestBean
import com.yidianling.ydl_pay.bean.params.GetAllCouponRequestBean
import com.yidianling.ydl_pay.bean.params.OrderRequestBean
import com.yidianling.ydl_pay.common.actionpoint.ActionDataBean
import com.yidianling.ydl_pay.common.bean.*
import com.yidianling.ydl_pay.common.bean.params.CheckRequestCouponBean
import com.yidianling.ydl_pay.common.bean.params.CreateOrderRequestBean
import com.yidianling.ydl_pay.common.bean.params.GetAllCouponRequestBean
import com.yidianling.ydl_pay.common.bean.params.OrderRequestBean
import com.yidianling.ydl_pay.pay.bean.RechargeBean
import io.reactivex.Observable
import okhttp3.MediaType
import okhttp3.RequestBody
......@@ -112,6 +113,23 @@ class HttpUtils {
return YDLHttpUtils.obtainApi(PayServices::class.java).pay(map)
}
/**
* 获得充值单号
*/
fun recharge(bean: BaseCommand): Observable<BaseResponse<RechargeBean>> {
var params = NetworkParamsUtils.getPostList(bean)
var map = NetworkParamsUtils.getMaps(params)
return YDLHttpUtils.obtainApi(PayServices::class.java).recharge(map)
}
/**
* 微信充值
*/
fun wxRecharge(bean: BaseCommand): Observable<BaseResponse<CommonWXPayBean>> {
var params = NetworkParamsUtils.getPostList(bean)
var map = NetworkParamsUtils.getMaps(params)
return YDLHttpUtils.obtainApi(PayServices::class.java).wxRecharge(map)
}
/**
* 行为数据埋点统计接口
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/http/PayServices.kt → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/http/PayServices.kt
package com.yidianling.ydl_pay.http
package com.yidianling.ydl_pay.common.http
import com.ydl.ydlcommon.base.config.YDL_DOMAIN
import com.ydl.ydlcommon.base.config.YDL_DOMAIN_JAVA
import com.ydl.ydlcommon.data.http.BaseResponse
import com.yidianling.ydl_pay.bean.*
import com.yidianling.ydl_pay.common.bean.*
import com.yidianling.ydl_pay.pay.bean.RechargeBean
import io.reactivex.Observable
import okhttp3.RequestBody
import retrofit2.http.*
......@@ -75,4 +76,14 @@ interface PayServices {
@FormUrlEncoded
@POST("pay/vcount-pay")
fun pay(@FieldMap params: Map<String, String>): Observable<BaseResponse<Any>>
//获得充值单号
@FormUrlEncoded
@POST("pay/recharge")
fun recharge(@FieldMap params: Map<String, String>): Observable<BaseResponse<RechargeBean>>
//微信充值
@FormUrlEncoded
@POST("pay/recharge-wx-option")
fun wxRecharge(@FieldMap params: Map<String, String>): Observable<BaseResponse<CommonWXPayBean>>
}
\ No newline at end of file
ydl-pay/src/main/java/com/yidianling/ydl_pay/http/log/LogUtil.java → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/http/log/LogUtil.java
package com.yidianling.ydl_pay.http.log;
package com.yidianling.ydl_pay.common.http.log;
import android.util.Log;
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/http/utils/HttpUrlUtils.java → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/http/utils/HttpUrlUtils.java
package com.yidianling.ydl_pay.http.utils;
package com.yidianling.ydl_pay.common.http.utils;
import com.yidianling.ydl_pay.BuildConfig;
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/http/utils/NetUtils.java → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/http/utils/NetUtils.java
package com.yidianling.ydl_pay.http.utils;
package com.yidianling.ydl_pay.common.http.utils;
import android.content.Context;
import android.content.Intent;
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/http/utils/RxDeviceTool.java → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/http/utils/RxDeviceTool.java
package com.yidianling.ydl_pay.http.utils;
package com.yidianling.ydl_pay.common.http.utils;
import android.app.Activity;
import android.app.KeyguardManager;
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/toast/ToastHelper.kt → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/toast/ToastHelper.kt
package com.yidianling.ydl_pay.toast
package com.yidianling.ydl_pay.common.toast
import android.content.Context
import android.support.annotation.StringRes
......@@ -24,11 +24,13 @@ class ToastHelper private constructor() {
}
fun show(context: Context, text: String) {
getInstance().show(context.applicationContext, text)
getInstance()
.show(context.applicationContext, text)
}
fun show(context: Context, @StringRes resId: Int) {
getInstance().show(context.applicationContext, resId)
getInstance()
.show(context.applicationContext, resId)
}
}
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/widget/CouponInfoDetailView.kt → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/widget/CouponInfoDetailView.kt
package com.yidianling.ydl_pay.widget
package com.yidianling.ydl_pay.common.widget
import android.annotation.SuppressLint
import android.content.Context
......@@ -7,7 +7,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.RelativeLayout
import com.yidianling.ydl_pay.R
import com.yidianling.ydl_pay.bean.CommonCouponBean
import com.yidianling.ydl_pay.common.bean.CommonCouponBean
import kotlinx.android.synthetic.main.view_coupon_info_detail.view.*
import java.lang.Float
import java.math.BigDecimal
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/widget/NoScrollViewPager.java → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/widget/NoScrollViewPager.java
package com.yidianling.ydl_pay.widget;
package com.yidianling.ydl_pay.common.widget;
import android.content.Context;
import android.support.v4.view.ViewPager;
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/widget/PayCouponView.kt → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/widget/PayCouponView.kt
package com.yidianling.ydl_pay.widget
package com.yidianling.ydl_pay.common.widget
import android.content.Context
import android.os.Handler
......@@ -13,14 +13,14 @@ import android.view.inputmethod.InputMethodManager
import android.widget.EditText
import android.widget.LinearLayout
import android.widget.TextView
import com.yidianling.ydl_pay.adapter.SelectCouponAdapter
import com.yidianling.ydl_pay.http.HttpUtils
import com.yidianling.ydl_pay.toast.ToastHelper
import com.yidianling.ydl_pay.common.adapter.SelectCouponAdapter
import com.yidianling.ydl_pay.common.http.HttpUtils
import com.yidianling.ydl_pay.common.toast.ToastHelper
import com.yidianling.ydl_pay.R
import com.yidianling.ydl_pay.bean.AllCouponListBean
import com.yidianling.ydl_pay.bean.CommonCouponBean
import com.yidianling.ydl_pay.bean.params.CheckRequestCouponBean
import com.yidianling.ydl_pay.http.utils.NetUtils
import com.yidianling.ydl_pay.common.bean.AllCouponListBean
import com.yidianling.ydl_pay.common.bean.CommonCouponBean
import com.yidianling.ydl_pay.common.bean.params.CheckRequestCouponBean
import com.yidianling.ydl_pay.common.http.utils.NetUtils
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.head_course_code_view.view.*
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/widget/PayInfoDetailView.kt → ydl-pay/src/main/java/com/yidianling/ydl_pay/common/widget/PayInfoDetailView.kt
package com.yidianling.ydl_pay.widget
package com.yidianling.ydl_pay.common.widget
import android.annotation.SuppressLint
import android.content.Context
......@@ -6,8 +6,8 @@ import android.view.View
import android.view.ViewGroup
import android.widget.LinearLayout
import com.yidianling.ydl_pay.R
import com.yidianling.ydl_pay.bean.CommonCouponBean
import com.yidianling.ydl_pay.bean.OrderInfoBean
import com.yidianling.ydl_pay.common.bean.CommonCouponBean
import com.yidianling.ydl_pay.common.bean.OrderInfoBean
import kotlinx.android.synthetic.main.view_pay_info_detail.view.*
import java.math.BigDecimal
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/PayParams.kt 0 → 100644
package com.yidianling.ydl_pay.pay
import android.os.Parcel
import android.os.Parcelable
/**
* author : Zhangwenchao
* e-mail : zhangwch@yidianling.com
* time : 2018/04/24
* update : yuanWai 2018/10/29
*/
data class PayParams(
var inlet : Int = INLET_NORMAL,
/**
* 类型 1 -> 充值，2 -> 付款
*/
var type: Int = PAY,
/**
* 类型标题
*/
var title: String = "",
/**
* 是否显示付款保障
*/
var visibleIndemnity: Boolean = false,
/**
* 支付按钮显示的文本
*/
var btnPayText: String = "确认",
/**
* 需要支付的金额
*/
var needPay: Float = 0F,
/**
* 订单id（如果是测评入口的话 就是测试题Id）
*/
var payId: String = "",
/**
* 已使用的红包金额（代付款列表入口 使用）
*/
var coupon_money: Float = 0F
) : Parcelable {
constructor(parcel: Parcel) : this(
parcel.readInt(),
parcel.readInt(),
parcel.readString(),
parcel.readByte() != 0.toByte(),
parcel.readString(),
parcel.readFloat(),
parcel.readString(),
parcel.readFloat())
override fun writeToParcel(parcel: Parcel, flags: Int) {
parcel.writeInt(inlet)
parcel.writeInt(type)
parcel.writeString(title)
parcel.writeByte(if (visibleIndemnity) 1 else 0)
parcel.writeString(btnPayText)
parcel.writeFloat(needPay)
parcel.writeString(payId)
parcel.writeFloat(coupon_money)
}
override fun describeContents(): Int {
return 0
}
companion object CREATOR : Parcelable.Creator<PayParams> {
/**
* 1.充值 2.付款
*/
const val RECHARGE = 1
const val PAY = 2
/**
* 入口类型
* 1.正常入口（默认） 2.测评入口
*/
const val INLET_NORMAL = 1
const val INLET_TEST = 2
override fun createFromParcel(parcel: Parcel): PayParams {
return PayParams(parcel)
}
override fun newArray(size: Int): Array<PayParams?> {
return arrayOfNulls(size)
}
}
}
\ No newline at end of file
ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/RxBus.kt 0 → 100644
package com.yidianling.ydl_pay.pay
import io.reactivex.Observable
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
/**
* author : Zhangwenchao
* e-mail : zhangwch@yidianling.com
* time : 2018/04/18
*/
class RxBus private constructor(){
companion object {
fun getInstance(): RxBus {
return Holder.INSTANCE
}
}
private val mBus: Subject<Any>
init {
mBus = PublishSubject.create()
}
fun <T>toObservable(tClass: Class<T>): Observable<T> {
return mBus.ofType(tClass)
}
fun post(any: Any) {
mBus.onNext(any)
}
private object Holder {
val INSTANCE = RxBus()
}
}
\ No newline at end of file
ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/RxPay.kt 0 → 100644
package com.yidianling.ydl_pay.pay
import android.app.Activity
import android.content.Context
import com.alipay.sdk.app.PayTask
import com.yidianling.ydl_pay.pay.bean.PayStatus
import com.tencent.mm.opensdk.constants.Build
import com.tencent.mm.opensdk.modelpay.PayReq
import com.tencent.mm.opensdk.openapi.WXAPIFactory
import com.yidianling.ydl_pay.pay.bean.WXPayEvent
import com.ydl.ydlcommon.data.http.CustomThrowable
import com.yidianling.ydl_pay.common.bean.CommonWXPayBean
import com.yidianling.ydl_pay.common.bean.PayResult
import de.greenrobot.event.EventBus
import io.reactivex.Emitter
import io.reactivex.Observable
import io.reactivex.schedulers.Schedulers
/**
* author : Zhangwenchao
* e-mail : zhangwch@yidianling.com
* time : 2018/04/18
*/
object RxPay {
init {
EventBus.getDefault().register(this)
}
private var emitter: Emitter<PayStatus>? = null
// 微信支付
fun wxPay(context: Context, option: CommonWXPayBean.WXOption): Observable<PayStatus> {
return Observable.create<PayStatus> { e ->
val api = WXAPIFactory.createWXAPI(context, null)
if (api.wxAppSupportAPI < Build.PAY_SUPPORTED_SDK_INT) {
e.onError(CustomThrowable("目前您的微信版本过低或未安装微信，需要安装微信才能使用"))
e.onComplete()
}
emitter = e
api.registerApp(option.appid)
val request = PayReq()
request.appId = option.appid
request.partnerId = option.partnerid
request.prepayId = option.prepayid
request.packageValue = "Sign=WXPay"
request.nonceStr = option.noncestr
request.timeStamp = option.timestamp
request.sign = option.sign
api.sendReq(request)
}.subscribeOn(Schedulers.io())
}
// 支付宝支付
fun aliPay(activity: Activity, aliSign: String): Observable<PayStatus> {
return Observable.create<PayStatus> {
val alipay = PayTask(activity)
val result = alipay.payV2(aliSign, true)
val payResult = PayResult(result)
when {
"9000" == payResult.resultStatus -> it.onNext(PayStatus(true))
else -> it.onError(CustomThrowable(payResult.memo))
}
it.onComplete()
}
}
fun onEvent(event: WXPayEvent) {
if (event.status.success) {
emitter?.onNext(event.status)
} else {
emitter?.onError(Throwable("支付失败", null))
}
emitter?.onComplete()
}
}
\ No newline at end of file
ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/bean/AliInfo.kt 0 → 100644
package com.yidianling.ydl_pay.pay.bean
data class AliInfo(val alipayPartner: String,
val alipayKey: String,
val alipaySellerEmail: String,
val alipayNotifyUrl: String,
val alirsakey: String)
\ No newline at end of file
ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/bean/PayParam.kt 0 → 100644
package com.yidianling.ydl_pay.pay.bean
/**
* author : Zhangwenchao
* e-mail : zhangwch@yidianling.com
* time : 2018/04/20
*/
open class PayParam(payId: String, val type: String) {
data class WxPayParam(val payId: String) : PayParam(payId, "wxapp_hz")
data class AliPayParam(val payId: String) : PayParam(payId, "aliapp")
}
\ No newline at end of file
ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/bean/PayStatus.kt 0 → 100644
package com.yidianling.ydl_pay.pay.bean
import android.support.annotation.Keep
/**
* author : Zhangwenchao
* e-mail : zhangwch@yidianling.com
* time : 2018/04/18
*
* 支付状态
*/
@Keep
data class PayStatus(val success: Boolean)
\ No newline at end of file
ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/bean/RechargeBean.kt 0 → 100644
package com.yidianling.ydl_pay.pay.bean
import android.support.annotation.Keep
/**
* author : Zhangwenchao
* e-mail : zhangwch@yidianling.com
* time : 2018/04/19
*/
@Keep
data class RechargeBean(val rechargeId: String,
/**
* 支付金额
*/
val money : String,
val aliInfo: AliInfo,
/**
* 支付宝 加签
*/
val aliSign : String)
\ No newline at end of file
ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/bean/RechargeParam.java 0 → 100644
package com.yidianling.ydl_pay.pay.bean;
import com.ydl.ydlcommon.data.http.BaseCommand;
/**
* @author jiucheng
* @描述:
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2020/2/6
*/
public class RechargeParam extends BaseCommand {
public String money;
public RechargeParam(String money) {
this.money = money;
}
}
ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/bean/TestAddOrderBean.kt 0 → 100644
package com.yidianling.ydl_pay.pay.bean
/**
* @author yuanWai
* @描述:测评下单接口 数据接收bean
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2018/10/26
*/
data class TestAddOrderBean(
/**
* 支付ID
*/
val payId : String?,
/**
* 订单ID
*/
val orderId : String?,
/**
* 需支付金额
*/
val money : String?,
/**
* 商品名称
*/
val title : String?,
/**
* 用户 ID
*/
val uid : String?,
/**
* 支付成功跳转链接
*/
val succ : String?)
\ No newline at end of file
ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/bean/WXPayEvent.kt 0 → 100644
package com.yidianling.ydl_pay.pay.bean
/**
* @author : Zhangwenchao
* @e-mail : zhangwch@yidianling.com
* @time : 2018/6/4
*/
data class WXPayEvent(val status: PayStatus)
\ No newline at end of file
ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/bean/WXRechargeIdParam.java 0 → 100644
package com.yidianling.ydl_pay.pay.bean;
import com.ydl.ydlcommon.data.http.BaseCommand;
/**
* @author jiucheng
* @描述:
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2020/2/6
*/
public class WXRechargeIdParam extends BaseCommand {
public String rechargeId;
public WXRechargeIdParam(String rechargeId) {
this.rechargeId = rechargeId;
}
}
ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/payDialog/ConfidePayParams.kt 0 → 100644
package com.yidianling.ydl_pay.pay.payDialog
/**
* 倾诉支付参数
*/
class ConfidePayParams{
var payTitle : String? = null
//订单金额
var orderPrice : Double? = null
//优惠金额
var coupnPrice : Double? = null
//可用余额
var avliableMoney : Double? = null
//支付id
var payId : String? = null
//支付成功跳转地址
var confideUrl : String? = null
constructor(payTitle: String?, orderPrice: Double?, coupnPrice: Double?, avliableMoney: Double?, payId: String?, confideUrl: String?) {
this.payTitle = payTitle
this.orderPrice = orderPrice
this.coupnPrice = coupnPrice
this.avliableMoney = avliableMoney
this.payId = payId
this.confideUrl = confideUrl
}
}
\ No newline at end of file
ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/payDialog/PayDialog.kt 0 → 100644
package com.yidianling.ydl_pay.pay.payDialog
import android.annotation.SuppressLint
import android.app.Activity
import android.app.Dialog
import android.graphics.Point
import android.os.Bundle
import android.support.v7.app.AlertDialog
import android.view.*
import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlcommon.utils.StringUtils
import com.ydl.ydlcommon.utils.log.LogHelper
import com.ydl.ydlcommon.utils.remind.ToastHelper
import com.yidianling.ydl_pay.R
import com.yidianling.ydl_pay.common.bean.params.AliPayParam
import com.yidianling.ydl_pay.common.bean.params.WxPayParam
import com.yidianling.ydl_pay.common.http.HttpUtils
import com.yidianling.ydl_pay.pay.RxPay
import com.yidianling.ydl_pay.pay.bean.PayStatus
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.pay_dialog_pay.*
import kotlinx.android.synthetic.main.pay_fragment_loading_dialog.view.*
import java.util.concurrent.TimeUnit
import kotlin.properties.Delegates
@SuppressLint("ValidFragment")
//新的支付弹窗
class PayDialog : Dialog {
//回调函数
private var callBack: CallBack? = null
/**
* 支付类型
* 1.微信支付 2.支付宝支付
*/
private val PAY_WECHAT = 1
private val PAY_ALI = 2
//加载中弹窗
private var dialog: AlertDialog? = null
private var dialogContentView: View? = null
/**
* 已选择支付方式
*/
private var payType = PAY_WECHAT
private var data: ConfidePayParams? = null
private var activity: Activity by Delegates.notNull()
constructor(context: Activity) : super(context) {
this.activity = context
}
override fun onStart() {
super.onStart()
//设置 dialog 的宽高
window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
//设置 dialog 的背景为 null
window.setBackgroundDrawable(null)
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
//去除标题栏
requestWindowFeature(Window.FEATURE_NO_TITLE)
val lp = window.attributes
lp.gravity = Gravity.BOTTOM //底部
lp.width = WindowManager.LayoutParams.MATCH_PARENT
// lp.windowAnimations = R.style.BottomDialogAnimation
window.attributes = lp
setContentView(R.layout.pay_dialog_pay)
initView()
if (data != null) {
text_title.text = data!!.payTitle ?: "倾诉服务"
setFoodPrice("￥${StringUtils.save2Double(data?.orderPrice ?: 0.00)}")
setSaleText("-￥${StringUtils.save2Double(data?.coupnPrice ?: 0.00)}")
setAvliableMoney("-￥${StringUtils.save2Double(data?.avliableMoney ?: 0.00)}")
setPayMoney()
}
}
fun initView() {
//确定支付
text_pay.setOnClickListener {
appPay()
}
//切换支付方式
ll_wechat.setOnClickListener {
payType = PAY_WECHAT
iv_wechat.setImageResource(R.drawable.pay_img_select)
iv_alipay.setImageResource(R.drawable.pay_img_no_select)
}
ll_alipay.setOnClickListener {
payType = PAY_ALI
iv_wechat.setImageResource(R.drawable.pay_img_no_select)
iv_alipay.setImageResource(R.drawable.pay_img_select)
}
}
//设置回调函数
fun setCallback(callBack: CallBack): PayDialog {
this.callBack = callBack
return this
}
//设置数据
fun show(data: ConfidePayParams?) {
this.data = data
show()
}
//设置三方支付是否显示
fun setOtherPayVisibity(visibity: Int) {
text_paytip.visibility = visibity
lin_pay.visibility = visibity
}
//设置商品价格
fun setFoodPrice(moeny: String) {
text_oldmoney.text = moeny
}
//设置可用余额
fun setAvliableMoney(moeny: String) {
text_yu_e.text = moeny
}
//设置优惠信息
fun setSaleText(money: String) {
text_youhui.text = money
}
//设置应支付金额
fun setPayMoney() {
if (data != null && data!!.orderPrice != null && data!!.coupnPrice != null && data!!.avliableMoney != null) {
var price: Double = data!!.orderPrice!! - data!!.coupnPrice!! - data!!.avliableMoney!!
if (price < 0.00) {
price = 0.00
}
text_money.text = "￥${StringUtils.save2Double(price)}"
} else {
text_money.text = "--"
}
}
/**
* app 支付，微信或支付宝
*/
@SuppressLint("CheckResult")
private fun appPay() {
if (data?.payId == null) {
ToastHelper.show("支付id有误，请返回重试")
return
}
Observable.just(payType)
.subscribeOn(Schedulers.io())
.flatMap {
when (it) {
0, 1 -> {
wxPayById(data?.payId!!)
}
else -> {
aliPayById(data?.payId!!)
}
}
}
.observeOn(AndroidSchedulers.mainThread())
.doOnSubscribe { showProgressDialog("") }
.doAfterTerminate { if (!activity.isFinishing) dismissProgressDialog() }
.subscribe({
//防止支付后支付端和服务端通知同步延迟 , 1.5秒后回调callback
Observable.timer(1500, TimeUnit.MILLISECONDS)
.observeOn(AndroidSchedulers.mainThread())
.subscribe {
if (activity != null && !activity.isFinishing) dismissProgressDialog()
this.callBack?.onSuccess()
}
LogHelper.getInstance().writeLogSync("支付成功")
this.callBack?.onSuccess()
dismiss()
}, {
ToastHelper.show(it.message ?: "支付失败")
LogHelper.getInstance().writeLogSync("支付失败：${it.message}")
})
}
/**
* 微信支付
* @param payId 支付id
*/
private fun wxPayById(payId: String): Observable<PayStatus> {
val bean = WxPayParam(payId, 1)
return HttpUtils.wxPay(bean)
.compose(RxUtils.resultData())
.observeOn(AndroidSchedulers.mainThread())
.flatMap { RxPay.wxPay(activity, it.option) }
}
/**
* 支付宝支付
* @param payId 支付Id
*/
private fun aliPayById(payId: String): Observable<PayStatus> {
var bean = AliPayParam(payId, 1)
return HttpUtils.getAliPayOrderId(bean)
.compose(RxUtils.resultData())
.flatMap {
RxPay.aliPay(activity, it.aliSign)
}
}
/**
* 显示加载中弹窗
*/
private fun showProgressDialog(str: String?) {
if (activity == null || activity.isFinishing) {
return
}
if (dialog != null && dialog!!.isShowing) {
return
}
if (dialog == null) {
dialog = AlertDialog.Builder(activity)
.create()
}
if (dialogContentView == null) {
dialogContentView = LayoutInflater.from(activity).inflate(R.layout.pay_fragment_loading_dialog, null)
dialogContentView?.tvMsg?.visibility = View.GONE
}
dialog?.show()
dialog?.window?.setContentView(dialogContentView)
dialog?.window?.setGravity(Gravity.CENTER)
val p = dialog?.window!!.attributes //获取对话框当前的参数值
var point = Point()
activity.windowManager.defaultDisplay.getSize(point)// 获取屏幕宽、高用
p.height = (point.y * 0.2).toInt()
p.width = (point.x * 0.35).toInt()
dialog?.window!!.attributes = p //设置生效
}
/**
* 隐藏加载中弹窗
*/
private fun dismissProgressDialog() {
if (dialog != null && dialog!!.isShowing) {
dialog!!.dismiss()
}
}
}
/**
* 支付成功回调函数
*/
interface CallBack {
fun onSuccess()
fun onError()
}
\ No newline at end of file
ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/redpacket/RedPacketBean.kt 0 → 100644
package com.yidianling.ydl_pay.pay.redpacket
import android.os.Parcel
import android.os.Parcelable
/**
* @author yuanwai
* @描述:红包数据bean
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2018/10/23
*/
data class RedPacketBean(
/**
* 红包 ID
*/
val id : String? = "",
/**
* 红包金额
*/
val coupon_money : Float? = 0F,
/**
* 用户 ID
*/
val uid : String? = "",
/**
* 红包标题
*/
val title : String? = "",
/**
* 红包说明
*/
val explain : String? = "",
/**
* 使用类型 1永久使用 2 有效期内使用
*/
val use_type : Int? = 2,
/**
* 是否选中
*/
val selected : Boolean? = false,
/**
* 截止日期
*/
val use_time_end : String? = ""): Parcelable {
constructor(parcel: Parcel) : this(
parcel.readString(),
parcel.readFloat(),
parcel.readString(),
parcel.readString(),
parcel.readString(),
parcel.readInt(),
parcel.readByte() != 0.toByte(),
parcel.readString()) {
}
override fun writeToParcel(parcel: Parcel, flags: Int) {
parcel.writeString(id)
parcel.writeFloat(coupon_money!!)
parcel.writeString(uid)
parcel.writeString(title)
parcel.writeString(explain)
parcel.writeInt(use_type!!)
parcel.writeByte(if (selected!!) 1 else 0)
parcel.writeString(use_time_end)
}
override fun describeContents(): Int {
return 0
}
companion object CREATOR : Parcelable.Creator<RedPacketBean> {
override fun createFromParcel(parcel: Parcel): RedPacketBean {
return RedPacketBean(parcel)
}
override fun newArray(size: Int): Array<RedPacketBean?> {
return arrayOfNulls(size)
}
}
}
\ No newline at end of file
ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/redpacket/RedPacketParam.kt 0 → 100644
package com.yidianling.ydl_pay.pay.redpacket
/**
* @author yuanWai
* @描述:
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2018/10/25
*/
data class RedPacketParam(val p : String)
\ No newline at end of file
ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/redpacket/RedPacketPayBean.kt 0 → 100644
package com.yidianling.ydl_pay.pay.redpacket
import android.os.Parcel
import android.os.Parcelable
import com.yidianling.ydl_pay.pay.PayParams
/**
* @author yuanWai
* @描述:
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2018/10/25
*/
data class RedPacketPayBean(val payParams: PayParams,
val data: ArrayList<RedPacketBean>): Parcelable {
constructor(parcel: Parcel) : this(
parcel.readParcelable(PayParams::class.java.classLoader),
parcel.createTypedArrayList(RedPacketBean.CREATOR)) {
}
override fun writeToParcel(parcel: Parcel, flags: Int) {
parcel.writeParcelable(payParams, flags)
parcel.writeTypedList(data)
}
override fun describeContents(): Int {
return 0
}
companion object CREATOR : Parcelable.Creator<RedPacketPayBean> {
override fun createFromParcel(parcel: Parcel): RedPacketPayBean {
return RedPacketPayBean(parcel)
}
override fun newArray(size: Int): Array<RedPacketPayBean?> {
return arrayOfNulls(size)
}
}
}
\ No newline at end of file
ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/redpacket/RedPacketPopWindow.kt 0 → 100644
package com.yidianling.ydl_pay.pay.redpacket
import android.annotation.SuppressLint
import android.app.Activity
import android.graphics.drawable.BitmapDrawable
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.LinearLayout
import android.widget.RelativeLayout
import com.ydl.ydlcommon.utils.Utils
import com.yidianling.common.tools.RxImageTool
import com.yidianling.common.view.popupwindow.BasePopupWindow
import com.yidianling.ydl_pay.R
@Suppress("DEPRECATION")
/**
* @author yuanWai
* @描述:红包弹窗
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2018/10/23
*/
class RedPacketPopWindow : BasePopupWindow {
//红包集合
var list : ArrayList<RedPacketBean>? = null
//选中红包监听器
var listener : OnSelectListener? = null
//选中的索引
private var selectIndex : Int = 0
constructor(mActivity: Activity, dataList : ArrayList<RedPacketBean>?, onSelectListener: OnSelectListener) : super(mActivity){
if (null == list){
list = ArrayList()
}else{
list!!.clear()
}
if (dataList != null) {
list!!.addAll(dataList)
}
initPopupwindow()
this.listener = onSelectListener
}
@SuppressLint("InflateParams")
override fun initPopupwindow() {
super.initPopupwindow()
mView = LayoutInflater.from(mContext).inflate(R.layout.pay_redpacket_pop_layout, null, false)
popupWindow!!.width = ViewGroup.LayoutParams.MATCH_PARENT
popupWindow!!.height = (Utils.getScreenHeight(mContext) * 0.66).toInt()
popupWindow!!.setBackgroundDrawable(BitmapDrawable())
popupWindow!!.setOnDismissListener(this)
popupWindow!!.contentView = mView
//创建view
createView(mView!!)
//填充数据
bindData()
mView?.findViewById<RelativeLayout>(R.id.rl_notUse)?.setOnClickListener {
selectRedPacket(null,-1)
}
}
/**
* 根据数据创建红包View
* 如果原有的view少于数据的个数 那就add
* 如果原有的view大于数据的个数 那就remove
*/
private fun createView(view : View){
val llContent = view.findViewById<LinearLayout>(R.id.ll_content)
if (llContent.childCount - 1 < list!!.size){
//如果数据源个数大于view个数 则add
for (index in 0 until list!!.size){
val marginTop = if (index == 0){
RxImageTool.dip2px(20f)
}else{
0
}
if (index+1 > llContent.childCount - 1){
val redPacketView = RedPacketView(mContext!!,marginTop)
llContent.addView(redPacketView)
}
}
}else{
//如果数据源个数小于view个数 则remove
val count = llContent.childCount - 1 - list!!.size
if (count == 0){
return
}
val end = llContent.childCount - 1 - count
val start = llContent.childCount - 1 - 1
for (index in start..end){
llContent.removeViewAt(index)
}
}
}
/**
* 根据现有的view个数进行数据填充
*/
fun bindData(){
if (selectIndex == -1){
mView!!.findViewById<ImageView>(R.id.imgCheck).visibility = View.VISIBLE
}else{
mView!!.findViewById<ImageView>(R.id.imgCheck).visibility = View.INVISIBLE
}
val llContent = mView!!.findViewById<LinearLayout>(R.id.ll_content)
for (index in 0 until list!!.size){
val redPacketView = llContent.getChildAt(index + 1)
if (redPacketView is RedPacketView){
redPacketView.initData(list!![index],index,object : RedPacketView.ICheckedListener {
override fun checked(bean: RedPacketBean, position : Int) {
selectRedPacket(bean,position)
}
})
redPacketView.checked(selectIndex == index)
}
}
}
/**
* 选择红包
* @param bean 红包数据 如果为null 就是不使用红包
* @param position 选择红包的索引
*/
private fun selectRedPacket(bean: RedPacketBean?, position : Int){
listener?.select(bean)
selectIndex = position
dismiss()
}
interface OnSelectListener {
//选中的红包
fun select(bean: RedPacketBean?)
}
}
\ No newline at end of file
ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/redpacket/RedPacketView.kt 0 → 100644
package com.yidianling.ydl_pay.pay.redpacket
import android.annotation.SuppressLint
import android.content.Context
import android.util.AttributeSet
import android.view.View
import android.view.ViewGroup
import android.widget.LinearLayout
import android.widget.RelativeLayout
import com.yidianling.common.tools.RxImageTool
import com.yidianling.ydl_pay.R
import kotlinx.android.synthetic.main.pay_redpacket_view.view.*
/**
* @author yuanWai
* @描述:红包View
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2018/10/24
*/
class RedPacketView : RelativeLayout{
private var listener : ICheckedListener? = null
constructor(mContext : Context):super(mContext){
initView(0)
}
constructor(mContext : Context,marginTop : Int):super(mContext){
initView(marginTop)
}
constructor(mContext : Context, attrs : AttributeSet) : super(mContext,attrs){
initView(0)
}
constructor(mContext: Context,attrs : AttributeSet,defStyleAttr : Int) : super(mContext,attrs,defStyleAttr){
initView(0)
}
private fun initView(marginTop : Int){
View.inflate(context, R.layout.pay_redpacket_view,this)
var params = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,RxImageTool.dip2px(90f))
val dp15 = RxImageTool.dip2px(15f)
params.setMargins(dp15,marginTop,dp15,RxImageTool.dip2px(20f))
layoutParams = params
setBackgroundResource(R.drawable.pay_redpacket_item_bg)
}
@SuppressLint("SimpleDateFormat")
fun initData(data : RedPacketBean?, position: Int, listener : ICheckedListener){
this.listener = listener
if (null == data){
visibility = View.GONE
return
}
visibility = View.VISIBLE
val sb = StringBuffer()
// val nf = NumberFormat.getInstance()
sb.append("￥").append(if (null == data.coupon_money) 0 else data.coupon_money.toInt())
//红包说明
tv_title.text = data.title
//截止日期
val timeBuffer = StringBuffer()
if (1 == data.use_type){
//永久使用
timeBuffer.append("永久有效")
}else{
//有效期内使用
timeBuffer.append("有效期至").append(data.use_time_end)
}
tvTimeEnd.text = timeBuffer.toString()
//红包金额
tvMoney.text = sb.toString()
//选择红包监听
setOnClickListener {
if (null != this.listener){
this.listener!!.checked(data,position)
}
}
}
fun checked(isChecked: Boolean){
if (isChecked){
imgCheck.visibility = View.VISIBLE
}else{
imgCheck.visibility = View.GONE
}
}
interface ICheckedListener{
fun checked(bean : RedPacketBean, position : Int)
}
}
\ No newline at end of file
ydl-pay/src/main/res/drawable/pay_bg_radius_top_white_10.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:topRightRadius="10dp" android:topLeftRadius="10dp" />
<solid android:color="@color/white" />
<stroke
android:width="1dp"
android:color="@color/white" />
</shape>
\ No newline at end of file
ydl-pay/src/main/res/drawable/pay_redpacket_item_bg.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<shape android:shape="rectangle" >
<stroke
android:width="0.5dp"
android:color="#F0F0F0" />
</shape>
</item>
<item
android:bottom="1dp"
android:right="1dp"
android:top="1dp">
<!-- 在实际使用中我发现1dp达不到显示效果，而2dp正好可以显示边框 -->
<shape android:shape="rectangle" >
<solid android:color="@color/white" />
</shape>
</item>
</layer-list>
\ No newline at end of file
ydl-pay/src/main/res/drawable/pay_redpacket_tv_bg.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="6dp"/>
<stroke android:color="#F0F0F0" android:width="0.5dp"/>
</shape>
\ No newline at end of file
ydl-pay/src/main/res/layout/pay_dialog_common_pay.xml
......@@ -23,7 +23,7 @@
</RelativeLayout>
<com.yidianling.ydl_pay.widget.NoScrollViewPager
<com.yidianling.ydl_pay.common.widget.NoScrollViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="425dp"
......
ydl-pay/src/main/res/layout/pay_dialog_pay.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="15dp"
android:background="@drawable/pay_bg_radius_top_white_10"
android:paddingRight="15dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp">
<TextView
android:id="@+id/text_title"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="倾诉服务"
android:gravity="center|left"
android:textStyle="bold"
android:textColor="@color/platform_color_242424"
android:textSize="17sp"
android:layout_weight="1"/>
<TextView
android:id="@+id/text_oldmoney"
android:layout_width="wrap_content"
android:layout_height="match_parent"
tools:text="129.00"
android:textColor="@color/platform_color_242424"
android:textStyle="bold"
android:textSize="16sp"
android:gravity="center_vertical"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/platform_color_E0E0E0"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="优惠"
android:textSize="15sp"
android:textColor="@color/platform_color_242424"
android:gravity="center|left"
android:layout_weight="1"/>
<TextView
android:id="@+id/text_youhui"
android:layout_width="wrap_content"
android:layout_height="match_parent"
tools:text="50"
android:textSize="15sp"
android:textColor="@color/platform_color_666666"
android:drawablePadding="5dp"
android:gravity="center_vertical"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/platform_color_E0E0E0"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="使用余额"
android:textSize="15sp"
android:textColor="@color/platform_color_242424"
android:gravity="center|left"
android:layout_weight="1"/>
<TextView
android:id="@+id/text_yu_e"
android:layout_width="wrap_content"
android:layout_height="match_parent"
tools:text="-9.00"
android:textSize="15sp"
android:textColor="@color/platform_color_666666"
android:gravity="center_vertical"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/platform_color_E0E0E0"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="还需支付"
android:textSize="15sp"
android:textColor="@color/platform_color_242424"
android:gravity="center|left"
android:layout_weight="1"/>
<TextView
android:id="@+id/text_money"
android:layout_width="wrap_content"
android:layout_height="match_parent"
tools:text="129.00"
android:textSize="20dp"
android:textColor="@color/platform_color_FF5A4C"
android:gravity="center_vertical"/>
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/text_paytip"
android:layout_width="match_parent"
android:layout_height="30dp"
android:text="选择支付方式"
android:textSize="12dp"
android:paddingLeft="15dp"
android:gravity="center_vertical"
android:textColor="@color/platform_color_999999"
android:background="@color/platform_color_F7F7F7"/>
<LinearLayout
android:id="@+id/lin_pay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_wechat"
android:layout_width="match_parent"
android:layout_height="55dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/pay_wechat_for_pay" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="微信支付"
android:textColor="@color/platform_color_242424"
android:textSize="15sp" />
<ImageView
android:id="@+id/iv_wechat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/pay_img_select" />
</LinearLayout>
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/divide_line_stroke_width"
android:background="#EDEDED" />
<LinearLayout
android:id="@+id/ll_alipay"
android:layout_width="match_parent"
android:layout_height="55dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/pay_zhifubao_for_pay" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="支付宝支付"
android:textColor="@color/platform_color_242424"
android:textSize="15sp" />
<ImageView
android:id="@+id/iv_alipay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/pay_img_no_select" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/text_pay"
android:layout_width="match_parent"
android:layout_height="55dp"
android:text="确认付款"
android:gravity="center"
android:textColor="@color/white"
android:textSize="17dp"
android:background="#FF3D9EFF"/>
</LinearLayout>
\ No newline at end of file
ydl-pay/src/main/res/layout/pay_fragment_loading_dialog.xml 0 → 100644
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
android:padding="24dp">
<ProgressBar
style="?android:attr/progressBarStyleSmall"
android:layout_width="32dp"
android:layout_height="32dp"/>
<TextView
android:id="@+id/tvMsg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:textColor="#ff666666"
android:text="加载中…"/>
</LinearLayout>
ydl-pay/src/main/res/layout/pay_redpacket_pop_layout.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/ll_layout"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="17dp"
android:textSize="16dp"
android:textColor="@color/color_3D3D3D"
android:text="可使用红包"/>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginTop="16dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="#F0F0F0"/>
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/ll_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:orientation="vertical">
<!--这样写是因为 padding不好用了 调UI好烦-->
<RelativeLayout
android:id="@+id/rl_notUse"
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal"
android:layout_marginTop="19.5dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:background="@drawable/pay_redpacket_tv_bg">
<TextView
android:layout_width="wrap_content"
android:layout_height="48dp"
android:gravity="center_vertical"
android:textColor="@color/platform_color_666666"
android:textSize="14sp"
android:text="不使用红包"
android:layout_marginStart="15dp"
tools:ignore="RtlSymmetry" />
<ImageView
android:id="@+id/imgCheck"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_centerVertical="true"
android:layout_marginRight="12dp"
android:layout_alignParentRight="true"
android:visibility="invisible"
android:background="@drawable/pay_img_select"/>
</RelativeLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>
\ No newline at end of file
ydl-pay/src/main/res/layout/pay_redpacket_view.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<LinearLayout
android:id="@+id/ll_Red"
android:layout_width="114dp"
android:layout_height="90dp"
android:background="@drawable/pay_redpacket_icon"
android:orientation="vertical">
<TextView
android:id="@+id/tvMoney"
android:layout_width="114dp"
android:layout_height="90dp"
android:gravity="center"
android:textColor="@color/white"
android:textSize="38dp"
android:textStyle="bold"
tools:text="￥3"/>
</LinearLayout>
<TextView
android:id="@+id/tv_title"
android:layout_toEndOf="@+id/ll_Red"
android:layout_marginTop="17dp"
android:layout_marginStart="12dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="@color/platform_color_666666"
android:textStyle="bold"
tools:text="心理测试专属红包"
tools:ignore="SpUsage" />
<TextView
android:id="@+id/tvTimeEnd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/ll_Red"
android:layout_alignParentBottom="true"
android:layout_marginStart="12dp"
android:layout_marginBottom="16dp"
android:textSize="10sp"
android:textColor="@color/platform_color_999999"
tools:text="有效期至2018-08-31"/>
<ImageView
android:id="@+id/imgCheck"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginTop="16dp"
android:layout_marginRight="12dp"
android:layout_alignParentRight="true"
android:background="@drawable/pay_img_select"/>
</merge>
\ No newline at end of file
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/log/LogHelper.kt
......@@ -2,14 +2,13 @@ package com.ydl.ydlcommon.utils.log
import android.content.Context
import android.util.Log
import com.yidianling.common.tools.*
import com.ydl.ydlcommon.base.BaseApp
import com.ydl.ydlcommon.data.PlatformDataManager
import com.ydl.ydlcommon.data.http.LogParam
import com.ydl.ydlcommon.data.http.ThrowableConsumer
import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.utils.FileUtils
import com.yidianling.common.tools.*
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.functions.Consumer
......@@ -40,7 +39,7 @@ class LogHelper private constructor() {
} catch (e: Exception) {
}
}.subscribeOn(Schedulers.io())
.subscribe()
.subscribe()
}
/**
......@@ -73,7 +72,7 @@ class LogHelper private constructor() {
} catch (e: Exception) {
}
}.subscribeOn(Schedulers.io())
.subscribe()
.subscribe()
}
private fun writeLog(content: String, className: String, methodName: String, line: Int) {
......@@ -82,7 +81,7 @@ class LogHelper private constructor() {
val writer = BufferedWriter(fileWriter)
writer.write("""Time:${format.format(Calendar.getInstance().time)}""")
writer.newLine()
writer.write("UserInfo:uid = ${ ModularServiceManager.getPlatformUserService()?.getUser()?.userId}")
writer.write("UserInfo:uid = ${ModularServiceManager.getPlatformUserService()?.getUser()?.userId}")
writer.newLine()
writer.write("""Network:${RxNetTool.getNetWorkTypeName(BaseApp.getApp())}""")
writer.newLine()
......@@ -108,30 +107,32 @@ class LogHelper private constructor() {
}
fun uploadLog(showToast:Boolean) {
fun uploadLog(showToast: Boolean) {
Observable.create<File> {
it.onNext(zip())
it.onComplete()
}.subscribeOn(Schedulers.io())
.flatMap { PlatformDataManager.getHttp().uploadLog(
.flatMap {
PlatformDataManager.getHttp().uploadLog(
LogParam(
it
)
) }
.observeOn(AndroidSchedulers.mainThread())
.subscribe(Consumer {
if (showToast){
ToastUtil.toastShort(it.msg)
}
Log.d("TAG", "")
}, object : ThrowableConsumer() {
override fun accept(msg: String) {
if (showToast){
ToastUtil.toastShort(msg)
}
Log.d("TAG", msg)
)
}
.observeOn(AndroidSchedulers.mainThread())
.subscribe(Consumer {
if (showToast) {
ToastUtil.toastShort(it.msg)
}
Log.d("TAG", "")
}, object : ThrowableConsumer() {
override fun accept(msg: String) {
if (showToast) {
ToastUtil.toastShort(msg)
}
})
Log.d("TAG", msg)
}
})
}
......@@ -153,18 +154,18 @@ class LogHelper private constructor() {
if (zipFile.exists()) zipFile.delete()
zipFile.createNewFile()
if (appLog.exists()){
if (appLog.exists()) {
files.add(appLog)
}
if (yunxinLog.exists()){
if (yunxinLog.exists()) {
files.add(yunxinLog)
}
if (agoraLog.exists()){
if (agoraLog.exists()) {
files.add(agoraLog)
}
// ZipUtils.toZip(getLogFolder().absolutePath, FileOutputStream(zipFile), true)
ZipUtils.toZip(files,FileOutputStream(zipFile))
ZipUtils.toZip(files, FileOutputStream(zipFile))
return zipFile
}
......@@ -213,14 +214,15 @@ class LogHelper private constructor() {
}
//获取云信日志路径
private fun getYunXinLog(context: Context):File{
val yunxin = FileUtils.getSDDirectory()+"/"+context.packageName+"/nim/log"
private fun getYunXinLog(context: Context): File {
val yunxin = FileUtils.getSDDirectory() + "/" + context.packageName + "/nim/log"
LogUtil.d(yunxin)
return File(yunxin)
}
//获取声网日志
private fun getAgoraLog(context: Context):File{
val agora = FileUtils.getSDDirectory()+"/"+context.packageName+"/agorasdk.log"
private fun getAgoraLog(context: Context): File {
val agora = FileUtils.getSDDirectory() + "/" + context.packageName + "/agorasdk.log"
return File(agora)
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment