Skip to content

android / dayu

Go to a project
Commit dafd3a98 by wukun
Options

240303

parent 718d0060
Inline Side-by-side
Showing with 465 additions and 29 deletions
baseSDK/src/main/java/com/dayu/common/Constants.java
......@@ -85,21 +85,21 @@ public class Constants {
/**
* 正式环境.
*/
public static String ENVIROMENT = "release";
public static String PHOTO = "online";
public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
public static String BASE_URL = "https://mobile.dayuspm.com";
public static String WEB_SOP = "https://sop.kf.ai/#/sop";
public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video";
public static boolean IS_DEBUG = false;
public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live)
public static int XLR_PID = 1936; //小绿人商家id
public static String SCHEME_9099 = "http://app.dl.kf.ai/ext/#/";
// public static String ENVIROMENT = "release";
// public static String PHOTO = "online";
// public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
// public static String BASE_URL = "https://mobile.dayuspm.com";
// public static String WEB_SOP = "https://sop.kf.ai/#/sop";
// public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
// public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
// public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
// public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
// public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
// public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video";
// public static boolean IS_DEBUG = false;
// public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live)
// public static int XLR_PID = 1936; //小绿人商家id
// public static String SCHEME_9099 = "http://app.dl.kf.ai/ext/#/";
/**
......
baseSDK/src/main/java/com/dayu/utils/GlideImageLoader.java
......@@ -49,6 +49,17 @@ public class GlideImageLoader {
.into(view);
}
public static void loadFit(Context context, String imageRes, ImageView view) {
RequestOptions options = new RequestOptions()
.placeholder(R.drawable.icon_video_default)
.diskCacheStrategy(DiskCacheStrategy.ALL);
Glide.with(context)
.load(imageRes)
.transition(withCrossFade())
.apply(options)
.into(view);
}
public static void load_1(Context context, String imageRes, ImageView view) {
RequestOptions options = new RequestOptions()
.centerInside()
......
baseSDK/src/main/java/com/dayu/widgets/CustomDialogNew.java 0 → 100644
package com.dayu.widgets;
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
import android.text.SpannableString;
import android.text.TextUtils;
import android.text.method.LinkMovementMethod;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.dayu.baselibrary.R;
import com.dayu.widgets.listener.OnCloseListener;
/**
* Created by luofan on 2017/11/10.
*/
public class CustomDialogNew extends Dialog implements View.OnClickListener {
private TextView contentTxt;
private TextView titleTxt;
private TextView submitTxt;
private TextView cancelTxt;
private TextView copyContentTv;
private Context mContext;
private String content;
private OnCloseListener listener;
private String positiveName;
private String negativeName;
private String title;
private String copyContent;
private int positiveColor;
private boolean flag;
private boolean cancel;
private boolean shouldDisMiss = true;
private View line;
private View view;
private LinearLayout parent;
private int negativeColor;
private SpannableString spannedContent;
public CustomDialogNew(Context context) {
super(context);
this.mContext = context;
}
public CustomDialogNew(Context context, int themeResId, String content) {
super(context, themeResId);
this.mContext = context;
this.content = content;
}
public CustomDialogNew(Context context, int themeResId, SpannableString content) {
super(context, themeResId);
this.mContext = context;
this.spannedContent = content;
}
public CustomDialogNew(Context context, int themeResId, String content, OnCloseListener listener) {
super(context, themeResId);
this.mContext = context;
this.content = content;
this.listener = listener;
}
public CustomDialogNew(Context context, int themeResId, SpannableString content, OnCloseListener listener) {
super(context, themeResId);
this.mContext = context;
this.spannedContent = content;
this.listener = listener;
}
public CustomDialogNew(Context context, int themeResId, View view, OnCloseListener listener) {
super(context, themeResId);
this.mContext = context;
this.view = view;
this.listener = listener;
}
protected CustomDialogNew(Context context, boolean cancelable, OnCancelListener cancelListener) {
super(context, cancelable, cancelListener);
this.mContext = context;
}
public CustomDialogNew setTitle(String title) {
this.title = title;
return this;
}
public CustomDialogNew setPositiveButton(String name) {
this.positiveName = name;
return this;
}
public CustomDialogNew setPositiveButtonColor(int colorId) {
this.positiveColor = colorId;
return this;
}
public CustomDialogNew setNegativeButtonColor(int colorId) {
this.negativeColor = colorId;
return this;
}
public CustomDialogNew setNegativeButton(String name) {
this.negativeName = name;
return this;
}
public CustomDialogNew setOneButton(boolean flag) {
this.flag = flag;
return this;
}
public CustomDialogNew shouldDisMiss(boolean shouldDisMiss) {
this.shouldDisMiss = shouldDisMiss;
return this;
}
public CustomDialogNew setCancel(boolean cancel) {
this.cancel = cancel;
return this;
}
public CustomDialogNew setCopyContent(String content) {
copyContent = content;
return this;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.dialog_custom_new);
initView();
}
private void initView() {
contentTxt = findViewById(R.id.content);
titleTxt = findViewById(R.id.title);
line = findViewById(R.id.v_line);
submitTxt = findViewById(R.id.submit);
submitTxt.setOnClickListener(this);
cancelTxt = findViewById(R.id.cancel);
parent = findViewById(R.id.parent);
copyContentTv = findViewById(R.id.copyContent);
cancelTxt.setOnClickListener(this);
if (TextUtils.isEmpty(spannedContent)) {
contentTxt.setText(content);
} else {
contentTxt.setMovementMethod(LinkMovementMethod.getInstance());
contentTxt.setText(spannedContent);
}
if (!TextUtils.isEmpty(positiveName)) {
submitTxt.setText(positiveName);
}
if (positiveColor != 0) {
submitTxt.setTextColor(positiveColor);
}
if (negativeColor != 0) {
cancelTxt.setTextColor(negativeColor);
}
if (!TextUtils.isEmpty(negativeName)) {
cancelTxt.setText(negativeName);
}
if (!TextUtils.isEmpty(title)) {
titleTxt.setText(title);
}
if (flag) {
line.setVisibility(View.GONE);
cancelTxt.setVisibility(View.GONE);
}
if (view != null) {
contentTxt.setVisibility(View.GONE);
parent.setVisibility(View.VISIBLE);
parent.removeAllViews();
parent.addView(view);
}
if (!TextUtils.isEmpty(copyContent)) {
copyContentTv.setText(copyContent);
// copyContentTv.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// ToastUtils.showShortToast("复制成功，请发送到微信聊天中打开");
// ClipboardManager manager = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
// manager.setPrimaryClip(ClipData.newPlainText(null, copyContent));
// }
// });
}
setCanceledOnTouchOutside(cancel);
setCancelable(cancel);
}
@Override
public void onClick(View v) {
int i = v.getId();
if (i == R.id.cancel) {
if (listener != null) {
listener.onClick(this, false);
}
if (shouldDisMiss && mContext != null) {
this.dismiss();
}
} else if (i == R.id.submit) {
if (listener != null) {
listener.onClick(this, true);
}
if (shouldDisMiss && mContext != null) {
this.dismiss();
}
}
}
}
baseSDK/src/main/res/drawable/btn_white_commom.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke android:width="1dp"/>
<corners android:radius="5dp"/>
<solid android:color="@color/white"/>
</shape>
\ No newline at end of file
baseSDK/src/main/res/layout/dialog_custom_new.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="280dp"
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
android:layout_gravity="center"
android:background="@drawable/item_shape"
android:orientation="vertical">
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dp"
android:text="@string/notice"
android:textColor="#FF030303"
android:textSize="17sp" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/light_grey" />
<TextView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginBottom="10dp"
android:layout_weight="1"
android:gravity="center"
tools:text="福建安利就发了房间爱立方街坊邻居发链接发发链接发发发发福建安利就发了房间爱立方街坊邻居发链接发发链接发发发发"
android:lineSpacingExtra="3dp"
android:textColor="#FF030303"
android:textSize="15sp" />
<TextView
android:id="@+id/copyContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginBottom="20dp"
android:gravity="center"
android:lineSpacingExtra="3dp"
android:textColor="@color/cl_tab_yellow"
android:textSize="15sp" />
<LinearLayout
android:id="@+id/parent"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginBottom="20dp"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/cl_selector_hui"
android:visibility="gone"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:orientation="horizontal"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:layout_marginBottom="20dp">
<TextView
android:id="@+id/cancel"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1.0"
android:gravity="center"
android:text="再想想"
android:textColor="@color/common_text_color"
android:textSize="15sp"
android:background="@drawable/btn_white_commom"/>
<View
android:id="@+id/v_line"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/cl_selector_hui"
android:visibility="gone"/>
<TextView
android:id="@+id/submit"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1.0"
android:layout_marginLeft="30dp"
android:gravity="center"
android:text="同意"
android:textColor="@color/white"
android:textSize="15sp"
android:background="@drawable/btn_blue_commom"/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
userCenter/src/main/java/com/dayu/usercenter/adapter/SelfLicenceAdapter.java
package com.dayu.usercenter.adapter;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import com.dayu.base.ui.adapter.CoreAdapter;
import com.dayu.usercenter.R;
import com.dayu.usercenter.databinding.ItemUserLicenceBinding;
import com.dayu.usercenter.databinding.ItemUserLicenceNewBinding;
import com.dayu.usercenter.model.bean.SelfLicenceBean;
import com.dayu.usercenter.presenter.userlicence.UserLicencePresent;
import com.dayu.utils.GlideImageLoader;
public class SelfLicenceAdapter extends CoreAdapter<SelfLicenceBean, ItemUserLicenceBinding> {
public class SelfLicenceAdapter extends CoreAdapter<SelfLicenceBean, ItemUserLicenceNewBinding> {
private UserLicencePresent mPresent;
public SelfLicenceAdapter(boolean needFoot) {
......@@ -19,11 +17,12 @@ public class SelfLicenceAdapter extends CoreAdapter<SelfLicenceBean, ItemUserLic
}
@Override
protected void onBind(ItemUserLicenceBinding holder, SelfLicenceBean item, int position) {
protected void onBind(ItemUserLicenceNewBinding holder, SelfLicenceBean item, int position) {
super.onBind(holder, item, position);
GlideImageLoader.loadFit(mContext, holder.ivImg, item.getUrl(), R.drawable.icon_img_default);
holder.tvTitle.setText(item.getName());
holder.tvCompany.setText(getStatusDesc(item.getStatus()));
holder.tvTitle.setText("【证书名称】 : "+item.getName());
// holder.tvCompany.setText(getStatusDesc(item.getStatus()));
holder.tvCompany.setText(" 颁证机构: " + item.getProviderName());
if (item.getStatus() == 3) {
holder.tvCompany.setTextColor(mContext.getResources().getColor(R.color.common_red));
} else {
......
userCenter/src/main/java/com/dayu/usercenter/model/bean/SelfLicenceBean.java
......@@ -29,6 +29,15 @@ public class SelfLicenceBean {
private String engineerMobile;
private int engineerId;
private double price;
private String providerName;
public String getProviderName() {
return providerName;
}
public void setProviderName(String providerName) {
this.providerName = providerName;
}
public int getId() {
return id;
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/SelfLicenceActivity.java
......@@ -42,7 +42,7 @@ public class SelfLicenceActivity extends BaseActivity<UserLicencePresent, Activi
mBind.titleBack.setOnClickListener(v -> finish());
mAdapter = new SelfLicenceAdapter(true);
mAdapter.setViewType(R.layout.item_user_licence);
mAdapter.setViewType(R.layout.item_user_licence_new);
mAdapter.setPresent(mPresenter);
mBind.recyclerView.setAdapter(mAdapter);
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/SelfLicenceDetailActivity.java
......@@ -30,6 +30,7 @@ import com.dayu.utils.GlideImageLoader;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager;
import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.CustomDialogNew;
import com.dayu.widgets.WechatShareDialog;
import com.umeng.socialize.bean.SHARE_MEDIA;
......@@ -63,12 +64,12 @@ public class SelfLicenceDetailActivity extends BaseActivity<UserLicenceDetailPre
Button btnDownload = findViewById(R.id.btn_download);
GlideImageLoader.load(this, url,ivContent);
GlideImageLoader.loadFit(this, url,ivContent);
if (2 == payStatus){
CustomDialog dialog = new CustomDialog(SelfLicenceDetailActivity.this, R.style.CustomDialog,
"查看、转发、下载证书需支付证书费:\n ￥ "+ price ,
CustomDialogNew dialog = new CustomDialogNew(SelfLicenceDetailActivity.this, R.style.CustomDialog,
"查看、转发、下载证书需支付证书费:" ,
(dialog1, confirm) -> {
if (confirm) {
LicencePayData payData = new LicencePayData(id,"");
......@@ -88,6 +89,7 @@ public class SelfLicenceDetailActivity extends BaseActivity<UserLicenceDetailPre
}
});
dialog.setTitle("付费证书")
.setCopyContent("￥ "+ price)
.shouldDisMiss(false)
.setPositiveButton("同意");
dialog.show();
......
userCenter/src/main/res/layout/activity_self_licence_detail.xml
......@@ -23,11 +23,19 @@
<ImageView style="@style/card_line" />
<ImageView
android:id="@+id/iv_content"
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
android:layout_weight="1">
<ImageView
android:id="@+id/iv_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:scaleType="fitXY"/>
</ScrollView>
<LinearLayout
android:layout_width="match_parent"
......
userCenter/src/main/res/layout/item_user_licence_new.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:id="@+id/ll_root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_13.3"
android:layout_marginTop="5dp"
android:layout_marginRight="@dimen/dp_13.3"
android:background="@drawable/item_shape"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="@dimen/dp_10">
<ImageView
android:id="@+id/iv_img"
android:layout_width="90dp"
android:layout_height="90dp"
android:src="@drawable/icon_img_default" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_6"
android:layout_weight="2"
android:orientation="vertical">
<TextView
android:id="@+id/tv_title"
style="@style/sale_item_text"
android:text="title"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_company"
style="@style/sale_item_text"
android:layout_marginTop="10dp"
android:text=""
/>
</LinearLayout>
<RelativeLayout
android:layout_width="70dp"
android:layout_height="wrap_content"
android:visibility="gone">
<ImageView
android:id="@+id/iv_arrow"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_alignParentRight="true"
android:src="@drawable/icon_arrow_right" />
</RelativeLayout>
</LinearLayout>
</layout>
\ No newline at end of file
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 sign in to comment