diff --git a/app/build.gradle b/app/build.gradle
index a72b55b..8d136a0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,6 +9,7 @@ android {
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+ multiDexEnabled true //突破应用方法数65535的一个限制
}
buildTypes {
release {
@@ -56,7 +57,7 @@ dependencies {
implementation 'com.j256.ormlite:ormlite-android:5.1'
implementation files('libs/eventbus-2.4.0.jar')
//三级联动选择
- // implementation 'com.contrarywind:Android-PickerView:3.2.6'
+ // implementation 'com.contrarywind:Android-PickerView:3.2.6'
implementation 'com.contrarywind:Android-PickerView:4.1.9'
-
+ implementation files('libs/fastjson-1.1.43.android.jar')
}
diff --git a/app/libs/fastjson-1.1.43.android.jar b/app/libs/fastjson-1.1.43.android.jar
new file mode 100644
index 0000000..483fd1e
Binary files /dev/null and b/app/libs/fastjson-1.1.43.android.jar differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 73df552..d0e51eb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,11 +15,11 @@
android:supportsRtl="true"
android:theme="@style/AppTheme">
-
-
+
+
-
-
+
+
@@ -30,10 +30,10 @@
android:screenOrientation="portrait"
android:theme="@style/SplashTheme">
-
-
-
-
+
+
+
+
+
+
diff --git a/app/src/main/java/com/example/administrator/seven/BaseApplication.java b/app/src/main/java/com/example/administrator/seven/BaseApplication.java
index c0ce0e8..ff1c085 100644
--- a/app/src/main/java/com/example/administrator/seven/BaseApplication.java
+++ b/app/src/main/java/com/example/administrator/seven/BaseApplication.java
@@ -39,7 +39,11 @@ import okhttp3.OkHttpClient;
public class BaseApplication extends Application {
private static Context mContext;
+ private static BaseApplication baseApplication;
+ public static BaseApplication getInstance() {
+ return baseApplication;
+ }
private String str;
@@ -52,6 +56,7 @@ public class BaseApplication extends Application {
@Override
public void onCreate() {
super.onCreate();
+ baseApplication = this;
mContext = this;
//用户资料存储工具
ProfileSpUtils.init(this);
diff --git a/app/src/main/java/com/example/administrator/seven/main/kehu/Bean/CommitDesignModel.java b/app/src/main/java/com/example/administrator/seven/main/kehu/Bean/CommitDesignModel.java
index d382827..f7b66c8 100644
--- a/app/src/main/java/com/example/administrator/seven/main/kehu/Bean/CommitDesignModel.java
+++ b/app/src/main/java/com/example/administrator/seven/main/kehu/Bean/CommitDesignModel.java
@@ -4,32 +4,6 @@ import com.example.administrator.seven.test.BaseModel;
public class CommitDesignModel extends BaseModel {
-
- /**
- * result : {"msg":"提交成功","success":0}
- * status : 0
- */
-
- private ResultBean result;
- private int status;
-
- public ResultBean getResult() {
- return result;
- }
-
- public void setResult(ResultBean result) {
- this.result = result;
- }
-
- public int getStatus() {
- return status;
- }
-
- public void setStatus(int status) {
- this.status = status;
- }
-
- public static class ResultBean {
/**
* msg : 提交成功
* success : 0
@@ -53,5 +27,5 @@ public class CommitDesignModel extends BaseModel {
public void setSuccess(int success) {
this.success = success;
}
- }
+
}
diff --git a/app/src/main/java/com/example/administrator/seven/main/kehu/Bean/JsonBeantwo.java b/app/src/main/java/com/example/administrator/seven/main/kehu/Bean/JsonBeantwo.java
index 16eeb6a..2f07d17 100644
--- a/app/src/main/java/com/example/administrator/seven/main/kehu/Bean/JsonBeantwo.java
+++ b/app/src/main/java/com/example/administrator/seven/main/kehu/Bean/JsonBeantwo.java
@@ -52,7 +52,7 @@ public class JsonBeantwo implements IPickerViewData {
@Override
public String getPickerViewText() {
- return this.areaName+","+this.areaId;
+ return this.areaName;
}
public static class CitiesBean {
diff --git a/app/src/main/java/com/example/administrator/seven/main/kehu/Bean/industryBean.java b/app/src/main/java/com/example/administrator/seven/main/kehu/Bean/industryBean.java
new file mode 100644
index 0000000..09816d4
--- /dev/null
+++ b/app/src/main/java/com/example/administrator/seven/main/kehu/Bean/industryBean.java
@@ -0,0 +1,99 @@
+package com.example.administrator.seven.main.kehu.Bean;
+
+import com.example.administrator.seven.test.BaseModel;
+
+import java.util.List;
+
+/**
+ * Time: 2020/8/20
+ * Author: jianbo
+ * Description:
+ */
+public class industryBean extends BaseModel {
+
+ /**
+ * result : {"msg":"成功","data":[{"industry_id":"1","industry":"家具"}],"success":0}
+ * status : 0
+ */
+
+ private ResultBean result;
+ private int status;
+
+ public ResultBean getResult() {
+ return result;
+ }
+
+ public void setResult(ResultBean result) {
+ this.result = result;
+ }
+
+ public int getStatus() {
+ return status;
+ }
+
+ public void setStatus(int status) {
+ this.status = status;
+ }
+
+ public static class ResultBean {
+ /**
+ * msg : 成功
+ * data : [{"industry_id":"1","industry":"家具"}]
+ * success : 0
+ */
+
+ private String msg;
+ private int success;
+ private List data;
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+
+ public int getSuccess() {
+ return success;
+ }
+
+ public void setSuccess(int success) {
+ this.success = success;
+ }
+
+ public List getData() {
+ return data;
+ }
+
+ public void setData(List data) {
+ this.data = data;
+ }
+
+ public static class DataBean {
+ /**
+ * industry_id : 1
+ * industry : 家具
+ */
+
+ private String industry_id;
+ private String industry;
+
+ public String getIndustry_id() {
+ return industry_id;
+ }
+
+ public void setIndustry_id(String industry_id) {
+ this.industry_id = industry_id;
+ }
+
+ public String getIndustry() {
+ return industry;
+ }
+
+ public void setIndustry(String industry) {
+ this.industry = industry;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/example/administrator/seven/main/kehu/TraceFragment.java b/app/src/main/java/com/example/administrator/seven/main/kehu/TraceFragment.java
index 8899868..03b99bc 100644
--- a/app/src/main/java/com/example/administrator/seven/main/kehu/TraceFragment.java
+++ b/app/src/main/java/com/example/administrator/seven/main/kehu/TraceFragment.java
@@ -151,6 +151,7 @@ public class TraceFragment extends BaseFragment implements View.OnClickListener
default:
break;
case R.id.bt_sousuo_ditu:
+ ShowAty.SearchActivity(getActivity());
break;
case R.id.enter_shop_shai:
break;
diff --git a/app/src/main/java/com/example/administrator/seven/main/kehu/activity/CustomerDetailActivity.java b/app/src/main/java/com/example/administrator/seven/main/kehu/activity/CustomerDetailActivity.java
index 8525300..0a8c891 100644
--- a/app/src/main/java/com/example/administrator/seven/main/kehu/activity/CustomerDetailActivity.java
+++ b/app/src/main/java/com/example/administrator/seven/main/kehu/activity/CustomerDetailActivity.java
@@ -1,12 +1,36 @@
package com.example.administrator.seven.main.kehu.activity;
import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
import android.widget.TextView;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.Priority;
+import com.bumptech.glide.request.RequestOptions;
+import com.example.administrator.seven.JsonUtils;
import com.example.administrator.seven.R;
import com.example.administrator.seven.base.BaseActivity;
+import com.example.administrator.seven.db.DbRecordBeanData;
+import com.example.administrator.seven.main.kehu.Bean.customerFPListBean;
+import com.example.administrator.seven.okgonet.NetApi;
+import com.example.administrator.seven.okgonet.Observer;
+import com.example.administrator.seven.utils.GlideTools;
+import com.example.administrator.seven.utils.ToastUtils;
+import com.example.administrator.seven.utils.ToolsText;
+import com.example.administrator.seven.utils.WidgetTools;
+import com.example.administrator.seven.utils.checkVersionsUtils.ProfileSpUtils;
import com.example.administrator.seven.widget.CircleImageView;
import com.example.administrator.seven.widget.TitleBar;
+import com.lzy.okgo.model.Response;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.List;
+import java.util.Map;
/**
* 客户详情
@@ -15,61 +39,83 @@ public class CustomerDetailActivity extends BaseActivity {
private TitleBar mTitleBar;
private CircleImageView mIvDraUserHeads;
- /**
- * 姓名:--
- */
private TextView mTvDraUserName;
- /**
- * 电话:— —
- */
private TextView mTvDarUserPhone;
- /**
- * 家装阶段:
- */
- private TextView mTvDraInfo01;
- /**
- * 毛胚
- */
private TextView mTvDraInfo02;
- /**
- * 风格
- */
- private TextView mTvDraInfo03;
- /**
- * 美式
- */
private TextView mTvDraInfo04;
- /**
- * 预算
- */
- private TextView mTvDraInfo05;
- /**
- * 10万
- */
private TextView mTvDraInfo06;
- private String namephone;
+ private String customer_id;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_customer_detail);
- namephone = getIntent().getStringExtra("namephone");
+ customer_id = getIntent().getStringExtra("customer_id");
initView();
initNormalBack();
+ getData(customer_id);
}
-
private void initView() {
mTitleBar = (TitleBar) findViewById(R.id.title_bar);
- mTitleBar.setTitle(namephone);
mIvDraUserHeads = (CircleImageView) findViewById(R.id.iv_dra_user_heads);
mTvDraUserName = (TextView) findViewById(R.id.tv_dra_user_name);
mTvDarUserPhone = (TextView) findViewById(R.id.tv_dar_user_phone);
- mTvDraInfo01 = (TextView) findViewById(R.id.tv_dra_info01);
mTvDraInfo02 = (TextView) findViewById(R.id.tv_dra_info02);
- mTvDraInfo03 = (TextView) findViewById(R.id.tv_dra_info03);
mTvDraInfo04 = (TextView) findViewById(R.id.tv_dra_info04);
- mTvDraInfo05 = (TextView) findViewById(R.id.tv_dra_info05);
mTvDraInfo06 = (TextView) findViewById(R.id.tv_dra_info06);
}
+ public void getData(String customer_id) {
+ new NetApi().customerDetail(customer_id).subscribe(new Observer() {
+ @Override
+ public void onNext(Response response) {
+ String body = (String) response.body();
+ try {
+ JSONObject jsonObject = new JSONObject(body);
+ String result = jsonObject.optString("result");
+ Log.d("okgo的返回结果result", result);
+ JSONObject result1 = jsonObject.getJSONObject("result");
+ String success = result1.getString("success");
+ String msg = result1.getString("msg");
+ if (success.equals("0")) {
+ String data1 = result1.getString("data");
+ Map data = JSON.parseObject(data1, new TypeReference