diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7d312d1..bfbd771 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -52,13 +52,6 @@
-
-
-
-
-
-
-
@@ -89,13 +82,6 @@
android:screenOrientation="portrait"
android:theme="@style/DefaultCityPickerTheme"
>
-
-
-
-
-
-
-
@@ -114,13 +100,6 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustomerActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustomerActivity.java
index 7e6fbef..89f4681 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustomerActivity.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustomerActivity.java
@@ -30,10 +30,8 @@ public class AddCustomerActivity extends BaseActivity {
mTitleBar = (TitleBar) findViewById(R.id.title_bar);
mTitleBar.setTitle("信息完善");
initNormalBack();
-// customer_id = getIntent().getStringExtra("customer_id");
-// source = getIntent().getStringExtra("source");
- search = getIntent().getStringExtra("search");
- pagetype = getIntent().getStringExtra("pagetype");
+// search = getIntent().getStringExtra("search");
+// pagetype = getIntent().getStringExtra("pagetype");
CustomerListBean.ResultBean.DataBean dataBean = (CustomerListBean.ResultBean.DataBean) getIntent().getSerializableExtra("dataBean");
customer_id = dataBean.getCustomer_id();
source = dataBean.getSource();
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/JsonDataActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/JsonDataActivity.java
index ba428fe..5874de9 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/JsonDataActivity.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/JsonDataActivity.java
@@ -31,7 +31,6 @@ import androidx.appcompat.app.AppCompatActivity;
*/
public class JsonDataActivity extends AppCompatActivity implements View.OnClickListener {
-
private List options1Items = new ArrayList<>();
private List options1Itemids = new ArrayList<>();
private ArrayList> options2Items = new ArrayList<>();
@@ -40,7 +39,6 @@ public class JsonDataActivity extends AppCompatActivity implements View.OnClickL
private static final int MSG_LOAD_DATA = 0x0001;
private static final int MSG_LOAD_SUCCESS = 0x0002;
private static final int MSG_LOAD_FAILED = 0x0003;
-
private static boolean isLoaded = false;
@Override
@@ -57,7 +55,7 @@ public class JsonDataActivity extends AppCompatActivity implements View.OnClickL
case MSG_LOAD_DATA:
if (thread == null) {//如果已创建就不再重新创建子线程了
- Toast.makeText(JsonDataActivity.this, "Begin Parse Data", Toast.LENGTH_SHORT).show();
+ // Toast.makeText(JsonDataActivity.this, "Begin Parse Data", Toast.LENGTH_SHORT).show();
thread = new Thread(new Runnable() {
@Override
public void run() {
@@ -70,12 +68,12 @@ public class JsonDataActivity extends AppCompatActivity implements View.OnClickL
break;
case MSG_LOAD_SUCCESS:
- Toast.makeText(JsonDataActivity.this, "Parse Succeed", Toast.LENGTH_SHORT).show();
+ // Toast.makeText(JsonDataActivity.this, "Parse Succeed", Toast.LENGTH_SHORT).show();
isLoaded = true;
break;
case MSG_LOAD_FAILED:
- Toast.makeText(JsonDataActivity.this, "Parse Failed", Toast.LENGTH_SHORT).show();
+ // Toast.makeText(JsonDataActivity.this, "Parse Failed", Toast.LENGTH_SHORT).show();
break;
}
}
@@ -102,7 +100,6 @@ public class JsonDataActivity extends AppCompatActivity implements View.OnClickL
}
}
-
private void showPickerView() {// 弹出选择器
OptionsPickerView pvOptions = new OptionsPickerBuilder(this, new OnOptionsSelectListener() {
@@ -126,7 +123,6 @@ public class JsonDataActivity extends AppCompatActivity implements View.OnClickL
Toast.makeText(JsonDataActivity.this, tx, Toast.LENGTH_SHORT).show();
}
})
-
.setTitleText("城市选择")
.setDividerColor(Color.BLACK)
.setTextColorCenter(Color.BLACK) //设置选中项文字颜色
@@ -161,29 +157,21 @@ public class JsonDataActivity extends AppCompatActivity implements View.OnClickL
ArrayList cityList = new ArrayList<>();//该省的城市列表（第二级）
ArrayList cityidList = new ArrayList<>();//该省的城市列表（第二级id）
ArrayList> province_AreaList = new ArrayList<>();//该省的所有地区列表（第三极）
-
for (int c = 0; c < jsonBean.get(i).getCities().size(); c++) {//遍历该省份的所有城市
String cityName = jsonBean.get(i).getCities().get(c).getAreaName();
String areaId = jsonBean.get(i).getCities().get(c).getAreaId();
cityList.add(cityName);//添加城市
cityidList.add(areaId);
-
}
/**
* 添加城市数据
*/
options2Items.add(cityList);
options2Itemids.add(cityidList);
-
}
-
-
-
mHandler.sendEmptyMessage(MSG_LOAD_SUCCESS);
-
}
-
public ArrayList parseData(String result) {//Gson 解析
ArrayList detail = new ArrayList<>();
try {
@@ -200,7 +188,6 @@ public class JsonDataActivity extends AppCompatActivity implements View.OnClickL
return detail;
}
-
@Override
protected void onDestroy() {
super.onDestroy();
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java
index 3cf7a79..a2fa76c 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java
@@ -132,8 +132,6 @@ public class ShowAty {
*/
public static void AddCustomerActivity(Context ctx,CustomerListBean.ResultBean.DataBean dataBean,String search,String pagetype) {
Intent i = new Intent(ctx, AddCustomerActivity.class);
-// i.putExtra("customer_id",customer_id);
-// i.putExtra("source",source);
i.putExtra("search",search);
i.putExtra("pagetype",pagetype);
Bundle bundle = new Bundle();
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 b3bb602..f8311db 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
@@ -12,11 +12,13 @@ import com.fenghoo.seven.dialog.BaseTipsDialog;
import com.fenghoo.seven.main.find.entity.ThreeEvent;
import com.fenghoo.seven.main.kehu.Bean.CustomerListBean;
import com.fenghoo.seven.main.kehu.Dialog.CusOperationDialog;
+import com.fenghoo.seven.main.kehu.activity.AddCustomerActivity;
import com.fenghoo.seven.main.kehu.activity.ShowAty;
import com.fenghoo.seven.main.kehu.adapter.CusListAdapter;
import com.fenghoo.seven.okgonet.HttpConstants;
import com.fenghoo.seven.okgonet.NetApi;
import com.fenghoo.seven.okgonet.Observer;
+import com.fenghoo.seven.utils.JumpUtils;
import com.fenghoo.seven.utils.ToastUtils;
import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils;
import com.lzy.okgo.model.HttpParams;
@@ -86,7 +88,10 @@ public class CustomerFragment extends MobanFragment {
String customer_id = item.getCustomer_id();
String source = item.getSource();
// ShowAty.AddCustomerActivity(getActivity(),customer_id,source,search,"0");
+
+
ShowAty.AddCustomerActivity(getActivity(),item,search,"0");
+ // JumpUtils.gotoActivity(getActivity(), AddCustomerActivity.class, false, "dataBean", item);
}
}).show();
diff --git a/app/src/main/java/com/fenghoo/seven/utils/JumpUtils.java b/app/src/main/java/com/fenghoo/seven/utils/JumpUtils.java
new file mode 100644
index 0000000..dc9e43f
--- /dev/null
+++ b/app/src/main/java/com/fenghoo/seven/utils/JumpUtils.java
@@ -0,0 +1,89 @@
+package com.fenghoo.seven.utils;
+
+import android.app.Activity;
+import android.content.Intent;
+
+import java.io.Serializable;
+
+public class JumpUtils {
+
+
+ /**
+ * activity跳转
+ *
+ * @param poFrom
+ * @param poTo
+ * @param pbFinish
+ * 是否关闭poFrom
+ * @param lsKey
+ * 参数key
+ * @param pmExtra
+ * 参数 Value Serializable
+ */
+ public static void gotoActivity(Activity poFrom, Class poTo,
+ boolean pbFinish, String lsKey, Object pmExtra) {
+ Intent loIntent = new Intent(poFrom, poTo);
+ if (pmExtra != null) {
+ loIntent.putExtra(lsKey, (Serializable) pmExtra);
+ }
+ poFrom.startActivity(loIntent);
+
+ if (pbFinish) {
+ poFrom.finish();
+ }
+ }
+
+
+ /**
+ * activity跳转
+ *
+ * @param poFrom
+ * @param poTo
+ * @param pbFinish
+ * 是否关闭poFrom
+ * @param requestCode
+ * @param lsKey
+ * 参数key
+ * @param pmExtra
+ * 参数 Value Serializable
+ */
+
+ public static void gotoForResultActivity(Activity poFrom, Class poTo,
+ boolean pbFinish, int requestCode, String lsKey, Object pmExtra) {
+ Intent loIntent = new Intent(poFrom, poTo);
+ if (pmExtra != null) {
+ loIntent.putExtra(lsKey, (Serializable) pmExtra);
+ }
+ poFrom.startActivityForResult(loIntent, requestCode);
+
+ if (pbFinish) {
+ poFrom.finish();
+ }
+ }
+
+ /**
+ * activity跳转
+ *
+ * @param poFrom
+ * @param poTo
+ * @param pbFinish
+ * 是否关闭poFrom
+ * @param requestCode
+ * @param lsKey
+ * 参数key
+ * @param pmExtra
+ * 参数 Value Serializable
+ */
+ public static void gotoResultActivity(Activity poFrom, Class poTo,
+ boolean pbFinish, int requestCode, String lsKey, Object pmExtra) {
+ Intent loIntent = new Intent(poFrom, poTo);
+ if (pmExtra != null) {
+ loIntent.putExtra(lsKey, (Serializable) pmExtra);
+ }
+ if (pbFinish)
+ poFrom.finish();
+ poFrom.setResult(requestCode, loIntent);
+ poFrom.finish();
+ }
+
+}
diff --git a/app/src/main/res/layout/addcus_head_view.xml b/app/src/main/res/layout/addcus_head_view.xml
index a099cae..b7d352a 100644
--- a/app/src/main/res/layout/addcus_head_view.xml
+++ b/app/src/main/res/layout/addcus_head_view.xml
@@ -120,6 +120,7 @@
android:gravity="center_vertical"
android:singleLine="true"
android:hint="请输入客户电话"
+ android:inputType="phone"
android:textColorHint="#D1D1D1"
android:textColor="#000000"
android:textSize="14sp"