admin/July
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

d

Browse Source
This commit is contained in:
jianbo
2020-09-04 18:16:17 +08:00
parent 96b845b673
commit 0505dedf59
7 changed files with 101 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/AndroidManifest.xml
View File

@@ -52,13 +52,6 @@
<activity android:name=".main.find.ConversationActivity" />
<activity android:name=".main.find.CommentActivity" />
<activity android:name=".main.kehu.activity.JsonDataActivity">
<!-- <intent-filter> -->
<!-- <action android:name="android.intent.action.MAIN" /> -->
<!-- <category android:name="android.intent.category.LAUNCHER" /> -->
<!-- </intent-filter> -->
</activity>
<activity android:name=".main.kehu.activity.CustomerDetailActivity" />
<activity android:name=".main.activity.Main2Activity" /> <!-- 开启页 -->
@@ -89,13 +82,6 @@
android:screenOrientation="portrait"
android:theme="@style/DefaultCityPickerTheme"
>
<!-- <intent-filter> -->
<!-- <action android:name="android.intent.action.MAIN" /> -->
<!-- <category android:name="android.intent.category.LAUNCHER" /> -->
<!-- </intent-filter> -->
</activity>
<activity android:name=".view.webview.XfiveWebActivity" />
<activity android:name=".view.webview.WebActivitytwo" />
@@ -114,13 +100,6 @@
<activity
android:name=".main.kehu.activity.DesignActivity"
android:screenOrientation="portrait">
<!-- <intent-filter> -->
<!-- <action android:name="android.intent.action.MAIN" /> -->
<!-- <category android:name="android.intent.category.LAUNCHER" /> -->
<!-- </intent-filter> -->
</activity>
<activity
android:name=".main.find.CloundSolutionActivity"
@@ -134,13 +113,12 @@
android:name=".main.my.activity.PersonalProfileActivity"
android:screenOrientation="portrait" />
<activity android:name=".main.kehu.activity.AddCustomerActivity"
android:windowSoftInputMode="adjustPan"
android:screenOrientation="portrait" />
<activity android:name=".main.kehu.activity.AddCustDialogActivity"
android:theme="@style/dialogstyle"
android:configChanges="orientation|screenSize"
android:screenOrientation="portrait" />
<activity android:name=".main.kehu.activity.StyleActivity"
android:screenOrientation="portrait" />
<activity android:name=".main.kehu.activity.BudgetActivity"
@@ -155,5 +133,4 @@
android:resource="@xml/file_paths_public"></meta-data>
</provider>
</application>
</manifest>

6
app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustomerActivity.java
View File

@@ -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();

19
app/src/main/java/com/fenghoo/seven/main/kehu/activity/JsonDataActivity.java
View File

@@ -31,7 +31,6 @@ import androidx.appcompat.app.AppCompatActivity;
*/
public class JsonDataActivity extends AppCompatActivity implements View.OnClickListener {
private List<JsonBeantwo> options1Items = new ArrayList<>();
private List<JsonBeantwo> options1Itemids = new ArrayList<>();
private ArrayList<ArrayList<String>> 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<String> cityList = new ArrayList<>();//该省的城市列表（第二级）
ArrayList<String> cityidList = new ArrayList<>();//该省的城市列表（第二级id）
ArrayList<ArrayList<String>> 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<JsonBeantwo> parseData(String result) {//Gson 解析
ArrayList<JsonBeantwo> detail = new ArrayList<>();
try {
@@ -200,7 +188,6 @@ public class JsonDataActivity extends AppCompatActivity implements View.OnClickL
return detail;
}
@Override
protected void onDestroy() {
super.onDestroy();

2
app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java
View File

@@ -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();

5
app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java
View File

@@ -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();

89
app/src/main/java/com/fenghoo/seven/utils/JumpUtils.java Normal file
View File

@@ -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();
}
}

1
app/src/main/res/layout/addcus_head_view.xml
View File

@@ -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"