Skip to content

android / dayu

Go to a project
Commit 0578d451 by mReturn
Options

share

parent f5d1dccc
Expand all
Inline Side-by-side
Showing with 536 additions and 268 deletions
.idea/gradle.xml
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<option value="$PROJECT_DIR$/orderCenter" /> <option value="$PROJECT_DIR$/orderCenter" />
<option value="$PROJECT_DIR$/pickerview" /> <option value="$PROJECT_DIR$/pickerview" />
<option value="$PROJECT_DIR$/provider" /> <option value="$PROJECT_DIR$/provider" />
<option value="$PROJECT_DIR$/saleCenter" />
<option value="$PROJECT_DIR$/userCenter" /> <option value="$PROJECT_DIR$/userCenter" />
<option value="$PROJECT_DIR$/wheelview" /> <option value="$PROJECT_DIR$/wheelview" />
</set> </set>
......
.idea/misc.xml
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</value> </value>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
......
.idea/modules.xml
...@@ -5,13 +5,14 @@ ...@@ -5,13 +5,14 @@
<module fileurl="file://$PROJECT_DIR$/IDCardLib/IDCardLib.iml" filepath="$PROJECT_DIR$/IDCardLib/IDCardLib.iml" /> <module fileurl="file://$PROJECT_DIR$/IDCardLib/IDCardLib.iml" filepath="$PROJECT_DIR$/IDCardLib/IDCardLib.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/baseSDK/baseSDK.iml" filepath="$PROJECT_DIR$/baseSDK/baseSDK.iml" /> <module fileurl="file://$PROJECT_DIR$/baseSDK/baseSDK.iml" filepath="$PROJECT_DIR$/baseSDK/baseSDK.iml" />
<module fileurl="file://$PROJECT_DIR$/dayu-saas-android.iml" filepath="$PROJECT_DIR$/dayu-saas-android.iml" /> <module fileurl="file://$PROJECT_DIR$/dayu-saas-android00.iml" filepath="$PROJECT_DIR$/dayu-saas-android00.iml" />
<module fileurl="file://$PROJECT_DIR$/locationComponent/locationComponent.iml" filepath="$PROJECT_DIR$/locationComponent/locationComponent.iml" /> <module fileurl="file://$PROJECT_DIR$/locationComponent/locationComponent.iml" filepath="$PROJECT_DIR$/locationComponent/locationComponent.iml" />
<module fileurl="file://$PROJECT_DIR$/managercenter/managercenter.iml" filepath="$PROJECT_DIR$/managercenter/managercenter.iml" /> <module fileurl="file://$PROJECT_DIR$/managercenter/managercenter.iml" filepath="$PROJECT_DIR$/managercenter/managercenter.iml" />
<module fileurl="file://$PROJECT_DIR$/messageCenter/messageCenter.iml" filepath="$PROJECT_DIR$/messageCenter/messageCenter.iml" /> <module fileurl="file://$PROJECT_DIR$/messageCenter/messageCenter.iml" filepath="$PROJECT_DIR$/messageCenter/messageCenter.iml" />
<module fileurl="file://$PROJECT_DIR$/orderCenter/orderCenter.iml" filepath="$PROJECT_DIR$/orderCenter/orderCenter.iml" /> <module fileurl="file://$PROJECT_DIR$/orderCenter/orderCenter.iml" filepath="$PROJECT_DIR$/orderCenter/orderCenter.iml" />
<module fileurl="file://$PROJECT_DIR$/pickerview/pickerview.iml" filepath="$PROJECT_DIR$/pickerview/pickerview.iml" /> <module fileurl="file://$PROJECT_DIR$/pickerview/pickerview.iml" filepath="$PROJECT_DIR$/pickerview/pickerview.iml" />
<module fileurl="file://$PROJECT_DIR$/provider/provider.iml" filepath="$PROJECT_DIR$/provider/provider.iml" /> <module fileurl="file://$PROJECT_DIR$/provider/provider.iml" filepath="$PROJECT_DIR$/provider/provider.iml" />
<module fileurl="file://$PROJECT_DIR$/saleCenter/saleCenter.iml" filepath="$PROJECT_DIR$/saleCenter/saleCenter.iml" />
<module fileurl="file://$PROJECT_DIR$/userCenter/userCenter.iml" filepath="$PROJECT_DIR$/userCenter/userCenter.iml" /> <module fileurl="file://$PROJECT_DIR$/userCenter/userCenter.iml" filepath="$PROJECT_DIR$/userCenter/userCenter.iml" />
<module fileurl="file://$PROJECT_DIR$/wheelview/wheelview.iml" filepath="$PROJECT_DIR$/wheelview/wheelview.iml" /> <module fileurl="file://$PROJECT_DIR$/wheelview/wheelview.iml" filepath="$PROJECT_DIR$/wheelview/wheelview.iml" />
</modules> </modules>
......
app/build_help.txt
windows系统下可能会报 Databinding错误 windows系统下可能会报 Databinding错误
解决方法： 配置环境变量：变量名为: JAVA_TOOL_OPTIONS 变量值为：-Dfile.encoding=UTF-8 解决方法： 配置环境变量：变量名为: JAVA_TOOL_OPTIONS 变量值为：-Dfile.encoding=UTF-8
参考 https://blog.csdn.net/suzhanfeng/article/details/77715129 参考 https://blog.csdn.net/suzhanfeng/article/details/77715129
\ No newline at end of file
打包后出现数据无法正常显示时，添加混淆规则
https://blog.csdn.net/yonbor605/article/details/86679179
\ No newline at end of file
app/proguard-rules.pro
...@@ -121,6 +121,10 @@ ...@@ -121,6 +121,10 @@
-keep class com.dayu.order.sqlbean.** { *; } -keep class com.dayu.order.sqlbean.** { *; }
-keep class com.dayu.provider.event.** { *; } -keep class com.dayu.provider.event.** { *; }
-keep class com.dayu.usercenter.data.protocol.** { *; } -keep class com.dayu.usercenter.data.protocol.** { *; }
-keep class com.dayu.usercenter.model.** { *; }
-keep class com.dayu.usercenter.event.** { *; }
-keep class com.bigfish.salecenter.model.** { *; }
-keep class com.bigfish.salecenter.event.** { *; }
-keep class com.dayu.event.** { *; } -keep class com.dayu.event.** { *; }
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
......
app/src/main/AndroidManifest.xml
...@@ -49,7 +49,8 @@ ...@@ -49,7 +49,8 @@
android:label="@string/tv_dayu" android:label="@string/tv_dayu"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
tools:replace="android:label,icon,theme"> tools:replace="android:label,icon,theme"
tools:ignore="GoogleAppIndexingWarning">
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="android.support.v4.content.FileProvider"
android:authorities="com.dayu.bigfish.fileProvider" android:authorities="com.dayu.bigfish.fileProvider"
......
app/src/main/java/com/dayu/bigfish/MyApplication.java
...@@ -19,6 +19,7 @@ import com.dayu.utils.NetworkConnectChangedReceiver; ...@@ -19,6 +19,7 @@ import com.dayu.utils.NetworkConnectChangedReceiver;
import com.umeng.analytics.MobclickAgent; import com.umeng.analytics.MobclickAgent;
import com.umeng.analytics.MobclickAgent.EScenarioType; import com.umeng.analytics.MobclickAgent.EScenarioType;
import com.umeng.commonsdk.UMConfigure; import com.umeng.commonsdk.UMConfigure;
import com.umeng.socialize.PlatformConfig;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.lang.reflect.Field; import java.lang.reflect.Field;
...@@ -76,6 +77,8 @@ public class MyApplication extends BaseApplication { ...@@ -76,6 +77,8 @@ public class MyApplication extends BaseApplication {
UMConfigure.setLogEnabled(true); UMConfigure.setLogEnabled(true);
UMConfigure.setEncryptEnabled(true); UMConfigure.setEncryptEnabled(true);
MobclickAgent.setScenarioType(mContext, EScenarioType.E_UM_NORMAL); MobclickAgent.setScenarioType(mContext, EScenarioType.E_UM_NORMAL);
PlatformConfig.setWeixin("wx44e10dbfc2ae4a52", "6107b1b7da9ed2eb3bcb3852c1ea4391");
} }
/** /**
......
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
...@@ -98,6 +98,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -98,6 +98,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
saleFragment = HomeSaleFragment.newInstance(); saleFragment = HomeSaleFragment.newInstance();
secondFragment = HomeOrderFragment.newInstance(); secondFragment = HomeOrderFragment.newInstance();
// thirdFragment = HomeMessageFragment.newInstance(); // thirdFragment = HomeMessageFragment.newInstance();
// fourFragment = HomePersonFragment.newInstance();
fourFragment = HomeUserFragment.newInstance(); fourFragment = HomeUserFragment.newInstance();
if (UserManager.getInstance().getRole() == Constants.ENGINEER) { if (UserManager.getInstance().getRole() == Constants.ENGINEER) {
// firstFragment = HomeFirstTabFragment.newInstance(); // firstFragment = HomeFirstTabFragment.newInstance();
......
app/src/main/java/com/dayu/bigfish/ui/service/LocationService.java
...@@ -41,7 +41,7 @@ public class LocationService extends Service { ...@@ -41,7 +41,7 @@ public class LocationService extends Service {
mHandler = new Handler() { mHandler = new Handler() {
@Override @Override
public void handleMessage(Message msg) { public void handleMessage(Message msg) {
if (mAccountId == 0 || mSiteId == 0) { if (mAccountId == 0 || mSiteId == 0 || mHandler == null) {
return; return;
} }
mHandler.post(() -> LocationUtils.getCurrentLocation(location -> { mHandler.post(() -> LocationUtils.getCurrentLocation(location -> {
...@@ -71,7 +71,7 @@ public class LocationService extends Service { ...@@ -71,7 +71,7 @@ public class LocationService extends Service {
sendMessage(); sendMessage();
} }
}; };
mTimer.schedule(mTask, 2000, 10000); mTimer.schedule(mTask, 2000, 1000*60*10);
} }
public void sendMessage() { public void sendMessage() {
......
baseSDK/src/main/AndroidManifest.xml
...@@ -15,5 +15,10 @@ ...@@ -15,5 +15,10 @@
</intent-filter> </intent-filter>
</receiver> </receiver>
<activity android:name="com.dayu.base.ui.activity.PreviewActivty" /> <activity android:name="com.dayu.base.ui.activity.PreviewActivty" />
<activity
android:name="com.dayu.wxapi.WXEntryActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:exported="true"
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
</application> </application>
</manifest> </manifest>
baseSDK/src/main/java/com/dayu/common/Constants.java
...@@ -24,33 +24,36 @@ public class Constants { ...@@ -24,33 +24,36 @@ public class Constants {
public static final String API_8500 = "/api-contract"; public static final String API_8500 = "/api-contract";
public static final String API_8600 = "/api-mall"; public static final String API_8600 = "/api-mall";
public static final String PROGRAM_PATH = "pages/mallDetail/main?goodsId=gid&userId=uid&type=1"; //小程序路径
/** /**
* 测试环境配置. * 测试环境配置.
*/ */
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL; // public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static final String ENVIROMENT = "debug"; // public static final String ENVIROMENT = "debug";
public static final String BASE_URL = "http://47.94.101.239:3112"; // public static final String BASE_URL = "http://47.94.101.239:3112";
public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"; // public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop"; // public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
public final static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult"; // public final static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
public final static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop"; // public final static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
public final static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail"; // public final static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail"; // public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
public static final boolean IS_DEBUG = true; // public static final boolean IS_DEBUG = true;
/** /**
* uat环境配置. * uat环境配置.
*/ */
// public static final String ENVIROMENT = "uat"; public static final String ENVIROMENT = "uat";
// public static final int LOG_LEVEL = LogUtils.LEVEL_ALL; public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
// public static final String BASE_URL = "http://47.95.223.6:3112"; public static final String BASE_URL = "http://47.95.223.6:3112";
// public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"; public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
// public final static String WEB_SOP = "http://47.95.223.6:9004/#/sop"; public final static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
// public final static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail"; public final static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
// public final static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail"; public final static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
// public final static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult"; public final static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
// public final static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop"; public final static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
// public static final boolean IS_DEBUG = true; public static final boolean IS_DEBUG = true;
/** /**
* 正式环境. * 正式环境.
......
baseSDK/src/main/java/com/dayu/utils/CommonUtils.java
...@@ -11,6 +11,14 @@ import android.view.inputmethod.InputMethodManager; ...@@ -11,6 +11,14 @@ import android.view.inputmethod.InputMethodManager;
import android.widget.TextView; import android.widget.TextView;
import com.dayu.baselibrary.R; import com.dayu.baselibrary.R;
import com.dayu.common.Constants;
import com.umeng.socialize.Config;
import com.umeng.socialize.ShareAction;
import com.umeng.socialize.UMShareListener;
import com.umeng.socialize.bean.SHARE_MEDIA;
import com.umeng.socialize.media.UMImage;
import com.umeng.socialize.media.UMMin;
import com.umeng.socialize.media.UMWeb;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
...@@ -55,7 +63,7 @@ public class CommonUtils { ...@@ -55,7 +63,7 @@ public class CommonUtils {
/** /**
* 拨打电话（跳转到拨号界面，用户手动点击拨打） * 拨打电话（跳转到拨号界面，用户手动点击拨打）
*/ */
public static void dialPhone(Context context,String phoneNum) { public static void dialPhone(Context context, String phoneNum) {
if (TextUtils.isEmpty(phoneNum)) if (TextUtils.isEmpty(phoneNum))
return; return;
Intent intent = new Intent(Intent.ACTION_DIAL); Intent intent = new Intent(Intent.ACTION_DIAL);
...@@ -68,14 +76,14 @@ public class CommonUtils { ...@@ -68,14 +76,14 @@ public class CommonUtils {
/** /**
* 获取带汉字描述的价格 * 获取带汉字描述的价格
*/ */
public static String getMoneyStr(Context context,double money) { public static String getMoneyStr(Context context, double money) {
return money+context.getString(R.string.money); return money + context.getString(R.string.money);
} }
//计算并设置时间 //计算并设置时间
public static String getTimeDesc(Context context, String time) { public static String getTimeDesc(Context context, String time) {
if (TextUtils.isEmpty(time) ) { if (TextUtils.isEmpty(time)) {
return""; return "";
} }
try { try {
long nowTime = System.currentTimeMillis(); long nowTime = System.currentTimeMillis();
...@@ -91,16 +99,16 @@ public class CommonUtils { ...@@ -91,16 +99,16 @@ public class CommonUtils {
long sec = (dTime / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60); long sec = (dTime / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
if (day > 0) { if (day > 0) {
if (day > 365) { if (day > 365) {
return(context.getString(R.string.one_year_ago)); return (context.getString(R.string.one_year_ago));
} else { } else {
return(day + context.getString(R.string.day_ago)); return (day + context.getString(R.string.day_ago));
} }
} else if (hour > 0) { } else if (hour > 0) {
return(hour + context.getString(R.string.hour_ago)); return (hour + context.getString(R.string.hour_ago));
} else if (min > 0) { } else if (min > 0) {
if (min > 5) { if (min > 5) {
return(min + context.getString(R.string.min_ago)); return (min + context.getString(R.string.min_ago));
} else { } else {
return context.getString(R.string.just_before); return context.getString(R.string.just_before);
} }
...@@ -114,30 +122,74 @@ public class CommonUtils { ...@@ -114,30 +122,74 @@ public class CommonUtils {
} }
/** /**
* 获取订单状态描述 * 获取订单状态描述
*
* @return * @return
*/ */
public static String getOrderStauts(Context context,int state) { public static String getOrderStauts(Context context, int state) {
// 1待付款2待商家确认3取消订单4待发货5待收货6已收货验收7退货申请8换货申请9退货待返货10换货待返货 // 1待付款2待商家确认3取消订单4待发货5待收货6已收货验收7退货申请8换货申请9退货待返货10换货待返货
// 11拒绝退货12拒绝换货13退货已返货14换货已返货15已退货16订单完成 // 11拒绝退货12拒绝换货13退货已返货14换货已返货15已退货16订单完成
String[] status = context.getResources().getStringArray(R.array.sale_order_status); String[] status = context.getResources().getStringArray(R.array.sale_order_status);
if (status.length>= state){ if (status.length >= state && state>=0) {
return status[state-1]; return status[state - 1];
}else { } else {
return "unkonwn"; return "unkonwn";
} }
} }
/** /**
* 获取订单状态对应的颜色 * 获取订单状态对应的颜色
*
* @return * @return
*/ */
public static int getOrderStautsColor(Context context, int state) { public static int getOrderStautsColor(Context context, int state) {
if (state>6 && state<16){ if (state > 6 && state < 16) {
return context.getResources().getColor(R.color.common_red); return context.getResources().getColor(R.color.common_red);
}else { } else {
return context.getResources().getColor(R.color.text_common_blue); return context.getResources().getColor(R.color.text_common_blue);
} }
} }
/**
* 分享链接（包含标题内容）
*/
public static void shareUrl(Activity activity, String url, String imgUrl, String title,
String description, SHARE_MEDIA platform, UMShareListener callBack) {
UMWeb web = new UMWeb(url);
web.setTitle(title);
web.setThumb(new UMImage(activity, imgUrl));
web.setDescription(description);
new ShareAction(activity).withMedia(web)
.setPlatform(platform)
.setCallback(callBack).share();
}
/**
* 分享小程序
**/
public static void shareProgram(Activity activity, String url, String imgUrl, String title,
String description,int uid,int gid, SHARE_MEDIA platform, UMShareListener callBack) {
//兼容低版本的网页链接
UMMin umMin = new UMMin(url);
// 小程序消息封面图片
umMin.setThumb(new UMImage(activity, imgUrl));
// 小程序消息title
umMin.setTitle(title);
// 小程序消息描述
umMin.setDescription(description);
//小程序页面路径
umMin.setPath(Constants.PROGRAM_PATH.replace("uid",uid+"").replace("gid",gid+""));
// 小程序原始id,在微信平台查询
umMin.setUserName("gh_0e5cd0cdbf46");
// Config.setMiniPreView(); //设置预览版
// Config.setMiniTest(); //设置测试版
new ShareAction(activity)
.withMedia(umMin)
.setPlatform(platform)
.setCallback(callBack).share();
}
} }
baseSDK/src/main/java/com/dayu/wxapi/WXEntryActivity.java 0 → 100644
package com.dayu.wxapi;
import com.umeng.socialize.weixin.view.WXCallbackActivity;
public class WXEntryActivity extends WXCallbackActivity {
}
baseSDK/src/main/res/values/strings.xml
...@@ -882,6 +882,7 @@ C) 在甲方使用大鱼平台服务过程中产生的业务数据，客户数 ...@@ -882,6 +882,7 @@ C) 在甲方使用大鱼平台服务过程中产生的业务数据，客户数
<item>已退货</item> <item>已退货</item>
<item>订单完成</item> <item>订单完成</item>
</array> </array>
<string name="can_not_share">不能分享</string>
<!--sale--> <!--sale-->
<!--user--> <!--user-->
......
baseSDK/src/main/res/values/styles.xml
<resources> <resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar"> <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<item name="colorPrimary">@color/cl_white</item> <item name="colorPrimary">@color/cl_white</item>
<item name="colorPrimaryDark">@color/cl_line</item> <item name="colorPrimaryDark">@color/cl_line</item>
<item name="colorAccent">@color/cl_accent</item> <item name="colorAccent">@color/cl_accent</item>
<!--<item name="android:statusBarColor" tools:targetApi="lollipop">@color/bar_grey</item>-->
</style> </style>
......
saleCenter/src/main/AndroidManifest.xml
...@@ -11,9 +11,6 @@ ...@@ -11,9 +11,6 @@
<activity android:name=".ui.activity.SaleOrderDetailActivity" <activity android:name=".ui.activity.SaleOrderDetailActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity android:name=".ui.activity.ProductSearchActivity"
android:screenOrientation="portrait"
/>
</application> </application>
</manifest> </manifest>
\ No newline at end of file
saleCenter/src/main/java/com/bigfish/salecenter/model/ProductDetailBean.java
...@@ -44,8 +44,8 @@ public class ProductDetailBean implements Serializable { ...@@ -44,8 +44,8 @@ public class ProductDetailBean implements Serializable {
private String goodsNum; private String goodsNum;
private String goodsModel; private String goodsModel;
private String pn; private String pn;
private int price; private double price;
private int salesPrice; private double salesPrice;
private int customerRebate; private int customerRebate;
private String brief; private String brief;
private String sellingPoint1; private String sellingPoint1;
...@@ -101,19 +101,19 @@ public class ProductDetailBean implements Serializable { ...@@ -101,19 +101,19 @@ public class ProductDetailBean implements Serializable {
this.pn = pn; this.pn = pn;
} }
public int getPrice() { public double getPrice() {
return price; return price;
} }
public void setPrice(int price) { public void setPrice(double price) {
this.price = price; this.price = price;
} }
public int getSalesPrice() { public double getSalesPrice() {
return salesPrice; return salesPrice;
} }
public void setSalesPrice(int salesPrice) { public void setSalesPrice(double salesPrice) {
this.salesPrice = salesPrice; this.salesPrice = salesPrice;
} }
......
saleCenter/src/main/java/com/bigfish/salecenter/presenter/saleorder/SaleOrderPresent.java
...@@ -54,7 +54,7 @@ public class SaleOrderPresent extends SaleOrderContract.Presenter { ...@@ -54,7 +54,7 @@ public class SaleOrderPresent extends SaleOrderContract.Presenter {
} }
private void getOrders() { private void getOrders() {
Api.getService(SaleService.class).getSaleOrders(23,type,keyStr,mPage,Constants.PAGESIZE).compose(Api.applySchedulers()) Api.getService(SaleService.class).getSaleOrders(mUserId,type,keyStr,mPage,Constants.PAGESIZE).compose(Api.applySchedulers())
.subscribe(baseObserver(orders->{ .subscribe(baseObserver(orders->{
// ToastUtils.showShortToast(products.getData().size() + " "); // ToastUtils.showShortToast(products.getData().size() + " ");
datas.set(orders); datas.set(orders);
......
saleCenter/src/main/java/com/bigfish/salecenter/presenter/saleproduct/SaleProductContract.java
package com.bigfish.salecenter.presenter.saleproduct; package com.bigfish.salecenter.presenter.saleproduct;
import com.bigfish.salecenter.model.ProductListBean;
import com.bigfish.salecenter.model.SaleTab; import com.bigfish.salecenter.model.SaleTab;
import com.dayu.base.ui.presenter.BaseListPresenter; import com.dayu.base.ui.presenter.BaseListPresenter;
import com.dayu.base.ui.presenter.BasePresenter; import com.dayu.base.ui.presenter.BasePresenter;
...@@ -11,6 +12,7 @@ import com.dayu.common.BaseView; ...@@ -11,6 +12,7 @@ import com.dayu.common.BaseView;
**/ **/
public interface SaleProductContract { public interface SaleProductContract {
interface View extends BaseView { interface View extends BaseView {
void share(ProductListBean item);
} }
abstract class Presenter extends BaseListPresenter<View> { abstract class Presenter extends BaseListPresenter<View> {
......
saleCenter/src/main/java/com/bigfish/salecenter/presenter/saleproduct/SaleProductPresent.java
...@@ -3,6 +3,7 @@ package com.bigfish.salecenter.presenter.saleproduct; ...@@ -3,6 +3,7 @@ package com.bigfish.salecenter.presenter.saleproduct;
import android.databinding.ObservableField; import android.databinding.ObservableField;
import android.text.TextUtils; import android.text.TextUtils;
import com.bigfish.salecenter.R;
import com.bigfish.salecenter.api.SaleService; import com.bigfish.salecenter.api.SaleService;
import com.bigfish.salecenter.event.RefreshSaleTab; import com.bigfish.salecenter.event.RefreshSaleTab;
import com.bigfish.salecenter.model.CollectProductData; import com.bigfish.salecenter.model.CollectProductData;
...@@ -12,6 +13,9 @@ import com.dayu.common.Constants; ...@@ -12,6 +13,9 @@ import com.dayu.common.Constants;
import com.dayu.event.UserInfo; import com.dayu.event.UserInfo;
import com.dayu.utils.ToastUtils; import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager; import com.dayu.utils.UserManager;
import com.umeng.socialize.ShareAction;
import com.umeng.socialize.media.UMImage;
import com.umeng.socialize.media.UMWeb;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
...@@ -95,16 +99,23 @@ public class SaleProductPresent extends SaleProductContract.Presenter { ...@@ -95,16 +99,23 @@ public class SaleProductPresent extends SaleProductContract.Presenter {
//点击分享按钮 //点击分享按钮
public void onShareClick(ProductListBean item) { public void onShareClick(ProductListBean item) {
mView.showDialog(); mView.share(item);
Api.getService(SaleService.class).canShare(item.getId(), mUserId).compose(Api.applySchedulers()) // mView.showDialog();
.subscribe(baseObserver(success -> { // Api.getService(SaleService.class).canShare(item.getId(), mUserId).compose(Api.applySchedulers())
ToastUtils.showShortToast("canShare: " + success); // .subscribe(baseObserver(canShare -> {
}) // ToastUtils.showShortToast("canShare: " + canShare);
// if (canShare){
); // mView.share(item);
// }else {
// ToastUtils.showShortToast(R.string.can_not_share);
// }
// })
//
// );
} }
@Override @Override
public void loadMore() { public void loadMore() {
if (type == 1) { if (type == 1) {
......
saleCenter/src/main/java/com/bigfish/salecenter/ui/activity/ProductSearchActivity.java deleted 100644 → 0
package com.bigfish.salecenter.ui.activity;
import android.content.Context;
import android.content.Intent;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import com.bigfish.salecenter.R;
import com.bigfish.salecenter.adapter.SaleProductAdapter;
import com.bigfish.salecenter.databinding.ActivityProductSearchBinding;
import com.bigfish.salecenter.databinding.ItemSaleProductBinding;
import com.bigfish.salecenter.model.ProductListBean;
import com.bigfish.salecenter.presenter.saleproduct.SaleProductContract;
import com.bigfish.salecenter.presenter.saleproduct.SaleProductPresent;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.widgets.listener.OnItemClickListener;
import java.util.ArrayList;
public class ProductSearchActivity extends BaseActivity<SaleProductPresent, ActivityProductSearchBinding>
implements SaleProductContract.View {
private int mType; //1.商品 2.收藏
SaleProductAdapter mAdapter;
public static void launch(Context context, int type) {
Intent intent = new Intent(context, ProductSearchActivity.class);
intent.putExtra("type", type);
context.startActivity(intent);
}
@Override
public void setPresenter() {
mBind.setPresenter(mPresenter);
}
@Override
public int getLayoutId() {
return R.layout.activity_product_search;
}
@Override
public void initView() {
mBind.tvCancel.setOnClickListener(view -> dumpBack());
mType = getIntent().getIntExtra("type", 0);
mPresenter.setType(mType);
initSerachView();
mAdapter = new SaleProductAdapter(true);
mAdapter.setViewType(R.layout.item_sale_product);
mAdapter.initPresenter(mPresenter);
mBind.recyclerView.setAdapter(mAdapter);
mAdapter.setData(new ArrayList<>());
mBind.recyclerView.setVisibility(View.GONE);
mBind.recyclerView.setOnItemClickListener(new OnItemClickListener<ProductListBean, ItemSaleProductBinding>() {
@Override
public void OnItemClick(ProductListBean item, ItemSaleProductBinding bind) {
Intent intent = new Intent(mActivity, ProductDetailActivity.class);
intent.putExtra("id", item.getId());
mActivity.startActivity(intent);
}
});
}
private void initSerachView() {
mBind.edtSeacher.setOnEditorActionListener((v, actionId, event) -> {
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
mPresenter.refresh();
InputMethodManager imm = (InputMethodManager) mActivity
.getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(mActivity.getCurrentFocus().getWindowToken(), 0);
return true;
}
return false;
});
}
}
saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/HomeSaleFragment.java
...@@ -120,7 +120,8 @@ public class HomeSaleFragment extends BaseFragment<HomeSalePresenter, FragmentHo ...@@ -120,7 +120,8 @@ public class HomeSaleFragment extends BaseFragment<HomeSalePresenter, FragmentHo
@Override @Override
public void setTabNum(SaleTab tab, int myTabIndex) { public void setTabNum(SaleTab tab, int myTabIndex) {
EventBus.getDefault().post(new SaleTabNumEvent(tab.products+tab.collect+tab.inSale+tab.saleDone)); // EventBus.getDefault().post(new SaleTabNumEvent(tab.products+tab.collect+tab.inSale+tab.saleDone));
EventBus.getDefault().post(new SaleTabNumEvent(tab.inSale));
String[] tabNum = new String[]{tab.products + "",tab.collect + "", tab.inSale + "",tab.saleDone + ""}; String[] tabNum = new String[]{tab.products + "",tab.collect + "", tab.inSale + "",tab.saleDone + ""};
if (isFirstAddTab) { if (isFirstAddTab) {
mBind.tbSale.removeAllTabs(); mBind.tbSale.removeAllTabs();
......
saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/SaleInstructionFragment.java
...@@ -92,14 +92,21 @@ public class SaleInstructionFragment extends BaseFragment<SImplePresenter, Fragm ...@@ -92,14 +92,21 @@ public class SaleInstructionFragment extends BaseFragment<SImplePresenter, Fragm
for (int i = 0; i < mDetail.getGoodsCategorys().size(); i++) { for (int i = 0; i < mDetail.getGoodsCategorys().size(); i++) {
sceneList.add(mDetail.getGoodsCategorys().get(i).getCategoryName()); sceneList.add(mDetail.getGoodsCategorys().get(i).getCategoryName());
} }
pointList.add(mDetail.getSellingPoint1()); fillPointList(mDetail.getSellingPoint1());
pointList.add(mDetail.getSellingPoint2()); fillPointList(mDetail.getSellingPoint2());
pointList.add(mDetail.getSellingPoint3()); fillPointList(mDetail.getSellingPoint3());
setSceneAdapter(); setSceneAdapter();
setPointAdapter(); setPointAdapter();
} }
//填充卖点数据
private void fillPointList(String pointStr){
if (!TextUtils.isEmpty(pointStr))
pointList.add(pointStr);
}
//适用场景 //适用场景
private void setSceneAdapter() { private void setSceneAdapter() {
BaseQuickAdapter<String, BaseViewHolder> sceneAdapter = BaseQuickAdapter<String, BaseViewHolder> sceneAdapter =
...@@ -128,6 +135,7 @@ public class SaleInstructionFragment extends BaseFragment<SImplePresenter, Fragm ...@@ -128,6 +135,7 @@ public class SaleInstructionFragment extends BaseFragment<SImplePresenter, Fragm
mBind.rvSellPoint.setLayoutManager(new GridLayoutManager(mActivity, 3)); mBind.rvSellPoint.setLayoutManager(new GridLayoutManager(mActivity, 3));
mBind.rvSellPoint.setAdapter(pointdapter); mBind.rvSellPoint.setAdapter(pointdapter);
} }
private void initCommentAdapter() { private void initCommentAdapter() {
mCommentAdapter = new CommentAdapter(false); mCommentAdapter = new CommentAdapter(false);
mCommentAdapter.setViewType(R.layout.item_sale_comment); mCommentAdapter.setViewType(R.layout.item_sale_comment);
...@@ -215,12 +223,13 @@ public class SaleInstructionFragment extends BaseFragment<SImplePresenter, Fragm ...@@ -215,12 +223,13 @@ public class SaleInstructionFragment extends BaseFragment<SImplePresenter, Fragm
private void getCommentData() { private void getCommentData() {
showDialog(); showDialog();
Api.getService(SaleService.class).getComment(mDetail.getId(), 1, 4,1, page, pageSize).compose(Api.applySchedulers()) Api.getService(SaleService.class).getComment(mDetail.getId(), 1, 4, 1, page, pageSize).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(data -> { .subscribe(mPresenter.baseObserver(data -> {
if (page == 1) { if (page == 1) {
commentList.clear(); commentList.clear();
} }
commentList = transData(data.getData()); // commentList = transData(data.getData());
commentList = data.getData();
mBind.tvComponent.setText("留言. " + commentList.size()); mBind.tvComponent.setText("留言. " + commentList.size());
mCommentAdapter.setData(commentList); mCommentAdapter.setData(commentList);
})); }));
......
saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/SaleProductFragment.java
...@@ -3,7 +3,6 @@ package com.bigfish.salecenter.ui.fragment; ...@@ -3,7 +3,6 @@ package com.bigfish.salecenter.ui.fragment;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.text.Editable; import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
...@@ -20,19 +19,21 @@ import com.bigfish.salecenter.model.ProductListBean; ...@@ -20,19 +19,21 @@ import com.bigfish.salecenter.model.ProductListBean;
import com.bigfish.salecenter.presenter.saleproduct.SaleProductContract; import com.bigfish.salecenter.presenter.saleproduct.SaleProductContract;
import com.bigfish.salecenter.presenter.saleproduct.SaleProductPresent; import com.bigfish.salecenter.presenter.saleproduct.SaleProductPresent;
import com.bigfish.salecenter.ui.activity.ProductDetailActivity; import com.bigfish.salecenter.ui.activity.ProductDetailActivity;
import com.bigfish.salecenter.ui.activity.ProductSearchActivity;
import com.dayu.base.ui.fragment.BaseFragment; import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.common.MyTextWatcher; import com.dayu.common.MyTextWatcher;
import com.dayu.event.UserInfo;
import com.dayu.utils.CommonUtils; import com.dayu.utils.CommonUtils;
import com.dayu.utils.ToastUtils; import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager;
import com.dayu.widgets.listener.OnItemClickListener; import com.dayu.widgets.listener.OnItemClickListener;
import com.umeng.socialize.ShareAction;
import com.umeng.socialize.bean.SHARE_MEDIA;
import com.umeng.socialize.media.UMImage;
import com.umeng.socialize.media.UMWeb;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.List;
/** /**
* Created by mReturn * Created by mReturn
* on 2020/2/12 * on 2020/2/12
...@@ -40,6 +41,7 @@ import java.util.List; ...@@ -40,6 +41,7 @@ import java.util.List;
public class SaleProductFragment extends BaseFragment<SaleProductPresent, FragmentCommonSaleBinding> implements public class SaleProductFragment extends BaseFragment<SaleProductPresent, FragmentCommonSaleBinding> implements
SaleProductContract.View { SaleProductContract.View {
private int type; //1.商品 2.收藏 private int type; //1.商品 2.收藏
private int mUserId;
SaleProductAdapter mAdapter; SaleProductAdapter mAdapter;
...@@ -68,6 +70,8 @@ public class SaleProductFragment extends BaseFragment<SaleProductPresent, Fragme ...@@ -68,6 +70,8 @@ public class SaleProductFragment extends BaseFragment<SaleProductPresent, Fragme
EventBus.getDefault().register(this); EventBus.getDefault().register(this);
Bundle bundle = getArguments(); Bundle bundle = getArguments();
type = bundle.getInt("type"); type = bundle.getInt("type");
UserInfo userInfo = UserManager.getInstance().getUser();
mUserId = Integer.parseInt(userInfo.getAccountId());
initSearchView(); initSearchView();
mPresenter.setType(type); mPresenter.setType(type);
...@@ -184,4 +188,12 @@ public class SaleProductFragment extends BaseFragment<SaleProductPresent, Fragme ...@@ -184,4 +188,12 @@ public class SaleProductFragment extends BaseFragment<SaleProductPresent, Fragme
super.onDestroy(); super.onDestroy();
EventBus.getDefault().unregister(this); EventBus.getDefault().unregister(this);
} }
@Override
public void share(ProductListBean item) {
String shareUrl = "http://www.baidu.com";
CommonUtils.shareProgram(mActivity,shareUrl,item.getFirstUrl(),item.getGoodsModel(),
item.getBrief(),mUserId,item.getId(),SHARE_MEDIA.WEIXIN,null);
}
} }
saleCenter/src/main/res/layout/activity_product_search.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<variable
name="presenter"
type="com.bigfish.salecenter.presenter.saleproduct.SaleProductPresent" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<RelativeLayout
android:id="@+id/rl_seacher"
style="@style/title"
android:visibility="visible">
<EditText
android:id="@+id/edt_seacher"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@+id/iv"
android:background="@null"
android:hint="@string/input_sale_product"
android:imeOptions="actionSearch"
android:inputType="text"
android:singleLine="true"
android:text="@={presenter.keyStr}"
android:textSize="16sp" />
<ImageView
android:id="@+id/iv"
style="@style/title_image_back"
android:src="@drawable/seacher" />
<TextView
android:id="@+id/tv_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="20dp"
android:gravity="center"
android:text="@string/cancle"
android:textColor="@color/cl_black"
android:textSize="@dimen/dp_18"
android:textStyle="bold" />
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_6"
android:layout_alignParentBottom="true"
android:src="@drawable/line_shape" />
</RelativeLayout>
</RelativeLayout>
<com.dayu.widgets.LRecyclerView
android:id="@+id/recyclerView"
setPresenter="@{presenter}"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#f5f5f5" />
</LinearLayout>
</layout>
\ No newline at end of file
saleCenter/src/main/res/layout/item_sale_step.xml
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<TextView <TextView
android:id="@+id/tv_time" android:id="@+id/tv_time"
style="@style/sale_item_text" style="@style/sale_item_text"
android:maxLines="2" android:maxLines="5"
android:textSize="12sp" android:textSize="12sp"
android:layout_width="95dp" android:layout_width="95dp"
android:layout_height="match_parent" android:layout_height="match_parent"
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
android:id="@+id/tv_progress" android:id="@+id/tv_progress"
style="@style/sale_item_text" style="@style/sale_item_text"
android:layout_width="95dp" android:layout_width="95dp"
android:maxLines="5"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/bg_order_step_item2" android:background="@drawable/bg_order_step_item2"
android:gravity="center" android:gravity="center"
...@@ -32,7 +33,7 @@ ...@@ -32,7 +33,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/bg_order_step_item1" android:background="@drawable/bg_order_step_item1"
android:maxLines="2" android:maxLines="5"
android:gravity="center" android:gravity="center"
android:text="@string/sale_record_str" /> android:text="@string/sale_record_str" />
</LinearLayout> </LinearLayout>
......
userCenter/src/main/java/com/dayu/usercenter/api/UserApiFactory.java
...@@ -52,7 +52,7 @@ public class UserApiFactory { ...@@ -52,7 +52,7 @@ public class UserApiFactory {
} }
public static Observable<OrderRecord> getOrderScore(int siteId, int engineerId) { public static Observable<OrderRecord> getOrderScore(int siteId, int engineerId) {
return Api.getService(UserService.class).getOrderScore(siteId, engineerId).compose(Api.applySchedulers()); return Api.getService(UserService.class).getOrderScore(engineerId).compose(Api.applySchedulers());
} }
public static Observable<TodayBalance> getTodayBalance(int accountId) { public static Observable<TodayBalance> getTodayBalance(int accountId) {
......
userCenter/src/main/java/com/dayu/usercenter/api/UserService.java
...@@ -101,9 +101,11 @@ public interface UserService { ...@@ -101,9 +101,11 @@ public interface UserService {
* @param engineerId * @param engineerId
* @return * @return
*/ */
// @GET(UserConstant.USER_REVENUE)
// Observable<BaseResponse<OrderRecord>> getOrderScore(@Path("siteId") int siteId,
// @Path("engineerId") int engineerId);
@GET(UserConstant.USER_REVENUE) @GET(UserConstant.USER_REVENUE)
Observable<BaseResponse<OrderRecord>> getOrderScore(@Path("siteId") int siteId, Observable<BaseResponse<OrderRecord>> getOrderScore(@Path("engineerId") int engineerId);
@Path("engineerId") int engineerId);
/** /**
* 获取今日收益. * 获取今日收益.
......
userCenter/src/main/java/com/dayu/usercenter/api/UserService2.java
...@@ -9,6 +9,8 @@ import com.dayu.usercenter.model.bean.AddressInfoBean; ...@@ -9,6 +9,8 @@ import com.dayu.usercenter.model.bean.AddressInfoBean;
import com.dayu.usercenter.model.bean.BusinessSceneBean; import com.dayu.usercenter.model.bean.BusinessSceneBean;
import com.dayu.usercenter.model.EditBankData; import com.dayu.usercenter.model.EditBankData;
import com.dayu.usercenter.model.bean.GlobelRateBean; import com.dayu.usercenter.model.bean.GlobelRateBean;
import com.dayu.usercenter.model.bean.SaleRecordBean;
import com.dayu.usercenter.model.bean.SaleRecordListBean;
import com.dayu.usercenter.model.bean.ServiceTypeBean; import com.dayu.usercenter.model.bean.ServiceTypeBean;
import com.dayu.usercenter.model.bean.StarRatioBean; import com.dayu.usercenter.model.bean.StarRatioBean;
import com.dayu.usercenter.model.bean.TreeAddressBean; import com.dayu.usercenter.model.bean.TreeAddressBean;
...@@ -177,6 +179,25 @@ public interface UserService2 { ...@@ -177,6 +179,25 @@ public interface UserService2 {
@GET(Constants.API_7300+"/geography/tree/{parentId}") @GET(Constants.API_7300+"/geography/tree/{parentId}")
Observable<BaseResponse<List<TreeAddressBean>>> getTreeAddress(@Path("parentId") int parednId); Observable<BaseResponse<List<TreeAddressBean>>> getTreeAddress(@Path("parentId") int parednId);
/**
* 销售业绩-完成销售订单量&奖金总额
* @param accountId
* @param type 1工程师 2小程序用户
* @return
*/
@GET(Constants.API_7800+"/payAccountRewardItem/totalRewardPriceAndOrderNum/accountId/{accountId}/type/{type}")
Observable<BaseResponse<SaleRecordBean>> getSaleRecordInfo(@Path("accountId") int accountId,
@Path("type") int type);
/**
*销售业绩-列表
* @return
*/
@GET(Constants.API_7800+"/payAccountRewardItem")
Observable<BaseResponse<BasePageBean<SaleRecordListBean>>> getSaleRecordList(@Query("accountId") int accountId,
@Query("page") int page,
@Query("pageSize") int pageSize);
} }
userCenter/src/main/java/com/dayu/usercenter/common/UserConstant.java
...@@ -73,7 +73,8 @@ public class UserConstant { ...@@ -73,7 +73,8 @@ public class UserConstant {
/** /**
* 服务记录、师傅评价. * 服务记录、师傅评价.
*/ */
public final static String USER_REVENUE = "/api-count/" + "ordersStatistics/total/siteId/{siteId}/engineerId/{engineerId}"; // public final static String USER_REVENUE = "/api-count/" + "ordersStatistics/total/siteId/{siteId}/engineerId/{engineerId}";
public final static String USER_REVENUE = "/api-count/" + "ordersStatistics/total/engineerId/{engineerId}";
/** /**
* 获取资质列表. * 获取资质列表.
......
userCenter/src/main/java/com/dayu/usercenter/data/protocol/OrderRecord.java
...@@ -10,11 +10,52 @@ public class OrderRecord { ...@@ -10,11 +10,52 @@ public class OrderRecord {
* 评分 : 0 * 评分 : 0
* 累计收益 : 0 * 累计收益 : 0
* 工单记录 : 0 * 工单记录 : 0
*
* serviceTotalPrice 服务收入
* salesCount 销售业绩
* categoryCounts 业务品类
* salesPrice 销售奖励
*/ */
private double cumulativeIncome; private double cumulativeIncome;
private int orderRecord; private int orderRecord;
private double score; private double score;
private int licenceInfoNum; private int licenceInfoNum;
private double serviceTotalPrice;
private int salesCount;
private double salesPrice ;
private int categoryCounts;
public double getServiceTotalPrice() {
return serviceTotalPrice;
}
public void setServiceTotalPrice(double serviceTotalPrice) {
this.serviceTotalPrice = serviceTotalPrice;
}
public int getSalesCount() {
return salesCount;
}
public void setSalesCount(int salesCount) {
this.salesCount = salesCount;
}
public double getSalesPrice() {
return salesPrice;
}
public void setSalesPrice(double salesPrice) {
this.salesPrice = salesPrice;
}
public int getCategoryCounts() {
return categoryCounts;
}
public void setCategoryCounts(int categoryCounts) {
this.categoryCounts = categoryCounts;
}
public int getLicenceInfoNum() { public int getLicenceInfoNum() {
return licenceInfoNum; return licenceInfoNum;
......
userCenter/src/main/java/com/dayu/usercenter/event/RefreshUserInfoEvent.java 0 → 100644
package com.dayu.usercenter.event;
public class RefreshUserInfoEvent {
}
userCenter/src/main/java/com/dayu/usercenter/event/RefreshUserRecordEvent.java 0 → 100644
package com.dayu.usercenter.event;
public class RefreshUserRecordEvent {
}
userCenter/src/main/java/com/dayu/usercenter/model/bean/SaleRecordBean.java 0 → 100644
package com.dayu.usercenter.model.bean;
public class SaleRecordBean {
/**
* orderNum : 0
* totalRewardPrice : 0
*/
private int orderNum;
private double totalRewardPrice;
public int getOrderNum() {
return orderNum;
}
public void setOrderNum(int orderNum) {
this.orderNum = orderNum;
}
public double getTotalRewardPrice() {
return totalRewardPrice;
}
public void setTotalRewardPrice(double totalRewardPrice) {
this.totalRewardPrice = totalRewardPrice;
}
}
userCenter/src/main/java/com/dayu/usercenter/model/bean/SaleRecordListBean.java 0 → 100644
package com.dayu.usercenter.model.bean;
public class SaleRecordListBean {
/**
* id : 6
* rewardPrice : 969.6
* rewardItem : 推荐有奖
* providerId : 464
* providerName : 云南贝华科技有限公司
* rewardTime : null
* type : 2
* accountId : -1
* createTime : 2020-02-26 15:54:46
* status : 2
* payAccountWithdrawId : 1
* goodsSettlementSheetId : 3
*/
private int id;
private double rewardPrice;
private String rewardItem;
private int providerId;
private String providerName;
private Object rewardTime;
private int type;
private int accountId;
private String createTime;
private int status;
private int payAccountWithdrawId;
private int goodsSettlementSheetId;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public double getRewardPrice() {
return rewardPrice;
}
public void setRewardPrice(double rewardPrice) {
this.rewardPrice = rewardPrice;
}
public String getRewardItem() {
return rewardItem;
}
public void setRewardItem(String rewardItem) {
this.rewardItem = rewardItem;
}
public int getProviderId() {
return providerId;
}
public void setProviderId(int providerId) {
this.providerId = providerId;
}
public String getProviderName() {
return providerName;
}
public void setProviderName(String providerName) {
this.providerName = providerName;
}
public Object getRewardTime() {
return rewardTime;
}
public void setRewardTime(Object rewardTime) {
this.rewardTime = rewardTime;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public int getAccountId() {
return accountId;
}
public void setAccountId(int accountId) {
this.accountId = accountId;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public int getPayAccountWithdrawId() {
return payAccountWithdrawId;
}
public void setPayAccountWithdrawId(int payAccountWithdrawId) {
this.payAccountWithdrawId = payAccountWithdrawId;
}
public int getGoodsSettlementSheetId() {
return goodsSettlementSheetId;
}
public void setGoodsSettlementSheetId(int goodsSettlementSheetId) {
this.goodsSettlementSheetId = goodsSettlementSheetId;
}
}
userCenter/src/main/java/com/dayu/usercenter/model/bean/StarRatioBean.java
...@@ -10,7 +10,7 @@ public class StarRatioBean { ...@@ -10,7 +10,7 @@ public class StarRatioBean {
*/ */
private int id; private int id;
private int ratio; private double ratio;
private int starLevel; private int starLevel;
private String starLevelName; private String starLevelName;
...@@ -22,11 +22,11 @@ public class StarRatioBean { ...@@ -22,11 +22,11 @@ public class StarRatioBean {
this.id = id; this.id = id;
} }
public int getRatio() { public double getRatio() {
return ratio; return ratio;
} }
public void setRatio(int ratio) { public void setRatio(double ratio) {
this.ratio = ratio; this.ratio = ratio;
} }
......
userCenter/src/main/java/com/dayu/usercenter/presenter/homeuser/HomeUserPresenter.java
...@@ -27,6 +27,9 @@ import io.reactivex.Observable; ...@@ -27,6 +27,9 @@ import io.reactivex.Observable;
public class HomeUserPresenter extends HomeUserContract.Presenter { public class HomeUserPresenter extends HomeUserContract.Presenter {
public ObservableField<String> mUrl = new ObservableField<>(); public ObservableField<String> mUrl = new ObservableField<>();
private int mUid;
private int mSid;
@Override @Override
public void onAttached() { public void onAttached() {
} }
...@@ -43,17 +46,21 @@ public class HomeUserPresenter extends HomeUserContract.Presenter { ...@@ -43,17 +46,21 @@ public class HomeUserPresenter extends HomeUserContract.Presenter {
@Override @Override
public void getAllData(int userId, int siteId) { public void getAllData(int userId, int siteId) {
Observable.mergeDelayError(UserApiFactory.getEngineerInfo(userId), UserApiFactory.getAchievement(siteId, userId), mUid = userId;
UserApiFactory.getOrderScore(siteId, userId), UserApiFactory.getTodayBalance(userId)).subscribe( mSid = siteId;
baseObserver(o -> { getUserInfo();
if (o instanceof EngineerInfo) { getRecordInfo();
mView.getPersonalInfoSuccess((EngineerInfo) o); }
} else if (o instanceof TodayAchievement) {
mView.getAchievementSuccess((TodayAchievement) o); public void getUserInfo(){
} else if (o instanceof OrderRecord) { UserApiFactory.getEngineerInfo(mUid).subscribe(baseObserver(data->
mView.getOrderRecordSuccess((OrderRecord) o); mView.getPersonalInfoSuccess(data)
} ));
})); }
public void getRecordInfo(){
UserApiFactory.getOrderScore(mSid,mUid).subscribe(baseObserver(data->
mView.getOrderRecordSuccess(data)
));
} }
......
userCenter/src/main/java/com/dayu/usercenter/presenter/userlicence/UserLicencePresent.java
...@@ -70,7 +70,7 @@ public class UserLicencePresent extends UserLicenceContract.Presenter{ ...@@ -70,7 +70,7 @@ public class UserLicencePresent extends UserLicenceContract.Presenter{
public void applyAllLicence(UserLicenceBean item) { public void applyAllLicence(UserLicenceBean item) {
mView.showDialog(); mView.showDialog();
ApplyLicenceData applyData = new ApplyLicenceData(mUserId,item.getId(), ApplyLicenceData applyData = new ApplyLicenceData(mUserId,item.getId(),
item.getLicenceAuthorityId(),item.getLicenceAuthorityName(),0); item.getLicenceAuthorityId(),item.getLicenceAuthorityName(),3);
Api.getService(UserService2.class).applyLicence(applyData).compose(Api.applySchedulers()) Api.getService(UserService2.class).applyLicence(applyData).compose(Api.applySchedulers())
.subscribe(baseObserver(result->{ .subscribe(baseObserver(result->{
ToastUtils.showShortToast(result?"申请成功":"申请失败"); ToastUtils.showShortToast(result?"申请成功":"申请失败");
......
userCenter/src/main/java/com/dayu/usercenter/ui/MyValueFormatter.java
...@@ -9,6 +9,7 @@ import java.text.DecimalFormat; ...@@ -9,6 +9,7 @@ import java.text.DecimalFormat;
/** /**
* Created by mReturn * Created by mReturn
* on 2020/2/15 * on 2020/2/15
* 柱状图formatter
**/ **/
public class MyValueFormatter extends ValueFormatter { public class MyValueFormatter extends ValueFormatter {
private final DecimalFormat mFormat; private final DecimalFormat mFormat;
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/BusinessTypeActivity.java
...@@ -11,11 +11,14 @@ import com.dayu.base.ui.presenter.SImplePresenter; ...@@ -11,11 +11,14 @@ import com.dayu.base.ui.presenter.SImplePresenter;
import com.dayu.usercenter.R; import com.dayu.usercenter.R;
import com.dayu.usercenter.api.UserService2; import com.dayu.usercenter.api.UserService2;
import com.dayu.usercenter.databinding.ActivityBusinessTypeBinding; import com.dayu.usercenter.databinding.ActivityBusinessTypeBinding;
import com.dayu.usercenter.event.RefreshUserRecordEvent;
import com.dayu.usercenter.model.SaveSceneData; import com.dayu.usercenter.model.SaveSceneData;
import com.dayu.usercenter.model.bean.BusinessSceneBean; import com.dayu.usercenter.model.bean.BusinessSceneBean;
import com.dayu.usercenter.model.bean.ServiceTypeBean; import com.dayu.usercenter.model.bean.ServiceTypeBean;
import com.dayu.utils.ToastUtils; import com.dayu.utils.ToastUtils;
import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -148,29 +151,39 @@ public class BusinessTypeActivity extends BaseActivity<SImplePresenter, Activity ...@@ -148,29 +151,39 @@ public class BusinessTypeActivity extends BaseActivity<SImplePresenter, Activity
typeList.add(typeBean.getId()); typeList.add(typeBean.getId());
} }
if (sceneList.size()>0) if (sceneList.size()>0){
saveScene(sceneList); saveScene(sceneList,typeList);
if (typeList.size()>0) }else{
saveType(typeList); saveType(typeList);
}
} }
//保存业务场景数据 //保存业务场景数据
private void saveScene(List<SaveSceneData> datas) { private void saveScene(List<SaveSceneData> datas,List<Long> typeList ) {
showDialog(); showDialog();
Api.getService(UserService2.class).saveBusinessScene(datas).compose(Api.applySchedulers()) Api.getService(UserService2.class).saveBusinessScene(datas).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(bool -> { .subscribe(mPresenter.baseObserver(bool -> {
ToastUtils.showShortToast(bool?R.string.save_success:R.string.save_fail); ToastUtils.showShortToast(bool?R.string.save_success:R.string.save_fail);
if (bool){
saveType(typeList);
}else{
ToastUtils.showShortToast(R.string.save_fail);
}
})); }));
} }
//保存服务类型数据 //保存服务类型数据
private void saveType(List<Long> ids) { private void saveType(List<Long> ids) {
if (ids.size() ==0)
return;
showDialog(); showDialog();
Api.getService(UserService2.class).saveServiceType(ids, mUserId).compose(Api.applySchedulers()) Api.getService(UserService2.class).saveServiceType(ids, mUserId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(bool -> { .subscribe(mPresenter.baseObserver(bool -> {
ToastUtils.showShortToast(bool?R.string.save_success:R.string.save_fail); ToastUtils.showShortToast(bool?R.string.save_success:R.string.save_fail);
if (bool) if (bool){
EventBus.getDefault().post(new RefreshUserRecordEvent());
finish(); finish();
}
})); }));
} }
} }
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/SaleRecordActivity.java
package com.dayu.usercenter.ui.activity2; package com.dayu.usercenter.ui.activity2;
import android.support.v7.widget.LinearLayoutManager;
import android.util.Log; import android.util.Log;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.dayu.base.api.Api;
import com.dayu.base.ui.activity.BaseActivity; import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.base.ui.presenter.SImplePresenter; import com.dayu.base.ui.presenter.SImplePresenter;
import com.dayu.usercenter.R; import com.dayu.usercenter.R;
import com.dayu.usercenter.api.UserService2;
import com.dayu.usercenter.databinding.ActivitySaleRecordBinding; import com.dayu.usercenter.databinding.ActivitySaleRecordBinding;
import com.dayu.usercenter.model.bean.SaleRecordListBean;
import com.dayu.usercenter.ui.MyValueFormatter; import com.dayu.usercenter.ui.MyValueFormatter;
import com.github.mikephil.charting.components.XAxis; import com.github.mikephil.charting.components.XAxis;
import com.github.mikephil.charting.components.YAxis; import com.github.mikephil.charting.components.YAxis;
...@@ -18,6 +24,7 @@ import com.github.mikephil.charting.interfaces.datasets.IDataSet; ...@@ -18,6 +24,7 @@ import com.github.mikephil.charting.interfaces.datasets.IDataSet;
import com.github.mikephil.charting.utils.ColorTemplate; import com.github.mikephil.charting.utils.ColorTemplate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
/** /**
* Created by mReturn * Created by mReturn
...@@ -37,8 +44,34 @@ public class SaleRecordActivity extends BaseActivity<SImplePresenter,ActivitySal ...@@ -37,8 +44,34 @@ public class SaleRecordActivity extends BaseActivity<SImplePresenter,ActivitySal
@Override @Override
public void initView() { public void initView() {
initUser();
mBind.receivingBack.setOnClickListener(v->dumpBack()); mBind.receivingBack.setOnClickListener(v->dumpBack());
initData();
}
private void initData() {
showDialog();
Api.getService(UserService2.class).getSaleRecordInfo(mUserId,1).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(data->{
mBind.tvIncome.setText(data.getTotalRewardPrice()+"");
mBind.tvCount.setText(data.getOrderNum()+"");
}));
Api.getService(UserService2.class).getSaleRecordList(mUserId,1,1000).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(data->setAdapter(data.getData())));
}
private void setAdapter(List<SaleRecordListBean> datas) {
BaseQuickAdapter<SaleRecordListBean, BaseViewHolder> adapter =
new BaseQuickAdapter<SaleRecordListBean, BaseViewHolder>(R.layout.item_record_common, datas) {
@Override
protected void convert(BaseViewHolder helper, SaleRecordListBean item) {
helper.setText(R.id.tv_item1, item.getRewardPrice()+"");
helper.setText(R.id.tv_item2, item.getProviderName());
helper.setText(R.id.tv_item3, item.getCreateTime());
}
};
mBind.rvRecord.setLayoutManager(new LinearLayoutManager(this));
mBind.rvRecord.setAdapter(adapter);
} }
} }
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/UserInfoActivity.java
...@@ -106,7 +106,7 @@ public class UserInfoActivity extends BaseActivity<UserInfoPresenter, ActivityUs ...@@ -106,7 +106,7 @@ public class UserInfoActivity extends BaseActivity<UserInfoPresenter, ActivityUs
tvItem2.setText(getString(R.string.commission_str)); tvItem2.setText(getString(R.string.commission_str));
}else { }else {
tvItem1.setText(item.getStarLevelName()); tvItem1.setText(item.getStarLevelName());
tvItem2.setText(item.getRatio()+"%"); tvItem2.setText((int)(item.getRatio()*100)+"%");
} }
} }
}; };
......
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomePersonFragment.java
...@@ -127,13 +127,14 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme ...@@ -127,13 +127,14 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
@Override @Override
public void getAchievementSuccess(TodayAchievement achievement) { public void getAchievementSuccess(TodayAchievement achievement) {
if (achievement.getAchievement() != 0) { if (achievement.getAchievement() != 0) {
//今日业绩
mBind.tvAchivement.setText(achievement.getAchievement() + ""); mBind.tvAchivement.setText(achievement.getAchievement() + "");
} }
} }
@Override @Override
public void getOrderRecordSuccess(OrderRecord record) { public void getOrderRecordSuccess(OrderRecord record) {
//累计业绩 //认证资质
mBind.tvAllAchivement.setText(record.getLicenceInfoNum() + ""); mBind.tvAllAchivement.setText(record.getLicenceInfoNum() + "");
//工单记录 //工单记录
mBind.tvOrderRecord.setText(record.getOrderRecord() + ""); mBind.tvOrderRecord.setText(record.getOrderRecord() + "");
...@@ -147,6 +148,7 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme ...@@ -147,6 +148,7 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
public void getAccountBalanceSuccess(TodayBalance todayBalance) { public void getAccountBalanceSuccess(TodayBalance todayBalance) {
if (todayBalance != null) { if (todayBalance != null) {
mAccountBalance = todayBalance.getAccountBalance(); mAccountBalance = todayBalance.getAccountBalance();
//账户余额
mBind.tvAccountBalance.setText(mAccountBalance + ""); mBind.tvAccountBalance.setText(mAccountBalance + "");
mBind.tvTodaybalance.setText(todayBalance.getTodaySubSidymoney() + ""); mBind.tvTodaybalance.setText(todayBalance.getTodaySubSidymoney() + "");
if (todayBalance.getTodaySubSidymoney() == 0) { if (todayBalance.getTodaySubSidymoney() == 0) {
......
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
...@@ -20,10 +20,13 @@ import com.dayu.usercenter.data.protocol.EngineerInfo; ...@@ -20,10 +20,13 @@ import com.dayu.usercenter.data.protocol.EngineerInfo;
import com.dayu.usercenter.data.protocol.OrderRecord; import com.dayu.usercenter.data.protocol.OrderRecord;
import com.dayu.usercenter.data.protocol.TodayAchievement; import com.dayu.usercenter.data.protocol.TodayAchievement;
import com.dayu.usercenter.databinding.FragmentHomeUserBinding; import com.dayu.usercenter.databinding.FragmentHomeUserBinding;
import com.dayu.usercenter.event.RefreshUserInfoEvent;
import com.dayu.usercenter.event.RefreshUserRecordEvent;
import com.dayu.usercenter.presenter.homeuser.HomeUserContract; import com.dayu.usercenter.presenter.homeuser.HomeUserContract;
import com.dayu.usercenter.presenter.homeuser.HomeUserPresenter; import com.dayu.usercenter.presenter.homeuser.HomeUserPresenter;
import com.dayu.usercenter.ui.activity.WithdrawalsActivity; import com.dayu.usercenter.ui.activity.WithdrawalsActivity;
import com.dayu.usercenter.ui.activity2.UserInfoActivity; import com.dayu.usercenter.ui.activity2.UserInfoActivity;
import com.dayu.utils.CommonUtils;
import com.dayu.utils.ProgressUtil; import com.dayu.utils.ProgressUtil;
import com.dayu.utils.SPUtils; import com.dayu.utils.SPUtils;
import com.dayu.utils.UserManager; import com.dayu.utils.UserManager;
...@@ -128,14 +131,19 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo ...@@ -128,14 +131,19 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
@Override @Override
public void getOrderRecordSuccess(OrderRecord record) { public void getOrderRecordSuccess(OrderRecord record) {
//累计业绩 //认证资质
mBind.tvSaleRecord.setText(record.getLicenceInfoNum() + ""); mBind.tvLicence.setText(record.getLicenceInfoNum() + "");
//工单记录 //工单记录
mBind.tvWorkOrders.setText(record.getOrderRecord() + ""); mBind.tvWorkOrders.setText(record.getOrderRecord() + "");
//个人评分 //个人评分
mBind.tvScore.setText(record.getScore() + mActivity.getString(R.string.score)); mBind.tvScore.setText(record.getScore() + mActivity.getString(R.string.score));
mScore = record.getScore() + ""; mScore = record.getScore() + "";
drawStars(mBind.tvStar, mScore, "5"); drawStars(mBind.tvStar, mScore, "5");
mBind.tvSaleReward.setText("￥"+record.getSalesPrice());
mBind.tvSaleRecord.setText(record.getSalesCount() + "");
mBind.tvServiceIncome.setText("￥"+record.getServiceTotalPrice());
mBind.tvBusinessType.setText(record.getCategoryCounts()+"");
} }
...@@ -269,4 +277,13 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo ...@@ -269,4 +277,13 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
public void certifiCation(CertificationEvent event) { public void certifiCation(CertificationEvent event) {
mPresenter.getAllData(userId, siteId); mPresenter.getAllData(userId, siteId);
} }
@Subscribe
public void refreshRecord(RefreshUserRecordEvent event){
mPresenter.getRecordInfo();
}
@Subscribe
public void refreshUser(RefreshUserInfoEvent event){
mPresenter.getUserInfo();
}
} }
userCenter/src/main/res/layout/activity_business_type.xml
...@@ -32,12 +32,14 @@ ...@@ -32,12 +32,14 @@
<android.support.v4.widget.NestedScrollView <android.support.v4.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="15dp" android:paddingLeft="15dp"
android:layout_marginBottom="68dp"> android:paddingRight="15dp"
android:layout_marginBottom="65dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingTop="10dp"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
......
userCenter/src/main/res/layout/activity_sale_record.xml
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/tv_income"
style="@style/sale_item_text" style="@style/sale_item_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
...@@ -55,6 +56,7 @@ ...@@ -55,6 +56,7 @@
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
android:id="@+id/tv_count"
style="@style/sale_item_text" style="@style/sale_item_text"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:text="0" android:text="0"
......
userCenter/src/main/res/layout/activity_service_record.xml
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/tv_income"
style="@style/sale_item_text" style="@style/sale_item_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
...@@ -56,6 +57,7 @@ ...@@ -56,6 +57,7 @@
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
android:id="@+id/tv_count"
style="@style/sale_item_text" style="@style/sale_item_text"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:text="0" android:text="0"
......
userCenter/src/main/res/layout/item_record_common.xml
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/bg_order_step_item1" android:background="@drawable/bg_order_step_item1"
android:gravity="center" android:gravity="center"
android:maxLines="5"
/> />
<TextView <TextView
...@@ -22,6 +23,7 @@ ...@@ -22,6 +23,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/bg_order_step_item2" android:background="@drawable/bg_order_step_item2"
android:gravity="center" android:gravity="center"
android:maxLines="5"
/> />
<TextView <TextView
...@@ -32,6 +34,7 @@ ...@@ -32,6 +34,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/bg_order_step_item1" android:background="@drawable/bg_order_step_item1"
android:gravity="center" android:gravity="center"
android:maxLines="5"
/> />
</LinearLayout> </LinearLayout>
userCenter/src/main/res/values/styles.xml
...@@ -22,15 +22,15 @@ ...@@ -22,15 +22,15 @@
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginTop">@dimen/dp_16.7</item> <item name="android:layout_marginTop">@dimen/dp_16.7</item>
<item name="android:textColor">@color/cl_home_title_text_color</item> <item name="android:textColor">@color/cl_home_title_text_color</item>
<item name="android:textSize">12sp</item> <item name="android:textSize">14sp</item>
</style> </style>
<style name="tv_user_bottom2"> <style name="tv_user_bottom2">
<item name="android:layout_width">wrap_content</item> <item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginTop">@dimen/dp_15</item> <item name="android:layout_marginTop">@dimen/dp_10</item>
<item name="android:textColor">@color/cl_home_button</item> <item name="android:textColor">@color/cl_home_button</item>
<item name="android:textSize">30sp</item> <item name="android:textSize">26sp</item>
</style> </style>
</resources> </resources>
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