diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..61a9130
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index eb2873e..11e5053 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,5 +26,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index af0bbdd..08f1998 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,10 +5,19 @@
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 879fdac..bf1f6ef 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,10 +2,9 @@
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/.idea/qaplug_profiles.xml b/.idea/qaplug_profiles.xml
new file mode 100644
index 0000000..3dfd21f
--- /dev/null
+++ b/.idea/qaplug_profiles.xml
@@ -0,0 +1,465 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index baece53..e68fd21 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 28
+ buildToolsVersion "28.0.0"
defaultConfig {
applicationId "com.fenghoo.seven"
minSdkVersion 19
@@ -48,7 +49,7 @@ dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
- implementation project(path: ':baselibs')
+// implementation project(path: ':baselibs')
implementation 'com.squareup.retrofit2:retrofit:2.4.0'
// implementation 'com.squareup.okhttp3:okhttp:3.11.0'
// implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
@@ -82,21 +83,29 @@ dependencies {
implementation 'org.jsoup:jsoup:1.10.1'
api 'com.amap.api:location:latest.integration'
implementation project(':citypicker')
-
// 基础依赖包，必须要依赖
implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
// fragment快速实现（可选）
implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
implementation('com.github.liuguangli:VerificationCodeInput:1.5')
-
implementation 'com.zhihu.android:matisse:0.5.2-beta2'
implementation 'com.github.tbruyelle:rxpermissions:0.10.2'
implementation 'top.zibin:Luban:1.1.7'
//android 6.0权限处理
api 'pub.devrel:easypermissions:1.2.0'
implementation 'com.squareup.picasso:picasso:2.5.2'
-
// api 'com.airbnb.android:lottie:1.0.1'
implementation 'com.airbnb.android:lottie:3.4.0'
implementation 'com.github.paradoxie:AutoVerticalTextview:0.1'
+
+
+ implementation 'com.123ufo:BannerView:1.0'
+ implementation 'io.reactivex.rxjava2:rxjava:2.1.5'
+ implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
+ implementation 'com.squareup.retrofit2:retrofit:2.4.0'
+ implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
+ implementation 'com.squareup.okhttp3:logging-interceptor:3.5.0'
+ implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
+ implementation 'com.github.bumptech.glide:glide:4.7.1'
+
}
diff --git a/app/src/main/assets/customerList.json b/app/src/main/assets/customerList.json
new file mode 100644
index 0000000..93c1395
--- /dev/null
+++ b/app/src/main/assets/customerList.json
@@ -0,0 +1,97 @@
+{
+ "data": [
+ {
+ "address": "",
+ "budget": "",
+ "customer_id": "49fc031a8b374e5c69b1640c2f77b5f4",
+ "decoration": "1",
+ "headimg": "http://192.168.1.3/upload/2020090409422893432.jpg",
+ "name": "狗子",
+ "phone": "13255558866",
+ "source": "1",
+ "source_name": "添加客户",
+ "style_id": "",
+ "style_name": "",
+ "type": "new",
+ "wechat": "— —"
+ },
+ {
+ "address": "住址",
+ "budget": "15万-20万",
+ "customer_id": "4db0ac2253cb643bfb0ddeb6375a27b3",
+ "decoration": "1",
+ "headimg": "",
+ "name": "阿爸。",
+ "phone": "13458966692",
+ "source": "1",
+ "source_name": "添加客户",
+ "style_id": "5",
+ "style_name": "现代简约",
+ "type": "old",
+ "wechat": "call"
+ },
+ {
+ "address": "一次是真的",
+ "budget": "5万-10万",
+ "customer_id": "5619a67e02a85290ad485d2e2b48b788",
+ "decoration": "2",
+ "headimg": "http://192.168.1.3/upload/2020090315102014899.jpg",
+ "name": "在乎",
+ "phone": "13278787787",
+ "source": "1",
+ "source_name": "添加客户",
+ "style_id": "7",
+ "style_name": "地中海",
+ "type": "old",
+ "wechat": "一次"
+ },
+ {
+ "address": "",
+ "budget": "",
+ "customer_id": "638de5977746a9337b08d9caaee11393",
+ "decoration": "2",
+ "headimg": "http://192.168.1.3/upload/2020090409345081526.jpg",
+ "name": "1212121",
+ "phone": "21212121qwq",
+ "source": "1",
+ "source_name": "添加客户",
+ "style_id": "",
+ "style_name": "",
+ "type": "new",
+ "wechat": ""
+ },
+ {
+ "address": "等，你，你",
+ "budget": "20万以上",
+ "customer_id": "7b4df32da7c8c08b55903117bb7cc8d9",
+ "decoration": "1",
+ "headimg": "http://192.168.1.3/upload/2020090409233368106.jpg",
+ "name": "你在，他",
+ "phone": "13826942573",
+ "source": "1",
+ "source_name": "添加客户",
+ "style_id": "6",
+ "style_name": "东南亚",
+ "type": "new",
+ "wechat": ""
+ },
+ {
+ "address": "",
+ "budget": "",
+ "customer_id": "af8b2b183071a36cf216211c48890ce9",
+ "decoration": "1",
+ "headimg": "http://192.168.1.3/upload/2020090409364521615.jpg",
+ "name": "二哈",
+ "phone": "13245725369",
+ "source": "0",
+ "source_name": "",
+ "style_id": "",
+ "style_name": "",
+ "type": "new",
+ "wechat": "微信"
+ }
+ ],
+ "msg": "获取成功",
+ "success": 0,
+ "total": 4
+}
\ No newline at end of file
diff --git a/app/src/main/assets/fpList.json b/app/src/main/assets/fpList.json
new file mode 100644
index 0000000..4a06998
--- /dev/null
+++ b/app/src/main/assets/fpList.json
@@ -0,0 +1,21 @@
+{
+ "data": [
+ {
+ "customer_id": "ae0c5199fdf564f90796aec09482b85d",
+ "fp_num": "2",
+ "headimg": "localhost/upload/2020081115530962805.jpg",
+ "industry": [
+ {
+ "customer_id": "ae0c5199fdf564f90796aec09482b85d",
+ "industry": "家具",
+ "type": "0"
+ }
+ ],
+ "name": "demo",
+ "phone": "18831913290",
+ "wechat": "wangyuxin283425757"
+ }
+ ],
+ "msg": "获取成功",
+ "success": 0
+}
\ No newline at end of file
diff --git a/app/src/main/assets/fpOrderInfo.json b/app/src/main/assets/fpOrderInfo.json
new file mode 100644
index 0000000..c80df27
--- /dev/null
+++ b/app/src/main/assets/fpOrderInfo.json
@@ -0,0 +1,34 @@
+{
+ "data": [
+ {
+ "budget": "",
+ "decoration": "1",
+ "enter_state": "0",
+ "fp_time": "1970-01-01 08:00",
+ "id": "1",
+ "industry": "家具",
+ "order": [
+ {
+ "fh_id": "1",
+ "order_name": "qqq",
+ "recudesum": "1.00",
+ "time": "2020-09-08 10:14"
+ }
+ ],
+ "order_state": "0",
+ "rob_time": "1970-01-01 08:00",
+ "travel": "1",
+ "type": "0",
+ "type_time": "1970-01-01 08:00",
+ "ygd_brand_name": "",
+ "ygd_brand_type": "",
+ "ygd_enter": "0",
+ "ygd_order": "0",
+ "ygd_rob_name": "",
+ "ygd_state": "0",
+ "ygd_store_name": ""
+ }
+ ],
+ "msg": "成功",
+ "success": 0
+}
\ No newline at end of file
diff --git a/app/src/main/assets/logingpwd.json b/app/src/main/assets/logingpwd.json
new file mode 100644
index 0000000..dd80d7a
--- /dev/null
+++ b/app/src/main/assets/logingpwd.json
@@ -0,0 +1,16 @@
+{
+ "data":
+ {
+ "industry_name": "家具",
+ "phone_number": "14729066305",
+ "status": "0",
+ "store_id": "1",
+ "user_head": "",
+ "user_name": "admin",
+ "user_type": "2",
+ "uuid": "3"
+ }
+ ,
+ "msg": "登陆成功",
+ "success": 0
+}
\ No newline at end of file
diff --git a/app/src/main/assets/orderList.json b/app/src/main/assets/orderList.json
new file mode 100644
index 0000000..d6deafb
--- /dev/null
+++ b/app/src/main/assets/orderList.json
@@ -0,0 +1,14 @@
+{
+ "data": [
+ {
+ "customer_id": "ae0c5199fdf564f90796aec09482b85d",
+ "headimg": "localhost/upload/2020081115530962805.jpg",
+ "name": "demo",
+ "order_num": "1",
+ "phone": "18831913290",
+ "wechat": "wangyuxin283425757"
+ }
+ ],
+ "msg": "获取成功",
+ "success": 0
+}
\ No newline at end of file
diff --git a/app/src/main/assets/privateList.json b/app/src/main/assets/privateList.json
new file mode 100644
index 0000000..fc38c0c
--- /dev/null
+++ b/app/src/main/assets/privateList.json
@@ -0,0 +1,15 @@
+{
+ "data": [
+ {
+ "connect_time": "10:48",
+ "content": "",
+ "nick_img": "",
+ "nick_name": "私信昵称",
+ "private_id": "1",
+ "read_num": "0",
+ "short_id": "私信id"
+ }
+ ],
+ "msg": "成功",
+ "success": 0
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/fenghoo/seven/main/activity/LoginPasswordActivity.java b/app/src/main/java/com/fenghoo/seven/main/activity/LoginPasswordActivity.java
index b4a2696..3fa778c 100644
--- a/app/src/main/java/com/fenghoo/seven/main/activity/LoginPasswordActivity.java
+++ b/app/src/main/java/com/fenghoo/seven/main/activity/LoginPasswordActivity.java
@@ -1,5 +1,6 @@
package com.fenghoo.seven.main.activity;
+import android.content.Context;
import android.os.CountDownTimer;
import android.text.Html;
import android.view.View;
@@ -138,6 +139,11 @@ public class LoginPasswordActivity extends BaseTreeActivity() {
@Override
protected void onSuccess(loginInfoBean data, String message) {
@@ -87,6 +120,7 @@ public class LoginPasswordPresenterImpl extends MvpBasePresenter data = result.getData();
+ if (mNextRequestPage == 1) {
+ if (data.size() == 0) {
+ markingtwoAdapter.setEmptyView(notDataView);
+ return;
+ }
+ setData(true, data);
+ } else {
+ setData(false, data);
+ }
+ } else {
+ setData(true, null);
+ markingtwoAdapter.setEmptyView(notDataView);
+ mSwl.setRefreshing(false);
+ }
+ return;
+ }
+
+
final HttpParams paramsPost = new HttpParams();
paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid());
paramsPost.put("page", mNextRequestPage);
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Dialog/CusInfoDialog.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Dialog/CusInfoDialog.java
new file mode 100644
index 0000000..f2b798e
--- /dev/null
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Dialog/CusInfoDialog.java
@@ -0,0 +1,108 @@
+package com.fenghoo.seven.main.kehu.Dialog;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.fenghoo.seven.R;
+import com.fenghoo.seven.utils.GlideTools;
+import com.fenghoo.seven.utils.WidgetTools;
+import com.fenghoo.seven.widget.CircleImageView;
+
+public class CusInfoDialog extends Dialog implements View.OnClickListener {
+
+ private Context mContext;
+ private OnCloseListener listener;
+ private RelativeLayout rl_cus_03;
+ private RelativeLayout rl_cus_04;
+ private RelativeLayout rl_cus_05;
+ private CircleImageView iv_dea_avatar;
+ private TextView tv_cus_02,tv_cus_05,tv_cus_06;
+ private String str1,str2,str3,str4;
+
+ public CusInfoDialog(Context context) {
+ super(context);
+ this.mContext = context;
+ }
+
+ public CusInfoDialog(Context context,String str1,String str2,String str3,String str4, int themeResId, OnCloseListener listener) {
+ super(context, themeResId);
+ this.mContext = context;
+ this.listener = listener;
+
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.cusinfo_dialog);
+ setCanceledOnTouchOutside(false);
+ Window window = getWindow();
+ window.getDecorView().setPadding(0, 0, 0, 0);
+ WindowManager.LayoutParams layoutParams = window.getAttributes();
+ layoutParams.width = WindowManager.LayoutParams.MATCH_PARENT;
+ layoutParams.horizontalMargin = 0;
+ window.setAttributes(layoutParams);
+ window.setGravity(Gravity.BOTTOM);
+ initView();
+ }
+
+ private void initView() {
+ rl_cus_03 = (RelativeLayout) findViewById(R.id.rl_cus_03);
+ rl_cus_03.setOnClickListener(this);
+ rl_cus_04 = (RelativeLayout) findViewById(R.id.rl_cus_04);
+ rl_cus_04.setOnClickListener(this);
+ rl_cus_05 = (RelativeLayout) findViewById(R.id.rl_cus_05);
+ rl_cus_05.setOnClickListener(this);
+ iv_dea_avatar = (CircleImageView) findViewById(R.id.iv_dea_avatar);
+ tv_cus_02 = (TextView) findViewById(R.id.tv_cus_02);
+ tv_cus_05 = (TextView) findViewById(R.id.tv_cus_05);
+ tv_cus_06 = (TextView) findViewById(R.id.tv_cus_06);
+ GlideTools.init(mContext).displaypic(iv_dea_avatar, str1, R.mipmap.icon_default_head);
+ WidgetTools.setTextfive(tv_cus_02, "抖音号：", str2);
+ WidgetTools.setTextfive(tv_cus_05, "", str3);
+ WidgetTools.setTextfive(tv_cus_06, "", str4);
+
+ }
+
+ @Override
+ public void onClick(View view) {
+ switch (view.getId()) {
+ case R.id.rl_cus_03://复制抖音号
+ if (listener != null) {
+ listener.copydouyin();
+ }
+ dismiss();
+ break;
+ case R.id.rl_cus_04://复制手机号
+ if (listener != null) {
+ listener.copyphone();
+ }
+ dismiss();
+ break;
+ case R.id.rl_cus_05://拨打电话
+ if (listener != null) {
+ listener.phoneClick();
+ }
+ dismiss();
+ break;
+
+ }
+ }
+
+ public interface OnCloseListener {
+
+ void phoneClick();
+ void copydouyin();
+ void copyphone();
+
+ }
+}
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivity.java
index 0ce375f..24db95d 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivity.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivity.java
@@ -3,8 +3,12 @@ package com.fenghoo.seven.main.kehu.activity;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
+import android.view.ViewParent;
+import android.widget.FrameLayout;
import android.widget.TextView;
+import com.fenghoo.seven.main.kehu.Bean.orderListBean;
+import com.fenghoo.seven.utils.GetJsonDataUtil;
import com.fenghoo.seven.utils.JsonUtils;
import com.fenghoo.seven.R;
import com.fenghoo.seven.base.BaseActivity;
@@ -75,6 +79,18 @@ public class FpOrderInfoActivity extends BaseActivity implements View.OnClickLis
* @return
*/
private void fpOrderInfo(String industry_id) {
+
+ if(HttpConstants.Dataflag==false){
+ String JsonData = new GetJsonDataUtil().getJson(FpOrderInfoActivity.this, "fpOrderInfo.json");//获取assets目录下的json文件数据
+ fpOrderInfoBean.ResultBean result = JsonUtils.fromJson(JsonData, fpOrderInfoBean.ResultBean.class);
+ if (result != null && String.valueOf(result.getSuccess()).equals("0")) {
+ List data = result.getData();
+ initRecyclerView(data);
+ }
+ return;
+ }
+
+
final HttpParams paramsPost = new HttpParams();
paramsPost.put("customer_id", customer_id);
paramsPost.put("industry_id", industry_id);
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java
index e8f2084..fba55fa 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java
@@ -1,10 +1,16 @@
package com.fenghoo.seven.main.kehu.fragment;
import android.Manifest;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.text.TextUtils;
import android.util.Log;
import android.view.ViewParent;
import android.widget.FrameLayout;
+import com.fenghoo.seven.main.kehu.Bean.FpListBean;
+import com.fenghoo.seven.main.kehu.Dialog.CusInfoDialog;
+import com.fenghoo.seven.utils.GetJsonDataUtil;
import com.fenghoo.seven.utils.JsonUtils;
import com.fenghoo.seven.R;
import com.fenghoo.seven.base.BaseBean;
@@ -89,6 +95,36 @@ public class CustomerFragment extends MobanFragment {
}
}).show();
+
+// new CusInfoDialog(getActivity(),str1,str2,str3,str4, R.style.dialog, new CusInfoDialog.OnCloseListener() {
+// @Override
+// public void phoneClick() {//拨打电话
+// if (str3 != null) {
+// getPermissions(str3);
+// }
+// }
+//
+// @Override
+// public void copydouyin() {
+// if(!TextUtils.isEmpty(str2)){
+// ClipboardManager cm = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
+// // 将文本内容放到系统剪贴板里。
+// cm.setText(item.getPhone());
+// ToastUtils.showToast(getActivity(),"复制成功");
+// }
+// }
+//
+// @Override
+// public void copyphone() {
+// if(!TextUtils.isEmpty(str3)){
+// ClipboardManager cm = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
+// // 将文本内容放到系统剪贴板里。
+// cm.setText(item.getPhone());
+// ToastUtils.showToast(getActivity(),"复制成功");
+// }
+// }
+//
+// }).show();
}
@Override
@@ -158,6 +194,36 @@ public class CustomerFragment extends MobanFragment {
@Override
public void requestData() {
+ if(HttpConstants.Dataflag==false){
+ String JsonData = new GetJsonDataUtil().getJson(getActivity(), "customerList.json");//获取assets目录下的json文件数据
+ CustomerListBean.ResultBean result = JsonUtils.fromJson(JsonData, CustomerListBean.ResultBean.class);
+ mSwl.setRefreshing(false);
+ if (result != null && String.valueOf(result.getSuccess()).equals("0")) {
+ List data = result.getData();
+ if (mNextRequestPage == 1) {
+ if (data.size() == 0) {
+ ViewParent parent = notDataView.getParent();
+ FrameLayout mFrameLayout = (FrameLayout) parent;
+ if (mFrameLayout != null) {
+ mFrameLayout.removeView(notDataView);
+ }
+ setData(true, null);
+ markingtwoAdapter.setEmptyView(notDataView);
+ return;
+ }
+ setData(true, data);
+ } else {
+ setData(false, data);
+ }
+ } else {
+ setData(true, null);
+ markingtwoAdapter.setEmptyView(notDataView);
+ mSwl.setRefreshing(false);
+ }
+ return;
+ }
+
+
final HttpParams paramsPost = new HttpParams();
String uuid = ProfileSpUtils.getInstance().getUserProfie().getData().getUuid();
Log.e("uuid==", uuid);
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java
index a84f3cd..b5bc6d6 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java
@@ -5,6 +5,8 @@ import android.view.View;
import android.view.ViewParent;
import android.widget.FrameLayout;
+import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
+import com.fenghoo.seven.utils.GetJsonDataUtil;
import com.fenghoo.seven.utils.JsonUtils;
import com.fenghoo.seven.main.find.entity.ThreeEvent;
import com.fenghoo.seven.main.kehu.Bean.IndustryBeantwo;
@@ -63,13 +65,24 @@ public class DealFragment extends MobanFragment {
List industry = item.getIndustry();
IndustryBeantwo industryBean = new IndustryBeantwo();
List dataBeans = new ArrayList<>();
- for (int i = 0; i < industry.size(); i++) {
- orderListBean.ResultBean.DataBean.IndustryBean industryBean1 = industry.get(i);
- IndustryBeantwo.DataBean dataBean = new IndustryBeantwo.DataBean();
- dataBean.setIndustry(industryBean1.getIndustry());
- dataBean.setIndustry_id(industryBean1.getIndustry_id());
- dataBeans.add(dataBean);
+ if(HttpConstants.Dataflag==false){
+ for (int i = 0; i < 3; i++) {
+ IndustryBeantwo.DataBean dataBean = new IndustryBeantwo.DataBean();
+ dataBean.setIndustry("家具");
+ dataBean.setIndustry_id("123");
+ dataBeans.add(dataBean);
+ }
+
+ }else {
+ for (int i = 0; i < industry.size(); i++) {
+ orderListBean.ResultBean.DataBean.IndustryBean industryBean1 = industry.get(i);
+ IndustryBeantwo.DataBean dataBean = new IndustryBeantwo.DataBean();
+ dataBean.setIndustry(industryBean1.getIndustry());
+ dataBean.setIndustry_id(industryBean1.getIndustry_id());
+ dataBeans.add(dataBean);
+ }
}
+
industryBean.setData(dataBeans);
ShowAty.FpOrderInfoActivity(getActivity(), item.getCustomer_id(), item.getName() + item.getPhone(), item.getHeadimg(), item.getWechat(), item.getAddress(), industryBean);
}
@@ -104,6 +117,37 @@ public class DealFragment extends MobanFragment {
@Override
public void requestData() {
+ if(HttpConstants.Dataflag==false){
+ String JsonData = new GetJsonDataUtil().getJson(getActivity(), "orderList.json");//获取assets目录下的json文件数据
+ orderListBean.ResultBean result = JsonUtils.fromJson(JsonData, orderListBean.ResultBean.class);
+ mSwl.setRefreshing(false);
+ if (result != null && String.valueOf(result.getSuccess()).equals("0")) {
+ List data = result.getData();
+ if (mNextRequestPage == 1) {
+ if (data.size() == 0) {
+ ViewParent parent = notDataView.getParent();
+ FrameLayout mFrameLayout = (FrameLayout) parent;
+ if (mFrameLayout != null) {
+ mFrameLayout.removeView(notDataView);
+ }
+ setData(true, null);
+ markingtwoAdapter.setEmptyView(notDataView);
+ return;
+ }
+ setData(true, data);
+ } else {
+ setData(false, data);
+ }
+ } else {
+ setData(true, null);
+ markingtwoAdapter.setEmptyView(notDataView);
+ mSwl.setRefreshing(false);
+ }
+ return;
+ }
+
+
+
final HttpParams paramsPost = new HttpParams();
paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid());
paramsPost.put("search", search);
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java
index e3cb889..aa866b1 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java
@@ -4,6 +4,8 @@ import android.util.Log;
import android.view.ViewParent;
import android.widget.FrameLayout;
+import com.fenghoo.seven.main.find.entity.privateListBean;
+import com.fenghoo.seven.utils.GetJsonDataUtil;
import com.fenghoo.seven.utils.JsonUtils;
import com.fenghoo.seven.main.find.entity.ThreeEvent;
import com.fenghoo.seven.main.kehu.Bean.FpListBean;
@@ -97,6 +99,37 @@ public class DistriFragment extends MobanFragment {
@Override
public void requestData() {
+ if(HttpConstants.Dataflag==false){
+ String JsonData = new GetJsonDataUtil().getJson(getActivity(), "fpList.json");//获取assets目录下的json文件数据
+ FpListBean.ResultBean result = JsonUtils.fromJson(JsonData, FpListBean.ResultBean.class);
+ mSwl.setRefreshing(false);
+ if (result != null && String.valueOf(result.getSuccess()).equals("0")) {
+ List data = result.getData();
+ if (mNextRequestPage == 1) {
+ if (data.size() == 0) {
+ ViewParent parent = notDataView.getParent();
+ FrameLayout mFrameLayout = (FrameLayout) parent;
+ if (mFrameLayout != null) {
+ mFrameLayout.removeView(notDataView);
+ }
+ setData(true, null);
+ markingtwoAdapter.setEmptyView(notDataView);
+ return;
+ }
+ setData(true, data);
+ } else {
+ setData(false, data);
+ }
+ } else {
+ setData(true, null);
+ markingtwoAdapter.setEmptyView(notDataView);
+ mSwl.setRefreshing(false);
+ }
+ return;
+ }
+
+
+
final HttpParams paramsPost = new HttpParams();
paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid());
paramsPost.put("search", search);
diff --git a/app/src/main/java/com/fenghoo/seven/okgonet/Func1.java b/app/src/main/java/com/fenghoo/seven/okgonet/Func1.java
index bce981d..66ef531 100644
--- a/app/src/main/java/com/fenghoo/seven/okgonet/Func1.java
+++ b/app/src/main/java/com/fenghoo/seven/okgonet/Func1.java
@@ -7,7 +7,7 @@ package com.fenghoo.seven.okgonet;
* 创建日期：2017/2/6
* 描 述：
* 修订历史：
- * ================================================
+ * =============================================JumpUtils.gotoActivity===
*/
public interface Func1 {
//把一个结果转为我们需要的一个结果
diff --git a/app/src/main/java/com/fenghoo/seven/okgonet/HttpConstants.java b/app/src/main/java/com/fenghoo/seven/okgonet/HttpConstants.java
index 7b198e5..bcbe87b 100644
--- a/app/src/main/java/com/fenghoo/seven/okgonet/HttpConstants.java
+++ b/app/src/main/java/com/fenghoo/seven/okgonet/HttpConstants.java
@@ -12,7 +12,7 @@ public class HttpConstants {
// public static String URiBase = "http://192.168.1.3";// 7月7
public static String URiBase = "http://106.53.92.2";// 7月7
-
+ public static Boolean Dataflag = false;// 真假数据源
/**
* 七月七
*/
diff --git a/app/src/main/res/layout/cusinfo_dialog.xml b/app/src/main/res/layout/cusinfo_dialog.xml
new file mode 100644
index 0000000..2dd1c2c
--- /dev/null
+++ b/app/src/main/res/layout/cusinfo_dialog.xml
@@ -0,0 +1,197 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/mipmap-xxxhdpi/icon_fuzhit.png b/app/src/main/res/mipmap-xxxhdpi/icon_fuzhit.png
new file mode 100644
index 0000000..5a5748c
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/icon_fuzhit.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/icon_keneng.png b/app/src/main/res/mipmap-xxxhdpi/icon_keneng.png
new file mode 100644
index 0000000..865c112
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/icon_keneng.png differ
diff --git a/baselibs/build.gradle b/baselibs/build.gradle
index d3e89fc..050f039 100644
--- a/baselibs/build.gradle
+++ b/baselibs/build.gradle
@@ -1,8 +1,9 @@
apply plugin: 'com.android.library'
+def dbFlow_version = "4.2.4"
android {
compileSdkVersion 28
- buildToolsVersion '28.0.3'
+ buildToolsVersion "28.0.0"
defaultConfig {
minSdkVersion 15
@@ -13,20 +14,11 @@ android {
}
dependencies {
- compile fileTree(include: ['*.jar'], dir: 'libs')
- compile 'com.123ufo:BannerView:1.0'
- //Rxjava
- compile 'io.reactivex.rxjava2:rxjava:2.1.5'
- compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
- compile 'com.squareup.retrofit2:retrofit:2.4.0'
- compile 'com.squareup.retrofit2:converter-gson:2.3.0'
- compile 'com.squareup.okhttp3:logging-interceptor:3.5.0'
- compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
- //地址选择器 https://github.com/chihane/JDAddressSelector
- compile 'com.github.chihane:JDAddressSelector:1.1.4'
- compile 'com.github.bumptech.glide:glide:4.7.1'
- //dagger
- // compile 'com.google.dagger:dagger:2.6'
- // annotationProcessor 'com.google.dagger:dagger-compiler:2.6'
+ implementation fileTree(include: ['*.jar'], dir: 'libs')
+
+// annotationProcessor "com.github.Raizlabs.DBFlow:dbflow-processor:${dbFlow_version}"
+// compile "com.github.Raizlabs.DBFlow:dbflow-core:${dbFlow_version}"
+// compile "com.github.Raizlabs.DBFlow:dbflow:${dbFlow_version}"
+
}
diff --git a/build.gradle b/build.gradle
index 72cb327..c3e1a31 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,7 @@ buildscript {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.6"
+
}
}
@@ -22,6 +23,10 @@ allprojects {
google()
jcenter()
maven { url "https://jitpack.io"}
+ maven { url "https://www.jitpack.io" }
+// maven { url 'https://dl.bintray.com/aweme-open-sdk-team/public' }
+
+
}
}
diff --git a/settings.gradle b/settings.gradle
index 54aeb11..0fabec7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':baselibs', ':citypicker'
+include ':app', ':citypicker'